diff --git a/content/fas.xul.php b/content/fas.xul.php index bfcdd99aa..418c41229 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -52,7 +52,7 @@ echo ''; ?> + variable->locale.'/fas.dtd'); ?> ]> loadVariables($user); $stg = new studiengang(); $stg->getAll('typ, kurzbz'); +if(isset($_REQUEST['outputformat'])) + $outputformat = $_REQUEST['outputformat']; +else + $outputformat = 'html'; + if(isset($_REQUEST['stsem'])) $studiensemester_kurzbz = $_REQUEST['stsem']; else @@ -39,7 +48,7 @@ else $stsem = new studiensemester(); $stsem->getAll(); -echo ' +$html.= ' @@ -63,7 +72,7 @@ echo '

DropOut Statistik - Studiensemester '.$db->convert_html_chars($studiensemester_kurzbz).'

'; -echo '
+$html.= ' Studiensemester: +$html.= '
'; -echo ' +$html.= ' @@ -92,6 +101,7 @@ echo ' '; +$csv.='"Studiengang", "Anfaenger M", "Anfaenger W", "Anfaenger Gesamt", "Abbrecher M", "Abbrecher W", "Abbrecher Gesamt", "DropOut in %"'."\r\n"; $summe_anfaenger_m=0; $summe_anfaenger_w=0; @@ -104,8 +114,10 @@ foreach($stg->result as $row_stg) { if($row_stg->typ!='b' && $row_stg->typ!='m') continue; - echo "\n"; - echo ''; + $html.= "\n"; + $html.= ''; + $csv.='"'.$row_stg->kuerzel.'", '; + $json.='"'.$row_stg->kuerzel.'":{'; //Studienanfaenger $qry = " @@ -129,10 +141,19 @@ foreach($stg->result as $row_stg) while($row = $db->db_fetch_object($result)) $anfaenger[$row->geschlecht]=$row->anzahl; - echo ''; - echo ''; + $html.= ''; + $csv.='"'.$anfaenger['m'].'", '; + $json.='"Anfaenger M": "'.$anfaenger['m'].'", '; + + $html.= ''; + $csv.='"'.$anfaenger['w'].'", '; + $json.='"Anfaenger W": "'.$anfaenger['w'].'", '; + $anfaenger_gesamt = array_sum($anfaenger); - echo ''; + $html.= ''; + $csv.='"'.$anfaenger_gesamt.'", '; + $json.='"Anfaenger Gesamt": "'.$anfaenger_gesamt.'", '; + $summe_anfaenger_m+=$anfaenger['m']; $summe_anfaenger_w+=$anfaenger['w']; $summe_anfaenger_gesamt+=$anfaenger_gesamt; @@ -173,10 +194,18 @@ foreach($stg->result as $row_stg) while($row = $db->db_fetch_object($result)) $abbrecher[$row->geschlecht]=$row->anzahl; - echo ''; - echo ''; + $html.= ''; + $csv.='"'.$abbrecher['m'].'", '; + $json.='"Abbrecher M": "'.$abbrecher['m'].'", '; + + $html.= ''; + $csv.='"'.$abbrecher['w'].'", '; + $json.='"Abbrecher W": "'.$abbrecher['w'].'", '; + $abbrecher_gesamt = array_sum($abbrecher); - echo ''; + $html.= ''; + $csv.='"'.$abbrecher_gesamt.'", '; + $json.='"Abbrecher Gesamt": "'.$abbrecher_gesamt.'", '; $summe_abbrecher_m+=$abbrecher['m']; $summe_abbrecher_w+=$abbrecher['w']; @@ -185,14 +214,17 @@ foreach($stg->result as $row_stg) $dropout=0; else $dropout = 100/$anfaenger_gesamt*$abbrecher_gesamt; - echo ''; - echo "\n\n"; + $html.= ''; + $csv.='"'.number_format($dropout,2).'"'."\n"; + $json.='"DropOut in %": "'.number_format($dropout,2).'"}, '; + + $html.= "\n\n"; } if($summe_abbrecher_gesamt==0 || $summe_anfaenger_gesamt==0) $dropout_gesamt=0; else $dropout_gesamt = 100/$summe_anfaenger_gesamt*$summe_abbrecher_gesamt; -echo ' +$html.= ' @@ -207,6 +239,28 @@ echo '
'.$db->convert_html_chars($row_stg->kuerzel).'
'.$db->convert_html_chars($row_stg->kuerzel).''.$db->convert_html_chars($anfaenger['m']).''.$db->convert_html_chars($anfaenger['w']).''.$db->convert_html_chars($anfaenger['m']).''.$db->convert_html_chars($anfaenger['w']).''.$db->convert_html_chars($anfaenger_gesamt).''.$db->convert_html_chars($anfaenger_gesamt).''.$db->convert_html_chars($abbrecher['m']).''.$db->convert_html_chars($abbrecher['w']).''.$db->convert_html_chars($abbrecher['m']).''.$db->convert_html_chars($abbrecher['w']).''.$db->convert_html_chars($abbrecher_gesamt).''.$db->convert_html_chars($abbrecher_gesamt).''.$db->convert_html_chars(number_format($dropout,2)).' %
'.$db->convert_html_chars(number_format($dropout,2)).' %
'; -echo ' +$html.= ' '; -?> \ No newline at end of file +// JSON-Ende: letzes Komma loeschen und beenden +$json=substr($json,0,-2).'}'; +switch ($outputformat) +{ + case 'csv': + header("Content-type: text/csv"); + header("Content-Disposition: attachment; filename=dropout.csv"); + header("Pragma: no-cache"); + header("Expires: 0"); + echo $csv; + break; + case 'json': + header("Content-type: application/json"); + header("Content-Disposition: attachment; filename=dropout.json"); + header("Pragma: no-cache"); + header("Expires: 0"); + echo $json; + //echo '{"one": "Singular sensation","two": "Beady little eyes","three": "Little birds pitch by my doorstep"}'; + break; + default: + echo $html; +} +?> diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php index 9c3c3a40f..3a3a6994d 100644 --- a/content/student/studentdetailoverlay.xul.php +++ b/content/student/studentdetailoverlay.xul.php @@ -26,10 +26,19 @@ header("Expires Mon, 26 Jul 1997 05:00:00 GMT"); header("Pragma: no-cache"); header("Content-type: application/vnd.mozilla.xul+xml"); require_once('../../config/vilesci.config.inc.php'); +require_once('../../include/variable.class.php'); +require_once('../../include/functions.inc.php'); +$user=get_uid(); +$variable = new variable(); +if(!$variable->loadVariables($user)) +{ + die('Fehler beim Laden der Variablen:'.$variable->errormsg); +} echo ''; - ?> - +variable->locale.'/fas.dtd'); ?> +]> '; - + @@ -343,13 +352,13 @@ echo ''; -