From 71b36b66e5d790864f414c1596159865cbb5f4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 6 Sep 2007 10:03:29 +0000 Subject: [PATCH] --- content/fas.xul.php | 4 ++-- content/statistik/bewerberstatistik.xls.php | 11 ++++++++++- content/statistik/lvplanung.php | 18 +++++++++++++++--- content/student/studentprojektarbeit.js.php | 8 ++++++++ .../studentprojektarbeitoverlay.xul.php | 4 ++-- include/projektarbeit.class.php | 4 ++-- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/content/fas.xul.php b/content/fas.xul.php index d964fdb6c..4c6e2e51f 100644 --- a/content/fas.xul.php +++ b/content/fas.xul.php @@ -218,12 +218,12 @@ echo ''; label = "&menu-statistic-notenspiegel.label;" command = "menu-statistic-notenspiegel:command" accesskey = "&menu-statistic-notenspiegel.accesskey;"/> - + accesskey = "&menu-statistic-bewerberstatistik.accesskey;"/>--> diff --git a/content/statistik/bewerberstatistik.xls.php b/content/statistik/bewerberstatistik.xls.php index 0ccbf8bf7..396b96aa6 100644 --- a/content/statistik/bewerberstatistik.xls.php +++ b/content/statistik/bewerberstatistik.xls.php @@ -42,6 +42,12 @@ loadVariables($conn, $user); $maxlength= array(); $zeile=1; + $stg_arr_2=array("227"=>"(B)BME","228"=>"(M)BMES","999"=>"(DI)bTec","11"=>"(DI)E","254"=>"(B)E","91"=>"(DI)EW", + "94"=>"(DI)EID","297"=>"(M)ES","1"=>"(M)EUE","329"=>"(M)GRT","300"=>"(M)IE","257"=>"(B)INF", + "182"=>"(DI)SET","327"=>"(B)SET","332"=>"(M)MTUM","298"=>"(M)TKIT","476"=>"(B)EUE","222"=>"(DI)VT", + "301"=>"(M)ITM","334"=>"(M)ITS","333"=>"(B)ITS","308"=>"(DI)IWI","335"=>"(B)IWI","336"=>"(M)IWI", + "330"=>"(B)MR","204"=>"(DI)MR","299"=>"(M)MMSE","92"=>"(DI)PW","328"=>"(M)SET","302"=>"(M)WI", + "145"=>"(DI)ICSS","258"=>"(B)ICSS","331"=>"(M)MR","256"=>"(B)WI","303"=>"(M)IMCS","255"=>"(B)EW"); // Creating a workbook $workbook = new Spreadsheet_Excel_Writer(); @@ -70,7 +76,10 @@ loadVariables($conn, $user); $studiengang->getAll('typ, kurzbzlang', false); foreach ($studiengang->result as $row) { - $worksheet->write(0,$i,'('.strtoupper($row->typ).') '.$row->kurzbzlang, $format_bold); + if(isset($stg_arr_2[$row->studiengang_kz])) + $worksheet->write(0,$i,$stg_arr_2[$row->studiengang_kz], $format_bold); + else + $worksheet->write(0,$i,'('.strtoupper($row->typ).') '.$row->kurzbzlang, $format_bold); $maxlength[$i]=strlen('('.strtoupper($row->typ).') '.$row->kurzbzlang); $stg_spalte[$row->studiengang_kz]=$i; $i++; diff --git a/content/statistik/lvplanung.php b/content/statistik/lvplanung.php index 32d78835a..13613c2d2 100644 --- a/content/statistik/lvplanung.php +++ b/content/statistik/lvplanung.php @@ -261,15 +261,27 @@ if($result = pg_query($conn, $qry)) { echo 'Betreuungen'; + echo ''; + echo ' '; + echo "Titel"; + //echo " "; + //echo ' '; + echo "Stunden"; + echo "Student"; + echo "Lektor"; + echo "Kosten"; + echo ' '; + echo ''; + $gesamtkosten_betreuung=0; $stunden_betreuung=0; while($row = pg_fetch_object($result)) { echo ''; echo ' '; - echo "$row->titel"; - echo " "; - echo ' '; + echo "$row->titel"; + //echo " "; + //echo ' '; echo "".number_format($row->stunden,2).""; $benutzer = new benutzer($conn); $benutzer->load($row->student_uid); diff --git a/content/student/studentprojektarbeit.js.php b/content/student/studentprojektarbeit.js.php index 1d8cf5680..604466abc 100644 --- a/content/student/studentprojektarbeit.js.php +++ b/content/student/studentprojektarbeit.js.php @@ -191,6 +191,7 @@ function StudentProjektarbeitResetFields() document.getElementById('student-projektarbeit-textbox-anmerkung').value=''; document.getElementById('student-projektarbeit-menulist-firma').value=''; document.getElementById('student-projektarbeit-menulist-note').value=''; + document.getElementById('student-projektarbeit-menulist-projekttyp').value='Bachelor'; } // ***** @@ -426,6 +427,11 @@ function StudentProjektarbeitSpeichern() return false; } + if(lehreinheit_id=='') + { + alert('Bitte eine Lehreinheit Auswaehlen'); + return false; + } var url = 'content/student/studentDBDML.php'; var req = new phpRequest(url,'',''); @@ -723,6 +729,8 @@ function StudentProjektbetreuerDetailDisableFields(val) document.getElementById('student-projektbetreuer-textbox-stunden').disabled=val; document.getElementById('student-projektbetreuer-textbox-stundensatz').disabled=val; document.getElementById('student-projektbetreuer-button-speichern').disabled=val; + document.getElementById('student-projektbetreuer-button-neueperson').disabled=val; + document.getElementById('student-projektbetreuer-button-kontaktdaten').disabled=val; } // **** diff --git a/content/student/studentprojektarbeitoverlay.xul.php b/content/student/studentprojektarbeitoverlay.xul.php index 80339292b..d4f7d1580 100644 --- a/content/student/studentprojektarbeitoverlay.xul.php +++ b/content/student/studentprojektarbeitoverlay.xul.php @@ -423,8 +423,8 @@ echo ''; -