From 0d348512d7fc31e170d92b3e927cc37aba262570 Mon Sep 17 00:00:00 2001 From: oesi Date: Wed, 19 Apr 2017 11:32:55 +0200 Subject: [PATCH 01/68] =?UTF-8?q?Bei=20Absolventen=20von=20Gemeinsamen=20S?= =?UTF-8?q?tudien=20wird=20das=20Sponsionsdatum=20nicht=20gepr=C3=BCft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vilesci/bis/studentenmeldung.php | 117 +++++++++++++++---------------- 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php index 4693f1c55..f8d28185d 100644 --- a/vilesci/bis/studentenmeldung.php +++ b/vilesci/bis/studentenmeldung.php @@ -783,8 +783,65 @@ function GenerateXMLStudentBlock($row) if($storgform=='') $storgform=$orgform_kurzbz; + // **** GS Container ****/ + $gsstatus=''; + $gsblock=''; + $gemeinsamestudien=false; + $qrygs="SELECT + tbl_mobilitaet.*, + tbl_gsprogramm.programm_code, + tbl_firma.partner_code + FROM + bis.tbl_mobilitaet + LEFT JOIN bis.tbl_gsprogramm USING(gsprogramm_id) + LEFT JOIN public.tbl_firma USING(firma_id) + WHERE + prestudent_id=".$db->db_add_param($row->prestudent_id)." + AND studiensemester_kurzbz=".$db->db_add_param($ssem).";"; + if($resultgs = $db->db_query($qrygs)) + { + while($rowgs = $db->db_fetch_object($resultgs)) + { + $gsstatus = 'GS '.$rowgs->status_kurzbz.' '.$row->gsstudientyp_kurzbz; + $gemeinsamestudien=true; + $studtyp = $kodex_studientyp_array[$row->gsstudientyp_kurzbz]; + $studstatuscode = (isset($kodex_studstatuscode_array[$rowgs->status_kurzbz])?$kodex_studstatuscode_array[$rowgs->status_kurzbz]:''); + + $gserror=''; + if($studstatuscode=='') + $gserror.="     Gemeinsame Studien - Status ist nicht gesetzt\n"; + if($studtyp=='') + $gserror.="     Gemeinsame Studien - Studientyp ist nicht gesetzt\n"; + if($rowgs->partner_code=='') + $gserror.="     Gemeinsame Studien - Partner Code ist leer\n"; + if($rowgs->programm_code=='') + $gserror.="     Gemeinsame Studien - Programm ist leer\n"; + + if($gserror!='') + { + $v.="Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): \n"; + $v.=$gserror."\n"; + return ''; + } + $gsblock.=" + + ".$rowgs->mobilitaetsprogramm_code." + ".$rowgs->programm_code." + ".$studtyp." + ".$rowgs->partner_code." + ".$rowgs->ausbildungssemester." + ".$studstatuscode." + "; + if(!isset($gssem[$storgform][$rowgs->ausbildungssemester])) + { + $gssem[$storgform][$rowgs->ausbildungssemester]=0; + } + $gssem[$storgform][$rowgs->ausbildungssemester]++; + } + } + //bei Absolventen das Beendigungsdatum (Sponsion oder Abschlussprüfung) überprüfen - if($aktstatus=='Absolvent') + if($aktstatus=='Absolvent' && !$gemeinsamestudien) { $qry_ap="SELECT * FROM lehre.tbl_abschlusspruefung WHERE student_uid=".$db->db_add_param($row->student_uid)." AND abschlussbeurteilung_kurzbz!='nicht' AND abschlussbeurteilung_kurzbz IS NOT NULL"; if($result_ap = $db->db_query($qry_ap)) @@ -883,64 +940,6 @@ function GenerateXMLStudentBlock($row) } else { - - // **** GS Container ****/ - $gsstatus=''; - $gsblock=''; - $gemeinsamestudien=false; - $qrygs="SELECT - tbl_mobilitaet.*, - tbl_gsprogramm.programm_code, - tbl_firma.partner_code - FROM - bis.tbl_mobilitaet - LEFT JOIN bis.tbl_gsprogramm USING(gsprogramm_id) - LEFT JOIN public.tbl_firma USING(firma_id) - WHERE - prestudent_id=".$db->db_add_param($row->prestudent_id)." - AND studiensemester_kurzbz=".$db->db_add_param($ssem).";"; - if($resultgs = $db->db_query($qrygs)) - { - while($rowgs = $db->db_fetch_object($resultgs)) - { - $gsstatus = 'GS '.$rowgs->status_kurzbz.' '.$row->gsstudientyp_kurzbz; - $gemeinsamestudien=true; - $studtyp = $kodex_studientyp_array[$row->gsstudientyp_kurzbz]; - $studstatuscode = (isset($kodex_studstatuscode_array[$rowgs->status_kurzbz])?$kodex_studstatuscode_array[$rowgs->status_kurzbz]:''); - - $gserror=''; - if($studstatuscode=='') - $gserror.="     Gemeinsame Studien - Status ist nicht gesetzt\n"; - if($studtyp=='') - $gserror.="     Gemeinsame Studien - Studientyp ist nicht gesetzt\n"; - if($rowgs->partner_code=='') - $gserror.="     Gemeinsame Studien - Partner Code ist leer\n"; - if($rowgs->programm_code=='') - $gserror.="     Gemeinsame Studien - Programm ist leer\n"; - - if($gserror!='') - { - $v.="Bei Student (UID, Vorname, Nachname) '".$row->student_uid."', '".$row->nachname."', '".$row->vorname."' ($row->status_kurzbz): \n"; - $v.=$gserror."\n"; - return ''; - } - $gsblock.=" - - ".$rowgs->mobilitaetsprogramm_code." - ".$rowgs->programm_code." - ".$studtyp." - ".$rowgs->partner_code." - ".$rowgs->ausbildungssemester." - ".$studstatuscode." - "; - if(!isset($gssem[$storgform][$rowgs->ausbildungssemester])) - { - $gssem[$storgform][$rowgs->ausbildungssemester]=0; - } - $gssem[$storgform][$rowgs->ausbildungssemester]++; - } - } - $datei.=" ".trim($row->matrikelnr).""; From 3a82b367156a5aa83e3938b60a74f995d97a9dcb Mon Sep 17 00:00:00 2001 From: oesi Date: Wed, 19 Apr 2017 14:32:23 +0200 Subject: [PATCH 02/68] =?UTF-8?q?Bugfix=20f=C3=BCr=20GS=20Absolventen=20di?= =?UTF-8?q?e=20im=20Vorsemester=20Absolviert=20haben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vilesci/bis/studentenmeldung.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vilesci/bis/studentenmeldung.php b/vilesci/bis/studentenmeldung.php index f8d28185d..5b194fc8e 100644 --- a/vilesci/bis/studentenmeldung.php +++ b/vilesci/bis/studentenmeldung.php @@ -665,6 +665,7 @@ function GenerateXMLStudentBlock($row) } } + $aktstatus_stsem = $ssem; //StudStatusCode und Semester ermitteln $qrystatus="SELECT * FROM public.tbl_prestudentstatus WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)." AND studiensemester_kurzbz=".$db->db_add_param($ssem)." AND (tbl_prestudentstatus.datum<=".$db->db_add_param($bisdatum).") @@ -721,6 +722,7 @@ function GenerateXMLStudentBlock($row) $aktstatus=$rowstatus->status_kurzbz; $aktstatus_datum=$rowstatus->datum; $storgform=$rowstatus->orgform_kurzbz; + $aktstatus_stsem = $rowstatus->studiensemester_kurzbz; } } else @@ -775,6 +777,7 @@ function GenerateXMLStudentBlock($row) $aktstatus=$rowstatus->status_kurzbz; $aktstatus_datum=$rowstatus->datum; $storgform=$rowstatus->orgform_kurzbz; + $aktstatus_stsem = $rowstatus->studiensemester_kurzbz; } } } @@ -797,7 +800,9 @@ function GenerateXMLStudentBlock($row) LEFT JOIN public.tbl_firma USING(firma_id) WHERE prestudent_id=".$db->db_add_param($row->prestudent_id)." - AND studiensemester_kurzbz=".$db->db_add_param($ssem).";"; + AND studiensemester_kurzbz=".$db->db_add_param($aktstatus_stsem)." + ORDER BY tbl_mobilitaet.insertamum DESC limit 1;"; + if($resultgs = $db->db_query($qrygs)) { while($rowgs = $db->db_fetch_object($resultgs)) From 7dd20eee2f5e794861e0e34831bd1fa6e44b9906 Mon Sep 17 00:00:00 2001 From: oesi Date: Fri, 21 Apr 2017 08:35:29 +0200 Subject: [PATCH 03/68] =?UTF-8?q?Lehrgangsgeb=C3=BChr=20zur=20OEH=20Beitra?= =?UTF-8?q?gsliste=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/statistik/oeh_beitraege.xls.php | 47 ++++++++++++++----------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/content/statistik/oeh_beitraege.xls.php b/content/statistik/oeh_beitraege.xls.php index 0d9e57269..4d0a4046a 100644 --- a/content/statistik/oeh_beitraege.xls.php +++ b/content/statistik/oeh_beitraege.xls.php @@ -157,14 +157,17 @@ if($studiensemester_kurzbz!='') (SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS w_strasse, titelpost, get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") as status, (SELECT ausbildungssemester FROM public.tbl_prestudentstatus WHERE prestudent_id=public.tbl_prestudent.prestudent_id AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' ORDER BY datum desc LIMIT 1) AS semester - FROM public.tbl_person - JOIN public.tbl_benutzer using(person_id) - JOIN public.tbl_student on(uid=student_uid) - JOIN public.tbl_prestudent using(prestudent_id) - JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id) - WHERE tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." - AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming') - AND tbl_student.studiengang_kz<999 AND tbl_prestudent.bismelden=true"; + FROM + public.tbl_person + JOIN public.tbl_benutzer using(person_id) + JOIN public.tbl_student on(uid=student_uid) + JOIN public.tbl_prestudent using(prestudent_id) + JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id) + WHERE + tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." + AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming') + AND tbl_student.studiengang_kz<10000 + AND tbl_prestudent.bismelden=true"; // AND tbl_benutzer.aktiv=true if($result = $db->db_query($qry)) @@ -331,19 +334,21 @@ if($studiensemester_kurzbz!='') (SELECT strasse FROM public.tbl_adresse WHERE person_id=public.tbl_person.person_id ORDER BY heimatadresse desc LIMIT 1) AS w_strasse, titelpost, get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") as status, (SELECT ausbildungssemester FROM public.tbl_prestudentstatus WHERE prestudent_id=public.tbl_prestudent.prestudent_id AND tbl_prestudentstatus.studiensemester_kurzbz='".addslashes($studiensemester_kurzbz)."' ORDER BY datum desc LIMIT 1) AS semester - FROM public.tbl_person - JOIN public.tbl_konto as ka using(person_id) - JOIN public.tbl_konto as kb using(person_id) - JOIN public.tbl_benutzer using(person_id) - JOIN public.tbl_student on(uid=student_uid) - JOIN public.tbl_prestudent using(prestudent_id) - JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id) - WHERE tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." - AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming','Absolvent','Abbrecher') - AND tbl_student.studiengang_kz<999 AND - ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=ka.studiengang_kz - AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz='OEH' AND tbl_student.studiengang_kz=kb.studiengang_kz - AND kb.buchungsnr_verweis=ka.buchungsnr"; + FROM + public.tbl_person + JOIN public.tbl_konto as ka using(person_id) + JOIN public.tbl_konto as kb using(person_id) + JOIN public.tbl_benutzer using(person_id) + JOIN public.tbl_student on(uid=student_uid) + JOIN public.tbl_prestudent using(prestudent_id) + JOIN public.tbl_prestudentstatus on(tbl_prestudentstatus.prestudent_id=tbl_student.prestudent_id) + WHERE + tbl_prestudentstatus.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." + AND get_rolle_prestudent(tbl_prestudent.prestudent_id, ".$db->db_add_param($studiensemester_kurzbz).") in('Student','Diplomand','Praktikant','Incoming','Absolvent','Abbrecher') + AND tbl_student.studiengang_kz<10000 + AND ka.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND ka.buchungstyp_kurzbz in('OEH','Lehrgangsgebuehr') AND tbl_student.studiengang_kz=ka.studiengang_kz + AND kb.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)." AND kb.buchungstyp_kurzbz in('OEH','Lehrgangsgebuehr') AND tbl_student.studiengang_kz=kb.studiengang_kz + AND kb.buchungsnr_verweis=ka.buchungsnr"; //AND tbl_benutzer.aktiv=true if($result = $db->db_query($qry)) From 0f1f568a6eeeca958dc2509781470f3fb792f186 Mon Sep 17 00:00:00 2001 From: Gerry Raab Date: Sun, 23 Apr 2017 23:29:03 +0200 Subject: [PATCH 04/68] Matrikelnummer im xls-export (FAS) --- content/statistik/studentenexport.xls.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/content/statistik/studentenexport.xls.php b/content/statistik/studentenexport.xls.php index cdc5d2cc2..cec1f2f51 100755 --- a/content/statistik/studentenexport.xls.php +++ b/content/statistik/studentenexport.xls.php @@ -177,7 +177,9 @@ loadVariables($user); $maxlength[$i]=8; $worksheet->write($zeile,++$i,"PRESTUDENTID", $format_bold); $maxlength[$i]=12; - + $worksheet->write($zeile,++$i,"MATR_NR", $format_bold); + $maxlength[$i]=12; + $zeile++; $ids = explode(';',$data); @@ -565,6 +567,12 @@ loadVariables($user); $maxlength[$i] = mb_strlen($row->prestudent_id); $worksheet->write($zeile,$i, $row->prestudent_id); $i++; + + //Matrikelnummer (tbl_person) + if(mb_strlen($row->matr_nr)>$maxlength[$i]) + $maxlength[$i] = mb_strlen($row->matr_nr); + $worksheet->write($zeile,$i, $row->matr_nr); + $i++; } From dbff27b6b94c6a29ea4d5e63068c43b2475bd95d Mon Sep 17 00:00:00 2001 From: oesi Date: Tue, 25 Apr 2017 15:11:55 +0200 Subject: [PATCH 05/68] =?UTF-8?q?Messages=20Karteireiter=20angepasst=20dam?= =?UTF-8?q?it=20die=20Vorschau=20neben=20der=20Liste=20ist.=20Formatierm?= =?UTF-8?q?=C3=B6glichkeit=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/messages.js.php | 43 ++++++++++++++++++++++++++++++++++------ content/messages.xul.php | 9 ++++++--- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/content/messages.js.php b/content/messages.js.php index 014c331c5..e61108eb6 100644 --- a/content/messages.js.php +++ b/content/messages.js.php @@ -24,6 +24,7 @@ var MessagePersonID=null; var MessagesTreeDatasource=''; // Datasource des Adressen Trees var MessagesSelectID=''; var MessageSenderPersonID=''; +var MessageIFrameIsInitialized=false; var MessagesTreeSinkObserver = { @@ -102,9 +103,9 @@ function MessagesNewMessage() else { var prestudentIdArray = getMultipleTreeCellText(tree, 'student-treecol-prestudent_id'); - + var action = 'index.ci.php/system/Messages/write/' + MessageSenderPersonID; - + openWindowPostArray(action, 'prestudent_id', prestudentIdArray); } } @@ -116,7 +117,7 @@ function MessagesSendAnswer() { var messagesTree = document.getElementById('messages-tree'); var studentsTree = parent.document.getElementById('student-tree'); - + if (messagesTree.currentIndex == -1) { alert("Bitte markieren Sie zuerst eine Nachricht"); @@ -126,9 +127,9 @@ function MessagesSendAnswer() var MessageId = getTreeCellText(messagesTree, 'messages-tree-message_id', messagesTree.currentIndex); var RecipientID = getTreeCellText(messagesTree, 'messages-tree-recipient_id', messagesTree.currentIndex); var prestudentIdArray = new Array(getTreeCellText(studentsTree, 'student-treecol-prestudent_id', studentsTree.currentIndex)); - + var action = 'index.ci.php/system/Messages/write/' + MessageSenderPersonID + '/' + MessageId + '/' + RecipientID; - + openWindowPostArray(action, 'prestudent_id', prestudentIdArray); } } @@ -156,5 +157,35 @@ function MessageAuswahl() document.getElementById('messages-button-answer').disabled=false; } } - document.getElementById('message-wysiwyg').value=text; + + MessagesIFrameSetHTML(text); } + +function MessagesIFrameSetHTML(val) +{ + MessageIFrameInit(); + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + editor = document.getElementById('message-wysiwyg'); + + if(editor.contentWindow.document.body.innerHTML!='') + { + //Inhalt leeren + editor.contentDocument.execCommand("selectall", false, null); + editor.contentDocument.execCommand("delete", false, null); + } + //Value setzen + if(val!='') + editor.contentDocument.execCommand("inserthtml", false, val); +} + +function MessageIFrameInit() +{ + if(!MessageIFrameIsInitialized) + { + netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); + editor = document.getElementById('message-wysiwyg'); + editor.contentDocument.designMode = 'on'; + editor.style.backgroundColor="#FFFFFF"; + MessageIFrameIsInitialized=true; + } +} \ No newline at end of file diff --git a/content/messages.xul.php b/content/messages.xul.php index 106fb7104..35e279c1d 100644 --- a/content/messages.xul.php +++ b/content/messages.xul.php @@ -73,7 +73,7 @@ echo ']>