From da7036d33a4dd52586a1d5a5ac424643b330a903 Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Fri, 20 May 2016 10:25:32 +0200 Subject: [PATCH] Bugfix ExamReg, Geburtsort instudent xml, Hide Moodle-Icon if not used --- cis/private/lehre/pruefung/pruefung.js.php | 15 +++++++++---- include/tw/cis_menu_lv.inc.php | 25 ++++++++++++---------- rdf/student.rdf.php | 1 + 3 files changed, 26 insertions(+), 15 deletions(-) mode change 100644 => 100755 rdf/student.rdf.php diff --git a/cis/private/lehre/pruefung/pruefung.js.php b/cis/private/lehre/pruefung/pruefung.js.php index 939bb34ff..3ef462d05 100755 --- a/cis/private/lehre/pruefung/pruefung.js.php +++ b/cis/private/lehre/pruefung/pruefung.js.php @@ -968,10 +968,17 @@ function loadPruefungStudiengang(studiengang_kz, studiensemester) var liste = ""; data.result.forEach(function(e){ liste += ""; + try + { + e.pruefung[0].termine.forEach(function(d){ + liste += "
  • "+convertDateTime(d.von)+" "+convertDateTime(d.von, "time")+" - "+convertDateTime(d.bis, "time")+"
  • "; + }); + } + catch(err) + { + var errmsg = err.message; + } + liste += ""; }); $("#pruefungenListe").append(liste); } diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index d6f7da13b..ee516d123 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -439,17 +439,20 @@ function checkZeilenUmbruch() } } } - $menu[]=array - ( - 'id'=>'core_menu_moodle', - 'position'=>'70', - 'name'=>$p->t('lehre/moodle'), - 'icon'=>'../../../skin/images/button_moodle.png', - 'link'=>$link, - 'link_target'=>$link_target, - 'link_onclick'=>$link_onclick, - 'text'=>$text - ); + if (MOODLE) + { + $menu[]=array + ( + 'id'=>'core_menu_moodle', + 'position'=>'70', + 'name'=>$p->t('lehre/moodle'), + 'icon'=>'../../../skin/images/button_moodle.png', + 'link'=>$link, + 'link_target'=>$link_target, + 'link_onclick'=>$link_onclick, + 'text'=>$text + ); + } //Gesamtnote if($is_lector && ((!defined('CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN') || CIS_LEHRVERANSTALTUNG_GESAMTNOTE_ANZEIGEN) && $angemeldet)) diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php old mode 100644 new mode 100755 index 8d4a8e4cd..842a9a36f --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -836,6 +836,7 @@ else matrikelnr.']]> convertISODate($student->gebdatum).']]> gebdatum.']]> + gebort.']]> verband.']]> gruppe.']]>