From 4c4633843f7f78fabbe680661c179a4b6b439c5a Mon Sep 17 00:00:00 2001 From: ma0048 Date: Mon, 29 Apr 2024 08:34:07 +0200 Subject: [PATCH] - status vom master hat keine auswirkung auf den status vom bachelor - infocenter loeschen von dokumenten im bewerbungstool hat keine auswirkung auf die spaltenanzeige --- application/controllers/jobs/ReihungstestJob.php | 4 ++-- application/views/system/infocenter/infocenterData.php | 5 +++++ .../views/system/infocenter/infocenterFreigegebenData.php | 5 +++++ .../infocenter/infocenterReihungstestAbsolviertData.php | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php index b55287439..3d9139447 100644 --- a/application/controllers/jobs/ReihungstestJob.php +++ b/application/controllers/jobs/ReihungstestJob.php @@ -901,7 +901,7 @@ class ReihungstestJob extends JOB_Controller $mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][] = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')'; } - elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum) + elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum && $row_ps->studiengang_typ !== 'm') { // Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen $lastStatus = $this->PrestudentstatusModel->getLastStatus($rowNiedrPrios->prestudent_id); @@ -927,7 +927,7 @@ class ReihungstestJob extends JOB_Controller = $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')'; } } - elseif ($rowNiedrPrios->laststatus == 'Wartender' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum) + elseif ($rowNiedrPrios->laststatus == 'Wartender' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum && $row_ps->studiengang_typ !== 'm') { // Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen // Mail zur Info an Assistenz schicken diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index 61dc5a575..d899a1218 100644 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -15,6 +15,7 @@ $STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; $ORG_NAME = '\'InfoCenter\''; $ONLINE = '\'online\''; + $LOGDATA_DELETEDFILE = '\'Document % deleted\''; $query = ' SELECT @@ -31,6 +32,7 @@ FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -40,6 +42,7 @@ FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -62,6 +65,7 @@ LEFT JOIN public.tbl_student student ON tbl_benutzer.uid = student.student_uid WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -283,6 +287,7 @@ FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php index 8003b42e0..d28e0de65 100644 --- a/application/views/system/infocenter/infocenterFreigegebenData.php +++ b/application/views/system/infocenter/infocenterFreigegebenData.php @@ -14,6 +14,7 @@ $IDENTITY = '\'identity\''; $ONLINE = '\'online\''; $STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; + $LOGDATA_DELETEDFILE = '\'Document % deleted\''; $query = ' SELECT @@ -30,6 +31,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -39,6 +41,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -53,6 +56,7 @@ $query = ' LEFT JOIN public.tbl_student student ON tbl_benutzer.uid = student.student_uid WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -252,6 +256,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php index 7f9ee1288..ac7fcd1fa 100644 --- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php +++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php @@ -10,6 +10,7 @@ $STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\''; $ORG_NAME = '\'InfoCenter\''; $STUDIENGEBUEHR_ANZAHLUNG = '\'StudiengebuehrAnzahlung\''; + $LOGDATA_DELETEDFILE = '\'Document % deleted\''; $query = ' SELECT @@ -26,6 +27,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -35,6 +37,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1 @@ -191,6 +194,7 @@ $query = ' FROM system.tbl_log l WHERE l.taetigkeit_kurzbz IN ('.$TAETIGKEIT_KURZBZ.') AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.') + AND l.logdata->>\'name\' NOT LIKE '. $LOGDATA_DELETEDFILE .' AND l.person_id = p.person_id ORDER BY l.log_id DESC LIMIT 1