From eb12b35e3749647c1dacd598fff6cba41a5f6691 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 12 Jul 2024 11:29:38 +0200 Subject: [PATCH] reload detailtab after changedStatus, update getUserLanguage() --- application/models/crm/Prestudentstatus_model.php | 3 ++- .../js/components/Stv/Studentenverwaltung/Details/Details.js | 3 +++ .../Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php index dac5fbb23..26b603a66 100644 --- a/application/models/crm/Prestudentstatus_model.php +++ b/application/models/crm/Prestudentstatus_model.php @@ -526,6 +526,7 @@ class Prestudentstatus_model extends DB_Model */ public function getHistoryPrestudent($prestudent_id) { + $lang= getUserLanguage(); $this->addSelect('tbl_prestudentstatus.prestudent_id'); $this->addSelect('tbl_prestudentstatus.status_kurzbz'); $this->addSelect('tbl_prestudentstatus.studiensemester_kurzbz'); @@ -545,7 +546,7 @@ class Prestudentstatus_model extends DB_Model $this->addSelect('grund.beschreibung[( SELECT index FROM public.tbl_sprache - WHERE sprache=' . $this->escape(getUserLanguage()) . ' + WHERE sprache=' . $this->escape($lang) . ' )] AS statusgrund_bezeichnung', false); $this->addSelect("CASE WHEN s.student_uid IS NOT NULL diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js index feec7a580..ae4f92b20 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js @@ -121,6 +121,9 @@ export default { }, udfsLoaded(udfs) { this.original = {...(this.original || {}), ...udfs}; + }, + reload(){ + this.updateStudent(this.modelValue); } }, created() { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index ae5a98958..a8528c4b9 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -410,6 +410,8 @@ export default{ this.addNewStatus(prestudentIds); }, changeStatusToStudent(prestudentIds){ + + //TODO Manu validation if Bewerber already before asking for ausbildungssemester this.hideModal('askForAusbildungssemester'); let deltaData = {