diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php index 31e610289..34e1ee15c 100644 --- a/application/views/templates/FHC-Footer.php +++ b/application/views/templates/FHC-Footer.php @@ -176,5 +176,4 @@ - - + \ No newline at end of file diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index f42543817..529c1aa5a 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -247,7 +247,7 @@ function checkZeilenUmbruch() $link=''; $text=''; - $link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem&nav=false"; + $link= APP_ROOT."index.ci.php/extensions/FHC-Core-Anwesenheiten/?stg_kz=$studiengang_kz&sem=$semester&lvid=$lvid&sem_kurzbz=$angezeigtes_stsem"; $menu[]=array ( @@ -604,4 +604,4 @@ function isDirectoryEmpty($DOC_ROOT, $kurzbz, $semester, $short_short_name, $typ } ?> - + \ No newline at end of file diff --git a/public/js/plugin/FhcAlert.js b/public/js/plugin/FhcAlert.js index eb6516820..ac5adba02 100644 --- a/public/js/plugin/FhcAlert.js +++ b/public/js/plugin/FhcAlert.js @@ -208,15 +208,26 @@ export default { helperAppInstance.$refs.alert.add({ severity: 'error', summary: 'Systemfehler', detail: message}); }, confirmDelete() { + return confirm({ + group: 'fhcAlertConfirm', + header: 'Achtung', + message: 'Möchten Sie sicher löschen?', + acceptLabel: 'Löschen', + acceptClass: 'btn btn-danger', + rejectLabel: 'Abbrechen', + rejectClass: 'btn btn-outline-secondary', + }) + }, + confirm(options) { return new Promise((resolve, reject) => { helperAppInstance.$confirm.require({ - group: 'fhcAlertConfirm', - header: 'Achtung', - message: 'Möchten Sie sicher löschen?', - acceptLabel: 'Löschen', - acceptClass: 'btn btn-danger', - rejectLabel: 'Abbrechen', - rejectClass: 'btn btn-outline-secondary', + group: options?.group ?? 'fhcAlertConfirm', + header: options?.header ?? 'Achtung', + message: options?.message ?? 'Möchten', + acceptLabel: options?.acceptLabel ?? 'Ok', + acceptClass: options?.acceptClass ?? 'btn btn-primary', + rejectLabel: options?.rejectLabel ?? 'Abbrechen', + rejectClass: options?.rejectClass ?? 'btn btn-outline-secondary', accept() { resolve(true); }, diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index cae3fa258..9063bfcde 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -27060,6 +27060,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'anwCountTermin', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesend am gewählten Termin', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Attending at date', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'global', @@ -28623,4 +28643,4 @@ foreach ($phrases as $phrase) } if(!$new) - echo 'Keine neuen Phrasen
'; + echo 'Keine neuen Phrasen
'; \ No newline at end of file