From 12ca915b00355e6b48a995a77a91f2da18b3c79b Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 21 May 2025 18:16:01 +0200 Subject: [PATCH 01/41] ddi/ddo text in legende old anw liste; studentdropdown order changed; email datumformat d.m.y; --- system/xsl/Anwesenheitsliste.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl index 55e72900c..fc9dede58 100644 --- a/system/xsl/Anwesenheitsliste.xsl +++ b/system/xsl/Anwesenheitsliste.xsl @@ -309,7 +309,8 @@ xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" (nz) ... nicht zugelassen (ma) ... MitarbeiterIn (a.o.) ... Außerordentliche/r HörerIn - (d.d.) ... Double Degree Program + (d.d.i) ... Double Degree Incoming Program + (d.d.o) ... Double Degree Outgoing Program From fce63eb31b4cdde68eef77a7ca99930dbf06732f Mon Sep 17 00:00:00 2001 From: ma0048 Date: Fri, 23 May 2025 10:35:47 +0200 Subject: [PATCH 02/41] svnr aus dem infocenter entfernt --- application/controllers/system/infocenter/InfoCenter.php | 3 +-- application/views/system/infocenter/stammdaten.php | 6 ------ public/js/infocenter/stammdaten.js | 1 - 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php index f6e41d2e6..08162c230 100644 --- a/application/controllers/system/infocenter/InfoCenter.php +++ b/application/controllers/system/infocenter/InfoCenter.php @@ -1275,7 +1275,6 @@ class InfoCenter extends Auth_Controller 'nachname' => $this->input->post('nachname'), 'titelpost' => isEmptyString($this->input->post('titelpost')) ? null : $this->input->post('titelpost'), 'gebdatum' => isEmptyString($this->input->post('gebdatum')) ? null : date("Y-m-d", strtotime($this->input->post('gebdatum'))), - 'svnr' => isEmptyString($this->input->post('svnr')) ? null : $this->input->post('svnr'), 'staatsbuergerschaft' => isEmptyString($this->input->post('buergerschaft')) ? null : $this->input->post('buergerschaft'), 'geschlecht' => $this->input->post('geschlecht'), 'geburtsnation' => isEmptyString($this->input->post('gebnation')) ? null : $this->input->post('gebnation'), @@ -1816,7 +1815,7 @@ class InfoCenter extends Auth_Controller } /** - * Loads all necessary Person data: Stammdaten (name, svnr, contact, ...), Dokumente, Logs and Notizen + * Loads all necessary Person data: Stammdaten (name, contact, ...), Dokumente, Logs and Notizen * @param $person_id * @return array */ diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php index f143c9c03..f852e9ace 100644 --- a/application/views/system/infocenter/stammdaten.php +++ b/application/views/system/infocenter/stammdaten.php @@ -32,12 +32,6 @@
gebdatum), 'd.m.Y') ?>
- - p->t('person','svnr')) ?> - -
svnr ?>
- - p->t('person','staatsbuergerschaft')) ?> diff --git a/public/js/infocenter/stammdaten.js b/public/js/infocenter/stammdaten.js index c7600f677..8e34996cd 100644 --- a/public/js/infocenter/stammdaten.js +++ b/public/js/infocenter/stammdaten.js @@ -44,7 +44,6 @@ $(document).ready(function () "nachname" : $('#nachname_input').val(), "titelpost" : $('#titelpost_input').val(), "gebdatum" : $('#gebdatum_input').val(), - "svnr" : $('#svnr_input').val(), "buergerschaft" : $('#buergerschaft').val(), "geschlecht" : $('#geschlecht').val(), "gebnation" : $('#gebnation').val(), From 3cebbc9fbab6705c190481d9ef6976afea5d073d Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 28 May 2025 17:04:07 +0200 Subject: [PATCH 03/41] modal optional expand to full size button - used for qr window; added missing phrase editEntschuldigung; --- public/js/components/Bootstrap/Modal.js | 26 ++++++-- system/phrasesupdate.php | 80 +++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 5 deletions(-) diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js index 2b3223ff7..ee4495278 100644 --- a/public/js/components/Bootstrap/Modal.js +++ b/public/js/components/Bootstrap/Modal.js @@ -3,7 +3,8 @@ export default { name: 'BootstrapModal', data: () => ({ - modal: null + modal: null, + fullscreen: false }), props: { backdrop: { @@ -26,6 +27,10 @@ export default { bodyClass: { type: [String,Array,Object], default: 'px-4 py-5' + }, + allowFullscreenExpand: { + type: Boolean, + default: false } }, emits: [ @@ -50,6 +55,9 @@ export default { }, toggle() { return this.modal.toggle(); + }, + toggleFullscreen() { + this.fullscreen = !this.fullscreen } }, mounted() { @@ -115,12 +123,20 @@ export default { }); }, template: `
-
+
-
+
- - +
+ + + + + +
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 0203b3c2f..9a461650b 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -30004,6 +30004,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrolle', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheitskontrolle', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'attendance check', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', @@ -32420,6 +32440,66 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrolleDatumOutOfRange', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Datum liegt außerhalb der erlaubten Kontrollspanne!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Date is outside the permitted control range!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'alertBetreuungSelected', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Der ausgewählte LV-Teil hat die Lehrform Betreuung! Bitte überprüfen sie die korrekte Auswahl des LV-Teils um fehlerhafte Kontrollen zu vermeiden!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The selected course component is taught in a supervised format! Please check that you have selected the correct course component to avoid incorrect assessments!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'editEntschuldigung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Entschuldigung bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit Excuse note', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 3e3fa9c1eb286a960df67ce613e3ee82a02d0e12 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Tue, 3 Jun 2025 08:57:28 +0200 Subject: [PATCH 04/41] svnr aus dem fas entfernt --- .../api/frontend/v1/stv/Student.php | 1 - .../api/frontend/v1/stv/Students.php | 1 - cis/infoterminal/index.php | 1 - content/dokumentenakt.pdf.php | 3 - .../statistik/studentenexportextended.xls.php | 9 +-- content/student/studentDBDML.php | 2 - content/student/studentdetailoverlay.xul.php | 3 +- content/student/studentenoverlay.xul.php | 5 -- content/student/studentoverlay.js.php | 6 -- include/prestudent.class.php | 1 - include/student.class.php | 4 +- .../Studentenverwaltung/Details/Details.js | 10 --- .../Stv/Studentenverwaltung/List.js | 1 - public/js/infocenter/stammdaten.js | 1 - rdf/ausbildungsvertrag.xml.php | 6 -- rdf/student.rdf.php | 9 +-- rdf/studienblatt.xml.php | 4 - .../personen/import/interessentenimport.php | 3 +- vilesci/personen/personen_details.php | 33 +++++++-- vilesci/personen/preinteressent_anlegen.php | 73 +++++++------------ vilesci/personen/preinteressent_detail.php | 3 - vilesci/statistik/oehwaehlerverzeichnis.php | 1 - vilesci/statistik/studierendenliste_oeh.php | 1 - 23 files changed, 59 insertions(+), 122 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index f24ef62bb..817d5adbc 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -186,7 +186,6 @@ class Student extends FHCAPI_Controller 'gebdatum', 'gebort', 'geburtsnation', - 'svnr', 'ersatzkennzeichen', 'staatsbuergerschaft', 'matr_nr', diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php index 5fb7b592c..c843eddd2 100644 --- a/application/controllers/api/frontend/v1/stv/Students.php +++ b/application/controllers/api/frontend/v1/stv/Students.php @@ -618,7 +618,6 @@ class Students extends FHCAPI_Controller $this->PrestudentModel->addSelect('wahlname'); $this->PrestudentModel->addSelect('vornamen'); $this->PrestudentModel->addSelect('titelpost'); - $this->PrestudentModel->addSelect('svnr'); $this->PrestudentModel->addSelect('ersatzkennzeichen'); $this->PrestudentModel->addSelect('gebdatum'); $this->PrestudentModel->addSelect('geschlecht'); diff --git a/cis/infoterminal/index.php b/cis/infoterminal/index.php index 1b4c7d637..04c591ee1 100644 --- a/cis/infoterminal/index.php +++ b/cis/infoterminal/index.php @@ -843,7 +843,6 @@ function meine_uid_informationen_detail($db,$uid,$count=0) $aktiv=$db->db_result($erg,0,"aktiv"); - $svnr=$db->db_result($erg,0,"svnr"); $titelpre=$db->db_result($erg,0,"titelpre"); $titelpost=$db->db_result($erg,0,"titelpost"); diff --git a/content/dokumentenakt.pdf.php b/content/dokumentenakt.pdf.php index a27b8d562..a737ee72d 100644 --- a/content/dokumentenakt.pdf.php +++ b/content/dokumentenakt.pdf.php @@ -307,8 +307,6 @@ foreach($prestudent_ids as $pid) $nation->load($prestudent->zgvnation); $zgvnation = $nation->kurztext; - $svnr = ($prestudent->svnr == '')?($prestudent->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$prestudent->ersatzkennzeichen:''):$prestudent->svnr; - foreach($adresse->result as $row_adresse) { if($row_adresse->heimatadresse) @@ -439,7 +437,6 @@ foreach($prestudent_ids as $pid) 'zustell_ort' => $zustellOrt, 'zustell_bundesland' => $zustellBundesland, 'geburtsnation' => $geburtsnation, - 'svnr' => $svnr, 'staatsbuergerschaft' => $staatsbuergerschaft, 'geschlecht' => $prestudent->geschlecht, 'telefonnummer' => $telefonnummer, diff --git a/content/statistik/studentenexportextended.xls.php b/content/statistik/studentenexportextended.xls.php index 89acbe18f..5ab34d026 100644 --- a/content/statistik/studentenexportextended.xls.php +++ b/content/statistik/studentenexportextended.xls.php @@ -125,8 +125,6 @@ $worksheet->write($zeile, ++$i, "PERSONENKENNZEICHEN", $format_bold); $maxlength[$i] = 19; $worksheet->write($zeile, ++$i, "STAATSBÜRGERSCHAFT", $format_bold); $maxlength[$i] = 16; -$worksheet->write($zeile, ++$i, "SVNR", $format_bold); -$maxlength[$i] = 4; $worksheet->write($zeile, ++$i, "PERSON_ID", $format_bold); $maxlength[$i] = 6; $worksheet->write($zeile, ++$i, "ERSATZKENNZEICHEN", $format_bold); @@ -396,12 +394,7 @@ function draw_content($row) $worksheet->write($zeile, $i, $row->staatsbuergerschaft); $i++; - //SVNR - if (mb_strlen($row->svnr) > $maxlength[$i]) - $maxlength[$i] = mb_strlen($row->svnr); - $worksheet->write($zeile, $i, $row->svnr); - $i++; - + //Person_id if (mb_strlen($row->person_id) > $maxlength[$i]) $maxlength[$i] = mb_strlen($row->person_id); diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php index e1bcffd84..041af9c20 100644 --- a/content/student/studentDBDML.php +++ b/content/student/studentDBDML.php @@ -594,7 +594,6 @@ if(!$error) $student->anmerkungen = $_POST['anmerkung']; $student->homepage = $_POST['homepage']; $student->matr_nr = $_POST['matr_nr']; - $student->svnr = $_POST['svnr']; $student->ersatzkennzeichen = $_POST['ersatzkennzeichen']; $student->familienstand = $_POST['familienstand']; $student->geschlecht = $_POST['geschlecht']; @@ -746,7 +745,6 @@ if(!$error) $person->gebzeit = $_POST['geburtszeit']; $person->anmerkungen = $_POST['anmerkung']; $person->homepage = $_POST['homepage']; - $person->svnr = $_POST['svnr']; $person->ersatzkennzeichen = $_POST['ersatzkennzeichen']; $person->familienstand = $_POST['familienstand']; $person->geschlecht = $_POST['geschlecht']; diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php index 132667395..36740d209 100644 --- a/content/student/studentdetailoverlay.xul.php +++ b/content/student/studentdetailoverlay.xul.php @@ -134,8 +134,7 @@ echo ''; -
- - bezeichnung : $studiengangbezeichnung; $studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch; - $svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr; - //Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen if ($studiengang->studiengang_kz<0) { @@ -146,7 +144,6 @@ foreach($uid_arr as $uid) echo "\t\t".$gebdatum."\n"; echo "\t\t".$student->gebort."\n"; echo "\t\t".$staatsbuergerschaft->langtext."\n"; - echo "\t\t".$svnr."\n"; echo "\t\t".trim($student->matrikelnr)."\n"; echo "\t\t".$db->convert_html_chars($studiengang_bezeichnung)."\n"; echo "\t\t".$db->convert_html_chars($studiengang_bezeichnung_englisch)."\n"; @@ -340,8 +337,6 @@ foreach($prestudent_arr as $prest_id) $studiengang_bezeichnung = empty($studiengangbezeichnung) ? $studiengang->bezeichnung : $studiengangbezeichnung; $studiengang_bezeichnung_englisch = empty($studiengangbezeichnung_englisch) ? $studiengang->english : $studiengangbezeichnung_englisch; - $svnr = ($person->svnr == '')?($person->ersatzkennzeichen != ''?'Ersatzkennzeichen: '.$person->ersatzkennzeichen:''):$person->svnr; - //Wenn Lehrgang, dann Erhalter-KZ vor die Studiengangs-Kz hängen if ($studiengang->studiengang_kz<0) { @@ -363,7 +358,6 @@ foreach($prestudent_arr as $prest_id) echo "\t\t".$gebdatum."\n"; echo "\t\t".$person->gebort."\n"; echo "\t\t".$staatsbuergerschaft->langtext."\n"; - echo "\t\t".$svnr."\n"; echo "\t\t".$db->convert_html_chars($studiengang_bezeichnung)."\n"; echo "\t\t".$db->convert_html_chars($studiengang_bezeichnung_englisch)."\n"; echo "\t\t".$studiengang->kurzbzlang."\n"; diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php index 61c903bd6..439ded6ec 100644 --- a/rdf/student.rdf.php +++ b/rdf/student.rdf.php @@ -235,7 +235,6 @@ function draw_content_liste($row) vorname.']]> nachname.']]> geschlecht.']]> - '.($row->svnr==''?' ':'svnr.']]>').' '.($row->ersatzkennzeichen==''?' ':'ersatzkennzeichen.']]>').' convertISODate($row->gebdatum).']]> gebdatum.']]> @@ -349,7 +348,6 @@ function draw_content($row) gebzeit.']]> '.($row->anmerkungen==''?' ':'anmerkungen.']]>').' anrede.']]> - svnr.']]> ersatzkennzeichen.']]> familienstand.']]> geschlecht.']]> @@ -470,7 +468,6 @@ function draw_empty_content() - @@ -647,7 +644,7 @@ if($xmlformat=='rdf') $sql_query=" SELECT p.person_id, tbl_student.prestudent_id, tbl_benutzer.uid, titelpre, titelpost,vorname, wahlname, vornamen, geschlecht, - nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen,svnr, tbl_student.matrikelnr, p.anmerkung as anmerkungen, + nachname, gebdatum, tbl_prestudent.anmerkung,ersatzkennzeichen, tbl_student.matrikelnr, p.anmerkung as anmerkungen, tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, tbl_student.studiengang_kz, aufmerksamdurch_kurzbz, mentor, public.tbl_benutzer.aktiv AS bnaktiv, ( SELECT kontakt @@ -985,8 +982,7 @@ if($xmlformat=='rdf') $qry .= " prestudent_id = ".$db->db_add_param($searchItems_string_orig).";"; else $qry .= " matrikelnr = ".$db->db_add_param($searchItems_string_orig)." OR - matr_nr = ".$db->db_add_param($searchItems_string_orig)." OR - svnr = ".$db->db_add_param($searchItems_string_orig).";"; + matr_nr = ".$db->db_add_param($searchItems_string_orig).";"; } if($result = $db->db_query($qry)) { @@ -1282,7 +1278,6 @@ else anrede.']]> geschlecht.']]> - svnr.']]> ersatzkennzeichen.']]> familienstand.']]> diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php index 3ee805c04..a9b78d968 100644 --- a/rdf/studienblatt.xml.php +++ b/rdf/studienblatt.xml.php @@ -105,9 +105,6 @@ foreach($uid_arr as $uid) $staatsbuergerschaft = new nation(); $staatsbuergerschaft->load($student->staatsbuergerschaft); - - $svnr = ($student->svnr == '')?'Ersatzkennzeichen: '.$student->ersatzkennzeichen:$student->svnr; - $geschlecht_obj = new geschlecht(); $geschlecht_obj->load($student->geschlecht); @@ -143,7 +140,6 @@ foreach($uid_arr as $uid) echo "\t\t\n"; echo "\t\tgebort."]]>\n"; echo "\t\tlangtext."]]>\n"; - echo "\t\t\n"; echo "\t\tmatr_nr)."]]>\n"; echo "\t\tmatrikelnr)."]]>\n"; echo "\t\tstudiengangbezeichnung."]]>\n"; diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php index d1830eaeb..8734a1353 100644 --- a/vilesci/personen/import/interessentenimport.php +++ b/vilesci/personen/import/interessentenimport.php @@ -1167,8 +1167,7 @@ if ($where != '') } } $status = mb_substr($status, 0, mb_strlen($status)-2); - - echo ''."$row->nachname$row->vorname$row->wahlname$row->vornamen$row->gebdatum$row->svnr".($row->geschlecht=='m'?'männlich':'weiblich').""; + echo ''."$row->nachname$row->vorname$row->wahlname$row->vornamen$row->gebdatum".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."".($row->geschlecht=='m'?'männlich':'weiblich').""; $qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id=".$db->db_add_param($row->person_id, FHC_INTEGER); if ($result_adr = $db->db_query($qry_adr)) while ($row_adr = $db->db_fetch_object($result_adr)) diff --git a/vilesci/personen/personen_details.php b/vilesci/personen/personen_details.php index d1dcd8815..b274558bd 100644 --- a/vilesci/personen/personen_details.php +++ b/vilesci/personen/personen_details.php @@ -125,6 +125,7 @@ $verband = (isset($_POST['verband'])?$_POST['verband']:''); $gruppe = (isset($_POST['gruppe'])?$_POST['gruppe']:''); $dms_id_lichtbild = ''; +$is_mitarbeiter = false; if($uid!='') { $qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE uid=".$db->db_add_param($uid)." @@ -144,7 +145,17 @@ if($uid!='') else die('Fehler beim Ermitteln der UID'); } - +else if ($person_id !='') +{ + $qry = "SELECT person_id, true as mitarbeiter FROM campus.vw_mitarbeiter WHERE person_id=".$db->db_add_param($person_id); + if($result = $db->db_query($qry)) + { + if($row = $db->db_fetch_object($result)) + { + $is_mitarbeiter = ($row->mitarbeiter=='t'?true:false); + } + } +} if(isset($_POST['saveperson'])) { if(!$rechte->isBerechtigt('student/stammdaten', null, 'su') && !$rechte->isBerechtigt('mitarbeiter/stammdaten', null, 'su')) @@ -163,7 +174,8 @@ if(isset($_POST['saveperson'])) $person->gebdatum = $geburtsdatum; $person->gebort = $geburtsort; $person->geburtsnation = $geburtsnation; - $person->svnr = $svnr; + if ($is_mitarbeiter) + $person->svnr = $svnr; $person->ersatzkennzeichen = $ersatzkennzeichen; $person->gebzeit = $geburtszeit; $person->staatsbuergerschaft = $staatsbuergerschaft; @@ -332,7 +344,8 @@ if(!$error_person_save) $geburtsdatum = $person->gebdatum; $geburtsort = $person->gebort; $geburtsnation = $person->geburtsnation; - $svnr = $person->svnr; + if ($is_mitarbeiter) + $svnr = $person->svnr; $ersatzkennzeichen = $person->ersatzkennzeichen; $geburtszeit = $person->gebzeit; $staatsbuergerschaft = $person->staatsbuergerschaft; @@ -398,10 +411,16 @@ foreach ($nation->nation as $row_nation) echo " - - SVNR - - Ersatzkennzeichen +"; + +if ($is_mitarbeiter) +{ + echo "SVNR + "; +} + +echo + "Ersatzkennzeichen Geburtszeit diff --git a/vilesci/personen/preinteressent_anlegen.php b/vilesci/personen/preinteressent_anlegen.php index 3ba5865d2..cc9ecbf53 100644 --- a/vilesci/personen/preinteressent_anlegen.php +++ b/vilesci/personen/preinteressent_anlegen.php @@ -140,7 +140,6 @@ function disablefields(obj) document.getElementById('vorname').disabled=val; document.getElementById('geschlecht').disabled=val; document.getElementById('geburtsdatum').disabled=val; - document.getElementById('svnr').disabled=val; document.getElementById('ersatzkennzeichen').disabled=val; //document.getElementById('adresse').disabled=val; //document.getElementById('plz').disabled=val; @@ -159,21 +158,6 @@ function disablefields(obj) } } -function GeburtsdatumEintragen() -{ - svnr = document.getElementById('svnr').value; - gebdat = document.getElementById('geburtsdatum'); - - if(svnr.length==10 && gebdat.value=='') - { - var tag = svnr.substr(4,2); - var monat = svnr.substr(6,2); - var jahr = svnr.substr(8,2); - - gebdat.value='19'+jahr+'-'+monat+'-'+tag; - } -} - function disablefields2(val) { document.getElementById('adresse').disabled=val; @@ -368,7 +352,6 @@ $email = (isset($_REQUEST['email'])?$_REQUEST['email']:''); $telefon = (isset($_REQUEST['telefon'])?$_REQUEST['telefon']:''); $mobil = (isset($_REQUEST['mobil'])?$_REQUEST['mobil']:''); $person_id = (isset($_REQUEST['person_id'])?$_REQUEST['person_id']:''); -$svnr = (isset($_REQUEST['svnr'])?$_REQUEST['svnr']:''); $ersatzkennzeichen = (isset($_REQUEST['ersatzkennzeichen'])?$_REQUEST['ersatzkennzeichen']:''); $ueberschreiben = (isset($_REQUEST['ueberschreiben'])?$_REQUEST['ueberschreiben']:''); @@ -413,7 +396,6 @@ if(isset($_POST['save'])) $person->geschlecht = $geschlecht; $person->gebdatum = $datum_obj->formatDatum($geburtsdatum,'Y-m-d'); $person->staatsbuergerschaft = $nation; - $person->svnr = $svnr; $person->ersatzkennzeichen = $ersatzkennzeichen; $person->aktiv = true; $person->insertamum = date('Y-m-d H:i:s'); @@ -689,39 +671,38 @@ if($result = $db->db_query($qry)) } echo ''; echo ''; -echo 'SVNR'; echo 'Ersatzkennzeichen'; echo 'Geburtsdatum (Format dd.mm.JJJJ)'; echo 'Geburtsort'; -echo 'Geburtsnation'; +echo 'Geburtsnation'; echo ''; -echo 'Sprache'; $sprache_obj = new sprache(); $sprache_obj->getAll(); foreach($sprache_obj->result as $row) -{ - if($row->sprache==$sprache) - $selected='selected'; - else - $selected=''; - - echo ""; -} -echo ''; +{ + if($row->sprache==$sprache) + $selected='selected'; + else + $selected=''; + + echo ""; +} +echo ''; echo ''; echo '
Adresse'; echo '
Nation'; + echo '
NachnameVornameGebDatumSVNRGeschlechtAdresseStatusDetails
'; while($row = $db->db_fetch_object($result)) { $status = ''; @@ -905,7 +886,7 @@ if($where!='') } $status = mb_substr($status, 0, mb_strlen($status)-2); - echo ''; echo ''; -//SVNR -echo ""; //Ersatzkennzeichen echo ""; //Geschlecht diff --git a/vilesci/statistik/oehwaehlerverzeichnis.php b/vilesci/statistik/oehwaehlerverzeichnis.php index f7ea9447e..d94301f99 100644 --- a/vilesci/statistik/oehwaehlerverzeichnis.php +++ b/vilesci/statistik/oehwaehlerverzeichnis.php @@ -61,7 +61,6 @@ header( 'Content-Disposition: attachment;filename='.$filename); $qry=" SELECT * FROM ( SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen, - tbl_person.svnr, tbl_person.ersatzkennzeichen, tbl_person.gebdatum, tbl_person.nachname, diff --git a/vilesci/statistik/studierendenliste_oeh.php b/vilesci/statistik/studierendenliste_oeh.php index 3480e76cd..a99cbde54 100644 --- a/vilesci/statistik/studierendenliste_oeh.php +++ b/vilesci/statistik/studierendenliste_oeh.php @@ -60,7 +60,6 @@ header( 'Content-Disposition: attachment;filename='.$filename); $qry=" SELECT * FROM ( SELECT DISTINCT ON (matrikelnr) matrikelnr AS personenkennzeichen, - tbl_person.svnr, tbl_person.ersatzkennzeichen, tbl_person.gebdatum, tbl_person.nachname, From fce55e38aeb132123a2758367ac4e05f99b7a6d3 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 12 Jun 2025 17:18:52 +0200 Subject: [PATCH 05/41] more & better anw phrasen --- system/phrasesupdate.php | 114 +++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 9 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 9a461650b..ad0f7e347 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -30087,18 +30087,58 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'entschuldigungAutoEmailBetreff', + 'phrase' => 'entFullEmailBetreff', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.', + 'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Neues Dokument wurde hochgeladen.', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Excuse note for digital attendances - a new document has been uploaded.', + 'text' => 'New Excuse note for digital attendances - a new document has been uploaded.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'entNewEmailBetreff', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Neue Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wird nachgereicht.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'New Excuse note for digital attendances - Document will be submitted later', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'entEditEmailBetreff', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Entschuldigung zur Befreiung der Anwesenheitspflicht: Dokument wurde eingereicht.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Excuse note for digital attendances - Document has been submitted', 'description' => '', 'insertvon' => 'system' ) @@ -32004,17 +32044,13 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben. - - Bitte beachten Sie dass nur Entschuldigungen INNERHALB des angegebenen Zeitraumes angezeigt werden. Sollten Sie nach einer lang wirken Entschuldigung suchen, müssen Sie die Zeitspanne entsprechend weit setzen.', + 'text' => 'Im Entschuldigungsmanagement können Sie als Studiengangsassistenz beziehungsweise als Administrator die von Studenten hochgeladenen Entschuldigungsdokumente überprüfen und den Status entsprechend vergeben.', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly. - - Please note that only excuses WITHIN the specified time period are displayed. If you are looking for a long-lasting excuse, you must set the time period accordingly.', + 'text' => 'In the excuse management, you as a course assistant or administrator can check the excuse documents uploaded by students and assign the status accordingly.', 'description' => '', 'insertvon' => 'system' ) @@ -32500,6 +32536,66 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'anwUserEntry', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheitseintrag', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Attendance Entry', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'highlightsettings', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Datumsmarkierung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Date Highlighting', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'editAnwKontrolle', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheitskontrolle bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit Attendance Checks', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 913211e84d9a8c5060925212691201a2f1fcc784 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 18 Jun 2025 16:23:35 +0200 Subject: [PATCH 06/41] even more & better anw phrasen --- system/phrasesupdate.php | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index ad0f7e347..66f5f6c05 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -30024,6 +30024,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'offen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Offen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Open', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', @@ -31984,6 +32004,66 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrolleTimeOverlap', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontrollzeiten überlappen mit Kontrolle von {0} bis {1}.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Times overlap with attendance check from {0} to {1}.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'keineKontrollenAnDatumFallback', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Keine Kontrollen an {0} gefunden, es werden alle Kontrollen angezeigt.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'No attendance checks found on {0}, all attendance checks are being shown.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'noLePreselectTermineTooOld', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Keine intelligente LV-Teil Vorauswahl möglich, da sämtliche Termine außerhalb des erlaubten Kontrollzeitraums liegen. Bitte wählen Sie sorgfältig den gewünschten LV-Teil aus.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'No intelligent pre-selection of teaching unit is possible, as all dates fall outside the permitted control period. Please carefully select the desired teaching unit.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', From 057288a4a5312f052dd196021172b42ad2ffb44a Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 25 Jun 2025 16:02:51 +0200 Subject: [PATCH 07/41] phrasen & rechte rename --- include/tw/cis_menu_lv.inc.php | 8 +-- system/phrasesupdate.php | 126 ++++++++++++++++++++++++++++++++- 2 files changed, 127 insertions(+), 7 deletions(-) diff --git a/include/tw/cis_menu_lv.inc.php b/include/tw/cis_menu_lv.inc.php index 73a347dc3..29ba54724 100644 --- a/include/tw/cis_menu_lv.inc.php +++ b/include/tw/cis_menu_lv.inc.php @@ -244,10 +244,10 @@ function checkZeilenUmbruch() if(defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN') && CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN && $angemeldet && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG') || in_array($lv->studiengang_kz, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_STG))) && (!defined('CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA') || in_array($lv->lehrveranstaltung_id, unserialize(CIS_LEHRVERANSTALTUNG_ANWESENHEIT_ANZEIGEN_LVA))) - && ($rechte->isBerechtigt('extension/anw_ent_admin') - || $rechte->isBerechtigt('extension/anwesenheit_lektor') - || $rechte->isBerechtigt('extension/anwesenheit_student') - || $rechte->isBerechtigt('extension/anwesenheit_admin'))) + && ($rechte->isBerechtigt('extension/anw_r_ent_assistenz') + || $rechte->isBerechtigt('extension/anw_r_lektor') + || $rechte->isBerechtigt('extension/anw_r_student') + || $rechte->isBerechtigt('extension/anw_r_full_assistenz'))) { $link=''; $text=''; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 66f5f6c05..8ee5685d6 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31447,18 +31447,78 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'studentConfig', + 'phrase' => 'errorCodeTooOld', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Studenten auswählen.', + 'text' => 'Der Zugangscode ist zeitlich abgelaufen.', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Configure student profile.', + 'text' => 'The access code has expired.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'profil', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Profil', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'profile', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'admin', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Entschuldigungsmanagement', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'excuse note management', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'allowed', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Aktuell prüfbar', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'allowed to test', 'description' => '', 'insertvon' => 'system' ) @@ -31504,6 +31564,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'termine', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Unterricht laut Stundenplan', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Lesson as per Timetable', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', @@ -31644,6 +31724,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrollen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontrollen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Attendance Checks', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', @@ -32296,6 +32396,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'file', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Dokument', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Document', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', From 1c73fdc83c18dba48755dec89ef6a68ba1464b98 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 30 Jun 2025 13:12:21 +0200 Subject: [PATCH 08/41] phrasen --- system/phrasesupdate.php | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 8ee5685d6..bb8a09605 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31692,7 +31692,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Keine zugeteilten Studenten gefunden für den gewählten LV-Teil gefunden!', + 'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!', 'description' => '', 'insertvon' => 'system' ), @@ -32376,6 +32376,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'studentenInLVTeil', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Studenten in LV-Teil', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Students in teaching unit', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', From 4b260673809429ee645242fdfe9cdd0bf474c636 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 2 Jul 2025 15:20:17 +0200 Subject: [PATCH 09/41] moar anw phrasen --- system/phrasesupdate.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index bb8a09605..72baff627 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -29944,6 +29944,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrolleOhneQR', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheiten ohne QR-Code einfügen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Insert attendances without QR-Code', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', From 919471d067c797cce4394d70b552a0c00f167365 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 3 Jul 2025 11:32:00 +0200 Subject: [PATCH 10/41] phrasen adjustment & error catch cases --- system/phrasesupdate.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 72baff627..ea1ca3a30 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31707,18 +31707,18 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'noStudentsFound', + 'phrase' => 'noStudentsFoundV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Keine zugeteilten Studenten für den gewählten LV-Teil gefunden!', + 'text' => 'Keine zugeteilten Studenten für Mitarbeiter {0} in dem gewählten LV-Teil {1} gefunden!', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'No assigned students for the selected teaching unit found!', + 'text' => 'No assigned students for employee {0} in the selected teaching unit {1} found!', 'description' => '', 'insertvon' => 'system' ) From 7fc98bd6a492159aba39aa119f94cb0f7ddb2ed5 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 3 Jul 2025 13:23:47 +0200 Subject: [PATCH 11/41] tooltip update --- system/phrasesupdate.php | 48 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index ea1ca3a30..4ba179ef8 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -29684,6 +29684,46 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'entschuldigtLegendeBlau', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Student ist am gewählten Datum bestätigt entschuldigt.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Student is confirmed excused on the selected date.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'entschuldigtLegendeTuerkis', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Student hat eine offene Entschuldigung am gewählten Datum.', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Student has an open excuse on the selected date.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', @@ -32239,7 +32279,7 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'tooltipAssistenz', + 'phrase' => 'tooltipAssistenzV2', 'insertvon' => 'system', 'phrases' => array( array( @@ -32283,7 +32323,7 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'tooltipLektorStartKontrolle', + 'phrase' => 'tooltipLektorStartKontrolleV2', 'insertvon' => 'system', 'phrases' => array( array( @@ -32292,7 +32332,7 @@ array( Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten. - Sie können pro Datum und Unterrichtsgruppe eine Anwesenheitskontrolle pro Tag eröffnen, welche jedoch beliebig oft aufgerufen und von Studenten eingecheckt werden kann. Es gelten dabei ihre zuletzt eingetragenen Zeiten. Ein Student muss nur einmal am Tag pro Gruppe einchecken um als anwesend registriert zu sein, egal wie oft Sie die Kontrolle starten.', + Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.', 'description' => '', 'insertvon' => 'system' ), @@ -32302,7 +32342,7 @@ array( The validity period determines the weighting of attendance in relation to the overall extent, but you can adjust this at your own discretion and do not have to stick strictly to the dates in the timetable. - You can open one attendance check per day for each date and class group, which can be called up and checked in by students as often as you like. The times they last entered apply. A student only has to check in once a day per group to be registered as present, regardless of how often you start the check.', + You can conduct multiple attendance checks per day per date and lesson group, as long as they do not overlap in your times and are at least {0} minutes long.', 'description' => '', 'insertvon' => 'system' ) From 475290e3eff3c09b60d4f053645b901ca2708948 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Thu, 3 Jul 2025 15:47:06 +0200 Subject: [PATCH 12/41] yet another phrase --- system/phrasesupdate.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 4ba179ef8..260c1720c 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -32876,6 +32876,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'lehreinheit_id', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'LV-Teil ID', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Teaching unit ID', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 101636e9fcd48dec5d1861074d33e511d21df4b1 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Fri, 4 Jul 2025 11:31:13 +0200 Subject: [PATCH 13/41] timeline tooltip --- system/phrasesupdate.php | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 260c1720c..26472be29 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -32876,6 +32876,38 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipAnwTimeline', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt. + + Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen. + + Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen. + + Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student. + + When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually. + + Scrolling within the timeline changes the visual spacing between individual days. + + Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'anwesenheiten', 'category' => 'global', From 386ae594280f87a965d63e2e4a20241bbed4c8b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 29 Jul 2025 16:46:12 +0200 Subject: [PATCH 14/41] Archivierung von MC Zertifikaten/Zeugnissen --- content/student/studentoverlay.js.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index d2030f493..d8cb1fc56 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -3553,6 +3553,15 @@ function StudentZeugnisDokumentArchivieren() xml = 'abschlussdokument_lehrgaenge.xml.php'; break; + case 'microcredentialzertifikat_1': + case 'microcredentialzertifikat_2': + case 'microcredentialzertifikat_3': + case 'microcredential_1': + case 'microcredential_2': + case 'microcredential_3': + xml = 'microcredential.xml.php'; + break; + default: alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt'); return @@ -4783,7 +4792,7 @@ function StudentNotenMoveFromAntrag() var uid = document.getElementById('student-detail-textbox-uid').value; req.add('student_uid', uid); - + var txt = "?"; for(var q in req.parms) { txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value); From 913b218fcac54aeac6260762769f641795d66fda Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Fri, 1 Aug 2025 10:53:15 +0200 Subject: [PATCH 15/41] phrasenupdate Stundenplan -> LV-Plan; tooltip update/remove; --- system/phrasesupdate.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 26472be29..034e4aca5 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31627,12 +31627,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'termine', + 'phrase' => 'termineV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterricht laut Stundenplan', + 'text' => 'Unterricht laut LV-Plan', 'description' => '', 'insertvon' => 'system' ), @@ -31652,7 +31652,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterricht laut Stundenplan', + 'text' => 'Unterricht laut LV-Plan', 'description' => '', 'insertvon' => 'system' ), @@ -32107,12 +32107,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'zeitNichtAusStundenplanBeginn', + 'phrase' => 'zeitNichtAusStundenplanBeginnV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut Stundenplan.', + 'text' => 'Unterrichtbeginn entspricht keinem Unterrichtstermin laut LV-Plan.', 'description' => '', 'insertvon' => 'system' ), @@ -32127,12 +32127,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'zeitNichtAusStundenplanEnde', + 'phrase' => 'zeitNichtAusStundenplanEndeV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut Stundenplan.', + 'text' => 'Unterrichtende entspricht keinem Unterrichtstermin laut LV-Plan.', 'description' => '', 'insertvon' => 'system' ), @@ -32147,12 +32147,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'datumNichtAusStundenplan', + 'phrase' => 'datumNichtAusStundenplanV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Datum entspricht keinem Stundenplan Termin.', + 'text' => 'Datum entspricht keinem LV-Plan Termin.', 'description' => '', 'insertvon' => 'system' ), @@ -32323,14 +32323,14 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'tooltipLektorStartKontrolleV2', + 'phrase' => 'tooltipLektorStartKontrolleV4', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem Stundenplan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an. + 'text' => 'Um eine Anwesenheitskontrolle für Ihre ausgewählte Unterrichtsgruppe durchzuführen, wählen Sie bitte einen Termin aus dem LV-Plan aus oder geben händisch die gewünschte Gültigkeitkeitsdauer der Kontrolle an. - Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im Stundenplan halten. + Die Gültigkeitsdauer bestimmt die Gewichtung der Anwesenheit in Relation zum Gesamtausmaß, sie können diese aber nach eigenem Ermessen anpassen und müssen sich nicht streng an die Termine im LV-Plan halten. Sie können pro Datum und Unterrichtsgruppe mehrere Anwesenheitskontrollen am Tag durchführen, solange sich diese nicht in Ihren Zeiten überschneiden und eine Mindestlänge von {0} Minuten beträgt.', 'description' => '', @@ -32599,12 +32599,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'termineAusStundenplan', + 'phrase' => 'termineAusStundenplanV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterricht Termine laut Stundenplan', + 'text' => 'Unterricht Termine laut LV-Plan', 'description' => '', 'insertvon' => 'system' ), @@ -32619,12 +32619,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'tooltipUnterrichtZeitCustom', + 'phrase' => 'tooltipUnterrichtZeitCustomV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterrichtszeiten werden aus dem Stundenplan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!', + 'text' => 'Unterrichtszeiten werden aus dem LV-Plan geladen, überschreiben Sie diese nur falls Ihre tatsächliche Unterrichtszeiten davon abweichen!', 'description' => '', 'insertvon' => 'system' ), @@ -32639,12 +32639,12 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'tooltipUnterrichtDatumCustom', + 'phrase' => 'tooltipUnterrichtDatumCustomV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Unterrichtsdaten werden aus dem Stundenplan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!', + 'text' => 'Unterrichtsdaten werden aus dem LV-Plan geladen, überschreiben Sie dieses nur falls Ihr tatsächliches Unterrichtsdatum abweicht!', 'description' => '', 'insertvon' => 'system' ), @@ -40200,7 +40200,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Stundenplan', + 'text' => 'LV-Plan', 'description' => '', 'insertvon' => 'system' ), From 0605baf68f5bc9fef210b8827f8b95f8c51707cc Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Wed, 6 Aug 2025 10:45:37 +0200 Subject: [PATCH 16/41] capitalize tab phrases; style&phrase change for Attendance Check Date Datepicker; Picture col min width icrease so the title is readable in english; --- system/phrasesupdate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 034e4aca5..01e4fcdfe 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -31767,7 +31767,7 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'kontrolldatum', + 'phrase' => 'kontrolldatumV2', 'insertvon' => 'system', 'phrases' => array( array( @@ -31778,7 +31778,7 @@ array( ), array( 'sprache' => 'English', - 'text' => 'Attendance Check Date', + 'text' => 'Check Date', 'description' => '', 'insertvon' => 'system' ) From 42a81a4558e8448b6b752158ad00929b26a4fabe Mon Sep 17 00:00:00 2001 From: chfhtw Date: Mon, 18 Aug 2025 13:06:59 +0200 Subject: [PATCH 17/41] API error clustering --- public/js/plugins/Api.js | 648 ++++++++++++++++++++++++--------------- system/phrasesupdate.php | 20 ++ 2 files changed, 423 insertions(+), 245 deletions(-) diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js index 43c2b3064..091a81717 100644 --- a/public/js/plugins/Api.js +++ b/public/js/plugins/Api.js @@ -10,7 +10,232 @@ export default { if (!app.config.globalProperties.$fhcAlert) app.use(FhcAlert); - function _get_config(form, uri, data, config) { + const $fhcAlert = app.config.globalProperties.$fhcAlert; + + function _send_array_or_object(errors, func) { + if (Array.isArray(errors)) + errors.forEach(func); + else + Object.entries(errors).forEach( + ([title, errs]) => errs.forEach( + error => func(error, title) + ) + ); + } + let DEFAULT_ERROR_CONFIG = { + success: true, + fail: true, + combine: { + form: ['validation', 'general'], + toast: ['validation', 'general', 'not_found', 'site_failed'] + }, + handler: { + form(form, errors) { + form.clearValidation(); + errors.forEach(err => form.setFeedback( + false, + err.messages || err.message + )); + }, + async toast(errors) { + const $p = app.config.globalProperties.$p; + if (!$p) + return Promise.reject('Phrasen plugin not loaded!'); + + async function _format_toast(errors) { + errors = errors.reduce((result, err) => { + switch (err.type) { + case 'not_found': + case 'site_failed': + if (err.message) + result[err.message] = [err.url]; + else + result._default = [err.url]; + break; + case 'general': + if (!result._default) + result._default = []; + result._default.push(err.message); + break; + case 'validation': + Object.entries(err.messages) + .forEach(([field, msg]) => { + if (!result[field]) + result[field] = []; + if (Array.isArray(msg)) + result[field].push(...msg); + else + result[field].push(msg); + }); + break; + } + return result; + }, {}); + let counter = 0; + const msgs = await Promise.all(Object.entries(errors) + .sort((a, b) => ['_default'].indexOf(b[0]) - ['_default'].indexOf(a[0])) // sort _default first + .map(async ([field, msgs]) => { + if (field == '_default') { + await $p.loadCategory('dashboard'); + const general = $p.t('dashboard/general'); + field = '
' + general + '
'; + } else { + field = '
' + field + '
'; + } + counter += msgs.length; + return field + + '
' + + msgs.join('
') + + '
'; + })); + return { + counter, + msgs + } + } + + let counter, msgs; + if (Array.isArray(errors)) { + ({ counter, msgs } = await _format_toast(errors)); + } else { + ({ counter, msgs } = await Object.entries(errors) + .reduce(async (res, [title, errs]) => { + const result = await res; + const { counter, msgs } = await _format_toast(errs); + result.counter += counter; + result.msgs.push('
' + + title + + '
' + + msgs.join('') + + '
'); + return result; + }, Promise.resolve({ counter: 0, msgs: []}))); + } + + await $p.loadCategory('ui'); + const n_errors = $p.t('ui/n_errors', { n: counter }); + + $fhcAlert.alertDefault( + 'error', + n_errors, + '
' + msgs.join('') + '
', + true, + true + ); + }, + php(errors) { + _send_array_or_object(errors, (error, title) => { + var message = ''; + message += 'Message: ' + error.message + '\n\n'; + message += 'Filename: ' + error.filename + '\n'; + message += 'Line Number: ' + error.line + '\n'; + if (error.backtrace && error.backtrace.length) { + message += '\nBacktrace: '; + error.backtrace.forEach(err => { + message += '\n\tFile: ' + err.file + '\n'; + message += '\tLine: ' + err.line + '\n'; + message += '\tFunction: ' + err.function + '\n'; + }); + } + switch (error.severity) { + case 'Warning': + case 'Core Warning': + case 'Compile Warning': + case 'User Warning': + if (title) + title += ': PHP ' + error.severity; + else + title = 'PHP ' + error.severity; + $fhcAlert.alertDefault('warn', title, message, true); + break; + case 'Notice': + case 'User Notice': + case 'Runtime Notice': + if (title) + title += ': PHP ' + error.severity; + else + title = 'PHP ' + error.severity; + $fhcAlert.alertDefault('info', title, message, true); + break; + default: + message = 'Type: PHP ' + error.severity + '\n\n' + message; + if (title) + message = title + '\n\n' + message; + $fhcAlert.alertSystemError(message); + break; + } + }); + }, + exception(errors) { + _send_array_or_object(errors, (error, title) => { + var message = ''; + if (title) + message += title + '\n\n'; + message += 'Type: ' + error.class + '\n\n'; + message += 'Message: ' + error.message + '\n\n'; + message += 'Filename: ' + error.filename + '\n'; + message += 'Line Number: ' + error.line + '\n'; + if (error.backtrace && error.backtrace.length) { + message += '\nBacktrace: '; + error.backtrace.forEach(err => { + message += '\n\tFile: ' + err.file + '\n'; + message += '\tLine: ' + err.line + '\n'; + message += '\tFunction: ' + err.function + '\n'; + }); + } + $fhcAlert.alertSystemError(message); + }); + }, + db(errors) { + _send_array_or_object(errors, (error, title) => { + var message = ''; + if (title) + message += title + '\n\n'; + if (error.heading !== undefined) + message += error.heading + '\n\n'; + if (error.code !== undefined) + message += 'Code: ' + error.code + '\n\n'; + if (error.sql !== undefined) + message += 'SQL: ' + error.sql + '\n\n'; + if (error.message !== undefined) + message += 'Message: ' + error.message + '\n\n'; + else if (error.messages !== undefined) + message += 'Messages: ' + error.messages.join('\n\t') + '\n\n'; + if (error.filename !== undefined) + message += 'Filename: ' + error.filename + '\n'; + if (error.line !== undefined) + message += 'Line Number: ' + error.line + '\n'; + + $fhcAlert.alertSystemError(message); + }); + }, + auth(errors) { + _send_array_or_object(errors, (error, title) => { + if (title) + title += ': ' + error.message; + else + title = error.message; + + var message = ''; + message += 'Controller name: ' + error.controller + '\n'; + message += 'Method name: ' + error.method + '\n'; + message += 'Required permissions: ' + error.required_permissions; + + $fhcAlert.alertDefault( + 'error', + title, + message, + true + ); + }); + } + } + }; + + if (options?.errorHandling !== undefined) + DEFAULT_ERROR_CONFIG = _merge_error_config(options.errorHandling); + + function get_config(form, uri, data, config) { if (typeof form == 'string' && config === undefined) { [uri, data, config] = [form, uri, data]; form = undefined; @@ -40,10 +265,9 @@ export default { return [uri, data, config]; } - - function _clean_return_value(response) { + function clean_return_value(response) { if (typeof response.data === 'string' || response.data instanceof String) - return _clean_return_value({ data: response }); + return clean_return_value({ data: response }); const result = response.data; delete response.data; @@ -55,10 +279,111 @@ export default { result.meta.response = response; return result; } - const baseURL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/"; + function _merge_error_config(config) { + if (config === false || config === 'off') + return { ...DEFAULT_ERROR_CONFIG, success: false, fail: false }; + + if (!config || config === true) + return { ...DEFAULT_ERROR_CONFIG }; + + if (config === 'success') + return { ...DEFAULT_ERROR_CONFIG, fail: false }; + + if (config === 'fail') + return { ...DEFAULT_ERROR_CONFIG, success: false }; + + const { success, fail, handler, combine } = config; + + config = { ...DEFAULT_ERROR_CONFIG }; + + Object.entries({ fail, success }).forEach(([key, value]) => { + if (value !== undefined) + config[key] = value; + }); + Object.entries({ handler, combine }).forEach(([key, value]) => { + if (value !== undefined) + config[key] = { ...config[key], ...value }; + }); + + return config; + } + function get_error_handler(config) { + const result = _merge_error_config(config?.errorHandling); + + if (!config?.form) { + result.combine.form = []; + } else { + const formHandler = result.handler.form; + result.handler.form = errors => formHandler(config.form, errors); + } + + return result; + } + function get_error_list(error) { + if (error.response) { + if (error.response.status == 404) { + return [{ + type: 'not_found', + message: error.message, + url: error.request.responseURL + }]; + } else { + return error.response.data.errors; + } + } else if (error.request) { + return [{ + type: 'site_failed', + message: error.message, + url: error.request.responseURL + }]; + } else { + return [{ + type: 'script', + message: error.message + }]; + } + } + function popHandleableErrors(errorHandling, errors) { + const result = {}; + const copy = []; + while (errors.length) + copy.push(errors.pop()); + for (var error of copy) { + let type = error.type; + let newType = null; + for (var t in errorHandling.combine) { + let newTypeCombinesType = errorHandling + .combine[t] + .includes(type); + let newTypeHasHandler = errorHandling.handler[t]; + if (newTypeCombinesType && newTypeHasHandler) { + newType = t; + if (newType == 'form') + break; + } + } + if (newType) + type = newType; + const handler = errorHandling.handler[type]; + if (handler) { + if (!result[type]) + result[type] = []; + if (Array.isArray(error)) + result[type].push(...error); + else + result[type].push(error); + continue; + } + errors.push(error); + } + return result; + } + const fhcApiAxios = axios.create({ timeout: 500000, - baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/" + baseURL: FHC_JS_DATA_STORAGE_OBJECT.app_root + + FHC_JS_DATA_STORAGE_OBJECT.ci_router + + "/" }); fhcApiAxios.interceptors.request.use(config => { @@ -100,57 +425,51 @@ export default { return config; }); - fhcApiAxios.interceptors.response.use(response => { - if (response.config?.errorHandling == 'off' - || response.config?.errorHandling === false - || response.config?.errorHandling == 'fail') - return _clean_return_value(response); - - // NOTE(chris): loop through errors - if (response.data.errors) - response.data.errors = response.data.errors.filter( - err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config) - ); - - return _clean_return_value(response); - }, error => { - if (error.code == 'ERR_CANCELED') - return Promise.reject({...{handled: true}, ...error}); - - if (error.config?.errorHandling == 'off' - || error.config?.errorHandling === false - || error.config?.errorHandling == 'success') - return Promise.reject(error); - - if (error.response) { - if (error.response.status == 404) { - app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL, true); - return Promise.reject({...{handled: true}, ...error}); - } + fhcApiAxios.interceptors.response.use( + response => { + if (response.config?.errorHandling == 'off' + || response.config?.errorHandling === false + || response.config?.errorHandling == 'fail') + return clean_return_value(response); // NOTE(chris): loop through errors - error.response.data.errors = error.response.data.errors.filter( - err => (error.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, error.config) - ); - if (!error.response.data.errors.length) - return Promise.reject({...{handled: true}, ...error}); - } else if (error.request) { - app.config.globalProperties.$fhcAlert.alertDefault('error', error.message, error.request.responseURL); - return Promise.reject({...{handled: true}, ...error}); - } else { - app.config.globalProperties.$fhcAlert.alertError(error.message); - return Promise.reject({...{handled: true}, ...error}); - } + if (response.data.errors) + response.data.errors = response.data.errors.filter( + err => (response.config[err.type + 'ErrorHandler'] || app.config.globalProperties.$api._defaultErrorHandlers[err.type])(err, response.config) + ); - return Promise.reject(error); - }); + return clean_return_value(response); + }, + error => { + if (error.code == 'ERR_CANCELED') + return Promise.reject({ handled: true, ...error }); + + const errorConfig = get_error_handler(error.config); + + if (!errorConfig.fail) + return Promise.reject(error); + + const remaining = get_error_list(error); + + const errors = popHandleableErrors(errorConfig, remaining); + + for (var type in errors) { + errorConfig.handler[type](errors[type]); + } + + if (remaining.length) + return Promise.reject(error); + + return Promise.reject({ handled: true, ...error }); + } + ); app.config.globalProperties.$api = { getUri(url) { return fhcApiAxios.getUri({url}); }, get(form, uri, params, config) { - [uri, params, config] = _get_config(form, uri, params, config); + [uri, params, config] = get_config(form, uri, params, config); if (params) { if (config) config.params = params; @@ -160,82 +479,56 @@ export default { return fhcApiAxios.get(uri, config); }, post(form, uri, data, config) { - [uri, data, config] = _get_config(form, uri, data, config); + [uri, data, config] = get_config(form, uri, data, config); return fhcApiAxios.post(uri, data, config); }, call(factory, configoverwrite, form) { if (Array.isArray(factory)) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; const $api = app.config.globalProperties.$api; Promise .allSettled(factory.map((config, index) => { - if (Array.isArray(config)) - return $api.call(config[1], { - errorHeader: config[0], - errorHandling: false - }); - else - return $api.call(config, { - errorHeader: '#' + index, - errorHandling: false - }); - })) - .then(res => { - // TODO(chris): obey form & configoverwrite - let messagesError = []; - let messagesSuccessful = []; - - res.forEach(result => { - if (result.status === 'fulfilled') { - //console.log(JSON.parse(result.value.data)); - const successTitle = "
" + result.value.data + "
"; - messagesSuccessful.push(successTitle + "ok"); - } else { - const errorTitle = "
" + result.reason.config.errorHeader + "
"; - const errorMsg = JSON.parse(result.reason.request.response); - const fullMessage = errorMsg.errors.map(error => { - if (error.type == 'validation') { - // TODO(chris): do we want the keys? - return '
' + Object.values(error.messages).join("
") + '
'; - } - // TODO(chris): other types - if (error.message) - return '
' + error.message + '
'; - if (error.messages) - return '
' + error.messages.join("\n") + '
'; - // TODO(chris): what to do here - return '
' + "Generic Error" + '
'; // TODO(chris): translate - }).join("\n"); - messagesError.push(errorTitle + fullMessage); - } + if (!Array.isArray(config)) + config = ['#' + index, config]; + return $api.call(config[1], { + errorHeader: config[0], + errorHandling: false }); + })) + .then(result => { + const [ , , config ] = get_config(form, undefined, undefined, configoverwrite || {}); + const errorConfig = get_error_handler(config); - if (messagesError.length) - { - const test = document.createElement('b'); - $fhcAlert.alertDefault( - 'error', - messagesError.length + " Fehler", // TODO(chris): translate - '
' + messagesError.join("") + '
', - true, - true - ); + if (!errorConfig.success && !errorConfig.fail) { + return result; } - if (messagesSuccessful.length) - { - const test = document.createElement('b'); - $fhcAlert.alertDefault( - 'info', - 'Feedback', - messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate - false, - true - ); + + const typedErrors = {}; + for (var res of result) { + const [ allowed, item ] = res.status === 'fulfilled' + ? [ errorConfig.success, res.value ] + : [ errorConfig.fail, res.reason ]; + if (!allowed) + return; + + const errors = popHandleableErrors(errorConfig, get_error_list(item)); + + for (var type in errors) { + if (!typedErrors[type]) + typedErrors[type] = { + [item.config.errorHeader]: errors[type] + }; + else + typedErrors[type][item.config.errorHeader] = errors[type]; + } + }; + + for (var errType in typedErrors) { + errorConfig.handler[errType](typedErrors[errType]); } }); } - let {method, url, params, config} = factory; + let { method, url, params, config } = factory; if (configoverwrite !== undefined) { config = configoverwrite; } @@ -251,141 +544,6 @@ export default { } else { console.error("FhcApi: method not allowed:", method); } - }, - _defaultErrorHandlers: { - validation(error, config) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - if (config?.form) { - config.form.clearValidation(); - config.form.setFeedback(false, error.messages); - return false; - } - if (Array.isArray(error.messages)) { - error.messages.forEach($fhcAlert.alertError); - return false; - } else if (typeof error.messages == 'object') { - if (config?.errorHeader) - Object.values(error.messages).forEach( - value => $fhcAlert.alertDefault( - 'error', - Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader, - value, - true - ) - ); - else - Object.entries(error.messages).forEach( - ([key, value]) => $fhcAlert.alertDefault('error', key, value, true) - ); - return false; - } - return true; - }, - general(error, config) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - if (config?.form) - config.form.setFeedback(false, error.message); - else if (config?.errorHeader) - $fhcAlert.alertDefault( - 'error', - Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader, - error.message, - true - ); - else - $fhcAlert.alertError(error.message); - }, - php(error) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - var message = ''; - message += 'Message: ' + error.message + '\n\n'; - message += 'Filename: ' + error.filename + '\n'; - message += 'Line Number: ' + error.line + '\n'; - if (error.backtrace && error.backtrace.length) { - message += '\nBacktrace: '; - error.backtrace.forEach(err => { - message += '\n\tFile: ' + err.file + '\n'; - message += '\tLine: ' + err.line + '\n'; - message += '\tFunction: ' + err.function + '\n'; - }); - } - switch (error.severity) { - case 'Warning': - case 'Core Warning': - case 'Compile Warning': - case 'User Warning': - $fhcAlert.alertDefault('warn', 'PHP ' + error.severity, message, true); - break; - case 'Notice': - case 'User Notice': - case 'Runtime Notice': - $fhcAlert.alertDefault('info', 'PHP ' + error.severity, message, true); - break; - default: - message = 'Type: PHP ' + error.severity + '\n\n' + message; - $fhcAlert.alertSystemError(message); - break; - } - }, - exception(error) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - var message = ''; - message += 'Type: ' + error.class + '\n\n'; - message += 'Message: ' + error.message + '\n\n'; - message += 'Filename: ' + error.filename + '\n'; - message += 'Line Number: ' + error.line + '\n'; - if (error.backtrace && error.backtrace.length) { - message += '\nBacktrace: '; - error.backtrace.forEach(err => { - message += '\n\tFile: ' + err.file + '\n'; - message += '\tLine: ' + err.line + '\n'; - message += '\tFunction: ' + err.function + '\n'; - }); - } - $fhcAlert.alertSystemError(message); - }, - db(error) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - var message = ''; - if (error.heading !== undefined) - message += error.heading + '\n\n'; - if (error.code !== undefined) - message += 'Code: ' + error.code + '\n\n'; - if (error.sql !== undefined) - message += 'SQL: ' + error.sql + '\n\n'; - if (error.message !== undefined) - message += 'Message: ' + error.message + '\n\n'; - else if (error.messages !== undefined) - message += 'Messages: ' + error.messages.join('\n\t') + '\n\n'; - if (error.filename !== undefined) - message += 'Filename: ' + error.filename + '\n'; - if (error.line !== undefined) - message += 'Line Number: ' + error.line + '\n'; - - $fhcAlert.alertSystemError(message); - }, - auth(error, config) { - const $fhcAlert = app.config.globalProperties.$fhcAlert; - - var message = ''; - message += 'Controller name: ' + error.controller + '\n'; - message += 'Method name: ' + error.method + '\n'; - message += 'Required permissions: ' + error.required_permissions; - if (config?.errorHeader) - $fhcAlert.alertDefault( - 'error', - Array.isArray(config.errorHeader) ? app.config.globalProperties.$p.t.apply(null, config.errorHeader) : config.errorHeader, - error.message, - true - ); - else - $fhcAlert.alertDefault('error', error.message, message); - } } }; diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 23eb39a21..cb1a8756b 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -1475,6 +1475,26 @@ $phrases = array( ) ) ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'n_errors', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => '{n} Fehler', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => '{n} Error(s)', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'ui', From f50171ad9aed21448f96087ad325359ace78901b Mon Sep 17 00:00:00 2001 From: chfhtw Date: Mon, 18 Aug 2025 15:38:35 +0200 Subject: [PATCH 18/41] Calender: track locale change for day & list mode --- public/js/components/Calendar/Mode/Day.js | 13 +++++++++---- public/js/components/Calendar/Mode/List.js | 11 ++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/public/js/components/Calendar/Mode/Day.js b/public/js/components/Calendar/Mode/Day.js index 68ca1fa89..e9764b495 100644 --- a/public/js/components/Calendar/Mode/Day.js +++ b/public/js/components/Calendar/Mode/Day.js @@ -44,11 +44,16 @@ export default { }, watch: { currentDate() { - this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; - if (this.rangeOffset) { - this.$refs.view.$refs.grid.disableAutoScroll(); + if (this.currentDate.locale != this.focusDate.locale) { + this.focusDate = this.currentDate; this.$emit('update:range', this.range); - this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } else { + this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; + if (this.rangeOffset) { + this.$refs.view.$refs.grid.disableAutoScroll(); + this.$emit('update:range', this.range); + this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } } } }, diff --git a/public/js/components/Calendar/Mode/List.js b/public/js/components/Calendar/Mode/List.js index 97990a5a3..76acfc610 100644 --- a/public/js/components/Calendar/Mode/List.js +++ b/public/js/components/Calendar/Mode/List.js @@ -47,10 +47,15 @@ export default { }, watch: { currentDate() { - this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; - if (this.rangeOffset) { + if (this.currentDate.locale != this.focusDate.locale) { + this.focusDate = this.currentDate; this.$emit('update:range', this.range); - this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } else { + this.rangeOffset = this.currentDate.startOf('day').diff(this.focusDate.startOf('day'), 'days').days; + if (this.rangeOffset) { + this.$emit('update:range', this.range); + this.$refs.slider.slidePages(this.rangeOffset).then(this.updatePage); + } } } }, From c5001f87bda7556c148332babd1efdb9647f5a05 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Tue, 19 Aug 2025 11:03:23 +0200 Subject: [PATCH 19/41] modal header flex container for buttons (close, expand); --- public/js/components/Bootstrap/Modal.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js index 4487127de..61c5c6857 100644 --- a/public/js/components/Bootstrap/Modal.js +++ b/public/js/components/Bootstrap/Modal.js @@ -135,12 +135,13 @@ export default {
- - - +
+ + +
From ef80a19a2478ae840166c0f7d3ca3d186f6cb3a6 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 13:22:59 +0200 Subject: [PATCH 20/41] allow negative studiengang_kz in prestudent and orgform urls --- application/config/routes.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index da3a45f03..f6eafbcd2 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -75,16 +75,16 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/outgoing'] = 'api/ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/inout/gemeinsamestudien'] = 'api/frontend/v1/stv/Students/getGemeinsamestudien'; // (studiengang_kz)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]] -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudents/$1'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$3'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudents/$1/$2/$4'; // (studiengang_kz)/(orgform)/prestudent[/(studiensemester_kurzbz)[/(filter)[/(otherfilter)]]] -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4'; -$route['api/frontend/v1/stv/[sS]tudents/(:num)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$4'; +$route['api/frontend/v1/stv/[sS]tudents/(-?[0-9]+)/([A-Z]{2,3})/prestudent/([WS]S[0-9]{4})/(:any)/(:any)'] = 'api/frontend/v1/stv/Students/getPrestudentsOrgform/$1/$2/$3/$5'; // (studiensemester_kurzbz)/(studiengang_kz)/(semester)/grp/(gruppe) $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/(-?[0-9]+)/(:num)/grp/(:any)'] = 'api/frontend/v1/stv/Students/getStudentsSpezialgruppe/$1/$2/$3/$4'; From 2198ea95e413d2a48334e2c2089d4935ff66737a Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 13:51:09 +0200 Subject: [PATCH 21/41] use form.post instead of form.send since latter expects a promise --- public/js/components/Stv/Studentenverwaltung/List/New.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js index dc78aedb6..74b8b49bf 100644 --- a/public/js/components/Stv/Studentenverwaltung/List/New.js +++ b/public/js/components/Stv/Studentenverwaltung/List/New.js @@ -193,7 +193,7 @@ export default { // TODO(chris): move to fhcapi.factory this.$refs.form - .send('api/frontend/v1/stv/student/add', data) + .post('api/frontend/v1/stv/student/add', data) .then(result => { this.$fhcAlert.alertSuccess('Gespeichert'); this.$refs.modal.hide(); From a482016deec26c1281beae682b59037bbe0bdfe5 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 13:58:41 +0200 Subject: [PATCH 22/41] modal-dialog-scrollable --- public/js/components/Stv/Studentenverwaltung/List/New.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/List/New.js b/public/js/components/Stv/Studentenverwaltung/List/New.js index 74b8b49bf..8de217e00 100644 --- a/public/js/components/Stv/Studentenverwaltung/List/New.js +++ b/public/js/components/Stv/Studentenverwaltung/List/New.js @@ -213,7 +213,7 @@ export default { }, template: ` - + From 1c86a6ad55f6f165b2e8bdc2ce5a9734cef1cd31 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 16:05:47 +0200 Subject: [PATCH 23/41] add validation callback wrapper method --- application/controllers/api/frontend/v1/stv/Student.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 21b07b755..506417ecc 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -710,4 +710,9 @@ class Student extends FHCAPI_Controller return true; return !!$value; } + + public function isValidDate($value) + { + return isValidDate($value); + } } From 905a2dadff8ed2855d8878bbb7e11e57cf97e078 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 17:18:57 +0200 Subject: [PATCH 24/41] terminate with error if receiver person_id or prestudent_id is not found --- .../controllers/api/frontend/v1/messages/Messages.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/messages/Messages.php b/application/controllers/api/frontend/v1/messages/Messages.php index dbc11735a..fa6748f6a 100644 --- a/application/controllers/api/frontend/v1/messages/Messages.php +++ b/application/controllers/api/frontend/v1/messages/Messages.php @@ -418,6 +418,10 @@ class Messages extends FHCAPI_Controller } $data = $this->getDataOrTerminateWithError($result); + if (count($data) < 1) + { + $this->terminateWithError('Error: Messages API no person_id found.'); + } $person = current($data); return $person->person_id; @@ -432,8 +436,12 @@ class Messages extends FHCAPI_Controller ); $data = $this->getDataOrTerminateWithError($result); + if (count($data) < 1) + { + $this->terminateWithError('Error: Messages API no prestudent_id found.'); + } $student = current($data); - // $this->terminateWithError($student->prestudent_id, self::ERROR_TYPE_GENERAL); + return $student->prestudent_id; } From ad8322839653f11c54d22c6de8edd970f66f0328 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 19 Aug 2025 17:34:23 +0200 Subject: [PATCH 25/41] do not terminatewithsuccess in function called in db transaction because this results in the transaction being rollbacked --- application/controllers/api/frontend/v1/stv/Student.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 506417ecc..4309e88a4 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -694,7 +694,7 @@ class Student extends FHCAPI_Controller return $result; }*/ - $this->terminateWithSuccess(true); + return success(true); } public function requiredIfNotPersonId($value) From 531fae8ab5834946e1b68eb4de061943502dcc9b Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Sat, 23 Aug 2025 16:46:26 +0200 Subject: [PATCH 26/41] enabled filling out UHSTAT1 form for logged in students --- application/controllers/codex/UHSTAT1.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index ff59ef41a..c290b098a 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -34,6 +34,7 @@ class UHSTAT1 extends FHC_Controller // load models $this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel'); $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); + $this->load->model('crm/Student_model', 'StudentModel'); $this->load->model('system/Sprache_model', 'SpracheModel'); $this->load->model('codex/Abschluss_model', 'AbschlussModel'); $this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel'); @@ -430,6 +431,17 @@ class UHSTAT1 extends FHC_Controller ) return $_SESSION[self::PERSON_ID_SESSION_INDEX]; + // ...check if student is successfully logged in + $loggedInPersonId = getAuthPersonId(); + if (isset($loggedInPersonId) && is_numeric($loggedInPersonId)) + { + // check if the the user is a student and if the benutzer is active + $this->StudentModel->addSelect('1'); + $this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid"); + $res = $this->StudentModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]); + if (hasData($res)) return $loggedInPersonId; + } + // if person id passed directly... $person_id = $this->input->post('person_id'); if (!isset($person_id)) $person_id = $this->input->get('person_id'); From 1025a8b461f24859524d764737c13318842665ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 25 Aug 2025 11:19:20 +0200 Subject: [PATCH 27/41] Removed Duplicate Phrase --- system/phrasesupdate.php | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 49b05b7ef..dd23a1c4a 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -33827,11 +33827,11 @@ array( array( 'sprache' => 'German', 'text' => 'Die "Digitale Anwesenheiten Timeline" ist ein experimentelles feature, welches eine zeitliche Visualisierung von Entschuldigungszeiträumen und Kontrollzeiträumen im Kontext eines Studenten anzeigt. - + Wenn Sie auf eine aufgelistete Entschuldigung oder Kontrolle klicken, versucht die Timeline diese zu finden, falls diese im angegebenen Zeitraum liegt, welcher standardmäßig das gesamte aktuelle Jahr beträgt. Sie können diese Grenzen manuell anpassen. - + Wenn man innerhalb der Timeline scrollt, ändert sich der visuelle Abstand zwischen einzelnen Tagen. - + Bei Klick auf eine gerenderte Datumsreichweite in der Timeline, listet sich oben rechts eine Liste von zugehörigen Attributen auf, welche Administratoren und Entwicklern in Fehlerfällen helfen sollen den Zustand der digitalen Amwesenheiten im Kontext eines Studierenden nachzuvollziehen', 'description' => '', 'insertvon' => 'system' @@ -33841,35 +33841,15 @@ array( 'text' => 'The "Digital Attendance Timeline" is an experimental feature that displays a temporal visualization of excuse periods and check-in periods in the context of a student. When you click on a listed excuse or check-in period, the timeline attempts to find it if it falls within the specified period, which by default is the entire current year. You can adjust these boundaries manually. - + Scrolling within the timeline changes the visual spacing between individual days. - + Clicking on a rendered date range in the timeline displays a list of associated attributes in the upper right corner. These attributes are intended to help administrators and developers understand the status of digital attendance in the context of a student in case of errors.', 'description' => '', 'insertvon' => 'system' ) ) ), - array( - 'app' => 'anwesenheiten', - 'category' => 'global', - 'phrase' => 'lehreinheit_id', - 'insertvon' => 'system', - 'phrases' => array( - array( - 'sprache' => 'German', - 'text' => 'LV-Teil ID', - 'description' => '', - 'insertvon' => 'system' - ), - array( - 'sprache' => 'English', - 'text' => 'Teaching unit ID', - 'description' => '', - 'insertvon' => 'system' - ) - ) - ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 1ef884de8c966613572f7523c4116db0fb57dd73 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Tue, 26 Aug 2025 14:25:04 +0200 Subject: [PATCH 28/41] API: return results on multicall --- public/js/plugins/Api.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js index 091a81717..034c326e9 100644 --- a/public/js/plugins/Api.js +++ b/public/js/plugins/Api.js @@ -486,7 +486,7 @@ export default { if (Array.isArray(factory)) { const $api = app.config.globalProperties.$api; - Promise + return Promise .allSettled(factory.map((config, index) => { if (!Array.isArray(config)) config = ['#' + index, config]; @@ -526,6 +526,8 @@ export default { for (var errType in typedErrors) { errorConfig.handler[errType](typedErrors[errType]); } + + return result; }); } let { method, url, params, config } = factory; From f1c9e641bbe0b64d990cb026bc6ebaefc87494fa Mon Sep 17 00:00:00 2001 From: chfhtw Date: Tue, 26 Aug 2025 14:25:29 +0200 Subject: [PATCH 29/41] API: feedback for stv status dropdown --- .../Studentenverwaltung/Details/Status/Dropdown.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js index 8c2071c51..1f6f41900 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Status/Dropdown.js @@ -151,7 +151,17 @@ export default { ApiStvStatus.addStudent(prestudent_id, data), { errorHeader: prestudent_id } ])) - .then(() => { + .then(result => { + const messagesSuccessful = result.filter(res => res.status == 'fulfilled'); + if (messagesSuccessful.length) { + this.$fhcAlert.alertDefault( + 'info', + 'Feedback', + messagesSuccessful.length + " erfolgreiche Statusänderung(en) durchgeführt", // TODO(chris): translate + false, + true + ); + } this.$emit('reloadTable'); this.$reloadList(); }); From e3665569929968383f1194d722bf20214e6a1d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 26 Aug 2025 16:05:06 +0200 Subject: [PATCH 30/41] =?UTF-8?q?Dienstverhinderung=20f=C3=BCr=20Volksschu?= =?UTF-8?q?ltag=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/profile/zeitsperre_resturlaub.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cis/private/profile/zeitsperre_resturlaub.php b/cis/private/profile/zeitsperre_resturlaub.php index ffd179401..1b6546d41 100644 --- a/cis/private/profile/zeitsperre_resturlaub.php +++ b/cis/private/profile/zeitsperre_resturlaub.php @@ -285,15 +285,16 @@ function showHideBezeichnungDropDown() if (dd.options[dd.selectedIndex].value == 'DienstV') { var str = ''; sp.innerHTML = str; From 41d26246aafafc48dd1f74f72a70f24c2da0390f Mon Sep 17 00:00:00 2001 From: chfhtw Date: Wed, 27 Aug 2025 10:19:39 +0200 Subject: [PATCH 31/41] Form Input Component: add name & use autocomplete that was loaded in the CI View --- public/js/components/Form/Input.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index c85272aab..81b47d504 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -3,6 +3,7 @@ import FhcFragment from "../Fragment.js"; let _uuid = {}; export default { + name: "FormInput", inheritAttrs: false, components: { FhcFragment @@ -220,7 +221,7 @@ export default { if (this.tag == 'VueDatePicker' && !this._.components.VueDatePicker) { this._.components.VueDatePicker = Vue.defineAsyncComponent(() => import("../vueDatepicker.js.php")); } else if (this.tag == 'PvAutocomplete' && !this._.components.PvAutocomplete) { - this._.components.PvAutocomplete = Vue.defineAsyncComponent(() => import(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + "/public/js/components/primevue/autocomplete/autocomplete.esm.min.js")); + this._.components.PvAutocomplete = primevue.autocomplete; } else if (this.tag == 'UploadImage' && !this._.components.UploadImage) { this._.components.UploadImage = Vue.defineAsyncComponent(() => import("./Upload/Image.js")); } else if (this.tag == 'UploadDms' && !this._.components.UploadDms) { From 2d2bbd1bb373bc99a7d7fa647162b6fb663f17d3 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Wed, 27 Aug 2025 10:20:41 +0200 Subject: [PATCH 32/41] Bootstrap Modal Component: forward shown-bs-modal event --- public/js/components/Bootstrap/Modal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js index 61c5c6857..a84d9d8d7 100644 --- a/public/js/components/Bootstrap/Modal.js +++ b/public/js/components/Bootstrap/Modal.js @@ -130,7 +130,7 @@ export default { }); }); }, - template: `
+ template: `
From 9a35ee59455899c4f6366b0a992b408f27587c3f Mon Sep 17 00:00:00 2001 From: ma0048 Date: Wed, 27 Aug 2025 11:48:35 +0200 Subject: [PATCH 33/41] raum content im alten cis wieder auf tablesorter --- .../39911_tabulator_in_contentmittitel.php | 64 ++++++++++++++----- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php index b743648ed..73ad7e319 100644 --- a/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php +++ b/system/dbupdate_3.4/39911_tabulator_in_contentmittitel.php @@ -1,5 +1,6 @@ @@ -8,27 +9,56 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:value-of select="titel" /> - - + + + + + + + + +

From 1024fc6cab1c40455334ddc92ef5e7709696a4c3 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Wed, 27 Aug 2025 14:41:50 +0200 Subject: [PATCH 34/41] Don't overwrite object => work with copies --- public/js/plugins/Api.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js index 034c326e9..0b8e2fd17 100644 --- a/public/js/plugins/Api.js +++ b/public/js/plugins/Api.js @@ -311,10 +311,10 @@ export default { const result = _merge_error_config(config?.errorHandling); if (!config?.form) { - result.combine.form = []; + result.combine = { ...result.combine, form: [] }; } else { const formHandler = result.handler.form; - result.handler.form = errors => formHandler(config.form, errors); + result.handler = { ...result.handler, form: errors => formHandler(config.form, errors) }; } return result; From 1d634a253048a227983c3af07558db9838fe6bfd Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Wed, 27 Aug 2025 16:23:58 +0200 Subject: [PATCH 35/41] uhstat form: bewerbungstool user data is loaded if there is a login, normal logged in user data otherwise. renamed methods, removed unnecessary model loads --- application/controllers/codex/UHSTAT1.php | 88 +++++++++++++++-------- application/views/codex/uhstat1.php | 6 +- 2 files changed, 63 insertions(+), 31 deletions(-) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index c290b098a..60eb6695e 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -32,9 +32,7 @@ class UHSTAT1 extends FHC_Controller $this->load->library('PermissionLib'); // load models - $this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel'); - $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - $this->load->model('crm/Student_model', 'StudentModel'); + $this->load->model('person/Benutzer_model', 'BenutzerModel'); $this->load->model('system/Sprache_model', 'SpracheModel'); $this->load->model('codex/Abschluss_model', 'AbschlussModel'); $this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel'); @@ -105,7 +103,7 @@ class UHSTAT1 extends FHC_Controller { $saved = false; - $person_id = $this->_getValidPersonId('sui'); + $person_id = $this->_getUHSTATPersonId('sui'); $this->form_validation->set_error_delimiters('', ''); @@ -246,7 +244,7 @@ class UHSTAT1 extends FHC_Controller // uhstat data can only be deleted with permission if (!$this->_checkPermission('suid')) show_error('no permission'); - $person_id = $this->_getValidPersonId('suid'); + $person_id = $this->_getUHSTATPersonId('suid'); $uhstat1datenRes = $this->Uhstat1datenModel->delete( array('person_id' => $person_id) @@ -288,13 +286,17 @@ class UHSTAT1 extends FHC_Controller */ private function _getFormMetaData() { - $person_id = $this->_getValidPersonId('s'); + $person_id = $this->_getUHSTATPersonId('s'); // read only display param $readOnly = $this->input->get('readOnly'); - // depending on permissions, editing or deleting is possible - $editPermission = $this->_checkPermission('sui'); + // checking permissions for form + + // saving is possible if there permission or student log in (but not from application tool) + $savePermission = $this->_checkPermission('sui') || ($this->_getUserPersonId() && !$this->_getApplicationToolPersonId()); + + // deleting only possible with permission $deletePermission = $this->_checkPermission('suid'); $languageIdx = $this->_getLanguageIndex(); @@ -305,7 +307,7 @@ class UHSTAT1 extends FHC_Controller 'abschluss_nicht_oesterreich' => array(), 'jahre' => array(), 'person_id' => $person_id, - 'editPermission' => $editPermission, + 'savePermission' => $savePermission, 'deletePermission' => $deletePermission, 'readOnly' => $readOnly ); @@ -387,7 +389,7 @@ class UHSTAT1 extends FHC_Controller */ private function _getUHSTAT1Data() { - $person_id = $this->_getValidPersonId('s'); + $person_id = $this->_getUHSTATPersonId('s'); $this->Uhstat1datenModel->addSelect( implode(', ', array_keys($this->_uhstat1Fields)) @@ -418,40 +420,70 @@ class UHSTAT1 extends FHC_Controller } /** - * Gets Id of person having permissions to manage UHSTAT1 data. - * Can be passed as parameter or be in session. + * Gets Id of person, for which UHSTAT1 data is edited. + * Can be passed as parameter, id of logged in person, or be in session. + * @param berechtigungsArt type of permission (suid) * @return int person_id */ - private function _getValidPersonId($berechtigungsArt) + private function _getUHSTATPersonId($berechtigungsArt) { // if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool) + $applicationToolPersonId = $this->_getApplicationToolPersonId(); + if (isset($applicationToolPersonId) && is_numeric($applicationToolPersonId)) return $applicationToolPersonId; + + // if successfully logged in + $loggedInPersonId = $this->_getUserPersonId(); + if (isset($loggedInPersonId) && is_numeric($loggedInPersonId)) + { + // if person id passed directly... + $person_id = $this->input->post('person_id'); + if (!isset($person_id)) $person_id = $this->input->get('person_id'); + + if (isset($person_id)) + { + if (!is_numeric($person_id)) show_error("invalid person id"); + // ...check if there is a permission for editing UHSTAT1 data + if ($this->_checkPermission($berechtigungsArt)) return $person_id; + } + + // if no id passed, use logged in person id + return $loggedInPersonId; + } + + show_error("No permission"); + } + + /** + * Gets person Id if there is a application tool login. + * @return person Id or null + */ + private function _getApplicationToolPersonId() + { + // if coming from aplication tool - person id is in session (person must be logged in bewerbungstool) if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]) && isset($_SESSION[self::LOGIN_SESSION_INDEX]) ) return $_SESSION[self::PERSON_ID_SESSION_INDEX]; - // ...check if student is successfully logged in + return null; + } + + /** + * Gets person Id if there is a user login. + * @return person Id or null + */ + private function _getUserPersonId() + { $loggedInPersonId = getAuthPersonId(); if (isset($loggedInPersonId) && is_numeric($loggedInPersonId)) { // check if the the user is a student and if the benutzer is active - $this->StudentModel->addSelect('1'); - $this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid"); - $res = $this->StudentModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]); + $this->BenutzerModel->addSelect('1'); + $res = $this->BenutzerModel->loadWhere(["public.tbl_benutzer.person_id" => $loggedInPersonId, "public.tbl_benutzer.aktiv" => TRUE]); if (hasData($res)) return $loggedInPersonId; } - - // if person id passed directly... - $person_id = $this->input->post('person_id'); - if (!isset($person_id)) $person_id = $this->input->get('person_id'); - - if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id"); - - // ...check if there is a permission for editing UHSTAT1 data - if ($this->_checkPermission($berechtigungsArt)) return $person_id; - - show_error("No permission"); + return null; } /** diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php index a255781f1..cb2f219f8 100644 --- a/application/views/codex/uhstat1.php +++ b/application/views/codex/uhstat1.php @@ -26,7 +26,7 @@ $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->va $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax'); $readOnly = isset($formMetaData['readOnly']); $disabled = $readOnly ? ' disabled' : ''; -$editPermission = isset($formMetaData['editPermission']) && $formMetaData['editPermission'] === true; +$savePermission = isset($formMetaData['savePermission']) && $formMetaData['savePermission'] === true; $deletePermission = isset($formMetaData['deletePermission']) && $formMetaData['deletePermission'] === true; $saved = isset($saved) && $saved === true; ?> @@ -51,7 +51,7 @@ $saved = isset($saved) && $saved === true; p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>


- +
@@ -288,7 +288,7 @@ $saved = isset($saved) && $saved === true;
- +
From 7df383f45ee01a4237c590ad4d869a96b6b0c042 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Thu, 28 Aug 2025 08:36:20 +0200 Subject: [PATCH 36/41] hinzugefuegte spann class caps durch den parser entfernt --- application/libraries/PhrasesLib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/libraries/PhrasesLib.php b/application/libraries/PhrasesLib.php index ecd8094d6..647bf7074 100644 --- a/application/libraries/PhrasesLib.php +++ b/application/libraries/PhrasesLib.php @@ -122,6 +122,7 @@ class PhrasesLib $tmpText = substr($tmpText, 0, strlen($tmpText) - 4); } } + $tmpText = str_replace(['', ''], '', $tmpText); $result->retval[$i]->text = $tmpText; } From d17f87be09fb2f43441f43a639934ec256642652 Mon Sep 17 00:00:00 2001 From: nscbrandb Date: Fri, 29 Aug 2025 10:35:27 +0200 Subject: [PATCH 37/41] also take environment config into account --- application/config/routes.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index f6eafbcd2..b4ce2ed4a 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -111,23 +111,26 @@ $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/prestudent/(:num)'] = 'a // // (studiensemester_kurzbz)/person/(person_id) $route['api/frontend/v1/stv/[sS]tudents/([WS]S[0-9]{4})/person/(:num)'] = 'api/frontend/v1/stv/Students/getPerson/$1/$2'; -// load routes from extensions -$subdir = 'application/config/extensions'; -$dirlist = scandir($subdir); +// load routes from extensions, also look for environment-specific configs +$subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions']; -if ($dirlist) +foreach($subdirs as $subdir) { - $files = array_diff($dirlist, array('.','..')); - - foreach ($files as &$item) + $dirlist = scandir($subdir); + if ($dirlist) { - if (is_dir($subdir . DIRECTORY_SEPARATOR . $item)) - { - $routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php'; + $files = array_diff($dirlist, array('.','..')); - if (file_exists($routes_file)) + foreach ($files as &$item) + { + if (is_dir($subdir . DIRECTORY_SEPARATOR . $item)) { - require($routes_file); + $routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php'; + + if (file_exists($routes_file)) + { + require($routes_file); + } } } } From fa6d651b2103ec5def3c8d8ed9f109d46abaabfb Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 1 Sep 2025 16:48:24 +0200 Subject: [PATCH 38/41] phrasen & permissionLib/Phrases reference $param in lvMenuBuild event --- .../controllers/api/frontend/v1/LvMenu.php | 2 + system/phrasesupdate.php | 186 +++++++++++++++++- 2 files changed, 185 insertions(+), 3 deletions(-) diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php index 393c4d5c3..2a305dbb5 100644 --- a/application/controllers/api/frontend/v1/LvMenu.php +++ b/application/controllers/api/frontend/v1/LvMenu.php @@ -269,6 +269,8 @@ class LvMenu extends FHCAPI_Controller 'lehrfach_id'=>$lehrfach_id, 'lektor_der_lv'=>$lektor_der_lv, 'lehrfach_oe_kurzbz_arr'=>$lehrfach_oe_kurzbz_arr, + 'permissionLib' => &$this->PermissionLib, + 'phrasesLib' => &$this->PhrasesLib ]; Events::trigger('lvMenuBuild', diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index dd23a1c4a..82ea03ba0 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -33361,18 +33361,18 @@ array( array( 'app' => 'anwesenheiten', 'category' => 'global', - 'phrase' => 'anwTimeline', + 'phrase' => 'anwTimelineV2', 'insertvon' => 'system', 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Digitale Anwesenheiten Timeline', + 'text' => 'Digitale Anwesenheiten Timeline EXPERIMENTELL', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Digital Attendances Timeline', + 'text' => 'Digital Attendances Timeline EXPERIMENTAL', 'description' => '', 'insertvon' => 'system' ) @@ -33850,6 +33850,186 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'kontrolleRestart', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Kontrolle wiederholen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Restart attendance check', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipLegende', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Status Legende für das Digitales Anwesenheiten und Entschuldigungsmanagement anzeigen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Show status legend for the digital attendance and excuse note management', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipCsv', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Tabelle als CSV Datei exportiern', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Export table as CSV file', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipEdit', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheitskontrollen bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit attendance checks', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipSaveChanges', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Manuell veränderte Anwesenheiten speichern', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Save manually edited attendance entries', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipRestartKontrolle', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Bestehende Anwesenheitskontrolle neu starten. Studierende, welche bereits gültig registriert sind, gelten weiterhin als anwesend!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Restart existing attendance check. Students who are already validly registered will continue to be considered present!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipDeleteKontrolle', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheitskontrolle löschen. Die dazugehörigen Statuseinträge der Studierenden werden auch gelöscht!', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Delete attendance checks. The corresponding student status entries will also be deleted!', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'tooltipEditKontrollzeiten', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zeitgrenzen einer Kontrolle bearbeiten', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Edit time limits of an attendance check', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'anwesenheit', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Anwesenheit', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Attendance', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END // From 022fb26e9267d0a12aaa0d74076e8c62378f0b0c Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Tue, 1 Jul 2025 17:37:32 +0200 Subject: [PATCH 39/41] uhstat1 form: removed staatenlos code from dropdowns --- application/controllers/codex/UHSTAT1.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index 60eb6695e..d65752b4f 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -10,6 +10,7 @@ class UHSTAT1 extends FHC_Controller const CODEX_OESTERREICH = 'A'; const CODEX_UNKNOWN_YEAR = 9999; const CODEX_UNKNOWN_NATION = 'XXX'; + const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const CODEX_UNKNOWN_BILDUNGMAX = 999; const LOWER_BOUNDARY_YEARS = 160; const UPPER_BOUNDARY_YEARS = 20; @@ -339,15 +340,19 @@ class UHSTAT1 extends FHC_Controller if (hasData($nationRes)) { + $dropdownNations = []; $nations = getData($nationRes); - // put austria in beginning of selection foreach ($nations as $nation) { - if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation); + // put austria in beginning of selection + if ($nation->nation_code == self::CODEX_OESTERREICH) + array_unshift($dropdownNations, $nation); + elseif (!in_array($nation->nation_code, self::CODEX_EXCLUDED_NATIONS)) // add nation if not excluded + $dropdownNations[] = $nation; } - $formMetaData['nation'] = $nations; + $formMetaData['nation'] = $dropdownNations; } // get abschluss list From 0782de055084a22239fa90fd4432744cfef9ced0 Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Wed, 2 Jul 2025 10:46:34 +0200 Subject: [PATCH 40/41] uhstat form: moved constant down for better readability --- application/controllers/codex/UHSTAT1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index d65752b4f..c1d4d0abf 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -10,8 +10,8 @@ class UHSTAT1 extends FHC_Controller const CODEX_OESTERREICH = 'A'; const CODEX_UNKNOWN_YEAR = 9999; const CODEX_UNKNOWN_NATION = 'XXX'; - const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const CODEX_UNKNOWN_BILDUNGMAX = 999; + const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const LOWER_BOUNDARY_YEARS = 160; const UPPER_BOUNDARY_YEARS = 20; From 8bba492ec15fe9a9dd2eea46e46b9a836e8ff8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Thu, 4 Sep 2025 13:36:14 +0200 Subject: [PATCH 41/41] Check for existing Folder before loading possible routes --- application/config/routes.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/application/config/routes.php b/application/config/routes.php index b4ce2ed4a..52bf535ca 100644 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -116,20 +116,23 @@ $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT foreach($subdirs as $subdir) { - $dirlist = scandir($subdir); - if ($dirlist) + if(is_dir($subdir)) { - $files = array_diff($dirlist, array('.','..')); - - foreach ($files as &$item) + $dirlist = scandir($subdir); + if ($dirlist) { - if (is_dir($subdir . DIRECTORY_SEPARATOR . $item)) - { - $routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php'; + $files = array_diff($dirlist, array('.','..')); - if (file_exists($routes_file)) + foreach ($files as &$item) + { + if (is_dir($subdir . DIRECTORY_SEPARATOR . $item)) { - require($routes_file); + $routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php'; + + if (file_exists($routes_file)) + { + require($routes_file); + } } } }
NachnameVornameGebDatumGeschlechtAdresseStatusDetails
'."$row->nachname$row->vorname$row->gebdatum$row->svnr".($row->geschlecht=='m'?'männlich':'weiblich').""; + echo '
'."$row->nachname$row->vorname$row->gebdatum".((strpos($status, 'Mitarbeiter') !== false) ? $row->svnr : '')."".($row->geschlecht=='m'?'männlich':'weiblich').""; $qry_adr = "SELECT * FROM public.tbl_adresse WHERE person_id='$row->person_id'"; if($result_adr = $db->db_query($qry_adr)) while($row_adr=$db->db_fetch_object($result_adr)) diff --git a/vilesci/personen/preinteressent_detail.php b/vilesci/personen/preinteressent_detail.php index 5f86e7369..a49c1a0c6 100644 --- a/vilesci/personen/preinteressent_detail.php +++ b/vilesci/personen/preinteressent_detail.php @@ -338,7 +338,6 @@ if(isset($_POST['saveperson'])) $person->gebzeit = $_POST['gebzeit']; $person->anmerkungen = $_POST['anmerkungen']; $person->homepage = $_POST['homepage']; - $person->svnr = $_POST['svnr']; $person->ersatzkennzeichen = $_POST['ersatzkennzeichen']; $person->familienstand = $_POST['familienstand']; $person->geschlecht = $_POST['geschlecht']; @@ -606,8 +605,6 @@ if($result = $db->db_query($qry)) } echo '
SVNR:Ersatzkennzeichen