diff --git a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php index ba20973a7..5825a86de 100644 --- a/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php +++ b/application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php @@ -65,18 +65,21 @@ class InaktiverStudentAktiverStatus extends PlausiChecker * @return success with prestudents or error */ public function getInaktiverStudentAktiverStatus( - $studiensemester_kurzbz, + $studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null ) { - $this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel'); - $aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt(); + if (!isset($studiensemester_kurzbz)) + { + $this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel'); + $aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt(); - if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes; + if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes; - $studiensemester_kurzbz = hasData($aktStudiensemesterRes) ? getData($aktStudiensemesterRes)[0]->studiensemester_kurzbz : ''; + $studiensemester_kurzbz = hasData($aktStudiensemesterRes) ? getData($aktStudiensemesterRes)[0]->studiensemester_kurzbz : ''; + } $params = array($studiensemester_kurzbz); diff --git a/application/libraries/issues/plausichecks/ZuVieleZweckeIncomingPlausi.php b/application/libraries/issues/plausichecks/ZuVieleZweckeIncomingPlausi.php index 8e7ba0855..df5d50936 100644 --- a/application/libraries/issues/plausichecks/ZuVieleZweckeIncomingPlausi.php +++ b/application/libraries/issues/plausichecks/ZuVieleZweckeIncomingPlausi.php @@ -43,7 +43,7 @@ class ZuVieleZweckeIncomingPlausi extends PlausiChecker $results[] = array( 'person_id' => $prestudent->person_id, 'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz, - //'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id), + 'fehlertext_params' => array('anzahl' => $prestudent->anzahl), 'resolution_params' => array('bisio_id' => $prestudent->bisio_id) ); } @@ -81,8 +81,8 @@ class ZuVieleZweckeIncomingPlausi extends PlausiChecker $qry = " SELECT * FROM ( SELECT - DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, zw.zweck_code, stg.studiengang_kz, - bisio.bisio_id, COUNT(zw.zweck_code) OVER (PARTITION BY bisio_id) AS anzahl + DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, stg.studiengang_kz, + bisio.bisio_id, (SELECT count(*) FROM bis.tbl_bisio_zweck WHERE bisio_id = bisio.bisio_id) AS anzahl FROM public.tbl_prestudent pre JOIN public.tbl_student stud USING (prestudent_id) @@ -91,7 +91,6 @@ class ZuVieleZweckeIncomingPlausi extends PlausiChecker JOIN public.tbl_studiensemester sem ON status.studiensemester_kurzbz = sem.studiensemester_kurzbz JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz JOIN bis.tbl_bisio bisio ON stud.student_uid = bisio.student_uid - JOIN bis.tbl_bisio_zweck zw USING (bisio_id) WHERE stg.melderelevant AND pre.bismelden diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php index cbce2b01e..0dabb00c1 100644 --- a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php +++ b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php @@ -12,16 +12,13 @@ class CORE_STUDENTSTATUS_0004 implements IIssueResolvedChecker if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id'])) return error('Prestudent Id missing, issue_id: '.$params['issue_id']); - if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz'])) - return error('Studiensemester missing, issue_id: '.$params['issue_id']); - $this->_ci =& get_instance(); // get code igniter instance $this->_ci->load->library('issues/plausichecks/InaktiverStudentAktiverStatus'); // check if issue persists $checkRes = $this->_ci->inaktiverstudentaktiverstatus->getInaktiverStudentAktiverStatus( - $params['studiensemester_kurzbz'], + null, null, $params['prestudent_id'] );