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/content/pdfExport.php b/content/pdfExport.php old mode 100644 new mode 100755 index 4cc56ea6e..460834f13 --- a/content/pdfExport.php +++ b/content/pdfExport.php @@ -185,7 +185,7 @@ if (isset($_GET['output']) && $_GET['output']!='pdf') else $output = $_GET['output']; } -else +else $output = 'pdf'; @@ -277,7 +277,7 @@ elseif(in_array($xsl,array('Ressource'))) exit; } } -elseif(in_array($xsl,array('Inskription','Studienerfolg','OutgoingLearning','OutgoingChangeL','LearningAgree','Zahlung'))) +elseif(in_array($xsl,array('Inskription','Studienerfolg','OutgoingLearning','OutgoingChangeL','LearningAgree','Zahlung','DichiaSost'))) { if(!$rechte->isBerechtigt('admin') && !$rechte->isBerechtigt('assistenz')) { 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/locale/it-IT/lehre.php b/locale/it-IT/lehre.php index 6fd29a5a5..1ae92d09a 100755 --- a/locale/it-IT/lehre.php +++ b/locale/it-IT/lehre.php @@ -15,7 +15,7 @@ $this->phrasen['lehre/kreuzerltool']='strumenti per esercitazioni
    (tool con c $this->phrasen['lehre/moodleMitKreuzerltoolInfo']='Moodle non può essere utilizzato in contemporanea con lo strumento per esercitazioni. Se si vuole utilizzare Moodle bisogna annullare l’uso dello strumento per esercitazioni'; $this->phrasen['lehre/lehrbeauftragter']='Docente incaricato'; $this->phrasen['lehre/lehrveranstaltungsinformation']='Informazioni corso'; -$this->phrasen['lehre/leistungsuebersicht']='Panoramica'; +$this->phrasen['lehre/leistungsuebersicht']='Panoramica per docenti'; $this->phrasen['lehre/lvInfoBearbeiten']='Modificare'; $this->phrasen['lehre/mail']='E-Mail agli studenti'; $this->phrasen['lehre/moodle']='Moodle'; 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.']]>