diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php index fb023c5fd..b5761405c 100644 --- a/application/views/system/infocenter/infocenterDetails.php +++ b/application/views/system/infocenter/infocenterDetails.php @@ -57,7 +57,7 @@
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index 52b18b056..62b896e43 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -351,7 +351,7 @@ if (!$berechtigung->isBerechtigt('admin') { $worksheet->write($lines,3,$elem->vorname); } - $worksheet->write($lines,4,$elem->semester.$elem->verband.$elem->gruppe); + $worksheet->writeString($lines,4,$elem->semester.$elem->verband.$elem->gruppe); $worksheet->write($lines,5,trim($elem->matrikelnr),$format_highlight); $worksheet->write($lines,6, $note, $format_highlightright); diff --git a/include/vertrag.class.php b/include/vertrag.class.php index 1d9ec364b..7cfa64ee2 100644 --- a/include/vertrag.class.php +++ b/include/vertrag.class.php @@ -121,7 +121,7 @@ class vertrag extends basis_db JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) WHERE vertrag_id=tbl_vertrag.vertrag_id - AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>=".$this->db_add_param($datum).") + AND studiensemester_kurzbz in (SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE start>".$this->db_add_param($datum).") ) )"; } diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js index 74c9f1d92..0f9d45883 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Noten/Zeugnis.js @@ -255,7 +255,7 @@ export default { deleteButton.className = 'btn btn-outline-secondary'; const icon = document.createElement('i'); icon.className = 'fa fa-trash'; - icon.title = this.$p.t('ui/loeschen'); + icon.title = this.$p.t('lehre/info_deleteMarkEntry'); deleteButton.append(icon); deleteButton.addEventListener('click', evt => { evt.stopPropagation(); diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js index e4132c2a2..9422e7790 100644 --- a/public/js/components/Stv/Studentenverwaltung/List.js +++ b/public/js/components/Stv/Studentenverwaltung/List.js @@ -822,18 +822,33 @@ export default { @headerFilterOn="handleHeaderFilter" > - + + + - -