From dd47cd2a7c19d0b41a4b0815488c4081a056c89e Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 11 Jun 2024 13:51:03 +0200 Subject: [PATCH 1/6] Updated filter: Added lizenzserver_kurzbz and lizenzserver_port to SoftwareManagement filter --- system/filtersupdate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/filtersupdate.php b/system/filtersupdate.php index bc67e9dae..fa8a361f4 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -1296,6 +1296,8 @@ $filters = array( {"name": "beschreibung"}, {"name": "hersteller"}, {"name": "os"}, + {"name": "lizenzserver_kurzbz"}, + {"name": "lizenzserver_port"}, {"name": "softwarestatus_kurzbz"} ], "filters": [] From cd0eacf947383d0572dcf68133fbf29c805ef835 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 11 Jun 2024 13:52:03 +0200 Subject: [PATCH 2/6] Updated phrases: Added phrases 'lizenzserverPort' and 'raumSwZuordnung' --- system/phrasesupdate.php | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 8baf66909..20f155afe 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -25539,6 +25539,46 @@ array( ) ) ), + array( + 'app' => 'softwarebereitstellung', + 'category' => 'global', + 'phrase' => 'lizenzserverPort', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Lizenzserver Port', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'License server port', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'softwarebereitstellung', + 'category' => 'global', + 'phrase' => 'raumSwZuordnung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Raum-/SW-Zuordnung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Location-/SW Assignment', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'softwarebereitstellung', 'category' => 'global', From f8d8a44a3cabe3fad2b7b83103fa9819b388d5c4 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 11 Jun 2024 14:47:54 +0200 Subject: [PATCH 3/6] student_uid zu sancho message Abmeldung StG Ablauf Einspruchsfrist --- application/controllers/jobs/AntragJob.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 717561589..57230ed92 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -412,6 +412,8 @@ class AntragJob extends JOB_Controller $this->StudierendenantragModel->addSelect('studiensemester_kurzbz'); $this->StudierendenantragModel->addSelect('s.insertamum'); $this->StudierendenantragModel->addSelect('s.insertvon'); + $this->StudierendenantragModel->addJoin('public.tbl_student pts', 'prestudent_id'); + $this->StudierendenantragModel->addSelect('pts.student_uid'); $this->StudierendenantragModel->db->where_in( 'public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', @@ -484,7 +486,7 @@ class AntragJob extends JOB_Controller $person = current(getData($result)); $email = $studiengang->email; $dataMail = array( - 'prestudent' => $antrag->prestudent_id, + 'prestudent' => $antrag->student_uid . ' / ' . $antrag->prestudent_id, 'studiensemester' => $antrag->studiensemester_kurzbz, 'name' => trim($person->vorname . ' '. $person->nachname), ); From 0b8191a435fd976767a461b63331335152867c54 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 11 Jun 2024 16:26:52 +0200 Subject: [PATCH 4/6] Beschriftung zu IDs in Sancho Message hinzugefuegt --- application/controllers/jobs/AntragJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 57230ed92..dbd0c5283 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -486,7 +486,7 @@ class AntragJob extends JOB_Controller $person = current(getData($result)); $email = $studiengang->email; $dataMail = array( - 'prestudent' => $antrag->student_uid . ' / ' . $antrag->prestudent_id, + 'prestudent' => 'UID: '$antrag->student_uid . ', PreStudentId' . $antrag->prestudent_id, 'studiensemester' => $antrag->studiensemester_kurzbz, 'name' => trim($person->vorname . ' '. $person->nachname), ); From 6816a300f60c6b4be9d7897cf42857306d20c011 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 11 Jun 2024 16:39:20 +0200 Subject: [PATCH 5/6] Beschriftung korrigiert --- application/controllers/jobs/AntragJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index dbd0c5283..0bac8794f 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -486,7 +486,7 @@ class AntragJob extends JOB_Controller $person = current(getData($result)); $email = $studiengang->email; $dataMail = array( - 'prestudent' => 'UID: '$antrag->student_uid . ', PreStudentId' . $antrag->prestudent_id, + 'prestudent' => 'UID: ' . $antrag->student_uid . ', PreStudentId: ' . $antrag->prestudent_id, 'studiensemester' => $antrag->studiensemester_kurzbz, 'name' => trim($person->vorname . ' '. $person->nachname), ); From c3278ad30f392ea68642ac94ee241de90cd58d74 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 14 Jun 2024 11:44:26 +0200 Subject: [PATCH 6/6] add app softwarebereitstellung to prevent checksystem errors when adding phrases for softwarebereitstellung while not having installed the extension --- system/dbupdate_3.4.php | 1 + .../28575_softwarebereitstellung.php | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 system/dbupdate_3.4/28575_softwarebereitstellung.php diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php index 3a3f0be78..acb27977a 100644 --- a/system/dbupdate_3.4.php +++ b/system/dbupdate_3.4.php @@ -54,6 +54,7 @@ require_once('dbupdate_3.4/21620_neues_feld_zum_erfassen_des_ESI.php'); require_once('dbupdate_3.4/36530_bis_internationsalisierung_codextabelle_neuerungen.php'); require_once('dbupdate_3.4/34543_ux_template.php'); require_once('dbupdate_3.4/17513_Entwicklungsteam.php'); +require_once('dbupdate_3.4/28575_softwarebereitstellung.php'); // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen echo '

Pruefe Tabellen und Attribute!

'; diff --git a/system/dbupdate_3.4/28575_softwarebereitstellung.php b/system/dbupdate_3.4/28575_softwarebereitstellung.php new file mode 100644 index 000000000..9cccc77fa --- /dev/null +++ b/system/dbupdate_3.4/28575_softwarebereitstellung.php @@ -0,0 +1,16 @@ +db_query("SELECT 1 FROM system.tbl_app WHERE app='softwarebereitstellung'")) +{ + if($db->db_num_rows($result) === 0) + { + $qry = "INSERT INTO system.tbl_app (app) VALUES('softwarebereitstellung');"; + + if(!$db->db_query($qry)) + echo 'System Tabelle app: '.$db->db_last_error().'
'; + else + echo '
app softwarebereitstellung hinzugefuegt
'; + } +}