From bf344df8d6c96d1987b4ab00180471cdbf2c494b Mon Sep 17 00:00:00 2001 From: ma0048 Date: Thu, 1 Jun 2023 07:12:40 +0200 Subject: [PATCH 01/17] - abgabetool anpassungen --- cis/private/lehre/abgabe_lektor_zusatz.php | 6 ++-- cis/private/lehre/abgabe_student_details.php | 29 ++------------------ vilesci/lehre/abgabe_assistenz_zusatz.php | 6 ++-- 3 files changed, 9 insertions(+), 32 deletions(-) diff --git a/cis/private/lehre/abgabe_lektor_zusatz.php b/cis/private/lehre/abgabe_lektor_zusatz.php index 39488b6c3..b764fd556 100644 --- a/cis/private/lehre/abgabe_lektor_zusatz.php +++ b/cis/private/lehre/abgabe_lektor_zusatz.php @@ -121,15 +121,15 @@ echo ' - '.$p->t('abgabetool/kontrollierteSchlagwoerter').':* + '.$p->t('abgabetool/kontrollierteSchlagwoerter').': - '.$p->t('abgabetool/deutscheSchlagwoerter').': + '.$p->t('abgabetool/deutscheSchlagwoerter').':* - '.$p->t('abgabetool/englischeSchlagwoerter').': + '.$p->t('abgabetool/englischeSchlagwoerter').':* diff --git a/cis/private/lehre/abgabe_student_details.php b/cis/private/lehre/abgabe_student_details.php index 6575dcf70..9171a978c 100644 --- a/cis/private/lehre/abgabe_student_details.php +++ b/cis/private/lehre/abgabe_student_details.php @@ -64,7 +64,6 @@ if(!isset($_POST['uid'])) $fixtermin = false; $datum = '01.01.1980'; $kurzbz = ''; - $kontrollschlagwoerter = ''; $schlagwoerter = ''; $schlagwoerter_en = ''; $abstract = ''; @@ -88,7 +87,6 @@ else $kurzbz = (isset($_POST['kurzbz'])?$_POST['kurzbz']:''); $betreuer = (isset($_POST['betreuer'])?$_POST['betreuer']:'-1'); $sprache = (isset($_POST['sprache'])?$_POST['sprache']:'German'); - $kontrollschlagwoerter = (isset($_POST['kontrollschlagwoerter'])?$_POST['kontrollschlagwoerter']:'-1'); $schlagwoerter = (isset($_POST['schlagwoerter'])?$_POST['schlagwoerter']:'-1'); $schlagwoerter_en = (isset($_POST['schlagwoerter_en'])?$_POST['schlagwoerter_en']:'-1'); $abstract = (isset($_POST['abstract'])?$_POST['abstract']:'-1'); @@ -211,23 +209,7 @@ if($command=='add') { //zusätzliche Daten bearbeiten //Check der Eingabedaten - if(strlen($kontrollschlagwoerter)<1) - { - $error=true; - } - if(mb_strlen($kontrollschlagwoerter)>=150) - { - $kontrollschlagwoerter = mb_substr($kontrollschlagwoerter, 0, 146).'...'; - } - if(strlen($abstract)<1) - { - $error=true; - } - if(strlen($abstract_en)<1) - { - $error=true; - } - if($seitenanzahl<1) + if((strlen($schlagwoerter) < 1) || (strlen($schlagwoerter_en) < 1) || (strlen($abstract) < 1) || (strlen($abstract_en) < 1) || ($seitenanzahl < 1)) { $error=true; } @@ -237,7 +219,6 @@ if($command=='add') seitenanzahl = ".$db->db_add_param($seitenanzahl).", abgabedatum = now(), sprache = ".$db->db_add_param($sprache).", - kontrollschlagwoerter = ".$db->db_add_param($kontrollschlagwoerter).", schlagwoerter_en = ".$db->db_add_param($schlagwoerter_en).", schlagwoerter = ".$db->db_add_param($schlagwoerter).", abstract = ".$db->db_add_param($abstract).", @@ -413,12 +394,9 @@ if($command=="update" && $error!=true) $htmlstr .= " \n"; } $htmlstr .= "\n"; - $htmlstr .= ''.$p->t('abgabetool/kontrollierteSchlagwoerter').':* - - '."\n"; - $htmlstr .= ''.$p->t('abgabetool/deutscheSchlagwoerter').': + $htmlstr .= ''.$p->t('abgabetool/deutscheSchlagwoerter').':* '."\n"; - $htmlstr .= ''.$p->t('abgabetool/englischeSchlagwoerter').': + $htmlstr .= ''.$p->t('abgabetool/englischeSchlagwoerter').':* '."\n"; $htmlstr .= ''.$p->t('abgabetool/abstract').' '.$p->t('abgabetool/maxZeichen').':* '."\n"; @@ -657,7 +635,6 @@ if($command!="add") $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; - $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; $htmlstr .= ''."\n"; diff --git a/vilesci/lehre/abgabe_assistenz_zusatz.php b/vilesci/lehre/abgabe_assistenz_zusatz.php index 20dbe9d97..724658d24 100644 --- a/vilesci/lehre/abgabe_assistenz_zusatz.php +++ b/vilesci/lehre/abgabe_assistenz_zusatz.php @@ -120,15 +120,15 @@ echo '
Student: '.$uid.'
Titel: '. - Kontrollierte Schlagwörter:* + Kontrollierte Schlagwörter: - Dt. Schlagwörter: + Dt. Schlagwörter:* - Engl. Schlagwörter: + Engl. Schlagwörter:* From 9f13f876ef587ae07ae960789a45f300dca0a657 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Thu, 1 Jun 2023 07:39:56 +0200 Subject: [PATCH 02/17] - swd.php entfernt --- cis/private/lehre/swd.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 cis/private/lehre/swd.php diff --git a/cis/private/lehre/swd.php b/cis/private/lehre/swd.php deleted file mode 100644 index 248779aac..000000000 --- a/cis/private/lehre/swd.php +++ /dev/null @@ -1,11 +0,0 @@ - From e56ccffe8d62e35f33630c4687a2b9fe71974c33 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Fri, 10 Nov 2023 14:30:41 +0100 Subject: [PATCH 03/17] Bugfixes: Studstatus --- application/models/education/Studierendenantrag_model.php | 2 +- application/views/lehre/Antrag/Student/List.php | 4 ++-- public/js/components/Studierendenantrag/Leitung.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php index 91af9c1f4..4931896cd 100644 --- a/application/models/education/Studierendenantrag_model.php +++ b/application/models/education/Studierendenantrag_model.php @@ -197,7 +197,7 @@ class Studierendenantrag_model extends DB_Model $this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT'); $this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz'); - $this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)'); + $this->addJoin('public.tbl_prestudentstatus ps', 'ps.prestudent_id=p.prestudent_id AND ps.studiensemester_kurzbz=' . $this->dbTable . '.studiensemester_kurzbz AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, ' . $this->dbTable . '.studiensemester_kurzbz)', 'LEFT'); $this->addJoin('lehre.tbl_studienplan plan', 'studienplan_id', 'LEFT'); $this->addJoin('bis.tbl_orgform of', 'of.orgform_kurzbz=COALESCE(plan.orgform_kurzbz, ps.orgform_kurzbz, stg.orgform_kurzbz)'); $this->addJoin( diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php index add2e8c7d..0bc4c401a 100644 --- a/application/views/lehre/Antrag/Student/List.php +++ b/application/views/lehre/Antrag/Student/List.php @@ -110,8 +110,8 @@ $this->load->view( typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?> - p->t('studierendenantrag', 'btn_show_lvs'); ?> - + p->t('studierendenantrag', 'btn_show_lvs'); ?> + p->t('studierendenantrag', 'my_lvs'); ?> diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js index da883acbc..611d01b7a 100644 --- a/public/js/components/Studierendenantrag/Leitung.js +++ b/public/js/components/Studierendenantrag/Leitung.js @@ -31,12 +31,12 @@ export default { stgkzL() { if (!this.stgL) return []; - return this.stgL.map(stg => stg.studiengang_kz); + return this.stgL.map(stg => parseInt(stg)); }, stgkzA() { if (!this.stgA) return []; - return this.stgA.map(stg => stg.studiengang_kz); + return this.stgA.map(stg => parseInt(stg)); } }, methods: { From 18f36c9d23b2b962aba236cbd1fe28f8a6a305ea Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 10 Nov 2023 15:16:40 +0100 Subject: [PATCH 04/17] update tabulator5 to version 5.5.2 to get better behaviour of frozen right column --- composer.json | 6 +++--- composer.lock | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 089e2a751..7d1627420 100644 --- a/composer.json +++ b/composer.json @@ -230,9 +230,9 @@ "type": "package", "package": { "name": "olifolkerd/tabulator5", - "version": "5.2.1", + "version": "5.5.2", "dist": { - "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip", + "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip", "type": "zip" } } @@ -426,7 +426,7 @@ "npm-asset/primeicons": "5.0.0", "olifolkerd/tabulator4": "4.9.*", - "olifolkerd/tabulator5": "5.2.*", + "olifolkerd/tabulator5": "5.5.*", "phpseclib/phpseclib": "2.0.*", diff --git a/composer.lock b/composer.lock index aac387eb2..5660e87e9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6e67e501fdd9ac047cc680abeb3daa9", + "content-hash": "b6e875dbd1ec2554abbf9f7513806469", "packages": [ { "name": "afarkas/html5shiv", @@ -1511,10 +1511,10 @@ }, { "name": "olifolkerd/tabulator5", - "version": "5.2.1", + "version": "5.5.2", "dist": { "type": "zip", - "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.2.1.zip" + "url": "https://github.com/olifolkerd/tabulator/archive/refs/tags/5.5.2.zip" }, "type": "library" }, From 89c546f74ff21c8760bce2bceb9bd90ea891f2e5 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Fri, 10 Nov 2023 15:29:50 +0100 Subject: [PATCH 05/17] fix resize-handle in right column header --- public/css/Tabulator5.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/css/Tabulator5.css b/public/css/Tabulator5.css index c6c4f925e..48124335f 100644 --- a/public/css/Tabulator5.css +++ b/public/css/Tabulator5.css @@ -35,3 +35,6 @@ .tabulator-row.tabulator-selected:hover .tabulator-cell { background-color: #769bcc; } +.tabulator .tabulator-col-resize-handle:last-of-type { + z-index: 999999; +} From f9cf1a5b32fb93d4e918d2658845e88cfba9a703 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Tue, 14 Nov 2023 22:55:29 +0100 Subject: [PATCH 06/17] change perstistenceID to force new settings in browser localstorage --- 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 aa1bc3734..7c7286d62 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -100,7 +100,7 @@ export default { page: true, //persist page columns: ["width", "visible"], //persist columns }, - persistenceID: 'studierendenantrag_leitung', + persistenceID: 'studierendenantrag_leitung_2023-11-14', columns: [{ formatter: 'rowSelection', titleFormatter: 'rowSelection', From 73e8761728ba1b698c5e7a18b94357c866033a51 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 21 Nov 2023 10:46:23 +0100 Subject: [PATCH 07/17] Bugfix: Lvzuweisung - DB Errors in production --- public/js/components/Studierendenantrag/Lvzuweisung.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js index 376e266d3..e43832cbc 100644 --- a/public/js/components/Studierendenantrag/Lvzuweisung.js +++ b/public/js/components/Studierendenantrag/Lvzuweisung.js @@ -64,7 +64,7 @@ export default { this.statusCode = response.data.retval[0].studierendenantrag_statustyp_kurzbz; this.statusMsg = response.data.retval[0].typ; } else { - this.addAlert(response.data.retval, 'alert-danger'); + this.addAlert(response.data.retval.message || response.data.retval, 'alert-danger'); this.statusCode = 0; this.statusMsg = 'Error'; } From ad8a18ed7d670f1d902d2810ee0d098bfae67117 Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Wed, 22 Nov 2023 13:08:47 +0100 Subject: [PATCH 08/17] change lvzuweisungurl to use VILESCI_ROOT if defined for Sancho_Mail_Antrag_W_New --- application/libraries/AntragLib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php index dcc38acc7..f3eb4d152 100644 --- a/application/libraries/AntragLib.php +++ b/application/libraries/AntragLib.php @@ -854,14 +854,18 @@ class AntragLib $prestudent_status = current($res); $email = $prestudent_status->email; // NOTE(chris): Sancho mail + $lvzuweisungLink = site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id); + if( defined('VILESCI_ROOT') ) + { + $lvzuweisungLink = VILESCI_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id; + } sendSanchoMail( 'Sancho_Mail_Antrag_W_New', [ 'antrag_id' => $antrag_id, 'stg' => $prestudent_status->stg_bezeichnung, 'Orgform' => $prestudent_status->orgform, - 'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id), - 'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id + 'lvzuweisungLink' => $lvzuweisungLink ], $email, $this->_ci->p->t('studierendenantrag', 'mail_subject_W_New') From ca2256bb32c8d15af1f75df9144c3974b9a93574 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 22 Nov 2023 14:57:06 +0100 Subject: [PATCH 09/17] Fix: Better handling of uninitialized variables --- .../Studierendenantrag/Form/AbmeldungStgl.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js index 3524bcd1f..64c9cc575 100644 --- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js +++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js @@ -30,7 +30,7 @@ export default { }, computed: { statusSeverity() { - switch (this.data.status) + switch (this.data?.status) { case 'Erstellt': return 'info'; case 'Genehmigt': return 'success'; @@ -141,39 +141,39 @@ export default { - + - + - + - + - + - + - +
{{p.t('lehre', 'studiengang')}}{{data.bezeichnung}}{{data?.bezeichnung}}
{{p.t('lehre', 'organisationsform')}}{{data.orgform_bezeichnung}}{{data?.orgform_bezeichnung}}
{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}{{data.name}}{{data?.name}}
{{p.t('person', 'personenkennzeichen')}}{{data.matrikelnr}}{{data?.matrikelnr}}
{{p.t('lehre', 'studienjahr')}}{{data.studienjahr_kurzbz}}{{data?.studienjahr_kurzbz}}
{{p.t('lehre', 'studiensemester')}}{{data.studiensemester_kurzbz}}{{data?.studiensemester_kurzbz}}
{{p.t('lehre', 'semester')}}{{data.semester}}{{data?.semester}}
-
+
{{p.t('studierendenantrag', 'antrag_grund')}}:
- 
{{data.grund}}
+ 
{{data?.grund}}
@@ -211,7 +211,7 @@ export default {
From a6f18ae424ec2a82f35e13d9427c796011718b4b Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 27 Nov 2023 12:21:25 +0100 Subject: [PATCH 17/17] Bugfix: parameter missing --- application/controllers/jobs/AntragJob.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php index 0571bd9dd..2e72041ff 100644 --- a/application/controllers/jobs/AntragJob.php +++ b/application/controllers/jobs/AntragJob.php @@ -376,6 +376,7 @@ class AntragJob extends JOB_Controller 'AntragJob', 'abbrecherStgl', $antrag->insertamum, + null, $antrag->insertvon ?: $insertvon ); if (isError($result))