From 440477d2496a752c53bdba989adc24df75ab2e77 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Mon, 13 Oct 2025 09:30:35 +0200 Subject: [PATCH 1/6] Quickfix: Api errors sometimes will not be displayed --- public/js/plugins/Api.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/public/js/plugins/Api.js b/public/js/plugins/Api.js index 895ecf70d..ed40551de 100644 --- a/public/js/plugins/Api.js +++ b/public/js/plugins/Api.js @@ -10,8 +10,6 @@ export default { if (!app.config.globalProperties.$fhcAlert) app.use(FhcAlert); - const $fhcAlert = app.config.globalProperties.$fhcAlert; - function _send_array_or_object(errors, func) { if (Array.isArray(errors)) errors.forEach(func); @@ -115,7 +113,7 @@ export default { await $p.loadCategory('ui'); const n_errors = $p.t('ui/n_errors', { n: counter }); - $fhcAlert.alertDefault( + app.config.globalProperties.$fhcAlert.alertDefault( 'error', n_errors, '
' + msgs.join('') + '
', @@ -146,7 +144,7 @@ export default { title += ': PHP ' + error.severity; else title = 'PHP ' + error.severity; - $fhcAlert.alertDefault('warn', title, message, true); + app.config.globalProperties.$fhcAlert.alertDefault('warn', title, message, true); break; case 'Notice': case 'User Notice': @@ -155,13 +153,13 @@ export default { title += ': PHP ' + error.severity; else title = 'PHP ' + error.severity; - $fhcAlert.alertDefault('info', title, message, true); + app.config.globalProperties.$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); + app.config.globalProperties.$fhcAlert.alertSystemError(message); break; } }); @@ -183,7 +181,7 @@ export default { message += '\tFunction: ' + err.function + '\n'; }); } - $fhcAlert.alertSystemError(message); + app.config.globalProperties.$fhcAlert.alertSystemError(message); }); }, db(errors) { @@ -206,7 +204,7 @@ export default { if (error.line !== undefined) message += 'Line Number: ' + error.line + '\n'; - $fhcAlert.alertSystemError(message); + app.config.globalProperties.$fhcAlert.alertSystemError(message); }); }, auth(errors) { @@ -221,7 +219,7 @@ export default { message += 'Method name: ' + error.method + '\n'; message += 'Required permissions: ' + error.required_permissions; - $fhcAlert.alertDefault( + app.config.globalProperties.$fhcAlert.alertDefault( 'error', title, message, From fed45015bddfde59e27e2bbed8e28df7c197cb39 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Mon, 13 Oct 2025 11:18:45 +0200 Subject: [PATCH 2/6] set updateamum, updatevon when changing profile update status --- application/controllers/api/frontend/v1/ProfilUpdate.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php index 9e3b72d74..604ae33c9 100644 --- a/application/controllers/api/frontend/v1/ProfilUpdate.php +++ b/application/controllers/api/frontend/v1/ProfilUpdate.php @@ -706,7 +706,13 @@ class ProfilUpdate extends FHCAPI_Controller private function setStatusOnUpdateRequest($id, $status, $status_message) { - return $this->ProfilUpdateModel->update([$id], ["status" => $status, "status_timestamp" => "NOW()", "status_message" => $status_message]); + return $this->ProfilUpdateModel->update([$id], [ + "status" => $status, + "status_timestamp" => "NOW()", + "status_message" => $status_message, + "updateamum" => "NOW()", + "updatevon" => getAuthUID() + ]); } private function updateRequestedChange($id, $requested_change) From 11205e9ec1c00f57c97054b049a1fb690c59cd52 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Thu, 16 Oct 2025 08:38:17 +0200 Subject: [PATCH 3/6] Bugfix: multiple types in CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN config were concatenated wrong in CIS 4.0 --- application/controllers/Cis/Documents.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Cis/Documents.php b/application/controllers/Cis/Documents.php index c5a6684d3..0b8d08a56 100644 --- a/application/controllers/Cis/Documents.php +++ b/application/controllers/Cis/Documents.php @@ -72,7 +72,7 @@ class Documents extends Auth_Controller $stgs = []; $stsemArray = []; - $buchungstypen = implode('\',\'', defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []); + $buchungstypen = defined("CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN") ? unserialize(CIS_DOKUMENTE_STUDIENBEITRAG_TYPEN) : []; $person_ids = []; foreach ($stati as $status) { $person_ids[] = $status->person_id; From e7788fc18fe01372a09b62984e486c30e55cb4c2 Mon Sep 17 00:00:00 2001 From: chfhtw Date: Thu, 16 Oct 2025 08:38:59 +0200 Subject: [PATCH 4/6] Bugfix: format betrag in StV Konto correctly --- application/controllers/api/frontend/v1/stv/Konto.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Konto.php b/application/controllers/api/frontend/v1/stv/Konto.php index a33680ea0..384452f3e 100644 --- a/application/controllers/api/frontend/v1/stv/Konto.php +++ b/application/controllers/api/frontend/v1/stv/Konto.php @@ -352,7 +352,7 @@ class Konto extends FHCAPI_Controller continue; } - + $result = $this->KontoModel->insert([ 'person_id' => $buchung['person_id'], 'studiengang_kz' => $buchung['studiengang_kz'], @@ -361,7 +361,7 @@ class Konto extends FHCAPI_Controller 'buchungstyp_kurzbz' => $buchung['buchungstyp_kurzbz'], 'credit_points' => $buchung['credit_points'], 'zahlungsreferenz' => $buchung['zahlungsreferenz'], - 'betrag' => $betrag, + 'betrag' => number_format($betrag, 2, '.', ''), 'buchungsdatum' => $buchungsdatum, 'mahnspanne' => '0', 'buchungsnr_verweis' => $buchung['buchungsnr'], From 4495632393d4811760f3083665653edd96102025 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 17 Oct 2025 14:45:03 +0200 Subject: [PATCH 5/6] join only prestudent for studiengang_kz of student --- application/controllers/api/frontend/v1/ProfilUpdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/api/frontend/v1/ProfilUpdate.php b/application/controllers/api/frontend/v1/ProfilUpdate.php index 604ae33c9..f97546288 100644 --- a/application/controllers/api/frontend/v1/ProfilUpdate.php +++ b/application/controllers/api/frontend/v1/ProfilUpdate.php @@ -637,7 +637,7 @@ class ProfilUpdate extends FHCAPI_Controller //? Send email to the Studiengangsassistentinnen $this->StudentModel->addSelect(["public.tbl_studiengang.email"]); $this->StudentModel->addJoin("public.tbl_benutzer", "public.tbl_benutzer.uid = public.tbl_student.student_uid"); - $this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id"); + $this->StudentModel->addJoin("public.tbl_prestudent", "public.tbl_benutzer.person_id = public.tbl_prestudent.person_id and public.tbl_student.studiengang_kz = public.tbl_prestudent.studiengang_kz"); $this->StudentModel->addJoin("public.tbl_prestudentstatus", "public.tbl_prestudentstatus.prestudent_id = public.tbl_prestudent.prestudent_id"); $this->StudentModel->addJoin("public.tbl_studiengang", "public.tbl_studiengang.studiengang_kz = public.tbl_prestudent.studiengang_kz"); $this->StudentModel->addGroupBy(["public.tbl_studiengang.email"]); From 87ec4fd482f4a568dbe4b8f7db8a43ac6fcd47ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Mon, 20 Oct 2025 17:32:43 +0200 Subject: [PATCH 6/6] =?UTF-8?q?Problem=20beim=20Drucken=20von=20Zeugnissen?= =?UTF-8?q?=20behoben=20wo=20die=20LV=20der=20Studienverpflichtung=20Sonde?= =?UTF-8?q?rzeichen=20enth=C3=A4lt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rdf/lehrveranstaltungszeugnis_ktu.rdf.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php index 9696978b3..8c614c21e 100644 --- a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php +++ b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php @@ -335,14 +335,14 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml") $anrechnung = new anrechnung(); $anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id); - $xml .= ""; + $xml .= "result) === 1) { $lehrveranstaltung_id_kompatibel = $anrechnung->result[0]->lehrveranstaltung_id; $xml .= $anrechnung->result[0]->lehrveranstaltung_bez; } - $xml .= ""; + $xml .= "]]>"; if($lehrveranstaltung_id_kompatibel != "") {