From 3ab8fd22f48ed35731d478921fb03e6fbca54b7e Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 6 Oct 2023 20:22:05 +0200 Subject: [PATCH 01/14] minor layout changes --- application/views/lehre/Antrag/Leitung/List.php | 1 + public/css/cis_bs5.css | 10 ++++++++++ .../js/components/Studierendenantrag/Leitung/Table.js | 10 ++++++++-- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php index 3dffacf3f..9c0749dae 100644 --- a/application/views/lehre/Antrag/Leitung/List.php +++ b/application/views/lehre/Antrag/Leitung/List.php @@ -13,6 +13,7 @@ $sitesettings = array( 'primevue3' => true, 'phrases' => array( 'global', + 'ui', 'studierendenantrag', 'lehre', 'person', diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css index 9ee7cd848..d4fc7960c 100644 --- a/public/css/cis_bs5.css +++ b/public/css/cis_bs5.css @@ -59,8 +59,18 @@ h6, .h6 { .fhc-container { padding: 0 15px; + max-width: 100%; } .tabulator { font-size: var(--bs-body-font-size); } + +.fhc-container .tabulator .tabulator-frozen { + background-color: #fff !important; +} + +.fhc-container .tabulator .tabulator-header .tabulator-col, +.fhc-container .tabulator-row .tabulator-cell { + border-right: 1px solid #dee2e6; +} diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js index 8cbfdd9d7..2af674a0f 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -86,8 +86,8 @@ export default { this.table = new Tabulator(this.$refs.table, { placeholder:"Keine zu bearbeitenden Datensätze", movableColumns: true, - height: '50vh', - layout: "fitDataStretch", // TODO(chris): wont work when changed + maxHeight: '50vh', + layout: "fitDataFill", // TODO(chris): wont work when changed ajaxURL: this.ajaxUrl, persistence: { // NOTE(chris): do not store column titles sort: true, //persist column sorting @@ -214,6 +214,10 @@ export default { } }, { field: 'actions', + frozen: true, + title: this.p.t('ui', 'aktion'), + headerFilter: false, + headerSort: false, formatter: (cell, formatterParams, onRendered) => { let container = document.createElement('div'), data = cell.getData(); @@ -325,9 +329,11 @@ export default { } // TODO(chris): not yet perfect + /* onRendered(() => { cell.getColumn().setWidth(true); }); + */ return container; } From c1a53a1be352c20a89ab123797e0180a4dfb155f Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Mon, 9 Oct 2023 11:47:02 +0200 Subject: [PATCH 02/14] do not use phrases from FHC_JS_PHRASES_STORAGE_OBJECT at all --- public/js/mixins/Phrasen.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js index bf11f8435..b94bc5702 100644 --- a/public/js/mixins/Phrasen.js +++ b/public/js/mixins/Phrasen.js @@ -59,13 +59,18 @@ const phrasen = { return ''; } if (!categories[category]) { - - if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) - categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); + + var initialval = ''; + if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) { + var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); + if(category[phrase] !== undefined ) { + initialval = category[phrase]; + } + } if (!categories[category] || Object.keys(categories[category]).length === 0) { categories[category] = undefined; - let val = Vue.ref(''); + let val = Vue.ref(initialval); loadLazy(category, val, phrase, params); return val; } From 17d5cff1784663d617c5f6b206cf3b84001df77b Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 9 Oct 2023 15:13:00 +0200 Subject: [PATCH 03/14] slightly better css --- public/css/cis_bs5.css | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css index d4fc7960c..4bc5a24f4 100644 --- a/public/css/cis_bs5.css +++ b/public/css/cis_bs5.css @@ -66,11 +66,30 @@ h6, .h6 { font-size: var(--bs-body-font-size); } -.fhc-container .tabulator .tabulator-frozen { - background-color: #fff !important; +.fhc-container .tabulator { + border-left: 1px solid #dee2e6; +} +.fhc-container .tabulator .tabulator-row { + border-bottom: none; +} +.fhc-container .tabulator .tabulator-row .tabulator-frozen, +.fhc-container .tabulator .tabulator-row .tabulator-cell { + border-bottom: 1px solid #dee2e6; +} +.fhc-container .tabulator .tabulator-row.tabulator-row-even { + background-color: transparent; +} +.fhc-container .tabulator .tabulator-headers .tabulator-frozen, +.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen, +.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell { + background-color: #fff; +} +.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen, +.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell { + background-color: #f2f2f2; } -.fhc-container .tabulator .tabulator-header .tabulator-col, -.fhc-container .tabulator-row .tabulator-cell { +.fhc-container .tabulator .tabulator-col, +.fhc-container .tabulator .tabulator-cell { border-right: 1px solid #dee2e6; } From c5b246dc8e132937e08937adae4d98109c22c5ce Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 13:08:43 +0200 Subject: [PATCH 04/14] CSS table row hovering --- public/css/cis_bs5.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css index 4bc5a24f4..48a5bfb1b 100644 --- a/public/css/cis_bs5.css +++ b/public/css/cis_bs5.css @@ -88,6 +88,10 @@ h6, .h6 { .fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell { background-color: #f2f2f2; } +.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-frozen, +.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-cell { + background-color: #ececec; +} .fhc-container .tabulator .tabulator-col, .fhc-container .tabulator .tabulator-cell { From 0a25982fa20ff95782d0137c464be909f6274a71 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 13:09:28 +0200 Subject: [PATCH 05/14] Do not allow frozen columns to be invisible --- public/js/components/Studierendenantrag/Leitung/Table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js index 2af674a0f..d28b2e4ab 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -344,7 +344,7 @@ export default { let columnData = []; for (let col of columns) { let def = col.getDefinition(); - if (def.title) { + if (def.title && !def.frozen) { columnData.push({ title: def.title, visible: col.isVisible(), From 5010a1653a382cc6f6a5855c63002b4c63c65b66 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 13:09:43 +0200 Subject: [PATCH 06/14] cleaner config --- application/config/studierendenantrag.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php index 159ead759..c5ebc0d80 100644 --- a/application/config/studierendenantrag.php +++ b/application/config/studierendenantrag.php @@ -110,11 +110,10 @@ $config['abmeldung_job_deadline_date_modifier'] = '+2 weeks'; /** * System User - uid of a user that is allowed to set prestudentstatus - * TODO(chris): DEBUG! CHANGE THIS! * * @var string */ -$config['antrag_job_systemuser'] = 'ma0168'; +$config['antrag_job_systemuser'] = ''; /** From b5ce0ba7ed255b025a19ae30d96802dfafa15311 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 13:12:51 +0200 Subject: [PATCH 07/14] Remove unnecessary comment --- public/js/components/Studierendenantrag/Leitung/Table.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js index d28b2e4ab..18c72f762 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -328,13 +328,6 @@ export default { container.append(button); } - // TODO(chris): not yet perfect - /* - onRendered(() => { - cell.getColumn().setWidth(true); - }); - */ - return container; } }] From 6137cf3347a90755b158c84c62660f1e5921600e Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 14:11:21 +0200 Subject: [PATCH 08/14] Remove unnecessary comment --- public/js/components/Studierendenantrag/Leitung/Table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js index 18c72f762..ea8dae107 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -87,7 +87,7 @@ export default { placeholder:"Keine zu bearbeitenden Datensätze", movableColumns: true, maxHeight: '50vh', - layout: "fitDataFill", // TODO(chris): wont work when changed + layout: "fitDataFill", ajaxURL: this.ajaxUrl, persistence: { // NOTE(chris): do not store column titles sort: true, //persist column sorting From ebdd6a2040d03b9ece17ed0cf0b20b71ba9de506 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 10 Oct 2023 14:16:32 +0200 Subject: [PATCH 09/14] =?UTF-8?q?Bug:=20Wiederholer=20Reminder=20werden=20?= =?UTF-8?q?nicht=20versandt=20-=20Fehlerquelle=20Datumsbereich=20wenn=20Pr?= =?UTF-8?q?=C3=BCfungen=20mehr=20als=20ein=20Monat=20verteilt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/jobs/AntragJob.php | 75 +++++++++------ .../models/education/Pruefung_model.php | 96 +++++++++++++++---- 2 files changed, 122 insertions(+), 49 deletions(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 6bd4e29d6..6f5747232 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -426,40 +426,56 @@ class AntragJob extends JOB_Controller $modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier'); $modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier'); - if ($modifier_deadline) - { + $digi_start = $this->config->item('digitalization_start'); + if ($digi_start) { + try { + $digi_start = new DateTime($digi_start); + } catch(Exception $e) { + } + } + + if ($modifier_deadline) { $dateDeadline = new DateTime(); $dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline)); + + if ($digi_start) + $dateDeadline = max($digi_start, $dateDeadline); + } else { + $dateDeadline = $digi_start ?: null; } - else - $dateDeadline = null; //first request - if ($modifier_request_1) - $this->sendReminder( - 'Request1', - null, - Studierendenantragstatus_model::STATUS_REQUESTSENT_1, - $dateDeadline, - $modifier_request_1, - $modifier_deadline, - 'Aufforderung: Bekanntgabe Wiederholung' - ); - else + if ($modifier_request_1) { + $dateStichtag = new DateTime(); + $dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1)); + if (!$dateDeadline || $dateStichtag > $dateDeadline) + $this->sendReminder( + 'Request1', + null, + Studierendenantragstatus_model::STATUS_REQUESTSENT_1, + $dateDeadline, + $dateStichtag, + $modifier_deadline, + 'Aufforderung: Bekanntgabe Wiederholung' + ); + } else $this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt'); //second request - if ($modifier_request_2) - $this->sendReminder( - 'Request2', - Studierendenantragstatus_model::STATUS_REQUESTSENT_1, - Studierendenantragstatus_model::STATUS_REQUESTSENT_2, - $dateDeadline, - $modifier_request_2, - $modifier_deadline, - 'Reminder Aufforderung: Bekanntgabe Wiederholung' - ); - else + if ($modifier_request_2) { + $dateStichtag = new DateTime(); + $dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2)); + if (!$dateDeadline || $dateStichtag > $dateDeadline) + $this->sendReminder( + 'Request2', + Studierendenantragstatus_model::STATUS_REQUESTSENT_1, + Studierendenantragstatus_model::STATUS_REQUESTSENT_2, + $dateDeadline, + $dateStichtag, + $modifier_deadline, + 'Reminder Aufforderung: Bekanntgabe Wiederholung' + ); + } else $this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt'); $this->logInfo('Ende Job sendAufforderungWiederholer'); @@ -479,14 +495,11 @@ class AntragJob extends JOB_Controller return $result; } - protected function sendReminder($name, $status_from, $status_to, $deadline, $date_modifier, $modifier_deadline, $subject) + protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject) { $this->logInfo('Start Job sendAufforderungWiederholer ' . $name); - $dateStichtag = new DateTime(); - $dateStichtag->sub(DateInterval::createFromDateString($date_modifier)); - - $result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $dateStichtag, $deadline); + $result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline); if(isError($result)) { diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php index 813a74179..83bf9b7f8 100644 --- a/application/models/education/Pruefung_model.php +++ b/application/models/education/Pruefung_model.php @@ -117,8 +117,74 @@ class Pruefung_model extends DB_Model return $this->db->get_compiled_select($this->dbTable); } + /** + * @return stdClass + */ + public function loadWhereCommitteeExamsFailed() + { + $this->dbTable = 'lehre.tbl_pruefung p'; + + $this->addSelect('p.datum'); + + $this->addJoin('lehre.tbl_note n', 'note'); + + $this->db->where("n.positiv", false); + $this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']); + + return $this->load(); + } + /** + * @return void + */ + protected function withDetailsForStudierendenAntrag() + { + $this->load->config('studierendenantrag'); + + $sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1"; + + $this->addSelect('pers.vorname'); + $this->addSelect('pers.nachname'); + $this->addSelect('pers.person_id'); + $this->addSelect('s.matrikelnr'); + $this->addSelect('g.bezeichnung'); + $this->addSelect('g.studiengang_kz'); + $this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false); + $this->addSelect('ps.prestudent_id'); + $this->addSelect('lv.bezeichnung as lvbezeichnung'); + $this->addSelect('le.studiensemester_kurzbz'); + $this->addSelect('a.typ'); + $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status'); + + $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id'); + $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id'); + $this->addJoin('public.tbl_student s', 'student_uid'); + $this->addJoin('public.tbl_prestudent ps', 'prestudent_id'); + $this->addJoin('public.tbl_person pers', 'person_id'); + $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid'); + $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz'); + $this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz'); + $this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT'); + + $this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist')); + + $this->db->where("g.aktiv", true); + + $statusgruende = $this->config->item('status_gruende_wiederholer'); + if (is_array($statusgruende) && !isEmptyArray($statusgruende)) { + foreach ($statusgruende as $k => $v) { + $statusgruende[$k] = $this->db->escape($v); + } + $this->db->where('lv.studiengang_kz NOT IN( + SELECT ps1.studiengang_kz + FROM + public.tbl_prestudent ps1 + JOIN public.tbl_prestudentstatus pss USING (prestudent_id) + WHERE pss.statusgrund_id in (' . implode(',', $statusgruende) . ') + AND ps.prestudent_id = ps1.prestudent_id)', null, false); + } + } /** * @param integer $prestudent_id student_uid @@ -127,23 +193,23 @@ class Pruefung_model extends DB_Model */ public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id) { + $this->withDetailsForStudierendenAntrag(); - $sql = $this->loadWhereThreeExamsFailed(); + $this->db->where('ps.prestudent_id', $prestudent_id); - $statusgruende = $this->config->item('status_gruende_wiederholer'); - if (!is_array($statusgruende)) - $statusgruende = []; - - return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?', [ - Studierendenantrag_model::TYP_WIEDERHOLUNG, - $statusgruende, - $prestudent_id - ]); + return $this->loadWhereCommitteeExamsFailed(); } + /** + * @param string $status + * @param \DateTime $maxDate + * @param \DateTime $minDate + * + * @return stdClass + */ public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate) { - $this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel'); + $this->withDetailsForStudierendenAntrag(); if ($maxDate) $this->db->where("p.datum < ", $maxDate->format('c')); @@ -170,12 +236,6 @@ class Pruefung_model extends DB_Model $this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status); } - $sql = $this->loadWhereThreeExamsFailed(); - - $statusgruende = $this->config->item('status_gruende_wiederholer'); - if (!is_array($statusgruende)) - $statusgruende = []; - - return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3', [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]); + return $this->loadWhereCommitteeExamsFailed(); } } From af89ec394220845b606a1bfda54610a02c784083 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 11 Oct 2023 14:43:43 +0200 Subject: [PATCH 10/14] Bugfix: Phrasen: local variable has overwritten function parameter --- public/js/mixins/Phrasen.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js index b94bc5702..3af8a6c92 100644 --- a/public/js/mixins/Phrasen.js +++ b/public/js/mixins/Phrasen.js @@ -62,9 +62,9 @@ const phrasen = { var initialval = ''; if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) { - var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); + var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); if(category[phrase] !== undefined ) { - initialval = category[phrase]; + initialval = tmp_category[phrase]; } } From 95d3b6ac5bdd74cdc90de547f14423b5d663d99f Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 11 Oct 2023 14:57:44 +0200 Subject: [PATCH 11/14] Bugfix: Phrasen: local variable has overwritten function parameter --- public/js/mixins/Phrasen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js index 3af8a6c92..6c27f87bb 100644 --- a/public/js/mixins/Phrasen.js +++ b/public/js/mixins/Phrasen.js @@ -63,7 +63,7 @@ const phrasen = { var initialval = ''; if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) { var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); - if(category[phrase] !== undefined ) { + if(tmp_category[phrase] !== undefined ) { initialval = tmp_category[phrase]; } } From 9d31cdffe6f67d45de4d3edf57014ffa6082efa9 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 11 Oct 2023 14:59:54 +0200 Subject: [PATCH 12/14] Bugfix: handle reload event of Table.js --- public/js/components/Studierendenantrag/Leitung.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js index 747ad7123..da883acbc 100644 --- a/public/js/components/Studierendenantrag/Leitung.js +++ b/public/js/components/Studierendenantrag/Leitung.js @@ -347,6 +347,7 @@ export default { @action:objectionDeny="actionoObjectionDeny" @action:objectionApprove="actionObjectionApprove" @action:cancel="actionCancel" + @reload="reload" > From b5c0c14e2aeca527d737c8753d4c347508f0c9d6 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Wed, 11 Oct 2023 19:20:40 +0200 Subject: [PATCH 13/14] fix typo --- system/phrasesupdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index d405692ba..4567365c2 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -21427,7 +21427,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Die Abmeldung vom Studium kann hier durchführt werden.', + 'text' => 'Die Abmeldung vom Studium kann hier durchgeführt werden.', 'description' => '', 'insertvon' => 'system' ), From d06819f25fc6db54edd72a613364c8daf3ee6409 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 12 Oct 2023 16:07:20 +0200 Subject: [PATCH 14/14] comment out info_ studierendenantrag phrase --- system/phrasesupdate.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 4567365c2..0a8407ad7 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -18936,6 +18936,9 @@ array( ) ) ), +/* + // es kann fuer jede Kombination Typ und Status eine Phrase der Form info__ 'core', 'category' => 'studierendenantrag', @@ -18956,6 +18959,7 @@ array( ) ) ), +*/ array( 'app' => 'core', 'category' => 'studierendenantrag',