diff --git a/application/config/navigation.php b/application/config/navigation.php index 957bdbdae..db11f72bb 100644 --- a/application/config/navigation.php +++ b/application/config/navigation.php @@ -120,11 +120,18 @@ $config['navigation_header'] = array( 'sort' => 30, 'requiredPermissions' => 'system/issues_verwalten:r' ), + 'plausichecks' => array( + 'link' => site_url('system/issues/Plausichecks'), + 'description' => 'Plausichecks', + 'expand' => true, + 'sort' => 40, + 'requiredPermissions' => 'system/issues_verwalten:r' + ), 'gruppenmanagement' => array( 'link' => site_url('person/Gruppenmanagement'), 'description' => 'Gruppenmanagement', 'expand' => true, - 'sort' => 40, + 'sort' => 50, 'requiredPermissions' => 'lehre/gruppenmanager:r' ) ) diff --git a/application/controllers/jobs/PlausiIssueProducer.php b/application/controllers/jobs/PlausiIssueProducer.php index fdacc7740..943d7aa46 100644 --- a/application/controllers/jobs/PlausiIssueProducer.php +++ b/application/controllers/jobs/PlausiIssueProducer.php @@ -15,6 +15,8 @@ class PlausiIssueProducer extends JOB_Controller /** * Runs issue production job. + * @param studiensemester_kurzbz string job is run for students of a certain semester. + * @param studiengang_kz int job is run for students of certain Studiengang. */ public function run($studiensemester_kurzbz = null, $studiengang_kz = null) { @@ -27,7 +29,7 @@ class PlausiIssueProducer extends JOB_Controller { // execute the check $this->logInfo("Checking " . $fehler_kurzbz . "..."); - $plausicheckRes = $this->plausicheckproducerlib->producePlausicheck($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz); + $plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz); if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes)); diff --git a/application/controllers/system/issues/Plausichecks.php b/application/controllers/system/issues/Plausichecks.php index daa7716dd..588e35037 100644 --- a/application/controllers/system/issues/Plausichecks.php +++ b/application/controllers/system/issues/Plausichecks.php @@ -4,8 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed'); class Plausichecks extends Auth_Controller { - private $_uid; - public function __construct() { parent::__construct( @@ -24,16 +22,20 @@ class Plausichecks extends Auth_Controller $this->load->model('system/Fehler_model', 'FehlerModel'); $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); $this->load->model('organisation/Studiengang_model', 'StudiengangModel'); - - $this->_setAuthUID(); // sets property uid } + /* + * Get data for filtering the plausichecks and load the view. + */ public function index() { $filterData = $this->_getFilterData(); $this->load->view('system/issues/plausichecks', $filterData); } + /** + * Initiate plausichecks run. + */ public function runChecks() { $studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz'); @@ -52,7 +54,7 @@ class Plausichecks extends Auth_Controller { // execute the check $issueTexts[$fehler_kurzbz] = array(); - $plausicheckRes = $this->plausicheckproducerlib->producePlausicheck($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz); + $plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz); if (isError($plausicheckRes)) $this->terminateWithJsonError(getError($plausicheckRes)); @@ -98,6 +100,9 @@ class Plausichecks extends Auth_Controller $this->outputJsonSuccess($issueTexts); } + /** + * Get the data needed for filtering for limiting checks. + */ private function _getFilterData() { $this->StudiensemesterModel->addOrder('start', 'DESC'); @@ -126,14 +131,4 @@ class Plausichecks extends Auth_Controller 'fehler' => $fehlerKurzbz ); } - - /** - * Retrieve the UID of the logged user and checks if it is valid - */ - private function _setAuthUID() - { - $this->_uid = getAuthUID(); - - if (!$this->_uid) show_error('User authentification failed'); - } } diff --git a/application/libraries/issues/PlausicheckLib.php b/application/libraries/issues/PlausicheckLib.php index dd6b0daed..a05b851c4 100644 --- a/application/libraries/issues/PlausicheckLib.php +++ b/application/libraries/issues/PlausicheckLib.php @@ -28,7 +28,8 @@ class PlausicheckLib /** * Studiengang should be the same for prestudent and student. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null) @@ -64,7 +65,9 @@ class PlausicheckLib /** * Orgform of a Studiengang in Studienplan should be the same as orgform of student. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getOrgformStgUngleichOrgformPrestudent($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -74,8 +77,8 @@ class PlausicheckLib $qry = " SELECT prestudent.person_id, prestudent.prestudent_id, status.studiensemester_kurzbz, - studiengang.orgform_kurzbz as stg_orgform, status.orgform_kurzbz as student_orgform, - stg.oe_kurzbz AS prestudent_stg_oe_kurzbz + studiengang.orgform_kurzbz AS stg_orgform, status.orgform_kurzbz AS student_orgform, + prestudent.studiengang_kz AS student_studiengang, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz FROM public.tbl_studiengang studiengang JOIN public.tbl_student student USING(studiengang_kz) @@ -89,7 +92,8 @@ class PlausicheckLib AND studiengang.studiengang_kz < 10000 AND status.studiensemester_kurzbz = ? AND NOT EXISTS( - SELECT 1 FROM lehre.tbl_studienplan JOIN lehre.tbl_studienordnung USING(studienordnung_id) + SELECT 1 FROM lehre.tbl_studienplan + JOIN lehre.tbl_studienordnung USING(studienordnung_id) WHERE tbl_studienordnung.studiengang_kz = prestudent.studiengang_kz AND tbl_studienplan.orgform_kurzbz = status.orgform_kurzbz)"; @@ -114,7 +118,9 @@ class PlausicheckLib /** * Students in "mixed" Studiengang should have Orgform. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getPrestudentMischformOhneOrgform($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -152,7 +158,9 @@ class PlausicheckLib /** * Studiengang should be the same for prestudent and studienplan. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent + * @param studienordnung_id int if check is to be executed only for a certain studienordnung_id * @return success with prestudents or error */ public function getStgPrestudentUngleichStgStudienplan($studiengang_kz = null, $prestudent_id = null, $studienordnung_id = null) @@ -171,7 +179,8 @@ class PlausicheckLib JOIN public.tbl_person USING(person_id) JOIN public.tbl_studiengang stg ON ps.studiengang_kz = stg.studiengang_kz WHERE - ps.studiengang_kz<>stordnung.studiengang_kz"; + ps.studiengang_kz<>stordnung.studiengang_kz + AND stg.melderelevant"; if (isset($studiengang_kz)) { @@ -199,7 +208,8 @@ class PlausicheckLib /** * Abbrecher cannot be active. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getAbbrecherAktiv($studiengang_kz = null, $prestudent_id = null) @@ -236,7 +246,8 @@ class PlausicheckLib /** * There shouldn't be any status after Abbrecher status. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null) @@ -272,7 +283,9 @@ class PlausicheckLib /** * Ausbildungssemester of prestudent (lehrverband) must be the same as Ausbildungssemester of prestudentstatus. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getAusbildungssemPrestudentUngleichAusbildungssemStatus($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -282,7 +295,7 @@ class PlausicheckLib $qry = " SELECT DISTINCT(student.student_uid), prestudent.person_id, prestudent.prestudent_id, - status.ausbildungssemester, lv.semester, status.studiensemester_kurzbz, + status.ausbildungssemester AS status_ausbildungssemester, lv.semester AS student_ausbildungssemester, status.studiensemester_kurzbz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz FROM public.tbl_student student @@ -314,7 +327,9 @@ class PlausicheckLib /** * Students with active status should have an active Benutzer. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getInaktiverStudentAktiverStatus($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -361,7 +376,9 @@ class PlausicheckLib * Students of a semester shouldn't start studies before the date of Bismeldung. * e.g. If student studies in WS2022 datum of status shouldn't be before 15.4.2020 * e.g. If student studies in SS2022 datum of status shouldn't be before 15.11.2022 - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getInskriptionVorLetzerBismeldung($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -415,7 +432,8 @@ class PlausicheckLib /** * Status Dates and status studysemester dates should be in correct order. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getDatumStudiensemesterFalscheReihenfolge($studiengang_kz = null, $prestudent_id = null) @@ -467,7 +485,8 @@ class PlausicheckLib /** * Students with active Benutzer should have a status in the current semester. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null) @@ -512,7 +531,9 @@ class PlausicheckLib /** * Studienplan should be valid in current Ausbildungssemester of prestudent. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getStudienplanUngueltig($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -566,7 +587,9 @@ class PlausicheckLib /** * Students with finished studies should have exactly one final exam. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getFalscheAnzahlAbschlusspruefungen($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null) @@ -626,7 +649,9 @@ class PlausicheckLib /** * Date of final exam shouldn't be missing for Absolvent. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param abschlusspruefung_id int if check is to be executed for a certain Abschlussprüfung * @return success with prestudents or error */ public function getDatumAbschlusspruefungFehlt($studiensemester_kurzbz = null, $studiengang_kz = null, $abschlusspruefung_id = null) @@ -652,7 +677,9 @@ class PlausicheckLib /** * Date of sponsion shouldn't be missing for Absolvent. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param abschlusspruefung_id int if check is to be executed only for a certain Abschlussprüfung * @return success with prestudents or error */ public function getDatumSponsionFehlt($studiensemester_kurzbz = null, $studiengang_kz = null, $abschlusspruefung_id = null) @@ -678,7 +705,9 @@ class PlausicheckLib /** * Bewerber should have participated in Reihungstest. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getBewerberNichtZumRtAngetreten($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -732,7 +761,9 @@ class PlausicheckLib /** * Current Ausbildungssemester shouldn't be 0. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null) @@ -770,8 +801,9 @@ class PlausicheckLib /** * Prestudent should have a final status. - * - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getAbschlussstatusFehlt($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null) @@ -852,7 +884,9 @@ class PlausicheckLib /** * Birthdate is too long ago. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param person_id int if check is to be executed only for one person * @return success with prestudents or error */ public function getGbDatumWeitZurueck($studiensemester_kurzbz = null, $studiengang_kz = null, $person_id = null) @@ -870,7 +904,7 @@ class PlausicheckLib SELECT 1 FROM public.tbl_prestudent JOIN public.tbl_prestudentstatus status USING(prestudent_id) - JOIN public.tbl_studiengang USING(studiengang_kz) + JOIN public.tbl_studiengang stg USING(studiengang_kz) WHERE person_id = pers.person_id"; if (isset($studiensemester_kurzbz)) @@ -898,7 +932,8 @@ class PlausicheckLib /** * Nation is not Austria, but address has austrian Gemeinde. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param person_id int if check is to be executed only for one person * @return success with prestudents or error */ public function getNationNichtOesterreichAberGemeinde($studiengang_kz = null, $person_id = null) @@ -936,7 +971,9 @@ class PlausicheckLib /** * Students should have exactly one home address. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param person_id int if check is to be executed only for one person * @return success with prestudents or error */ public function getFalscheAnzahlHeimatadressen($studiensemester_kurzbz = null, $studiengang_kz = null, $person_id = null) @@ -986,7 +1023,9 @@ class PlausicheckLib /** * Students should have exactly one delivery address. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param person_id int if check is to be executed only for one person * @return success with prestudents or error */ public function getFalscheAnzahlZustelladressen($studiensemester_kurzbz = null, $studiengang_kz = null, $person_id = null) @@ -1039,7 +1078,9 @@ class PlausicheckLib /** * Incoming shouldn't have austrian home address. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param person_id int if check is to be executed only for one person * @return success with prestudents or error */ public function getIncomingHeimatNationOesterreich($studiensemester_kurzbz, $studiengang_kz = null, $person_id = null) @@ -1080,7 +1121,8 @@ class PlausicheckLib /** * Incoming should have IN/OUT data. - * @param int prestudent_id if check is to be executed only for one prestudent + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param prestudent_id int if check is to be executed only for one prestudent * @return success with prestudents or error */ public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null) @@ -1125,6 +1167,9 @@ class PlausicheckLib /** * Get final exams in a semester which are invalid (e.g. missing data) + * @param studiensemester_kurzbz string if check is to be executed for certain Studiengang + * @param studiengang_kz int if check is to be executed for certain Studiengang + * @param abschlusspruefung_id int if check is to be executed for certain Abschlussprüfung */ private function _getInvalidAbschlusspruefungen($studiensemester_kurzbz = null, $studiengang_kz = null, $abschlusspruefung_id = null) { @@ -1178,6 +1223,7 @@ class PlausicheckLib /** * Gets Bismeldedate from Studiensemester. + * @param studiensemester_kurzbz string */ private function _getBisdateFromSemester($studiensemester_kurzbz) { diff --git a/application/libraries/issues/PlausicheckProducerLib.php b/application/libraries/issues/PlausicheckProducerLib.php index adca981d1..74adb21dd 100644 --- a/application/libraries/issues/PlausicheckProducerLib.php +++ b/application/libraries/issues/PlausicheckProducerLib.php @@ -52,7 +52,13 @@ class PlausicheckProducerLib if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz; } - public function producePlausicheck($fehler_kurzbz, $studiensemester_kurzbz = null, $studiengang_kz = null) + /** + * Executes check for a fehler_kurzbz, returns the result. + * @param $fehler_kurzbz string + * @param $studiensemester_kurzbz string optionally needed for issue production + * @param $studiengang_kz int optionally needed for issue production + */ + public function producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz = null, $studiengang_kz = null) { $libName = $this->_fehlerLibMappings[$fehler_kurzbz]; @@ -85,6 +91,9 @@ class PlausicheckProducerLib return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($paramsForCheck); } + /** + * Gets all fehler_kurzbz for fehler which need to be checked. + */ public function getFehlerKurzbz() { return array_keys($this->_fehlerLibMappings); diff --git a/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php b/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php index c3fb1ae66..41df05acd 100644 --- a/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php +++ b/application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php @@ -36,6 +36,8 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker 'person_id' => $prestudent->person_id, 'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz, 'fehlertext_params' => array( + 'student_ausbildungssemester' => $prestudent->student_ausbildungssemester, + 'status_ausbildungssemester' => $prestudent->status_ausbildungssemester, 'prestudent_id' => $prestudent->prestudent_id, 'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz ), diff --git a/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php b/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php index d663f6797..b7ef64c41 100644 --- a/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php +++ b/application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php @@ -33,9 +33,10 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker 'person_id' => $prestudent->person_id, 'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz, 'fehlertext_params' => array( - 'stg_orgform' => $prestudent->stg_orgform, + 'student_studiengang' => $prestudent->student_studiengang, 'student_orgform' => $prestudent->student_orgform, - 'prestudent_id' => $prestudent->prestudent_id + 'prestudent_id' => $prestudent->prestudent_id, + 'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz ), 'resolution_params' => array( 'prestudent_id' => $prestudent->prestudent_id, diff --git a/application/libraries/issues/plausichecks/PlausiChecker.php b/application/libraries/issues/plausichecks/PlausiChecker.php index 3c781cd63..bfa72b5e0 100644 --- a/application/libraries/issues/plausichecks/PlausiChecker.php +++ b/application/libraries/issues/plausichecks/PlausiChecker.php @@ -17,7 +17,7 @@ abstract class PlausiChecker /** * Executes a plausi check. - * @param array $params parameters needed for executing the check + * @param $paramsForChecking array parameters needed for executing the check * @return array with objects which failed the plausi check */ abstract public function executePlausiCheck($paramsForChecking); diff --git a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php index 9b70219f4..8d96b7c65 100644 --- a/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php +++ b/application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php @@ -12,15 +12,12 @@ class CORE_STUDENTSTATUS_0014 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/PlausicheckLib'); // check if issue persists - $checkRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt($params['studiensemester_kurzbz'], null, $params['prestudent_id']); + $checkRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt(null, null, $params['prestudent_id']); if (isError($checkRes)) return $checkRes; diff --git a/application/views/system/issues/plausichecks.php b/application/views/system/issues/plausichecks.php index 421243f0a..99d426199 100644 --- a/application/views/system/issues/plausichecks.php +++ b/application/views/system/issues/plausichecks.php @@ -12,7 +12,7 @@ $this->load->view( 'ajaxlib' => true, 'navigationwidget' => true, 'dialoglib' => true, - //'customCSSs' => array('public/css/issues/issuesZustaendigkeiten.css', 'public/css/sbadmin2/tablesort_bootstrap.css'), + 'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css'), 'customJSs' => array('public/js/issues/plausichecks.js') ) ); @@ -68,7 +68,7 @@ $this->load->view( -
+
-
+

- +
diff --git a/system/fehlerupdate.php b/system/fehlerupdate.php index 0827c6225..0d8f653a6 100644 --- a/system/fehlerupdate.php +++ b/system/fehlerupdate.php @@ -137,7 +137,7 @@ $fehlerArr = array( 'fehlercode' => 'CORE_STG_0002', 'fehler_kurzbz' => 'OrgformStgUngleichOrgformPrestudent', 'fehlercode_extern' => null, - 'fehlertext' => 'Organisationsform des Studienganges (%s) stimmt nicht mit Organisationsformen des Studenten (%s) überein. (prestudent_id %s)', + 'fehlertext' => 'Es ist kein Studienplan mit Studiengang (%s) und Organisationsform (%s) des Studenten zugewiesen. (prestudent_id %s, Studiensemester %s)', 'fehlertyp_kurzbz' => 'error', 'app' => 'core' ), @@ -177,7 +177,7 @@ $fehlerArr = array( 'fehlercode' => 'CORE_STUDENTSTATUS_0003', 'fehler_kurzbz' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus', 'fehlercode_extern' => null, - 'fehlertext' => 'Aktuelles Ausbildungssemester bei StudentIn (Lehrverband) stimmt nicht mit dem Ausbildungssemester des aktuellen Status überein. (prestudent_id %s, Studiensemester %s)', + 'fehlertext' => 'Aktuelles Ausbildungssemester %s bei StudentIn (Lehrverband) stimmt nicht mit dem Ausbildungssemester %s des aktuellen Status überein. (prestudent_id %s, Studiensemester %s)', 'fehlertyp_kurzbz' => 'error', 'app' => 'core' ),