diff --git a/application/controllers/jobs/IssueResolver.php b/application/controllers/jobs/IssueResolver.php index d53a6c10c..78e867936 100755 --- a/application/controllers/jobs/IssueResolver.php +++ b/application/controllers/jobs/IssueResolver.php @@ -25,6 +25,7 @@ class IssueResolver extends IssueResolver_Controller 'CORE_INOUT_0006' => 'CORE_INOUT_0006', 'CORE_INOUT_0007' => 'CORE_INOUT_0007', 'CORE_INOUT_0008' => 'CORE_INOUT_0008', + 'CORE_INOUT_0009' => 'CORE_INOUT_0009', 'CORE_STG_0001' => 'CORE_STG_0001', 'CORE_STG_0002' => 'CORE_STG_0002', 'CORE_STG_0003' => 'CORE_STG_0003', diff --git a/application/libraries/issues/PlausicheckLib.php b/application/libraries/issues/PlausicheckLib.php index 951e77c7f..07f091208 100644 --- a/application/libraries/issues/PlausicheckLib.php +++ b/application/libraries/issues/PlausicheckLib.php @@ -1169,7 +1169,7 @@ class PlausicheckLib * @param prestudent_id int if check is to be executed only for one prestudent * @return object success or error */ - public function getIncomingUndGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) + public function getIncomingOrGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) { $params = array($studiensemester_kurzbz, $studiensemester_kurzbz); diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php index fb85cf98f..c1e15151f 100644 --- a/application/libraries/issues/PlausicheckProducerLib.php +++ b/application/libraries/issues/PlausicheckProducerLib.php @@ -30,7 +30,7 @@ class PlausicheckProducerLib 'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus', 'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich', 'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz', - 'IncomingUndGsFoerderrelevant' => 'IncomingUndGsFoerderrelevant', + 'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant', 'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung', 'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde', 'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent', diff --git a/application/libraries/issues/plausichecks/IncomingUndGsFoerderrelevant.php b/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php similarity index 85% rename from application/libraries/issues/plausichecks/IncomingUndGsFoerderrelevant.php rename to application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php index 919fb8415..0e12ccac8 100644 --- a/application/libraries/issues/plausichecks/IncomingUndGsFoerderrelevant.php +++ b/application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php @@ -7,7 +7,7 @@ require_once('PlausiChecker.php'); /** * */ -class IncomingUndGsFoerderrelevant extends PlausiChecker +class IncomingOrGsFoerderrelevant extends PlausiChecker { public function executePlausiCheck($params) { @@ -18,7 +18,7 @@ class IncomingUndGsFoerderrelevant extends PlausiChecker $studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null; // get all students failing the plausicheck - $prestudentRes = $this->_ci->plausichecklib->getIncomingUndGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz); + $prestudentRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz); if (isError($prestudentRes)) return $prestudentRes; diff --git a/application/libraries/issues/resolvers/CORE_INOUT_0009.php b/application/libraries/issues/resolvers/CORE_INOUT_0009.php new file mode 100644 index 000000000..b56344042 --- /dev/null +++ b/application/libraries/issues/resolvers/CORE_INOUT_0009.php @@ -0,0 +1,29 @@ +_ci =& get_instance(); // get code igniter instance + + $this->_ci->load->library('issues/PlausicheckLib'); + + // check if issue persists + $checkRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant(null, null, $params['prestudent_id']); + + if (isError($checkRes)) return $checkRes; + + if (hasData($checkRes)) + return success(false); // not resolved if issue is still present + else + return success(true); // resolved otherwise + } +} diff --git a/system/fehlerupdate.php b/system/fehlerupdate.php index 9cfa5a0c4..98204315a 100644 --- a/system/fehlerupdate.php +++ b/system/fehlerupdate.php @@ -127,7 +127,7 @@ $fehlerArr = array( ), array( 'fehlercode' => 'CORE_INOUT_0009', - 'fehler_kurzbz' => 'IncomingUndGsFoerderrelevant', + 'fehler_kurzbz' => 'IncomingOrGsFoerderrelevant', 'fehlercode_extern' => null, 'fehlertext' => 'Incoming oder gemeinsames Studium ist nicht als nicht förderrelevant markiert. (prestudent_id %s)', 'fehlertyp_kurzbz' => 'error',