From fbd7c6d689c3ccb8e19e337cf235b7a21527cfaf Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 20 Oct 2015 10:42:55 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Locale=20f=C3=BCr=20Zahlen=20korrigiert=20d?= =?UTF-8?q?amit=20Komma=20als=20Punkt=20dargestellt=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/cis.config-default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php index 5dceae7bd..aa24ca99a 100644 --- a/config/cis.config-default.inc.php +++ b/config/cis.config-default.inc.php @@ -11,6 +11,7 @@ error_reporting(E_ALL); mb_internal_encoding("UTF-8"); mb_regex_encoding("UTF-8"); setlocale (LC_ALL, 'de_AT.utf8'); +setlocale (LC_NUMERIC, 'C'); // Zeitzone date_default_timezone_set('Europe/Vienna'); From 2c8b77e0fb734542131070253d03a316ca0a1f2b Mon Sep 17 00:00:00 2001 From: Andreas Moik Date: Tue, 20 Oct 2015 10:57:33 +0200 Subject: [PATCH 2/3] =?UTF-8?q?getArray()=20hinzugef=C3=BCgt,=20welche=20d?= =?UTF-8?q?ie=20Statistikdaten=20als=20Array=20zur=C3=BCckgibt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/statistik.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/statistik.class.php b/include/statistik.class.php index c66ddb503..85fb6e834 100644 --- a/include/statistik.class.php +++ b/include/statistik.class.php @@ -605,6 +605,11 @@ class statistik extends basis_db { return json_encode($this->json); } + + function getArray() + { + return $this->json; + } /** * From 70b5cd8a3729b70a6a3c6aec302eda07f0db7eaa Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 20 Oct 2015 11:09:16 +0200 Subject: [PATCH 3/3] Gruppen werden in der Notenliste als Text formatiert damit Gruppen mit E im Namen nicht als Exponentialzahl dargestellt werden --- cis/private/lehre/notenliste.xls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index 76d8cfe2a..14d72eccb 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -246,7 +246,7 @@ else $note=''; $worksheet->write($lines,1,$elem->nachname.$inc); $worksheet->write($lines,2,$elem->vorname); - $worksheet->write($lines,3,$elem->semester.$elem->verband.$elem->gruppe); + $worksheet->write($lines,3,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"'); $worksheet->write($lines,4,'="'.trim($elem->matrikelnr).'"',$format_highlight); $worksheet->write($lines,5,$note,$format_highlight); $i++;