From b7da7b86f9411a9f85d88fde6e983aa1f0c30ff2 Mon Sep 17 00:00:00 2001 From: Andreas Oesterreicher Date: Tue, 1 Aug 2017 10:45:00 +0200 Subject: [PATCH 1/3] PHP7 compatibility fix --- .../lehre/benotungstool/anwesenheitsliste.php | 304 +++++++++--------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/cis/private/lehre/benotungstool/anwesenheitsliste.php b/cis/private/lehre/benotungstool/anwesenheitsliste.php index 5493fc11a..2a5845c7f 100644 --- a/cis/private/lehre/benotungstool/anwesenheitsliste.php +++ b/cis/private/lehre/benotungstool/anwesenheitsliste.php @@ -15,7 +15,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. * - * Authors: Christian Paminger , + * Authors: Christian Paminger , * Andreas Oesterreicher and * Rudolf Hangl . */ @@ -54,9 +54,9 @@ if(isset($_GET['uebung_id']) && is_numeric($_GET['uebung_id'])) } else { - if(!isset($_GET['all'])) + if(!isset($_GET['all'])) die('Fehlerhafte Parameteruebergabe'); - else + else { $lehreinheit_id = $_GET['lehreinheit_id']; $lehreinheit_obj = new lehreinheit($lehreinheit_id); @@ -78,11 +78,11 @@ if (isset($_GET["download_abgabe"])){ exit; } /* -$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE +$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE tbl_lehreinheit.lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER)." AND mitarbeiter_uid=".$db->db_add_param($user); */ -$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE +$qry = "SELECT * FROM lehre.tbl_lehreinheit JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id) WHERE tbl_lehreinheit.lehrveranstaltung_id in(Select lehrveranstaltung_id from lehre.tbl_lehreinheit where lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER).") AND mitarbeiter_uid=".$db->db_add_param($user); @@ -91,12 +91,12 @@ if(!$result = $db->db_query($qry)) $rechte = new benutzerberechtigung(); $rechte->getBerechtigungen($user); - + if(!($db->db_num_rows($result)>0 || $rechte->isBerechtigt('admin',0) || $rechte->isBerechtigt('admin',$lehreinheit_obj->studiengang_kz) || $rechte->isBerechtigt('lehre',$lehreinheit_obj->studiengang_kz))) die('Sie haben keine Berechtigung für diesen Bereich'); // Beteiligte Gruppen laden -$gruppen = ''; +$gruppen = ''; $qry_gruppen = "SELECT * FROM lehre.tbl_lehreinheitgruppe WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_obj->lehreinheit_id, FHC_INTEGER); if($result_gruppen = $db->db_query($qry_gruppen)) { @@ -122,33 +122,33 @@ if(isset($_GET['output']) && $_GET['output']=='xls') //EXCEL VERSION / ALLE Kreuzerllisten $le_obj = new lehreinheit(); $le_obj->load($lehreinheit_id); - + $lv_obj = new lehrveranstaltung(); $lv_obj->load($le_obj->lehrveranstaltung_id); - + // Creating a workbook $workbook = new Spreadsheet_Excel_Writer(); $workbook->setVersion(8); // sending HTTP headers $workbook->send("Kreuzerlliste_Gesamt_".$lv_obj->lehreverzeichnis. "_" . date("d_m_Y") . ".xls"); - + // Creating a worksheet $worksheet =& $workbook->addWorksheet("Kreuzerltool"); $worksheet->setInputEncoding('utf-8'); - + $format_bold =& $workbook->addFormat(); $format_bold->setBold(); - + $format_title =& $workbook->addFormat(); $format_title->setBold(); // let's merge $format_title->setAlign('merge'); - - - + + + $worksheet->write(0,0,'Gesamtübersicht '.$lv_obj->bezeichnung.' vom '.date('d.m.Y'), $format_bold); $maxlength = array(); - + //Ueberschrift $i=0; $worksheet->write(1,$i,"Vorname", $format_title); @@ -174,7 +174,7 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $maxlength[$i]=strlen('Punkte insgesamt'); $worksheet->write(1,++$i,"Unterschrift", $format_title); $maxlength[$i]=strlen('Unterschrift')+5; - + if(isset($_GET['gruppe']) && $_GET['gruppe']!='') { $gruppe = $_GET['gruppe']; @@ -188,49 +188,49 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz; $qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz=".$db->db_add_param($row->gruppe_kurzbz)." AND studiensemester_kurzbz = ".$db->db_add_param($stsem)." ORDER BY nachname, vorname"; } - else + else { $gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe; - $qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student - WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)." + $qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student + WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)." AND semester=".$db->db_add_param($row->semester). ($row->verband!=''?" AND verband=".$db->db_add_param($row->verband):''). ($row->gruppe!=''?" AND gruppe=".$db->db_add_param($row->gruppe):''). " ORDER BY nachname, vorname"; } - + } else die('Gruppe konnte nicht ermittelt werden'); } - else + else die('Gruppe konnte nicht ermittelt werden'); } - else + else { if(isset($_GET['lehreinheit_id']) && $_GET['lehreinheit_id']!='') { $lehreinheit_id = $_GET['lehreinheit_id']; $gruppe_bez = 'Alle Studienrende'; //Alle Studenten die dieser Lehreinheit zugeordnet sind - $qry_stud = "SELECT - vw_student.uid, vorname, nachname, matrikelnr, - tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe - FROM - campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe, + $qry_stud = "SELECT + vw_student.uid, vorname, nachname, matrikelnr, + tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe + FROM + campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband, lehre.tbl_lehreinheit - WHERE - tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND + WHERE + tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitgruppe.lehreinheit_id AND vw_student.uid = tbl_benutzergruppe.uid AND tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz AND vw_student.uid=tbl_studentlehrverband.student_uid AND tbl_studentlehrverband.studiensemester_kurzbz=tbl_lehreinheit.studiensemester_kurzbz UNION - SELECT - vw_student.uid, vorname, nachname, matrikelnr, tbl_studentlehrverband.semester, - tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe - FROM + SELECT + vw_student.uid, vorname, nachname, matrikelnr, tbl_studentlehrverband.semester, + tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe + FROM campus.vw_student, lehre.tbl_lehreinheitgruppe, public.tbl_studentlehrverband, lehre.tbl_lehreinheit WHERE tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND @@ -239,29 +239,29 @@ if(isset($_GET['output']) && $_GET['output']=='xls') tbl_studentlehrverband.student_uid=vw_student.uid AND tbl_lehreinheit.lehreinheit_id=tbl_lehreinheitgruppe.lehreinheit_id AND tbl_lehreinheit.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz AND - ((tbl_lehreinheitgruppe.verband<>'' AND - tbl_lehreinheitgruppe.gruppe<>'' AND + ((tbl_lehreinheitgruppe.verband<>'' AND + tbl_lehreinheitgruppe.gruppe<>'' AND trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband) AND trim(tbl_lehreinheitgruppe.gruppe) = trim(tbl_studentlehrverband.gruppe)) OR - (tbl_lehreinheitgruppe.verband<>'' AND + (tbl_lehreinheitgruppe.verband<>'' AND (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null) AND trim(tbl_lehreinheitgruppe.verband) = trim(tbl_studentlehrverband.verband)) OR (tbl_lehreinheitgruppe.verband is null AND tbl_lehreinheitgruppe.gruppe is null) ) ORDER BY nachname, vorname"; } - else + else die('Fehler bei der Parameteruebergabe'); $gruppe=''; } - + if($result_stud = $db->db_query($qry_stud)) { $zeile=3; - + while($row_stud = $db->db_fetch_object($result_stud)) - { + { $spalte=0; $summe=0; //vorname @@ -275,15 +275,15 @@ if(isset($_GET['output']) && $_GET['output']=='xls') //matrikelnr $worksheet->write($zeile,++$spalte,'="'.$row_stud->matrikelnr.'"'); if(strlen($row_stud->matrikelnr)>$maxlength[$spalte]) - $maxlength[$spalte]=strlen($row_stud->matrikelnr); + $maxlength[$spalte]=strlen($row_stud->matrikelnr); //Gruppe $worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe); if(strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe)>$maxlength[$spalte]) $maxlength[$spalte]=strlen($row_stud->semester.$row_stud->verband.$row_stud->gruppe); - + foreach($ueb_obj->uebungen as $row_ueb) { - $qry = "SELECT sum(punkte) as punkte FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id) + $qry = "SELECT sum(punkte) as punkte FROM campus.tbl_studentbeispiel JOIN campus.tbl_beispiel USING(beispiel_id) WHERE uebung_id=".$db->db_add_param($row_ueb->uebung_id)." AND student_uid=".$db->db_add_param($row_stud->uid)." AND vorbereitet=true"; if($result = $db->db_query($qry)) { @@ -292,67 +292,67 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $punkte = $row->punkte; $summe +=$punkte; } - else + else $punkte = 'failed'; } - else + else $punkte='failed'; //punkte auf uebung $worksheet->write($zeile,++$spalte,($punkte!=''?$punkte:'0')); } - + //summe $worksheet->write($zeile,++$spalte,$summe); - + //mitarbeit - $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id) + $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id) WHERE lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($row_stud->uid); if($result = $db->db_query($qry)) if($row = $db->db_fetch_object($result)) - $mitarbeit=$row->mitarbeit; - else + $mitarbeit=$row->mitarbeit; + else $mitarbeit='failed'; - else + else $mitarbeit='failed'; - + $worksheet->write($zeile,++$spalte,($row->mitarbeit!=''?$mitarbeit:'0')); //punkte insgesamt $worksheet->write($zeile,++$spalte,($summe+$mitarbeit), $format_bold); - - $zeile++; + + $zeile++; } for($i=0;$isetColumn(0, $i, $maxlength[$i]); } } - + $workbook->close(); } - else + else { //EXCEL VERSION / Einzelne Kreuzerlliste - + // Creating a workbook $workbook = new Spreadsheet_Excel_Writer(); $workbook->setVersion(8); - + // sending HTTP headers $workbook->send("Kreuzerltool". "_" . date("d_m_Y") . ".xls"); - + // Creating a worksheet $worksheet =& $workbook->addWorksheet("Kreuzerltool"); $worksheet->setInputEncoding('utf-8'); - + $format_bold =& $workbook->addFormat(); $format_bold->setBold(); - + $format_title =& $workbook->addFormat(); $format_title->setBold(); // let's merge $format_title->setAlign('merge'); - + $worksheet->write(0,0,$uebung_obj->bezeichnung.' am '.date('d.m.Y').' '.$gruppen, $format_bold); $maxlength = array(); //Ueberschrift @@ -382,7 +382,7 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $maxlength[$i]=strlen('Mitarbeit insgesamt'); $worksheet->write(1,++$i,"Unterschrift", $format_title); $maxlength[$i]=strlen('Unterschrift')+5; - + if(isset($_GET['gruppe']) && $_GET['gruppe']!='') { $gruppe = $_GET['gruppe']; @@ -394,60 +394,60 @@ if(isset($_GET['output']) && $_GET['output']=='xls') if($row->gruppe_kurzbz!='') { $gruppe_bez = 'Gruppe '.$row->gruppe_kurzbz; - $qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe - FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) + $qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe + FROM campus.vw_student JOIN public.tbl_benutzergruppe USING(uid) WHERE gruppe_kurzbz=".$db->db_add_param($row->gruppe_kurzbz)." AND studiensemester_kurzbz=".$db->db_add_param($stsem)." ORDER BY nachname, vorname"; } - else + else { $gruppe_bez = 'Gruppe '.$row->verband.$row->gruppe; - $qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student - WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)." + $qry_stud = "SELECT uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student + WHERE studiengang_kz=".$db->db_add_param($row->studiengang_kz)." AND semester=".$db->db_add_param($row->semester). ($row->verband!=''?" AND verband=".$db->db_add_param($row->verband):''). ($row->gruppe!=''?" AND gruppe=".$db->db_add_param($row->gruppe):''). " ORDER BY nachname, vorname"; } - + } else die('Gruppe konnte nicht ermittelt werden'); } - else + else die('Gruppe konnte nicht ermittelt werden'); - - + + $lehreinheit_id = $uebung_obj->lehreinheit_id; } - else + else { if(isset($_GET['lehreinheit_id']) && $_GET['lehreinheit_id']!='') { $lehreinheit_id = $_GET['lehreinheit_id']; $gruppe_bez = 'Alle Studienrende'; - $qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) + $qry_stud = "SELECT uid, vorname, nachname, matrikelnr FROM campus.vw_student_lehrveranstaltung JOIN campus.vw_student using(uid) WHERE studiensemester_kurzbz = ".$db->db_add_param($stsem)." AND lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." ORDER BY nachname, vorname"; - + //Alle Studenten die dieser Lehreinheit zugeordnet sind /* - $qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe - FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe - WHERE tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND + $qry_stud = "SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe + FROM campus.vw_student, public.tbl_benutzergruppe, lehre.tbl_lehreinheitgruppe + WHERE tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER)." AND vw_student.uid = tbl_benutzergruppe.uid AND tbl_benutzergruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz UNION - SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe + SELECT vw_student.uid, vorname, nachname, matrikelnr, vw_student.semester, vw_student.verband, vw_student.gruppe FROM campus.vw_student, lehre.tbl_lehreinheitgruppe WHERE tbl_lehreinheitgruppe.lehreinheit_id=".$db->db_add_param($lehreinheit_id)." AND tbl_lehreinheitgruppe.studiengang_kz=vw_student.studiengang_kz AND tbl_lehreinheitgruppe.semester = vw_student.semester AND - ((tbl_lehreinheitgruppe.verband<>'' AND - tbl_lehreinheitgruppe.gruppe<>'' AND + ((tbl_lehreinheitgruppe.verband<>'' AND + tbl_lehreinheitgruppe.gruppe<>'' AND trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband) AND trim(tbl_lehreinheitgruppe.gruppe) = trim(vw_student.gruppe)) OR - (tbl_lehreinheitgruppe.verband<>'' AND + (tbl_lehreinheitgruppe.verband<>'' AND (trim(tbl_lehreinheitgruppe.gruppe)='' OR tbl_lehreinheitgruppe.gruppe is null) AND trim(tbl_lehreinheitgruppe.verband) = trim(vw_student.verband)) OR (tbl_lehreinheitgruppe.verband is null AND tbl_lehreinheitgruppe.gruppe is null) @@ -455,7 +455,7 @@ if(isset($_GET['output']) && $_GET['output']=='xls') ORDER BY nachname, vorname"; */ } - else + else die('Fehler bei der Parameteruebergabe'); $gruppe=''; } @@ -463,9 +463,9 @@ if(isset($_GET['output']) && $_GET['output']=='xls') if($result_stud = $db->db_query($qry_stud)) { $zeile=3; - + while($row_stud = $db->db_fetch_object($result_stud)) - { + { $spalte=0; $punkte_heute=0; //vorname @@ -480,7 +480,7 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $worksheet->write($zeile,++$spalte,'="'.$row_stud->matrikelnr.'"'); if(strlen($row_stud->matrikelnr)>$maxlength[$spalte]) $maxlength[$spalte]=strlen($row_stud->matrikelnr); - + //Gruppe /* $worksheet->write($zeile,++$spalte,$row_stud->semester.$row_stud->verband.$row_stud->gruppe); @@ -493,27 +493,27 @@ if(isset($_GET['output']) && $_GET['output']=='xls') $studentbeispiel_obj->load_studentbeispiel($row_stud->uid, $row_bsp->beispiel_id); if($studentbeispiel_obj->vorbereitet) $punkte = $row_bsp->punkte; - else + else $punkte = 0; $punkte_heute +=$punkte; //punkte auf uebung $worksheet->write($zeile,++$spalte,$punkte); } - + //punkte heute $worksheet->write($zeile,++$spalte,$punkte_heute); - + //mitarbeit heute - $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung + $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung WHERE uebung_id=".$db->db_add_param($uebung_id, FHC_INTEGER)." AND student_uid=".$db->db_add_param($row_stud->uid); if($result = $db->db_query($qry)) if($row = $db->db_fetch_object($result)) $worksheet->write($zeile,++$spalte,($row->mitarbeit_heute!=''?$row->mitarbeit_heute:'0')); - else + else $worksheet->write($zeile,++$spalte,'failed'); - else + else $worksheet->write($zeile,++$spalte,'failed'); - + //punkte insgesamt $qry = "SELECT sum(tbl_beispiel.punkte) AS gesamt_ohne_mitarbeit FROM campus.tbl_uebung, campus.tbl_beispiel, campus.tbl_studentbeispiel WHERE tbl_studentbeispiel.student_uid=".$db->db_add_param($row_stud->uid)." AND @@ -525,32 +525,32 @@ if(isset($_GET['output']) && $_GET['output']=='xls') if($result = $db->db_query($qry)) if($row = $db->db_fetch_object($result)) $worksheet->write($zeile,++$spalte,($row->gesamt_ohne_mitarbeit!=''?$row->gesamt_ohne_mitarbeit:'0')); - else + else $worksheet->write($zeile,++$spalte,'failed'); - else + else $worksheet->write($zeile,++$spalte,'failed'); - + //mitarbeit insgesamt - $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id) + $qry = "SELECT sum(mitarbeitspunkte) as mitarbeit_heute FROM campus.tbl_studentuebung JOIN campus.tbl_uebung USING(uebung_id) WHERE student_uid=".$db->db_add_param($row_stud->uid)." AND lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER); if($result = $db->db_query($qry)) if($row = $db->db_fetch_object($result)) $worksheet->write($zeile,++$spalte,($row->mitarbeit_heute!=''?$row->mitarbeit_heute:'0')); - else + else $worksheet->write($zeile,++$spalte,'failed'); - else + else $worksheet->write($zeile,++$spalte,'failed'); - - $zeile++; + + $zeile++; } for($i=0;$isetColumn(0, $i, $maxlength[$i]); } - + $workbook->close(); } } -else +else { //HTML VERSION ?> @@ -561,7 +561,7 @@ else Kreuzerltool + + diff --git a/application/views/organisation/studiensemester.php b/application/views/organisation/studiensemester.php new file mode 100644 index 000000000..3e12df906 --- /dev/null +++ b/application/views/organisation/studiensemester.php @@ -0,0 +1,55 @@ +load->view('templates/header', array('title' => 'StudiensemesterList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '7:{sorter:false}, 8:{sorter:false}', 'sortList' =>'4,1')); +?> + +
+
+

Studiensemester

+ + Neues Studiensemester anlegen + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KurzbezBezeichnungStartEndeStudienjahrBeschreibungOnlinebewerbung
studiensemester_kurzbz; ?>bezeichnung; ?>start), "d.m.Y"); ?>ende), "d.m.Y"); ?>studienjahr_kurzbz; ?>beschreibung; ?>onlinebewerbung) ? "Ja" : "Nein"; ?> + + Bearbeiten + + + + Löschen + +
+
+
+ + + + + diff --git a/application/views/organisation/studiensemesterEdit.php b/application/views/organisation/studiensemesterEdit.php new file mode 100644 index 000000000..2a8c36902 --- /dev/null +++ b/application/views/organisation/studiensemesterEdit.php @@ -0,0 +1,19 @@ +load->view('templates/header', array('title' => 'StudiensemesterEdit', 'datepicker' => true, 'datepickerclass' => 'dateinput')); +?> + +
+
+
+

Studiensemester bearbeiten: studiensemester_kurzbz; ?>

+
"> + + + + + + + + + diff --git a/application/views/organisation/studiensemesterForm.php b/application/views/organisation/studiensemesterForm.php new file mode 100644 index 000000000..193e3d4d2 --- /dev/null +++ b/application/views/organisation/studiensemesterForm.php @@ -0,0 +1,103 @@ +bezeichnung) ? $sem->bezeichnung : ""); +$start = (isset($sem->start) ? date_format(date_create($sem->start), "d.m.Y") : ""); +$ende = (isset($sem->ende) ? date_format(date_create($sem->ende), "d.m.Y") : ""); +$studienjahr_kurzbz = (isset($sem->studienjahr_kurzbz) ? $sem->studienjahr_kurzbz : ""); +$beschreibung = (isset($sem->beschreibung) ? $sem->beschreibung : ""); +$onlinebewerbung = (isset($sem->onlinebewerbung) ? $sem->onlinebewerbung : ""); +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Bezeichnung:

+
+
+   +
+ Datum start:

+
+
+   +
+ Datum ende:

+
+
+   +
+ Studienjahr:

+ + + + +
+   +
+ Beschreibung:

+ +
+
+   +
+ Onlinebewerbung +
+ 		+ /> +
+   +
+ + + + + +
+
+
+
\ No newline at end of file diff --git a/application/views/organisation/studiensemesterNew.php b/application/views/organisation/studiensemesterNew.php new file mode 100644 index 000000000..dfda83df9 --- /dev/null +++ b/application/views/organisation/studiensemesterNew.php @@ -0,0 +1,79 @@ +load->view('templates/header', array('title' => 'StudiensemesterNew', 'jqueryComposer' => true, 'datepicker' => true, 'datepickerclass' => 'dateinput')); +?> + + +
+
+
+

Neues Studiensemester anlegen

+
" + id="newSemesterForm"> + + + + + + + + + + + + + + + diff --git a/application/views/templates/header.php b/application/views/templates/header.php index 97d280585..b5bdda896 100644 --- a/application/views/templates/header.php +++ b/application/views/templates/header.php @@ -3,6 +3,8 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; !isset($jquery) ? $jquery = false : $jquery = $jquery; +!isset($jqueryComposer) ? $jqueryComposer = false : $jqueryComposer = $jqueryComposer; +!isset($jqueryui) ? $jqueryui = false : $jqueryui = $jqueryui; !isset($jquery_checkboxes) ? $jquery_checkboxes = false : $jquery_checkboxes = $jquery_checkboxes; !isset($jquery_custom) ? $jquery_custom = false : $jquery_custom = $jquery_custom; !isset($tablesort) ? $tablesort = false : $tablesort = $tablesort; @@ -13,9 +15,20 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci'; !isset($jsoneditor) ? $jsoneditor = false : $jsoneditor = $jsoneditor; !isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms; !isset($textile) ? $textile = false : $textile = $textile; +!isset($datepicker) ? $datepicker = false : $datepicker = $datepicker; if ($tablesort || $jquery_checkboxes || $jquery_custom) $jquery = true; + +if($datepicker) + $jqueryui = true; + +if($jqueryui) + $jqueryComposer = true; + +if($jquery && $jqueryComposer) + show_error("Two JQuery versions used: composer and includefolderversion"); + ?> @@ -32,6 +45,15 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom) + + + + + + + + + @@ -53,6 +75,19 @@ if ($tablesort || $jquery_checkboxes || $jquery_custom) }); + + + + + diff --git a/composer.json b/composer.json index 6d58e01df..c2fdfe1f7 100755 --- a/composer.json +++ b/composer.json @@ -75,6 +75,7 @@ "rougin/combustor": "1.1.*", "rougin/refinery": "*", "components/jquery": "2.1.4", + "components/jqueryui": "1.12.*", "components/angular.js": "1.3.16", "components/bootstrap": "3.3.5", "michelf/php-markdown": "1.5.0", diff --git a/composer.lock b/composer.lock index 02d54eab8..69144179c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,59 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "adbc1b15e2cdf73d1f0db3727e919dc5", - "content-hash": "97bc2bdf8f101931b1f6eac635401324", + "content-hash": "eb5f2edc278196fd77c4de1f2e201dc0", "packages": [ - { - "name": "blueimp/jquery-file-upload", - "version": "v9.14.1", - "source": { - "type": "git", - "url": "https://github.com/vkhramtsov/jQuery-File-Upload.git", - "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/71d67a9c277e29efcf5935cd2409009c0f841a57", - "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57", - "shasum": "" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Sebastian Tschan", - "homepage": "https://blueimp.net" - } - ], - "description": "File Upload widget for jQuery.", - "homepage": "https://github.com/blueimp/jQuery-File-Upload", - "keywords": [ - "bootstrap", - "chunk", - "cross-domain", - "cross-site", - "drag", - "drop", - "file", - "gae", - "go", - "jquery", - "multiple", - "php", - "preview", - "progress", - "python", - "resume", - "selection", - "upload", - "widget" - ], - "time": "2016-11-21 05:38:19" - }, { "name": "codeigniter-restserver", "version": "2.6", @@ -98,7 +47,7 @@ ], "description": "The CodeIgniter framework", "homepage": "https://codeigniter.com", - "time": "2016-10-28 15:13:14" + "time": "2016-10-28T15:13:14+00:00" }, { "name": "components/angular.js", @@ -402,7 +351,7 @@ ], "description": "Shim repository for Angular.js", "homepage": "http://angularjs.org", - "time": "2015-06-07 20:10:38" + "time": "2015-06-07T20:10:38+00:00" }, { "name": "components/bootstrap", @@ -470,42 +419,7 @@ "responsive", "web" ], - "time": "2015-06-17 06:08:09" - }, - { - "name": "components/font-awesome", - "version": "4.7.0", - "source": { - "type": "git", - "url": "https://github.com/components/font-awesome.git", - "reference": "885308b939369d147bec93174722786bc2c4eedd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/components/font-awesome/zipball/885308b939369d147bec93174722786bc2c4eedd", - "reference": "885308b939369d147bec93174722786bc2c4eedd", - "shasum": "" - }, - "type": "component", - "extra": { - "component": { - "styles": [ - "css/font-awesome.css" - ], - "files": [ - "css/font-awesome.min.css", - "css/font-awesome.css.map", - "fonts/*" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT", - "OFL-1.1" - ], - "description": "The iconic font designed for use with Twitter Bootstrap.", - "time": "2016-10-25 10:56:23" + "time": "2015-06-17T06:08:09+00:00" }, { "name": "components/jquery", @@ -547,7 +461,7 @@ ], "description": "jQuery JavaScript Library", "homepage": "http://jquery.com", - "time": "2015-05-08 05:04:47" + "time": "2015-05-08T05:04:47+00:00" }, { "name": "components/jqueryui", @@ -632,61 +546,7 @@ } ], "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.", - "time": "2016-09-16 05:47:55" - }, - { - "name": "compwright/codeigniter-installers", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/compwright/codeigniter-installers.git", - "reference": "adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/compwright/codeigniter-installers/zipball/adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f", - "reference": "adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f", - "shasum": "" - }, - "require-dev": { - "composer/composer": "1.0.*@dev" - }, - "type": "composer-installer", - "extra": { - "class": "Composer\\Installer\\CodeigniterInstaller" - }, - "autoload": { - "psr-0": { - "Composer\\Installer": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathon Hill", - "email": "jhill9693@gmail.com", - "homepage": "http://jonathonhill.net", - "role": "Developer" - } - ], - "description": "Composer installers for CodeIgniter", - "homepage": "https://github.com/compwright/codeigniter-installers", - "keywords": [ - "MX", - "codeigniter", - "composer", - "core", - "hmvc", - "installer", - "library", - "module", - "spark", - "sparks" - ], - "time": "2012-11-12 16:11:38" + "time": "2016-09-16T05:47:55+00:00" }, { "name": "easyrdf/easyrdf", @@ -748,7 +608,7 @@ "rdfa", "sparql" ], - "time": "2015-02-27 09:45:49" + "time": "2015-02-27T09:45:49+00:00" }, { "name": "fzaninotto/faker", @@ -796,7 +656,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2016-04-29T12:21:54+00:00" }, { "name": "json-forms", @@ -884,7 +744,7 @@ "json", "schema" ], - "time": "2014-08-25 02:48:14" + "time": "2014-08-25T02:48:14+00:00" }, { "name": "kevinlebrun/colors.php", @@ -935,7 +795,7 @@ "console", "shell" ], - "time": "2016-04-12 20:58:34" + "time": "2016-04-12T20:58:34+00:00" }, { "name": "kingsquare/json-schema-form", @@ -969,7 +829,7 @@ } ], "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema", - "time": "2014-07-10 12:27:19" + "time": "2014-07-10T12:27:19+00:00" }, { "name": "michelf/php-markdown", @@ -1020,7 +880,7 @@ "keywords": [ "markdown" ], - "time": "2015-03-01 12:03:08" + "time": "2015-03-01T12:03:08+00:00" }, { "name": "ml/iri", @@ -1067,7 +927,7 @@ "uri", "url" ], - "time": "2014-01-21 13:43:39" + "time": "2014-01-21T13:43:39+00:00" }, { "name": "ml/json-ld", @@ -1116,7 +976,7 @@ "JSON-LD", "jsonld" ], - "time": "2016-10-10 08:57:56" + "time": "2016-10-10T08:57:56+00:00" }, { "name": "netcarver/textile", @@ -1169,7 +1029,7 @@ "plaintext", "textile" ], - "time": "2016-11-17 14:18:12" + "time": "2016-11-17T14:18:12+00:00" }, { "name": "psr/log", @@ -1216,7 +1076,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "rdlowrey/auryn", @@ -1277,64 +1137,7 @@ "dic", "ioc" ], - "time": "2016-03-14 20:10:19" - }, - { - "name": "rogeriopradoj/codeigniter-curl", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/rogeriopradoj/codeigniter-curl.git", - "reference": "eb954890e242a5e80812006e60b07f1ce29b7e7a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rogeriopradoj/codeigniter-curl/zipball/eb954890e242a5e80812006e60b07f1ce29b7e7a", - "reference": "eb954890e242a5e80812006e60b07f1ce29b7e7a", - "shasum": "" - }, - "require": { - "compwright/codeigniter-installers": "*" - }, - "type": "codeigniter-spark", - "notification-url": "https://packagist.org/downloads/", - "authors": [ - { - "name": "Rogerio Prado de Jesus", - "email": "rogeriopradoj@gmail.com" - } - ], - "description": "codeigniter-curl philsturgeon's library via composer", - "time": "2013-05-27 21:19:21" - }, - { - "name": "rogeriopradoj/codeigniter-restclient", - "version": "2.1.1", - "source": { - "type": "git", - "url": "https://github.com/rogeriopradoj/codeigniter-restclient.git", - "reference": "64991a0105c3cd891a64e1d35e497270ca2b0d78" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rogeriopradoj/codeigniter-restclient/zipball/64991a0105c3cd891a64e1d35e497270ca2b0d78", - "reference": "64991a0105c3cd891a64e1d35e497270ca2b0d78", - "shasum": "" - }, - "require": { - "compwright/codeigniter-installers": "*", - "rogeriopradoj/codeigniter-curl": "*" - }, - "type": "codeigniter-spark", - "notification-url": "https://packagist.org/downloads/", - "authors": [ - { - "name": "Rogerio Prado de Jesus", - "email": "rogeriopradoj@gmail.com" - } - ], - "description": "codeigniter-restclient philsturgeon's library via composer", - "time": "2013-05-27 21:23:54" + "time": "2016-03-14T20:10:19+00:00" }, { "name": "rougin/blueprint", @@ -1385,7 +1188,7 @@ "php", "template" ], - "time": "2016-02-01 16:31:13" + "time": "2016-02-01T16:31:13+00:00" }, { "name": "rougin/combustor", @@ -1450,7 +1253,7 @@ "generator", "php" ], - "time": "2016-02-14 10:36:58" + "time": "2016-02-14T10:36:58+00:00" }, { "name": "rougin/describe", @@ -1503,7 +1306,7 @@ "describe", "php" ], - "time": "2016-03-24 18:17:47" + "time": "2016-03-24T18:17:47+00:00" }, { "name": "rougin/refinery", @@ -1568,7 +1371,7 @@ "php", "refinery" ], - "time": "2016-03-04 16:55:32" + "time": "2016-03-04T16:55:32+00:00" }, { "name": "rougin/spark-plug", @@ -1627,7 +1430,7 @@ "php", "spark-plug" ], - "time": "2015-10-23 08:27:10" + "time": "2015-10-23T08:27:10+00:00" }, { "name": "symfony/console", @@ -1688,7 +1491,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-11-15 23:02:12" + "time": "2016-11-15T23:02:12+00:00" }, { "name": "symfony/debug", @@ -1745,7 +1548,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-07-30 07:22:48" + "time": "2016-07-30T07:22:48+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1804,7 +1607,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/yaml", @@ -1853,7 +1656,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-11-14 16:15:57" + "time": "2016-11-14T16:15:57+00:00" }, { "name": "tinymce/tinymce", @@ -1899,7 +1702,7 @@ "tinymce", "wysiwyg" ], - "time": "2016-11-23 13:00:08" + "time": "2016-11-23T13:00:08+00:00" }, { "name": "twig/twig", @@ -1960,7 +1763,7 @@ "keywords": [ "templating" ], - "time": "2016-11-23 18:41:40" + "time": "2016-11-23T18:41:40+00:00" }, { "name": "wikimedia/composer-merge-plugin", @@ -2009,7 +1812,7 @@ } ], "description": "Composer plugin to merge multiple composer.json files", - "time": "2016-03-08 17:11:37" + "time": "2016-03-08T17:11:37+00:00" }, { "name": "zetacomponents/base", @@ -2072,7 +1875,7 @@ ], "description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.", "homepage": "https://github.com/zetacomponents", - "time": "2014-09-19 03:28:34" + "time": "2014-09-19T03:28:34+00:00" }, { "name": "zetacomponents/database", @@ -2147,7 +1950,7 @@ ], "description": "A lightweight database layer on top of PHP's PDO that allows you to utilize a database without having to take care of differences in SQL dialects.", "homepage": "https://github.com/zetacomponents", - "time": "2014-09-27 19:26:09" + "time": "2014-09-27T19:26:09+00:00" }, { "name": "zetacomponents/document", @@ -2198,7 +2001,7 @@ ], "description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.", "homepage": "https://github.com/zetacomponents", - "time": "2013-12-19 11:40:00" + "time": "2013-12-19T11:40:00+00:00" }, { "name": "zetacomponents/workflow", @@ -2264,7 +2067,7 @@ ], "description": "The purpose of the Workflow component is to provide the core functionality of an activity-based workflow system including the definition and execution of workflow specifications.", "homepage": "https://github.com/zetacomponents", - "time": "2014-09-27 19:26:10" + "time": "2014-09-27T19:26:10+00:00" }, { "name": "zetacomponents/workflow-database-tiein", @@ -2331,7 +2134,7 @@ ], "description": "Contains the database backend for the Workflow component.", "homepage": "https://github.com/zetacomponents", - "time": "2014-09-27 19:26:10" + "time": "2014-09-27T19:26:10+00:00" }, { "name": "zetacomponents/workflow-event-log-tiein", @@ -2391,10 +2194,206 @@ ], "description": "Contains the EventLog listener for the Workflow component.", "homepage": "https://github.com/zetacomponents", - "time": "2007-12-17 09:04:44" + "time": "2007-12-17T09:04:44+00:00" } ], "packages-dev": [ + { + "name": "blueimp/jquery-file-upload", + "version": "v9.14.1", + "source": { + "type": "git", + "url": "https://github.com/vkhramtsov/jQuery-File-Upload.git", + "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/71d67a9c277e29efcf5935cd2409009c0f841a57", + "reference": "71d67a9c277e29efcf5935cd2409009c0f841a57", + "shasum": "" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sebastian Tschan", + "homepage": "https://blueimp.net" + } + ], + "description": "File Upload widget for jQuery.", + "homepage": "https://github.com/blueimp/jQuery-File-Upload", + "keywords": [ + "bootstrap", + "chunk", + "cross-domain", + "cross-site", + "drag", + "drop", + "file", + "gae", + "go", + "jquery", + "multiple", + "php", + "preview", + "progress", + "python", + "resume", + "selection", + "upload", + "widget" + ], + "time": "2016-11-21T05:38:19+00:00" + }, + { + "name": "components/font-awesome", + "version": "4.7.0", + "source": { + "type": "git", + "url": "https://github.com/components/font-awesome.git", + "reference": "885308b939369d147bec93174722786bc2c4eedd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/components/font-awesome/zipball/885308b939369d147bec93174722786bc2c4eedd", + "reference": "885308b939369d147bec93174722786bc2c4eedd", + "shasum": "" + }, + "type": "component", + "extra": { + "component": { + "styles": [ + "css/font-awesome.css" + ], + "files": [ + "css/font-awesome.min.css", + "css/font-awesome.css.map", + "fonts/*" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT", + "OFL-1.1" + ], + "description": "The iconic font designed for use with Twitter Bootstrap.", + "time": "2016-10-25T10:56:23+00:00" + }, + { + "name": "compwright/codeigniter-installers", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/compwright/codeigniter-installers.git", + "reference": "adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/compwright/codeigniter-installers/zipball/adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f", + "reference": "adbbd5ae2cbf5a24a39931235b1ac7dab56abb4f", + "shasum": "" + }, + "require-dev": { + "composer/composer": "1.0.*@dev" + }, + "type": "composer-installer", + "extra": { + "class": "Composer\\Installer\\CodeigniterInstaller" + }, + "autoload": { + "psr-0": { + "Composer\\Installer": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathon Hill", + "email": "jhill9693@gmail.com", + "homepage": "http://jonathonhill.net", + "role": "Developer" + } + ], + "description": "Composer installers for CodeIgniter", + "homepage": "https://github.com/compwright/codeigniter-installers", + "keywords": [ + "MX", + "codeigniter", + "composer", + "core", + "hmvc", + "installer", + "library", + "module", + "spark", + "sparks" + ], + "time": "2012-11-12T16:11:38+00:00" + }, + { + "name": "rogeriopradoj/codeigniter-curl", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/rogeriopradoj/codeigniter-curl.git", + "reference": "eb954890e242a5e80812006e60b07f1ce29b7e7a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rogeriopradoj/codeigniter-curl/zipball/eb954890e242a5e80812006e60b07f1ce29b7e7a", + "reference": "eb954890e242a5e80812006e60b07f1ce29b7e7a", + "shasum": "" + }, + "require": { + "compwright/codeigniter-installers": "*" + }, + "type": "codeigniter-spark", + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Rogerio Prado de Jesus", + "email": "rogeriopradoj@gmail.com" + } + ], + "description": "codeigniter-curl philsturgeon's library via composer", + "time": "2013-05-27T21:19:21+00:00" + }, + { + "name": "rogeriopradoj/codeigniter-restclient", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://github.com/rogeriopradoj/codeigniter-restclient.git", + "reference": "64991a0105c3cd891a64e1d35e497270ca2b0d78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rogeriopradoj/codeigniter-restclient/zipball/64991a0105c3cd891a64e1d35e497270ca2b0d78", + "reference": "64991a0105c3cd891a64e1d35e497270ca2b0d78", + "shasum": "" + }, + "require": { + "compwright/codeigniter-installers": "*", + "rogeriopradoj/codeigniter-curl": "*" + }, + "type": "codeigniter-spark", + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Rogerio Prado de Jesus", + "email": "rogeriopradoj@gmail.com" + } + ], + "description": "codeigniter-restclient philsturgeon's library via composer", + "time": "2013-05-27T21:23:54+00:00" + }, { "name": "squizlabs/php_codesniffer", "version": "2.7.1", @@ -2471,7 +2470,7 @@ "phpcs", "standards" ], - "time": "2016-11-30 04:02:31" + "time": "2016-11-30T04:02:31+00:00" } ], "aliases": [], diff --git a/include/tw/vilesci_menu_main.inc.php b/include/tw/vilesci_menu_main.inc.php index ba82a46e5..b6c21764a 100755 --- a/include/tw/vilesci_menu_main.inc.php +++ b/include/tw/vilesci_menu_main.inc.php @@ -168,6 +168,8 @@ $menu=array 'Service'=>array('name'=>'Service', 'link'=>'stammdaten/service_frameset.html', 'target'=>'main','permissions'=>array('basis/service')), 'Dokumentvorlagen'=>array('name'=>'Dokumentvorlagen', 'link'=>'stammdaten/dokumentvorlagen_verwaltung.php', 'target'=>'main','permissions'=>array('basis/dokumente')), 'GSProgramm'=>array('name'=>'GSProgramm', 'link'=>'stammdaten/gsprogramm.php', 'target'=>'main','permissions'=>array('inout/uebersicht')), + 'Studiensemester'=>array('name'=>'Studiensemester', 'link'=>'../index.ci.php/organisation/studiensemester/listStudiensemester', 'target'=>'main','permissions'=>array('admin')), + 'Studienjahr'=>array('name'=>'Studienjahr', 'link'=>'../index.ci.php/organisation/studienjahr/listStudienjahr', 'target'=>'main','permissions'=>array('admin')), 'FH Ausweis'=>array ( 'name'=>'FH Ausweis','permissions'=>array('basis/fhausweis'), From 5d0dcb6e4a79b7980f4cf6ea1e2c53ec27a69945 Mon Sep 17 00:00:00 2001 From: Andreas Oesterreicher Date: Tue, 1 Aug 2017 16:54:43 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Kommentar=20erg=C3=A4nzt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/global.config-default.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/config/global.config-default.inc.php b/config/global.config-default.inc.php index ba24752e3..ac130e593 100644 --- a/config/global.config-default.inc.php +++ b/config/global.config-default.inc.php @@ -70,6 +70,7 @@ define('CIS_GESAMTNOTE_GEWICHTUNG', true); define('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2',true); // Bei Gesamtnote eine zusaetzliche Spalte fuer den 3. Termin anzeigen +// Erfordert den Eintrag "Termin3" in der Tabelle lehre.tbl_pruefungstyp define('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3',true); // Bei Gesamtnote eine zusaetzliche Spalte fuer die kommissionelle Pruefung anlegen
+ Kurzbezeichnung:

+
+
+   +