From d542cf7720b9c0651d8510a18a73916e3200a6ae Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 14 Aug 2024 16:20:47 +0200 Subject: [PATCH 01/12] s&d --- application/libraries/AntragLib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php index c1649587d..1a96eadf1 100644 --- a/application/libraries/AntragLib.php +++ b/application/libraries/AntragLib.php @@ -126,7 +126,7 @@ class AntragLib return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id); } // NOTE(chris): get last status that is not pause - $this->_ci->StudierendenantragstatusModel->addOrder('insertamum'); + $this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC'); $this->_ci->StudierendenantragstatusModel->addLimit(1); $result = $this->_ci->StudierendenantragstatusModel->loadWhere([ 'studierendenantrag_id' => $antrag_id, From ea0a24961286506e77f70554bb51278167b5847d Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 13 Apr 2026 09:14:27 +0200 Subject: [PATCH 02/12] micro degree abschlussdokumente hinzugefuegt --- .../components/Stv/Studentenverwaltung/Details/Archiv.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js index 9d8104ba5..ca5a5a0ca 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Archiv.js @@ -84,6 +84,14 @@ export default { 'microcredential_2', 'microcredential_3', 'microcredential_4', + 'microdegree_1', + 'microdegree_2', + 'microdegree_3', + 'microdegree_4', + 'microdegreeabschluss_1', + 'microdegreeabschluss_2', + 'microdegreeabschluss_3', + 'microdegreeabschluss_4', ] }, documentDropdownObject: {} From 3ce3eff0221374d76a5227ee610f6eb16ea70423 Mon Sep 17 00:00:00 2001 From: ma0048 Date: Tue, 14 Apr 2026 09:30:45 +0200 Subject: [PATCH 03/12] fehlendes mapping hinzugefuegt --- content/student/studentoverlay.js.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php index 9ebe73cfe..1e40960ca 100644 --- a/content/student/studentoverlay.js.php +++ b/content/student/studentoverlay.js.php @@ -3555,6 +3555,14 @@ function StudentZeugnisDokumentArchivieren() case 'microcredential_2': case 'microcredential_3': case 'microcredential_4': + case 'microdegree_1': + case 'microdegree_2': + case 'microdegree_3': + case 'microdegree_4': + case 'microdegreeabschluss_1': + case 'microdegreeabschluss_2': + case 'microdegreeabschluss_3': + case 'microdegreeabschluss_4': xml = 'microcredential.xml.php'; break; From 3a646ffe77b1078f4f8d6490ee693dba2d972bb7 Mon Sep 17 00:00:00 2001 From: Johann Hoffmann Date: Mon, 20 Apr 2026 11:06:06 +0200 Subject: [PATCH 04/12] adapt AbgabeJob relevant queries so they compare with the pgsql date function CURRENT_DATE instead of NOW() to avoid the cutoff from uploads the happened "yesterday but more than 24 hours ago"; also added another "abgabedatum < CURRENT_DATE" condition, to avoid sending this exact case as updates 2 days in a row; --- application/models/education/Paabgabe_model.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/application/models/education/Paabgabe_model.php b/application/models/education/Paabgabe_model.php index be42b7660..d59b7cf62 100644 --- a/application/models/education/Paabgabe_model.php +++ b/application/models/education/Paabgabe_model.php @@ -79,10 +79,16 @@ class Paabgabe_model extends DB_Model JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid) JOIN public.tbl_person USING (person_id) - WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ? - OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?) - AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?"; - + WHERE ( + (campus.tbl_paabgabe.insertamum >= CURRENT_DATE - INTERVAL ? + AND campus.tbl_paabgabe.insertamum < CURRENT_DATE + ) + OR + (campus.tbl_paabgabe.updateamum >= CURRENT_DATE - INTERVAL ? + AND campus.tbl_paabgabe.updateamum < CURRENT_DATE + ) + AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?"; + return $this->execQuery($query, [$interval, $interval, $relevantTypes]); } @@ -108,7 +114,8 @@ class Paabgabe_model extends DB_Model JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id) WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL - AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?"; + AND campus.tbl_paabgabe.abgabedatum >= CURRENT_DATE - INTERVAL ? + AND campus.tbl_paabgabe.abgabedatum < CURRENT_DATE"; if($relevantTypes !== null) { $query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?"; From dac71f597a2fd7d7e02d01428102d254ac0e5976 Mon Sep 17 00:00:00 2001 From: kindlm Date: Mon, 20 Apr 2026 11:24:59 +0200 Subject: [PATCH 05/12] =?UTF-8?q?Spalte=20Anmeldedatum=20in=20RT-=C3=9Cber?= =?UTF-8?q?sicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Spalte Frage_ID in RT-Administration JQuery und Tabelsorter aus Include in Service_Uebersicht --- cis/private/info/service_uebersicht.php | 10 +++--- .../reihungstest_administration.php | 6 +++- vilesci/stammdaten/reihungstestverwaltung.php | 31 +++++++++++++++++-- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/cis/private/info/service_uebersicht.php b/cis/private/info/service_uebersicht.php index 348a82b0d..ef2516bf7 100644 --- a/cis/private/info/service_uebersicht.php +++ b/cis/private/info/service_uebersicht.php @@ -46,12 +46,13 @@ echo ' - - '; + include('../../../include/meta/jquery.php'); + include('../../../include/meta/jquery-tablesorter.php'); + const MOODLE_ADDON_KURZBZ = 'moodle'; // Load Addons to get Moodle_Path @@ -71,7 +72,7 @@ echo ' $("#myTable").tablesorter( { sortList: [[0,0],[1,0]], - widgets: [\'zebra\'] + widgets: [\'zebra\',\'filter\'] }); } ); @@ -151,8 +152,9 @@ foreach($service->result as $row) $person = new person(); $person->getPersonFromBenutzer($row->operativ_uid); $operativ = $person->nachname.' '.$person->vorname; + $oeBez = new organisationseinheit($row->oe_kurzbz); echo ''; - echo '',$row->oe_kurzbz,''; + echo '',$oeBez->bezeichnung,''; echo ''.$row->bezeichnung.''; echo '',$row->beschreibung,''; echo '',$design,''; diff --git a/vilesci/stammdaten/reihungstest_administration.php b/vilesci/stammdaten/reihungstest_administration.php index 3b59e1961..6fbf3e5c0 100644 --- a/vilesci/stammdaten/reihungstest_administration.php +++ b/vilesci/stammdaten/reihungstest_administration.php @@ -588,7 +588,9 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id'])) { if(is_numeric($_POST['prestudent_id']) && $_POST['prestudent_id']!='') { - $qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id,tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte + $qry="SELECT nachname,vorname,person_id,prestudent_id,tbl_pruefling.pruefling_id, + tbl_pruefling_frage.begintime,bezeichnung,kurzbz,tbl_frage.nummer,level, + tbl_vorschlag.nummer as antwortnummer, tbl_vorschlag.punkte, tbl_frage.frage_id FROM testtool.tbl_antwort JOIN testtool.tbl_vorschlag USING(vorschlag_id) JOIN testtool.tbl_frage USING (frage_id) @@ -615,6 +617,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id'])) Level Antwort # Punkte + FrageID '; @@ -632,6 +635,7 @@ if(isset($_POST['testergebnisanzeigen']) && isset($_POST['prestudent_id'])) echo "$row->level"; echo "$row->antwortnummer"; echo "$row->punkte"; + echo "$row->frage_id"; echo ''; } echo ''; diff --git a/vilesci/stammdaten/reihungstestverwaltung.php b/vilesci/stammdaten/reihungstestverwaltung.php index 990b3e129..f415f33cd 100644 --- a/vilesci/stammdaten/reihungstestverwaltung.php +++ b/vilesci/stammdaten/reihungstestverwaltung.php @@ -837,6 +837,25 @@ if(isset($_GET['excel']))