Merge branch 'master' into feature-76233/LoginAsUser_Logging

# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php

application/config/fehler.php

@@ -1,448 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['fehler'] = array(
-	array(
-		'fehlercode' => 'CORE_ZGV_0001',
-		'fehler_kurzbz' => 'zgvDatumInZukunft',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Datum in Zukunft',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => array('core'),
-		'producerLibName' => 'ZgvDatumInZukunft',
-		'resolverLibName' => 'CORE_ZGV_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0002',
-		'fehler_kurzbz' => 'zgvDatumVorGeburtsdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Datum vor Geburtsdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvDatumVorGeburtsdatum',
-		'resolverLibName' => 'CORE_ZGV_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0003',
-		'fehler_kurzbz' => 'zgvMasterDatumInZukunft',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum in Zukunft',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumInZukunft',
-		'resolverLibName' => 'CORE_ZGV_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0004',
-		'fehler_kurzbz' => 'zgvMasterDatumVorZgvdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum vor Zgvdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumVorZgvdatum',
-		'resolverLibName' => 'CORE_ZGV_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0005',
-		'fehler_kurzbz' => 'zgvMasterDatumVorGeburtsdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum vor Geburtsdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumVorGeburtsdatum',
-		'resolverLibName' => 'CORE_ZGV_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0001',
-		'fehler_kurzbz' => 'keinAufenthaltszweckPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Aufenthaltszweck gefunden',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'KeinAufenthaltszweckPlausi',
-		'resolverLibName' => 'CORE_INOUT_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0002',
-		'fehler_kurzbz' => 'zuVieleZweckeIncomingPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es sind %s Aufenthaltszwecke eingetragen (max. 1 Zweck für Incomings)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZuVieleZweckeIncomingPlausi',
-		'resolverLibName' => 'CORE_INOUT_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0003',
-		'fehler_kurzbz' => 'falscherIncomingZweckPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aufenthaltszweckcode ist %s (für Incomings ist nur Zweck 1, 2, 3 erlaubt)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscherIncomingZweckPlausi',
-		'resolverLibName' => 'CORE_INOUT_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0004',
-		'fehler_kurzbz' => 'outgoingAufenthaltfoerderungfehltPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Keine Aufenthaltsfoerderung angegeben (bei Outgoings >= 29 Tage Monat im Ausland muss mind. 1 gemeldet werden)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingAufenthaltfoerderungfehltPlausi',
-		'resolverLibName' => 'CORE_INOUT_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0005',
-		'fehler_kurzbz' => 'outgoingAngerechneteEctsFehlenPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Angerechnete ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingAngerechneteEctsFehlenPlausi',
-		'resolverLibName' => 'CORE_INOUT_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0006',
-		'fehler_kurzbz' => 'outgoingErworbeneEctsFehlenPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Erworbene ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingErworbeneEctsFehlenPlausi',
-		'resolverLibName' => 'CORE_INOUT_0006',
-		'producerIsResolver' => false
-	),
-
-	/** Plausichecks **/
-	array(
-		'fehlercode' => 'CORE_INOUT_0007',
-		'fehler_kurzbz' => 'IncomingHeimatNationOesterreich',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Heimatnation bei Incoming Österreich',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingHeimatNationOesterreich',
-		'resolverLibName' => 'CORE_INOUT_0007',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0008',
-		'fehler_kurzbz' => 'IncomingOhneIoDatensatz',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Incoming hat keinen IO Datensatz (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingOhneIoDatensatz',
-		'resolverLibName' => 'CORE_INOUT_0008',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0009',
-		'fehler_kurzbz' => 'IncomingOrGsFoerderrelevant',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Incoming oder gemeinsames Studium ist nicht als nicht förderrelevant markiert. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingOrGsFoerderrelevant',
-		'resolverLibName' => 'CORE_INOUT_0009',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0001',
-		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudent',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Studiengang des Prestudenten ist ungleich dem Studiengang des Studenten. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StgPrestudentUngleichStgStudent',
-		'resolverLibName' => 'CORE_STG_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0002',
-		'fehler_kurzbz' => 'OrgformStgUngleichOrgformPrestudent',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es ist kein Studienplan mit Studiengang (%s) und Organisationsform (%s) des Studenten zugewiesen. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OrgformStgUngleichOrgformPrestudent',
-		'resolverLibName' => 'CORE_STG_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0003',
-		'fehler_kurzbz' => 'PrestudentMischformOhneOrgform',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Organisationsform ist für Studierenden/BewerberIn in Mischformstudiengang nicht eingetragen. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'PrestudentMischformOhneOrgform',
-		'resolverLibName' => 'CORE_STG_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0004',
-		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudienplan',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Studiengang des Prestudenten passt nicht zu Studiengang des Studienplans. (prestudent_id %s, Studienplan %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StgPrestudentUngleichStgStudienplan',
-		'resolverLibName' => 'CORE_STG_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0001',
-		'fehler_kurzbz' => 'AbbrecherAktiv',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'AbbrecherIn hat aktiven Benutzer. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AbbrecherAktiv',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0002',
-		'fehler_kurzbz' => 'StudentstatusNachAbbrecher',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktiver Status nach Abbrecher Status. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StudentstatusNachAbbrecher',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0003',
-		'fehler_kurzbz' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Ausbildungssemester %s des aktuellen Status stimmt nicht mit Ausbildungssemester %s bei StudentIn (Lehrverband) überein. (student_uid %s, prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0004',
-		'fehler_kurzbz' => 'InaktiverStudentAktiverStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Inaktiver Benutzer hat aktiven Status. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'InaktiverStudentAktiverStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0005',
-		'fehler_kurzbz' => 'InskriptionVorLetzerBismeldung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Datum der Inskription liegt vor dem Datum der letzten BIS-Meldung %s. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'InskriptionVorLetzerBismeldung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0006',
-		'fehler_kurzbz' => 'DatumStudiensemesterFalscheReihenfolge',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Datum und Studiensemester sind bei den Status in falscher Reihenfolge. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumStudiensemesterFalscheReihenfolge',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0006',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0007',
-		'fehler_kurzbz' => 'AktiverStudentOhneStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktive/r StudentIn ohne aktuellen Status (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktiverStudentOhneStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0007',
-		'producerIsResolver' => false
-	),
-	//~ array(
-		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0008',
-		//~ 'fehler_kurzbz' => 'StudienplanUngueltig',
-		//~ 'fehlercode_extern' => null,
-		//~ 'fehlertext' => 'Studienplan %s ist im Ausbildungssemester %s nicht gültig (prestudent_id %s)',
-		//~ 'fehlertyp_kurzbz' => 'error',
-		//~ 'app' => 'core',
-		//~ 'producerLibName' => 'StudienplanUngueltig',
-		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0008',
-		//~ 'producerIsResolver' => false
-	//~ ),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0009',
-		'fehler_kurzbz' => 'FalscheAnzahlAbschlusspruefungen',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Mehrere oder keine bestandenen Abschlussprüfungen (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscheAnzahlAbschlusspruefungen',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0009',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0010',
-		'fehler_kurzbz' => 'DatumAbschlusspruefungFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Abschlussprüfung Datum (prestudent_id %s, abschlusspruefung_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumAbschlusspruefungFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0010',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0011',
-		'fehler_kurzbz' => 'DatumSponsionFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Sponsionsdatum (prestudent_id %s, abschlusspruefung_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumSponsionFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0011',
-		'producerIsResolver' => false
-	),
-	//~ array(
-		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0012',
-		//~ 'fehler_kurzbz' => 'BewerberNichtZumRtAngetreten',
-		//~ 'fehlercode_extern' => null,
-		//~ 'fehlertext' => 'Bewerber nicht zum Reihungstest angetreten (prestudent_id %s)',
-		//~ 'fehlertyp_kurzbz' => 'warning',
-		//~ 'app' => 'core',
-		//~ 'producerLibName' => 'BewerberNichtZumRtAngetreten',
-		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0012',
-		//~ 'producerIsResolver' => false
-	//~ ),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0013',
-		'fehler_kurzbz' => 'AktSemesterNull',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktuelles Ausbildungssemester ist 0 (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktSemesterNull',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0013',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0014',
-		'fehler_kurzbz' => 'AbschlussstatusFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Abschlussstatus (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'AbschlussstatusFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0014',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0015',
-		'fehler_kurzbz' => 'AktiverStudentstatusOhneKontobuchung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Keine Kontobuchung bei aktivem Studentstatus (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktiverStudentstatusOhneKontobuchung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0015',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0016',
-		'fehler_kurzbz' => 'DualesStudiumOhneMarkierung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'StudentIn in dualem Studiengang nicht als dual markiert (prestudent_id %s, Studienplan %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DualesStudiumOhneMarkierung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0016',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0001',
-		'fehler_kurzbz' => 'GbDatumWeitZurueck',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Geburtsdatum vor dem 01.01.1920',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'GbDatumWeitZurueck',
-		'resolverLibName' => 'CORE_PERSON_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0002',
-		'fehler_kurzbz' => 'NationNichtOesterreichAberGemeinde',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Nation der Adresse ist ungleich Österreich, es ist aber eine österreichische Gemeinde (%s) angegeben (adresse_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'NationNichtOesterreichAberGemeinde',
-		'resolverLibName' => 'CORE_PERSON_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0003',
-		'fehler_kurzbz' => 'FalscheAnzahlHeimatadressen',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es sind mehrere oder keine Heimatadressen eingetragen',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscheAnzahlHeimatadressen',
-		'resolverLibName' => 'CORE_PERSON_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0004',
-		'fehler_kurzbz' => 'FalscheAnzahlZustelladressen',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es sind mehrere oder keine Zustelladressen eingetragen',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscheAnzahlZustelladressen',
-		'resolverLibName' => 'CORE_PERSON_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0005',
-		'fehler_kurzbz' => 'geburtsnationFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Geburtsnation nicht vorhanden',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'GeburtsnationFehlt',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_PERSON_0006',
-		'fehler_kurzbz' => 'uhstatPersonkennungFehltCore',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Personkennung fehlt (vBpk AS, vBpk BF oder Ersatzkennzeichen fehlt)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'UhstatPersonkennungFehltCore',
-		'resolverLibName' => 'CORE_PERSON_0006',
-		'producerIsResolver' => false
-	)
-);

application/config/infocenter.php

@@ -3,3 +3,4 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 $config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
+$config['infocenter_qualifikationskurs_kz'] = '10002';

application/controllers/Cis/Compat.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Compat extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'ci' => ['basis/cis:r'],
+			'legacy' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * @access public
+	 * @return void 
+	 */
+	public function ci()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+	/**
+	 * @access public
+	 * @return void
+	 */
+	public function legacy()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+}

application/controllers/api/frontend/v1/CisMenu.php

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 
@@ -91,6 +94,8 @@ class CisMenu extends FHCAPI_Controller
 		$doc->loadXML($menuItem->content);
 		$urlElem = $doc->getElementsByTagName('url')->item(0);
 
+		$this->menuItemUrlTargetHelper($menuItem, $doc);
+
 		if (!$urlElem) {
 			return '';
 		}
@@ -122,5 +127,18 @@ class CisMenu extends FHCAPI_Controller
 		return $url;
 	}
 
+	private function menuItemUrlTargetHelper($menuItem, $xmldoc)
+	{
+		if($menuItem->template_kurzbz === 'redirect')
+		{
+			$targetElem = $xmldoc->getElementsByTagName('target')->item(0);
+			$target = ($targetElem) ? $targetElem->textContent : '';
+			if(!in_array($target, array('_self', '_top', '_blank')))
+			{
+				$target = '_self';
+			}
+			$menuItem->target = $target;
+		}
+	}
 }
 

application/controllers/api/frontend/v1/Lehrveranstaltung.php

@@ -81,7 +81,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	{
 		$studiengang_kz = $this->getStudiengangKz($stg_kz);
 
-		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
+		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
 
 		$verband = null;

application/controllers/api/frontend/v1/LvPlan.php

@@ -114,6 +114,7 @@ class LvPlan extends FHCAPI_Controller
 
 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
+
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);
 
 		// fetching moodle events

application/controllers/api/frontend/v1/Studium.php

@@ -167,7 +167,9 @@ class Studium extends FHCAPI_Controller
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
 			foreach($lehrveranstaltungen as $lehrv){
-				foreach($lehrv->lehrveranstaltungen as $lv){
+				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
+				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
+				foreach($lvs as $lv){
 					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
 					$lv->lektoren = $lvLektoren;
 				}
@@ -286,6 +288,7 @@ SELECT tbl_lehrveranstaltung.*,
 		$lehrveranstaltungen = $this->LehrveranstaltungModel->execReadOnlyQuery($query,[$studienplan_id, $semester]);
 		
 		$lehrveranstaltungen = $this->getDataOrTerminateWithError($lehrveranstaltungen);
+		
 		usort($lehrveranstaltungen, function($a, $b){
 			if($a->lehrtyp_kurzbz == "modul"){
 				return -1;
@@ -302,12 +305,17 @@ SELECT tbl_lehrveranstaltung.*,
 			}
 			else{
 				$parent =array_filter($carry, function($item)use($lehrv){
-					return $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+					return isset($item->lehrveranstaltungen)
+						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
 				});
 				$parent = current($parent);
 				if($parent){
 					$parent->lehrveranstaltungen[] = $lehrv;
 				}
+				else{
+					// lehrveranstaltung without a modul: keep it on the top level
+					array_push($carry, $lehrv);
+				}
 			}
 			return $carry;
 		}, []);

application/controllers/api/frontend/v1/issues/IssueChecker.php

@@ -1,200 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class IssueChecker extends FHCAPI_Controller
-{
-	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
-
-	protected $person_id;
-	protected $_extensionName = null;
-	protected $_fehlercodes = [];
-	protected $_apps = [];
-
-	protected $errors = [];
-	protected $infos = [];
-
-	public function __construct($permissions = [])
-	{
-		$default_permissions = [
-			'checkPerson' => self::DEFAULT_PERMISSION,
-			'countPersonOpenIssues' => self::DEFAULT_PERMISSION
-		];
-
-		if(!is_array($permissions))
-		{
-			$this->terminateWithError("Issue Checker: permissions must be an array");
-		}
-
-		$merged_permissions = array_merge($default_permissions, $permissions);
-
-		parent::__construct($merged_permissions);
-
-		$this->load->model('system/Issue_model', 'IssueModel');
-		$this->load->model('system/Fehler_model', 'FehlerModel');
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$producerArgs = [];
-		$resolverArgs = [];
-
-		// get fehler kurzbz from fehlercodes, if fehlercodes provided
-		if (!isEmptyArray($this->_fehlercodes))
-		{
-			$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz');
-			$this->FehlerModel->db->where_in('tbl_fehler.fehlercode', $this->_fehlercodes);
-			$fehlerKurzbzRes = $this->FehlerModel->load();
-
-			if (isError($fehlerKurzbzRes)) $this->terminateWithError(getError($fehlerKurzbzRes), self::ERROR_TYPE_GENERAL);
-			if (hasData($fehlerKurzbzRes))
-			{
-				$producerArgs['fehlerKurzbz'] = array_column(getData($fehlerKurzbzRes), 'fehler_kurzbz');
-				$resolverArgs['fehlercode'] = array_column(getData($fehlerKurzbzRes), 'fehlercode');
-			}
-		}
-		elseif (!isEmptyArray($this->_apps)) // if apps are provided
-		{
-			// get fehlercodes for the apps
-			$fehlerRes = $this->FehlerModel->getByApps($this->_apps);
-			if (hasData($fehlerRes)) $this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
-
-			$producerArgs['apps'] = $this->_apps;
-			$resolverArgs['apps'] = $this->_apps;
-		}
-
-		// load producer and checker libraries with fehler kurbz and fehlercode list
-		$this->load->library(
-			'issues/PlausicheckProducerLib',
-			$producerArgs,
-			'PlausicheckProducerLib'
-		);
-
-		$this->load->library(
-			'issues/PlausicheckResolverLib',
-			$resolverArgs,
-			'PlausicheckResolverLib'
-		);
-
-		$this->load->library('PhrasesLib');
-
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
-	}
-
-	public function checkPerson()
-	{
-		$person_id = $this->input->post('person_id', true);
-		$hauptzustaendig = filter_var($this->input->post('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-
-		$this->person_id = intval($person_id);
-		$this->hauptzustaendig = $hauptzustaendig;
-
-		$persRes = $this->PersonModel->load($this->person_id);
-		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
-
-		$this->_produceIssues();
-		$this->_resolveIssues();
-		$this->_produceIssues();
-
-		$openIssueCountRes = $this->_countOpenIssues();
-		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
-
-		$data = array(
-			'person_id' => $this->person_id,
-			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
-		);
-
-		$this->addMeta('errors', $this->errors);
-		$this->addMeta('infos', $this->infos);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function countPersonOpenIssues()
-	{
-		$person_id = $this->input->get('person_id', true);
-		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-
-		$this->person_id = intval($person_id);
-		$this->hauptzustaendig = $hauptzustaendig;
-
-		$persRes = $this->PersonModel->load($this->person_id);
-
-		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
-
-		$openIssueCountRes = $this->_countOpenIssues();
-		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
-
-		$data = array(
-			'person_id' => $this->person_id,
-			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
-		);
-
-		$this->addMeta('errors', $this->errors);
-		$this->addMeta('infos', $this->infos);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	protected function _countOpenIssues()
-	{
-		if (isEmptyArray($this->_fehlercodes)) return success([]);
-
-		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			$this->_fehlercodes,
-			$this->person_id,
-			$oe_kurzbz = null,
-			$fehlercode_extern = null,
-			$this->hauptzustaendig
-		);
-
-		// log error if occured
-		if (isError($openIssuesRes)) return $openIssuesRes;
-
-		$issues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
-		$issuescount = is_array($issues) || $issues instanceof Countable ? count($issues) : 0;
-
-		return success($issuescount);
-	}
-
-	protected function _produceIssues()
-	{
-		$result = $this->PlausicheckProducerLib->producePlausicheckIssues(
-			array('person_id' => $this->person_id)
-		);
-
-		// log if error, or log info if inserted new issue
-		if (isset($result->errors))
-			$this->errors = array_merge($this->errors, $result->errors);
-		if (isset($result->infos))
-			$this->infos = array_merge($this->infos, $result->infos);
-	}
-
-	protected function _resolveIssues()
-	{
-		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			$this->_fehlercodes,
-			$this->person_id
-		);
-
-		if (hasData($openIssuesRes))
-		{
-			$openIssues = getData($openIssuesRes);
-
-			$result = $this->PlausicheckResolverLib->resolvePlausicheckIssues($openIssues);
-
-			// log if error, or log info if inserted new issue
-			if (isset($result->errors))
-				$this->errors = array_merge($this->errors, $result->errors);
-			if (isset($result->infos))
-				$this->infos = array_merge($this->infos, $result->infos);
-		}
-	}
-}

application/controllers/api/frontend/v1/issues/Issues.php

@@ -1,104 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-
-class Issues extends FHCAPI_Controller
-{
-	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
-
-	public function __construct() {
-
-		parent::__construct(
-			array(
-				'getOpenIssuesByProperties' => Self::DEFAULT_PERMISSION,
-				'getPersonenMitOffenenIssues' => Self::DEFAULT_PERMISSION
-			)
-		);
-
-		// Loads authentication library and starts authenticationfetc
-		$this->load->library('AuthLib');
-
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-		$this->load->model('person/Person_model','PersonModel');
-		$this->load->model('system/Fehler_model','FehlerModel');
-		$this->load->model('system/Issue_model', 'IssueModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	public function getOpenIssuesByProperties()
-	{
-		$person_id = $this->input->get('person_id', true);
-		$oe_kurzbz = $this->input->get('oe_kurzbz', true);
-		$fehlertyp_kurzbz = $this->input->get('fehlertyp_kurzbz', true);
-		$apps = $this->input->get('apps', true);
-		$behebung_parameter = $this->input->get('behebung_parameter', true);
-		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (isset($person_id) && !is_numeric($person_id))
-			$this->terminateWithError('person id is not numeric!');
-
-		if (isset($behebung_parameter) && !is_array($behebung_parameter))
-			$this->terminateWithError('Behebung parameter invalid');
-
-		$issueRes = $this->IssueModel->getOpenIssuesByProperties(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz,
-			$apps,
-			$behebung_parameter,
-			$hauptzustaendig
-		);
-
-		if (isError($issueRes))
-		{
-			$this->terminateWithError(getError($issueRes));
-		}
-
-		$this->terminateWithSuccess(hasData($issueRes) ? getData($issueRes) : []);
-	}
-
-	public function getPersonenMitOffenenIssues()
-	{
-
-		$sql = <<<EOSQL
-SELECT
-
-		person_id, uid, vorname, nachname, count(*) AS openissues ,
-		(select count(*) anz_aktiv
-		 from hr.tbl_dienstverhaeltnis dv
-		 where dv.mitarbeiter_uid=uid and dv.von<=now() and
-		       (dv.bis is null OR dv.bis>=now())
-		) aktiv
-FROM
-		system.tbl_issue
-JOIN
-		system.tbl_fehler USING (fehlercode)
-JOIN
-		public.tbl_person USING (person_id)
-JOIN
-		public.tbl_benutzer USING (person_id)
-JOIN
-		public.tbl_mitarbeiter ON uid = mitarbeiter_uid
-WHERE
-		app = 'personalverwaltung' AND verarbeitetamum IS NULL
-GROUP BY
-		person_id, uid, vorname, nachname
-HAVING
-		count(*) > 0
-ORDER BY
-		count(*) DESC;
-
-EOSQL;
-
-		$personenmitissues = $this->IssueModel->execReadOnlyQuery($sql);
-		if( hasData($personenmitissues) )
-		{
-			$this->terminateWithSuccess(getData($personenmitissues));
-		}
-		else
-		{
-			$this->terminateWithSuccess(array());
-		}
-	}
-}

application/controllers/api/frontend/v1/issues/StudentIssueChecker.php

@@ -1,17 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-require_once APPPATH.'/controllers/api/frontend/v1/issues/IssueChecker.php';
-
-class StudentIssueChecker extends IssueChecker
-{
-	protected $_apps = array(
-		'core',
-		'dvuh',
-		'bis'
-	);
-
-	//protected $_fehlercodes = array(
-		//~ 'CORE_AA_0001'
-	//);
-}

application/controllers/api/frontend/v1/stv/LvTermine.php

@@ -370,6 +370,7 @@ class LvTermine extends FHCAPI_Controller
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
+						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result));

application/controllers/api/frontend/v1/stv/Projektarbeit.php

@@ -42,6 +42,8 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->load->model('education/Note_model', 'NoteModel');
 		$this->load->model('education/Projektbetreuer_model', 'BetreuerModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 
 		// load libraries
 		$this->load->library('PermissionLib');
@@ -100,16 +102,16 @@ class Projektarbeit extends FHCAPI_Controller
 	private function fetchProjektarbeitById($projektarbeit_id) {
 		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
-			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
-			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
+			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id,
+			tbl_projektarbeit.studiensemester_kurzbz, firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
 		);
-		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
+		
+		
 		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);
-
 	}
 
 	/**
@@ -246,14 +248,38 @@ class Projektarbeit extends FHCAPI_Controller
 		$additional_lehrveranstaltung_id = $this->input->get('additional_lehrveranstaltung_id');
 
 		if (!isset($student_uid)) $this->terminateWithError($this->p->t('ui', 'error_missingId', ['id'=> 'Student UID']), self::ERROR_TYPE_GENERAL);
-		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemester missing', self::ERROR_TYPE_GENERAL);
 
-		// get Lvs
+		// get prestudent_id from student model
+		$studentRes = $this->StudentModel->load(['student_uid' => $student_uid]);
+		if(hasData($studentRes)) {
+			$student = getData($studentRes);
+		} else {
+			$this->terminateWithError($studentRes, self::ERROR_TYPE_GENERAL);
+		}
+		
+		// to get prestudent_status history
+		$historyRes = $this->PrestudentstatusModel->getHistoryPrestudent($student[0]->prestudent_id);
+		if(hasData($historyRes)) {
+			$history = getData($historyRes);
+		} else {
+			$this->terminateWithError($historyRes, self::ERROR_TYPE_GENERAL);
+		}
+		
+		// query for every lva of a studiengang that has projektarbeit flag true
 		$lvsResult = $this->LehrveranstaltungModel->getLvsForProjektarbeit($student_uid, $studiengang_kz, $additional_lehrveranstaltung_id);
-
 		if (isError($lvsResult)) return $this->terminateWithError($lvsResult, self::ERROR_TYPE_GENERAL);
-
 		$lvs = hasData($lvsResult) ? getData($lvsResult) : [];
+		
+		$lvsIDs = array_column($lvs, 'lehrveranstaltung_id');
+		
+		// get current studienplan_id from status history to find out which lva options are actually assigned to the students studienplan 
+		// important so the projektarbeit has the correct lva assigned to be able to find and print the thesis title on the degree documents!
+		$currentStatus = $history[0];
+		$lvByStudienPlanRes = $this->LehrveranstaltungModel->getLvsByStudienplanByLvaIDs($currentStatus->studienplan_id, $lvsIDs);
+		if(hasData($lvByStudienPlanRes)) {
+			$lvs = getData($lvByStudienPlanRes);
+		}
 
 		foreach ($lvs as $lv)
 		{
@@ -320,11 +346,18 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);
 
-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
-			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'is_natural', [
 			'is_natural' =>  $this->p->t('ui', 'error_fieldNotNumeric', ['field' => 'Lehreinheit'])
 		]);
 
+		$this->form_validation->set_rules('lehrveranstaltung_id', 'Lehrveranstaltung', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehrveranstaltung'])
+		]);
+
+		$this->form_validation->set_rules('studiensemester_kurzbz', 'Studiensemester', 'required', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Studiensemester'])
+		]);
+
 		$this->form_validation->set_rules('beginn', 'Beginn', 'is_valid_date', [
 			'is_valid_date' => $this->p->t('ui', 'error_notValidDate', ['field' => 'Beginn'])
 		]);
@@ -354,6 +387,8 @@ class Projektarbeit extends FHCAPI_Controller
 			'projekttyp_kurzbz' => $formData['projekttyp_kurzbz'],
 			'firma_id' => $formData['firma_id'] ?? null,
 			'lehreinheit_id' => $formData['lehreinheit_id'],
+			'lehrveranstaltung_id' => $formData['lehrveranstaltung_id'],
+			'studiensemester_kurzbz' => $formData['studiensemester_kurzbz'],
 			'beginn' => isset($formData['beginn']) && !isEmptyString($formData['beginn']) ? $formData['beginn'] : null,
 			'ende' => isset($formData['ende']) && !isEmptyString($formData['ende']) ? $formData['ende'] : null,
 			'note' => $formData['note'] ?? null,

application/controllers/api/frontend/v1/stv/Students.php

@@ -108,6 +108,7 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -153,7 +154,8 @@ class Students extends FHCAPI_Controller
 		$this->addMeta('ci_params', [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
-		
+
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);		
 
 		$this->studentlistlib->addJoin(
 			"(
@@ -213,6 +215,7 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
+		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
 
 		$this->studentlistlib->addJoin(
 			"(

application/controllers/jobs/IssueResolver.php

@@ -5,46 +5,58 @@
  */
 class IssueResolver extends IssueResolver_Controller
 {
-	protected $_fehlercodes = array(
-		'CORE_ZGV_0001',
-		'CORE_ZGV_0002',
-		'CORE_ZGV_0003',
-		'CORE_ZGV_0004',
-		'CORE_ZGV_0005',
-		'CORE_INOUT_0001',
-		'CORE_INOUT_0002',
-		'CORE_INOUT_0003',
-		'CORE_INOUT_0004',
-		'CORE_INOUT_0005',
-		'CORE_INOUT_0006',
-		'CORE_INOUT_0007',
-		'CORE_INOUT_0008',
-		'CORE_INOUT_0009',
-		'CORE_STG_0001',
-		'CORE_STG_0002',
-		'CORE_STG_0003',
-		'CORE_STG_0004',
-		'CORE_STUDENTSTATUS_0001',
-		'CORE_STUDENTSTATUS_0002',
-		'CORE_STUDENTSTATUS_0003',
-		'CORE_STUDENTSTATUS_0004',
-		'CORE_STUDENTSTATUS_0005',
-		'CORE_STUDENTSTATUS_0006',
-		'CORE_STUDENTSTATUS_0007',
-		'CORE_STUDENTSTATUS_0008',
-		'CORE_STUDENTSTATUS_0009',
-		'CORE_STUDENTSTATUS_0010',
-		'CORE_STUDENTSTATUS_0011',
-		'CORE_STUDENTSTATUS_0012',
-		'CORE_STUDENTSTATUS_0013',
-		'CORE_STUDENTSTATUS_0014',
-		'CORE_STUDENTSTATUS_0015',
-		'CORE_STUDENTSTATUS_0016',
-		'CORE_PERSON_0001',
-		'CORE_PERSON_0002',
-		'CORE_PERSON_0003',
-		'CORE_PERSON_0004',
-		'CORE_PERSON_0005',
-		'CORE_PERSON_0006'
-	);
+	public function __construct()
+	{
+		parent::__construct();
+
+		// set fehler codes which can be resolved by the job, with own resolver defined
+		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
+		$this->_codeLibMappings = array(
+			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
+			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
+			'CORE_ZGV_0003' => 'CORE_ZGV_0003',
+			'CORE_ZGV_0004' => 'CORE_ZGV_0004',
+			'CORE_ZGV_0005' => 'CORE_ZGV_0005',
+			'CORE_INOUT_0001' => 'CORE_INOUT_0001',
+			'CORE_INOUT_0002' => 'CORE_INOUT_0002',
+			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
+			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
+			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
+			'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',
+			'CORE_STG_0004' => 'CORE_STG_0004',
+			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
+			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
+			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
+			'CORE_STUDENTSTATUS_0005' => 'CORE_STUDENTSTATUS_0005',
+			'CORE_STUDENTSTATUS_0006' => 'CORE_STUDENTSTATUS_0006',
+			'CORE_STUDENTSTATUS_0007' => 'CORE_STUDENTSTATUS_0007',
+			'CORE_STUDENTSTATUS_0008' => 'CORE_STUDENTSTATUS_0008',
+			'CORE_STUDENTSTATUS_0009' => 'CORE_STUDENTSTATUS_0009',
+			'CORE_STUDENTSTATUS_0010' => 'CORE_STUDENTSTATUS_0010',
+			'CORE_STUDENTSTATUS_0011' => 'CORE_STUDENTSTATUS_0011',
+			'CORE_STUDENTSTATUS_0012' => 'CORE_STUDENTSTATUS_0012',
+			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
+			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
+			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
+			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
+			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
+			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
+			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
+			'CORE_PERSON_0004' => 'CORE_PERSON_0004',
+			'CORE_PERSON_0005' => 'CORE_PERSON_0005',
+			'CORE_PERSON_0006' => 'CORE_PERSON_0006'
+		);
+
+		// fehler which are resolved by the job the same way as they are produced
+		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
+		$this->_codeProducerLibMappings = array(
+			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
+		);
+	}
 }

application/controllers/jobs/PlausiIssueProducer.php

@@ -6,7 +6,7 @@
 class PlausiIssueProducer extends PlausiIssueProducer_Controller
 {
 	private $_currentStudiensemester;
-	protected $_apps = 'core';
+	protected $_app = 'core';
 
 	public function __construct()
 	{
@@ -18,12 +18,12 @@ class PlausiIssueProducer extends PlausiIssueProducer_Controller
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 
 		// get current Studiensemester
-		$studiensemesterRes = $this->StudiensemesterModel->getAktOrNextSemester(62);
+		$studiensemesterRes = $this->StudiensemesterModel->getAkt();
 		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;
 
 		// set fehler which can be produced by the job
 		// structure: fehler_kurzbz => class (library) name for resolving
-		$this->_fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$this->_fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
 	}
 
 	/**

application/controllers/jobs/ReihungstestJob.php

@@ -803,7 +803,7 @@ class ReihungstestJob extends JOB_Controller
 	{
 		if (!isset($studiensemester) || isEmptyString($studiensemester))
 		{
-			$this->logError("Studiensemster not passed as parameter");
+			$this->logError("Studiensemester not passed as parameter");
 			return;
 		}
 

application/controllers/system/fehler/CLI_Manager.php

@@ -1,57 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class CLI_Manager extends CLI_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-
-		// Load libraries
-		$this->load->library('FehlerUpdateLib');
-	}
-
-		/**
-	 *
-	 */
-	public function installAll()
-	{
-		$this->fehlerupdatelib->installAll();
-	}
-
-	/**
-	 *
-	 */
-	public function installFromCore()
-	{
-		$this->fehlerupdatelib->installFromCore();
-	}
-
-	/**
-	 *
-	 */
-	public function installFrom($extensionName)
-	{
-		$this->fehlerupdatelib->installFrom(urldecode($extensionName));
-	}
-}

application/controllers/system/fehler/Manager.php

@@ -1,46 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class Manager extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'installAll' => 'admin:rw',
-				'installFromCore' => 'admin:rw'
-			)
-		);
-
-		// Load libraries
-		$this->load->library('FehlerUpdateLib');
-	}
-
-	/**
-	 *
-	 */
-	public function installAll()
-	{
-		$this->fehlerupdatelib->installAll();
-	}
-
-	/**
-	 *
-	 */
-	public function installFromCore()
-	{
-		$this->fehlerupdatelib->installFromCore();
-	}
-
-	/**
-	 *
-	 */
-	public function installFrom($fehlerConfigDirectory)
-	{
-		$this->fehlerupdatelib->installFrom($fehlerConfigDirectory);
-	}
-}

application/controllers/system/infocenter/InfoCenter.php

@@ -34,6 +34,9 @@ class InfoCenter extends Auth_Controller
 	const PREV_FILTER_ID = 'prev_filter_id';
 	const KEEP_TABLESORTER_FILTER = 'keepTsFilter';
 
+	const ONBOARDING_INSERTVON = 'onboarding';
+	const ONBOARDING_KENNZEICHENTYP = 'eobRegistrierungsId';
+
 	private $_uid; // contains the UID of the logged user
 
 	// Used to log with PersonLogLib
@@ -175,6 +178,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
 		$this->load->model('person/adresse_model', 'AdresseModel');
+		$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
@@ -1452,6 +1456,100 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Done!");
 	}
+
+	public function getAbsageData()
+	{
+		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
+
+		if (!is_null($stg_typ))
+		{
+			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
+
+			$data = array (
+				'statusgruende' => $statusgruende,
+				'studiengaenge' => $studiengaenge->retval
+			);
+
+			$this->outputJsonSuccess($data);
+		}
+		else
+			$this->outputJsonSuccess(null);
+	}
+
+	public function getStudienArtBerechtigung($typ = null)
+	{
+		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
+		return getData($stg_typ);
+	}
+
+	public function getStudienartData()
+	{
+		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
+	}
+
+	public function saveAbsageForAll()
+	{
+		$statusgrund = $this->input->post('statusgrund');
+		$studiengang = $this->input->post('studiengang');
+		$abgeschickt = $this->input->post('abgeschickt');
+		$personen = $this->input->post('personen');
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+
+		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
+
+		if ($studiengang === 'all' && $abgeschickt === 'all')
+		{
+			foreach($personen as $person)
+			{
+				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
+
+				if (!hasData($prestudenten))
+					continue;
+
+				$prestudentenData = getData($prestudenten);
+
+				foreach ($prestudentenData as $prestudent)
+				{
+					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
+				}
+			}
+		}
+		else
+		{
+			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+			$this->StudienplanModel->addSelect('1');
+			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
+			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
+			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
+			$this->StudienplanModel->addLimit(1);
+			$studiengangResult = $this->StudienplanModel->load();
+
+			if (hasData($studiengangResult))
+			{
+				foreach($personen as $person)
+				{
+					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
+
+					if (!hasData($prestudent))
+						continue;
+
+					$prestudentData = getData($prestudent);
+					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
+				}
+			}
+			else
+				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
+
+		}
+
+		$this->outputJsonSuccess("Success");
+	}
+
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -1946,6 +2044,17 @@ class InfoCenter extends Auth_Controller
 			show_error(getError($user_person));
 		}
 
+		// add info about first electronig onboarding login
+		$this->KennzeichenModel->addSelect('insertamum');
+		$onboarding_first_login = $this->KennzeichenModel->loadWhere(
+			array('person_id' => $person_id, 'kennzeichentyp_kurzbz' => self::ONBOARDING_KENNZEICHENTYP)
+		);
+
+		if (isError($onboarding_first_login))
+		{
+			show_error(getError($onboarding_first_login));
+		}
+
 		$data = array (
 			'lockedby' => $lockedby,
 			'lockedbyother' => $lockedbyother,
@@ -1955,7 +2064,9 @@ class InfoCenter extends Auth_Controller
 			'messages' => $messages->retval,
 			'logs' => $logs,
 			'notizen' => $notizen->retval,
-			'notizenbewerbung' => $notizen_bewerbung->retval
+			'notizenbewerbung' => $notizen_bewerbung->retval,
+			'created_by_onboarding' => $stammdaten->retval->insertvon == self::ONBOARDING_INSERTVON,
+			'onboarding_first_login' => hasData($onboarding_first_login) ? getData($onboarding_first_login)[0]->insertamum : null
 		);
 
 		return $data;
@@ -2375,97 +2486,4 @@ class InfoCenter extends Auth_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
-
-	public function getAbsageData()
-	{
-		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
-
-		if (!is_null($stg_typ))
-		{
-			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
-			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
-
-			$data = array (
-				'statusgruende' => $statusgruende,
-				'studiengaenge' => $studiengaenge->retval
-			);
-
-			$this->outputJsonSuccess($data);
-		}
-		else
-			$this->outputJsonSuccess(null);
-	}
-
-	public function getStudienArtBerechtigung($typ = null)
-	{
-		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
-		return getData($stg_typ);
-	}
-
-	public function getStudienartData()
-	{
-		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
-	}
-
-	public function saveAbsageForAll()
-	{
-		$statusgrund = $this->input->post('statusgrund');
-		$studiengang = $this->input->post('studiengang');
-		$abgeschickt = $this->input->post('abgeschickt');
-		$personen = $this->input->post('personen');
-		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-
-		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
-			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
-
-		if ($studiengang === 'all' && $abgeschickt === 'all')
-		{
-			foreach($personen as $person)
-			{
-				$prestudenten = $this->PrestudentModel->getByPersonWithoutLehrgang($person, $studienSemester);
-
-				if (!hasData($prestudenten))
-					continue;
-
-				$prestudentenData = getData($prestudenten);
-
-				foreach ($prestudentenData as $prestudent)
-				{
-					$this->saveAbsage($prestudent->prestudent_id, $statusgrund);
-				}
-			}
-		}
-		else
-		{
-			$this->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-			$this->StudienplanModel->addSelect('1');
-			$this->StudienplanModel->addJoin('lehre.tbl_studienordnung so', 'studienordnung_id');
-			$escaped = $this->StudienplanModel->db->escape(strtoupper($studiengang));
-			$this->StudienplanModel->db->where("UPPER(so.studiengangkurzbzlang || ':' || tbl_studienplan.orgform_kurzbz) = $escaped");
-			$this->StudienplanModel->addLimit(1);
-			$studiengangResult = $this->StudienplanModel->load();
-
-			if (hasData($studiengangResult))
-			{
-				foreach($personen as $person)
-				{
-					$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt, $abgeschickt === 'all');
-
-					if (!hasData($prestudent))
-						continue;
-
-					$prestudentData = getData($prestudent);
-					$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
-				}
-			}
-			else
-				$this->terminateWithJsonError("Falschen Studiengang übergeben!");
-
-		}
-
-		$this->outputJsonSuccess("Success");
-	}
 }

application/controllers/system/infocenter/Rueckstellung.php

@@ -7,6 +7,8 @@ class Rueckstellung extends Auth_Controller
 	private $_ci; // Code igniter instance
 	private $_uid;
 
+	const ZGV_UEBERPRUEFUNG_MAIL_VORLAGE = 'ZGVUEP';
+
 	public function __construct()
 	{
 		parent::__construct(
@@ -23,6 +25,7 @@ class Rueckstellung extends Auth_Controller
 		$this->load->model('crm/RueckstellungStatus_model', 'RueckstellungStatusModel');
 		$this->load->model('person/Person_model', 'PersonModel');
 		$this->load->library('PersonLogLib');
+		$this->load->library('MessageLib');
 
 		$this->_setAuthUID(); // sets property uid
 		
@@ -78,6 +81,8 @@ class Rueckstellung extends Auth_Controller
 		
 		$this->_log($person_id, $status_kurzbz);
 
+		if  ($status_kurzbz === 'onhold_zgv')
+			$this->sendRueckstellungMessage($person_id);
 		$this->outputJson($result);
 	}
 
@@ -104,6 +109,10 @@ class Rueckstellung extends Auth_Controller
 			if (isError($result))
 				$this->terminateWithJsonError(getError($result));
 			$this->_log($person, $status_kurzbz);
+
+			if  ($status_kurzbz === 'onhold_zgv')
+				$this->sendRueckstellungMessage($person);
+
 		}
 		$this->outputJsonSuccess("Erfolgreich gespeichert!");
 	}
@@ -160,4 +169,26 @@ class Rueckstellung extends Auth_Controller
 			$this->_uid
 		);
 	}
+
+	private function sendRueckstellungMessage($person_id)
+	{
+		$person = $this->_ci->PersonModel->load($person_id);
+
+		if (hasData($person))
+		{
+			$person = getData($person)[0];
+
+			return $this->messagelib->sendMessageUserTemplate(
+				$person_id,
+				self::ZGV_UEBERPRUEFUNG_MAIL_VORLAGE,
+				array(
+					'anrede' => $person->anrede,
+					'nachname' => $person->nachname
+				),
+				null,
+				getAuthPersonId(),
+				'infocenter'
+			);
+		}
+	}
 }

application/controllers/system/issues/IssuesKonfiguration.php

@@ -88,11 +88,9 @@ class IssuesKonfiguration extends Auth_Controller
 
 		// get all Fehler, optionally filtered by app
 		$params = array('fehlercode_extern' => null);
-		$this->FehlerModel->addDistinct();
 		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertyp_kurzbz, fehlertext');
-		$this->FehlerModel->addJoin('system.tbl_fehler_app', 'fehlercode');
 		$this->FehlerModel->addOrder('fehlercode');
-		if (!isEmptyString($app)) $params['tbl_fehler_app.app'] = $app;
+		if (!isEmptyString($app)) $params['app'] = $app;
 		$fehlerRes = $this->FehlerModel->loadWhere($params);
 
 		if (isError($fehlerRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerLaden'));

application/controllers/system/issues/IssuesZustaendigkeiten.php

@@ -69,7 +69,10 @@ class IssuesZustaendigkeiten extends Auth_Controller
 	{
 		$app = $this->input->get('app');
 
-		$fehlerRes = $this->FehlerModel->getByApps($app);
+		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertext, fehlertyp_kurzbz, app');
+		$this->FehlerModel->addOrder('fehlercode');
+
+		$fehlerRes = isset($app) ? $this->FehlerModel->loadWhere(array('app' => $app)) : $this->FehlerModel->load();
 
 		$this->outputJson($fehlerRes);
 	}

application/controllers/system/issues/Plausichecks.php

@@ -5,7 +5,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 class Plausichecks extends Auth_Controller
 {
 	const GENERIC_ISSUE_OCCURED_TEXT = 'Issue aufgetreten';
-	const APPS = ['core', 'dvuh', 'bis'];
 
 	public function __construct()
 	{
@@ -17,7 +16,8 @@ class Plausichecks extends Auth_Controller
 		);
 
 		// Load libraries
-		$this->load->library('issues/PlausicheckProducerLib', array('apps' => self::APPS));
+		$this->load->library('issues/PlausicheckProducerLib', array('app' => 'core'));
+		$this->load->library('issues/PlausicheckDefinitionLib');
 		$this->load->library('WidgetLib');
 
 		// Load models
@@ -46,31 +46,37 @@ class Plausichecks extends Auth_Controller
 
 		// issues array for passing issue texts
 		$allIssues = array();
-
-		$fehler_kurzbz_arr = isEmptyString($fehler_kurzbz) ? array_keys($this->plausicheckproducerlib->getFehlerMappings()) : [$fehler_kurzbz];
-
-		$this->FehlerModel->addOrder('fehler_kurzbz, fehlercode');
-		$this->FehlerModel->db->where_in('fehler_kurzbz', $fehler_kurzbz_arr);
-		$fehlerRes = $this->FehlerModel->load();
-
-		if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
-		if (!hasData($fehlerRes)) return $this->outputJsonSuccess([]);
-
-		// all fehler which are going to be checked
-		$fehlerArr = getData($fehlerRes);
-
+		// all fehler kurzbz which are going to be checked
+		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
 		// set Studiengang to null if not passed
 		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;
 
 		// get the data returned by Plausicheck
-		foreach ($fehlerArr as $fehler)
+		foreach ($fehlerKurzbz as $fehler_kurzbz)
 		{
+			// get Text and fehlercode of the Fehler
+			$this->FehlerModel->addSelect('fehlercode, fehlertext, fehlertyp_kurzbz');
+			$fehlerRes = $this->FehlerModel->loadWhere(array('fehler_kurzbz' => $fehler_kurzbz));
+
+			if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
+
+			// do not check error if no data
+			if (!hasData($fehlerRes)) continue;
+
+			// get the error data
+			$fehler = getData($fehlerRes)[0];
+
 			// initialize issue array
-			$allIssues[$fehler->fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
+			$allIssues[$fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
+
+			// get library name for producing issue
+			$libName = $fehlerLibMappings[$fehler_kurzbz];
 
 			// execute the check
 			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$fehler->fehler_kurzbz,
+				$libName,
+				$fehler_kurzbz,
 				array(
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'studiengang_kz' => $studiengang_kz
@@ -101,7 +107,7 @@ class Plausichecks extends Auth_Controller
 						{
 							// replace placeholder with params, if present
 							if (count($fehlertext_params) != substr_count($fehlerText, '%s'))
-								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler->fehler_kurzbz);
+								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler_kurzbz);
 
 							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
 						}
@@ -112,7 +118,7 @@ class Plausichecks extends Auth_Controller
 						$issueObj = new StdClass();
 						$issueObj->fehlertext = $fehlerText;
 						$issueObj->type = $fehlerTyp;
-						$allIssues[$fehler->fehler_kurzbz]['data'][] = $issueObj;
+						$allIssues[$fehler_kurzbz]['data'][] = $issueObj;
 					}
 					else // if no issue text found, use generic text
 					{
@@ -143,12 +149,6 @@ class Plausichecks extends Auth_Controller
 
 		if (isError($currSemRes)) show_error(getError($currSemRes));
 
-		if (!hasData($currSemRes))
-		{
-			$currSemRes = $this->StudiensemesterModel->getNext();
-			if (isError($currSemRes)) show_error(getError($currSemRes));
-		}
-
 		$this->StudiengangModel->addSelect('studiengang_kz, tbl_studiengang.bezeichnung, tbl_studiengang.typ,
 			tbl_studiengangstyp.bezeichnung AS typbezeichnung, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel');
 		$this->StudiengangModel->addJoin('public.tbl_studiengangstyp', 'typ');
@@ -157,7 +157,7 @@ class Plausichecks extends Auth_Controller
 
 		if (isError($studiengaengeRes)) show_error(getError($studiengaengeRes));
 
-		$fehlerKurzbz = array_keys($this->plausicheckproducerlib->getFehlerMappings());
+		$fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
 
 		$db = new DB_Model();
 
@@ -168,9 +168,7 @@ class Plausichecks extends Auth_Controller
 			FROM
 				system.tbl_fehler
 			WHERE
-				fehler_kurzbz IN ?
-			ORDER BY
-				fehler_kurzbz, fehlercode',
+				fehler_kurzbz IN ?',
 			array($fehlerKurzbz)
 		);
 
@@ -190,8 +188,7 @@ class Plausichecks extends Auth_Controller
 			'semester' => hasData($studiensemesterRes) ? getData($studiensemesterRes) : array(),
 			'currsemester' => hasData($currSemRes) ? getData($currSemRes) : array(),
 			'studiengaenge' => hasData($studiengaengeRes) ? getData($studiengaengeRes) : array(),
-			'fehlerKurzbzCodeMappings' => $fehlerKurzbzCodeMappings,
-			'studiengang_kz' => $this->input->get('studiengang_kz') ?? ''
+			'fehlerKurzbzCodeMappings' => $fehlerKurzbzCodeMappings
 		);
 	}
 }

application/core/IssueResolver_Controller.php

@@ -5,8 +5,11 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	// codes of fehler to be resolved
-	protected $_fehlercodes = [];
+	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
+	protected $_codeLibMappings = [];
+
+	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
+	protected $_codeProducerLibMappings = [];
 
 	public function __construct()
 	{
@@ -21,18 +24,25 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
-		// initialize librariy with provided fehlercodes
 		$this->load->library(
 			'issues/PlausicheckResolverLib',
 			[
-				'fehlercodes' => $this->_fehlercodes
+				'extensionName' => $this->_extensionName ?? null,
+				'codeLibMappings' => $this->_codeLibMappings,
+				'codeProducerLibMappings' => $this->_codeProducerLibMappings
 			]
 		);
 
 		$this->logInfo("Issue resolve job started");
 
-		// resolve the issues
-		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues();
+		// load open issues with given errorcodes
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
+		);
+
+		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
+
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);
 
 		// log if error, or log info if inserted new issue
 		foreach ($result->errors as $error) $this->logError($error);

application/core/PlausiIssueProducer_Controller.php

@@ -5,23 +5,14 @@
  */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerKurzbz = [];
-	protected $_apps = [];
-
-	/**
-	 * Runs issue production job.
-	 */
-	public function run()
-	{
-		// producing issues
-		$this->producePlausicheckIssues(array());
-	}
+	protected $_fehlerLibMappings = [];
+	protected $_app;
 
 	protected function producePlausicheckIssues($params)
 	{
 		$this->load->library(
 			'issues/PlausicheckProducerLib',
-			['apps' => $this->_apps, 'fehlerKurzbz' => $this->_fehlerKurzbz]
+			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
 		);
 
 		$this->logInfo("Plausicheck issue producer job started");

application/libraries/AnrechnungLib.php

@@ -741,7 +741,7 @@ class AnrechnungLib
 		$fullname = hasData($result) ? $result->retval[0]->vorname. $result->retval[0]->nachname : '';
 		
 		// Return filename
-		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname;
+		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname . '.pdf';
 	}
 	
 	public function LVhasLector($anrechnung_id)

application/libraries/AuthLib.php

@@ -64,7 +64,7 @@ class AuthLib
 		{
 			// - The uid must be NOT an empty string
 			// - The current user should NOT be already logged as the given uid
-			if (!isEmptyString($uid) && $this->getAuthObj()->username != $uid)
+			if (!isEmptyString($uid) && $this->getAuthObj()->{self::AO_USERNAME} != $uid)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -75,8 +75,28 @@ class AuthLib
 					$loginAS = $this->_createAuthObjByPerson(array('uid' => $uid));
 					if (isSuccess($loginAS))
 					{
+						$authObj = getData($loginAS); // get the authenticate object
+
 						// Store the new authentication object in authentication session
-						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, getData($loginAS));
+						setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
+
+						$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
+
+						// Load the LogLib
+						$this->_ci->load->library('LogLib');
+						// Setup the LogLib
+						$this->_ci->loglib->setConfigs(
+							array(
+								'dbLogType' => 'API', // required
+								'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
+								'requestId' => 'API'
+							)
+						);
+						// Log into the database
+						$this->_ci->loglib->logInfoDB(
+							'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
+							'" and person id '.$authObj->{self::AO_PERSON_ID}
+						);
 					}
 				}
 				else
@@ -105,7 +125,7 @@ class AuthLib
 		{
 			// - The person id must be a number
 			// - The current user should NOT be already logged as the given person id
-			if (is_numeric($person_id) && $this->getAuthObj()->person_id != $person_id)
+			if (is_numeric($person_id) && $this->getAuthObj()->{self::AO_PERSON_ID} != $person_id)
 			{
 				$this->_ci->load->library('PermissionLib'); // Loads permissions library
 
@@ -124,6 +144,24 @@ class AuthLib
 							{
 								// Store the new authentication object in authentication session
 								setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObj);
+
+								$authObjOrigin = getSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ_ORIGIN);
+
+								// Load the LogLib
+								$this->_ci->load->library('LogLib');
+								// Setup the LogLib
+								$this->_ci->loglib->setConfigs(
+									array(
+										'dbLogType' => 'API', // required
+										'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
+										'requestId' => 'API'
+									)
+								);
+								// Log into the database
+								$this->_ci->loglib->logInfoDB(
+									'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has changed identity with the user "'.$authObj->{self::AO_USERNAME}.
+									'" and person id '.$authObj->{self::AO_PERSON_ID}
+								);
 							}
 							else // if does NOT have permissions
 							{
@@ -172,6 +210,22 @@ class AuthLib
 			// The LoginAs account is logged out
 			// The user is again connected with its real account
 			setSessionElement(self::SESSION_NAME, self::SESSION_AUTH_OBJ, $authObjOrigin);
+
+			// Load the LogLib
+			$this->_ci->load->library('LogLib');
+			// Setup the LogLib
+			$this->_ci->loglib->setConfigs(
+				array(
+					'dbLogType' => 'API', // required
+					'dbExecuteUser' => $authObjOrigin->{self::AO_USERNAME}, // current logged user
+					'requestId' => 'API'
+				)
+			);
+			// Log into the database
+			$this->_ci->loglib->logInfoDB(
+				'The user "'.$authObjOrigin->{self::AO_USERNAME}.'" has logout from the user "'.$authObj->{self::AO_USERNAME}.
+				'" and person id '.$authObj->{self::AO_PERSON_ID}
+			);
 		}
 	}
 
@@ -608,3 +662,4 @@ class AuthLib
 		return $finalUserBasicDataByUID;
 	}
 }
+

application/libraries/FehlerUpdateLib.php

@@ -1,384 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class FehlerUpdateLib
-{
-	// Who adds phrases into the database
-	const UPSERT_BY = 'FehlerUpdate';
-
-	const CONFIG_DIRECTORY = 'config';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const CONFIG_FEHLER_INDEX = 'fehler';
-
-	const TYPE_STRING = 'string';
-	const TYPE_ARRAY = 'array';
-
-	//~ // Array elements names
-	const FEHLERCODE = 'fehlercode';
-	const FEHLER_KURZBZ = 'fehler_kurzbz';
-	const FEHLERTEXT = 'fehlertext';
-	const FEHLERTYP_KURZBZ = 'fehlertyp_kurzbz';
-	const APP = 'app';
-	const FEHLERCODE_EXTERN = 'fehlercode_extern';
-
-	// structure of a fehler
-	// type default: string
-	const FEHLER_ATTRIBUTES = [
-		self::FEHLERCODE => ['required' => true],
-		self::FEHLER_KURZBZ  => ['required' => false],
-		self::FEHLERTEXT => ['required' => true, 'updateable' => false],
-		self::FEHLERTYP_KURZBZ => ['required' => false, 'updateable' => true],
-		self::APP => ['required' => true, 'types' => [self::TYPE_STRING, self::TYPE_ARRAY]],
-		self::FEHLERCODE_EXTERN => ['required' => false]
-	];
-
-	private $_ci; // Code igniter instance
-	private $_updateHistory = [];
-
-	/**
-	 * Loads parser library
-	 */
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		// Loads EPrintfLib
-		$this->_ci->load->library('EPrintfLib');
-
-		// Loads the Models
-		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
-		$this->_ci->load->model('system/App_model', 'AppModel');
-
-		// Loads extensions lib
-		$this->_ci->load->library('ExtensionsLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * Install all possible fehler, from core and extensions
-	 */
-	public function installAll()
-	{
-		$this->installFromCore();
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$this->installFrom($ext->name);
-			}
-		}
-	}
-
-	/**
-	 * Install fehler from the core
-	 */
-	public function installFromCore()
-	{
-		$this->_installFehler();
-	}
-
-	/**
-	 * Install fehler from the given path
-	 */
-	public function installFrom($extensionName)
-	{
-		if (!isset($extensionName))
-		{
-			$this->_ci->eprintflib->printError('Extension name missing!');
-			return;
-		}
-
-		$this->_installFehler(ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName.'/'.FehlerUpdateLib::CONFIG_FEHLER_NAME);
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Install fehler from the given directory
-	 */
-	private function _installFehler($fehlerConfigDirectory = null)
-	{
-		// check that fehler config file exists
-		$configDir = isset($fehlerConfigDirectory) ? $fehlerConfigDirectory : self::CONFIG_FEHLER_NAME;
-
-		$configFilename = APPPATH.self::CONFIG_DIRECTORY.'/'.$configDir.'.php';
-
-		if (!file_exists($configFilename))
-		{
-			return;
-		}
-
-		// Load Fehler Entries
-		$this->_ci->load->config($configDir);
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
-
-		if (!isset($configArray) || !is_array($configArray)) // check if fehler config entries could be loaded
-		{
-			$this->_ci->eprintflib->printError(
-				'Fehler config array could not be loaded, directory '.$configDir.' index '.self::CONFIG_FEHLER_INDEX
-			);
-			return;
-		}
-
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
-		$this->_ci->eprintflib->printInfo('Fehler installation started, directory '.$configDir);
-
-		foreach ($configArray as $idx => $configEntry)
-		{
-			// create fehler from config entry
-			$createFehlerResult = $this->_createFehlerFromEntry($configEntry);
-
-			// write error if creation failed
-			if (isError($createFehlerResult))
-			{
-				$this->_ci->eprintflib->printError(
-					getError($createFehlerResult).', directory '.$configDir.', index '.$idx
-				);
-			}
-			elseif (hasData($createFehlerResult))
-			{
-				// add fehler to db
-				$addFehlerResult = $this->_updateFehler(getData($createFehlerResult));
-
-				if (isError($addFehlerResult))
-				{
-					$this->_ci->eprintflib->printError(
-						getError($addFehlerResult).', directory'.$configDir.', index '.$idx
-					);
-				}
-			}
-		}
-
-		$this->_ci->eprintflib->printInfo('Fehler installation ended');
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
-	}
-
-	/**
-	 * Add a new fehler to the database
-	 */
-	private function _updateFehler($fehler)
-	{
-		$fehlerReferences = $fehler['references'];
-		$fehler = $fehler['fehler'];
-
-		// Checks if the fehler already exists in the database
-		$this->_ci->FehlerModel->db->where(self::FEHLERCODE.' = ', $fehler[self::FEHLERCODE]);
-		if (isset($fehler[self::FEHLER_KURZBZ]) && !isEmptyString($fehler[self::FEHLER_KURZBZ]))
-			$this->_ci->FehlerModel->db->or_where(self::FEHLER_KURZBZ.' = ', $fehler[self::FEHLER_KURZBZ]);
-		$fehlerResult = $this->_ci->FehlerModel->load();
-
-		// If an error occurred then return the error itself
-		if (isError($fehlerResult)) return $fehlerResult;
-
-		$updateRes = null;
-
-		// if fehler has been found
-		if (hasData($fehlerResult))
-		{
-			$foundFehler = getData($fehlerResult)[0];
-
-			// check if fehlercode - fehler kurzbz combination is correct
-			if ($foundFehler->{self::FEHLERCODE} != $fehler[self::FEHLERCODE]
-				|| $foundFehler->{self::FEHLER_KURZBZ} != ($fehler[self::FEHLER_KURZBZ] ?? null)
-			) {
-				return error("Wrong fehlercode - fehler kurzbz combination: ".$fehler[self::FEHLERCODE].", ".$fehler[self::FEHLER_KURZBZ]);
-			}
-
-			$this->_ci->eprintflib->printMessage(
-				"Fehler ".$fehler[self::FEHLERCODE]
-					.(isset($fehler[self::FEHLER_KURZBZ]) ? " (".$fehler[self::FEHLER_KURZBZ].")" : "")
-					." already exists in database"
-			);
-
-			$updateArr = [];
-
-			// update fehler, if needed
-			foreach (self::FEHLER_ATTRIBUTES as $attributeName => $attributeInfo)
-			{
-				if (!array_key_exists($attributeName, $fehler)) continue;
-
-				// set attributes to be updated
-				if (isset($attributeInfo['updateable']) && $attributeInfo['updateable'] && $foundFehler->{$attributeName} != $fehler[$attributeName])
-				{
-					$updateArr[$attributeName] = $fehler[$attributeName];
-
-					if (isset($this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName])
-						&& $this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName] != $fehler[$attributeName]
-					) {
-						return error("Conflicting update values for attribute ".$attributeName.", fehler ".$foundFehler->{self::FEHLERCODE});
-					}
-					$this->_updateHistory[$foundFehler->{self::FEHLERCODE}][$attributeName] = $fehler[$attributeName];
-				}
-			}
-
-			if (!isEmptyArray($updateArr))
-			{
-				$updateRes = $this->_ci->FehlerModel->update(
-					[self::FEHLERCODE => $foundFehler->{self::FEHLERCODE}],
-					array_merge($updateArr, ['updateamum' => 'NOW()', 'updatevon' => self::UPSERT_BY])
-				);
-				if (isError($updateRes)) return $updateRes;
-
-				$this->_ci->eprintflib->printMessage(
-					"Fehler ".$fehler[self::FEHLERCODE].(isset($fehler[self::FEHLER_KURZBZ]) ? " (".$fehler[self::FEHLER_KURZBZ].")" : "")." updated"
-				);
-			}
-		}
-		else
-		{
-			// no fehler has been found
-
-			// then add the fehler to the database
-			$updateRes = $this->_ci->FehlerModel->insert(
-				array_merge($fehler, ['insertamum' => 'NOW()', 'insertvon' => self::UPSERT_BY])
-			);
-
-			// If an error occurred then return the error itself
-			if (isError($updateRes)) return $updateRes;
-
-			// Prints info about the new added fehler
-			$this->_ci->eprintflib->printMessage(
-				sprintf(
-					'A new fehler has been added into the database: '.
-					'fehlercode => %s | fehler_kurzbz => %s | fehlertyp => %s',
-					$fehler[self::FEHLERCODE],
-					$fehler[self::FEHLER_KURZBZ],
-					$fehler[self::FEHLERTYP_KURZBZ]
-				)
-			);
-		}
-
-		// handle references
-		if (isset($fehlerReferences[self::APP]))
-		{
-			$this->_ci->load->model('system/FehlerApp_model', 'FehlerAppModel');
-			$apps = $fehlerReferences[self::APP];
-
-			// load all assigned apps
-			$this->_ci->FehlerAppModel->addSelect(self::APP);
-			$fehlerAppRes = $this->_ci->FehlerAppModel->loadWhere([self::FEHLERCODE => $fehler[self::FEHLERCODE]]);
-
-			$fehlerApps = hasData($fehlerAppRes) ? array_column(getData($fehlerAppRes), self::APP) : [];
-
-			$appsToInsert = array_diff($apps, $fehlerApps);
-
-			foreach ($appsToInsert as $app)
-			{
-				// check if app exists in db
-				$fehlerAppsInsertRes = $this->_ci->FehlerAppModel->insert(
-					[self::FEHLERCODE => $fehler[self::FEHLERCODE], self::APP => $app, 'insertamum' => 'NOW()', 'insertvon' => self::UPSERT_BY]
-				);
-
-				if (isError($fehlerAppsInsertRes)) return $fehlerAppsInsertRes;
-
-				$this->_ci->eprintflib->printMessage(
-					"Added app ".$app." to fehler ".$fehler[self::FEHLERCODE]
-				);
-			}
-		}
-
-		// If here then no blocking errors occurred
-		return success();
-	}
-
-	/**
-	 * Create an array with fehler data from config entry
-	 */
-	private function _createFehlerFromEntry($configEntry)
-	{
-		$fehler = ['fehler' => [], 'references' => []];
-		foreach (self::FEHLER_ATTRIBUTES as $attributeName => $attributeInfo)
-		{
-			$required = isset($attributeInfo['required']) && $attributeInfo['required'];
-			if (!isset($configEntry[$attributeName]))
-			{
-				if ($required) return error('attribute'.$attributeName.' is missing');
-				continue;
-			}
-
-			$attributeValue = $configEntry[$attributeName];
-			$validType = false;
-			if (isset($attributeInfo['types']) && is_array($attributeInfo['types']))
-			{
-				foreach ($attributeInfo['types'] as $type)
-				{
-					switch ($type)
-					{
-						case self::TYPE_STRING:
-							if (is_string($attributeValue) || is_null($attributeValue)) $validType = true;
-							break;
-						case self::TYPE_ARRAY:
-							if (is_array($attributeValue) && !($required && isEmptyArray($attributeValue))) $validType = true;
-							break;
-						//~ default:
-							//~ if (is_string($configEntry[$attributeName]) || is_null($configEntry[$attributeName])) $validType = true;
-					}
-				}
-			}
-			else
-			{
-				$validType = is_string($attributeValue) || is_null($attributeValue);
-			}
-
-			if (!$validType)
-			{
-				return error('attribute'.$attributeName.' has invalid type');
-			}
-
-			if ($attributeName == self::APP)
-			{
-				if (is_string($attributeValue)) $attributeValue = [$attributeValue];
-
-				foreach ($attributeValue as $app)
-				{
-					// check if app exists in db
-					$this->_ci->AppModel->addSelect('1');
-					$appRes = $this->_ci->AppModel->loadWhere(['app' => $app]);
-
-					if (!hasData($appRes)) return error("App ".$app." does not exist");
-				}
-			}
-
-			if (isset($attributeInfo['types']) && is_array($attributeInfo['types']) && in_array(self::TYPE_ARRAY, $attributeInfo['types']))
-			{
-				$fehler['references'][$attributeName] = $attributeValue;
-			}
-			else
-			{
-				$fehler['fehler'][$attributeName] = $attributeValue;
-			}
-
-		}
-		return success($fehler);
-	}
-}

application/libraries/IssuesLib.php

@@ -20,10 +20,6 @@ class IssuesLib
 	const ERRORTYPE_CODE = 'error';
 	const WARNINGTYPE_CODE = 'warning';
 
-	const STATUS_KURZBZ = 'status_kurzbz';
-	const VERARBEITET_AMUM = 'verarbeitetamum';
-	const VERARBEITET_VON = 'verarbeitetvon';
-
 	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance();
@@ -95,16 +91,12 @@ class IssuesLib
 			return error("fehlercode_extern missing");
 
 		// get external fehlercode (unique for each app)
-		$fehlerRes = $this->_ci->FehlerModel->execReadOnlyQuery(
-			'
-				SELECT
-					fehlercode
-				FROM
-					system.tbl_fehler fe
-				WHERE
-					fehlercode_extern = ?
-					AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode AND app = ?)',
-			[$fehlercode_extern, $this->_app]
+		$this->_ci->FehlerModel->addSelect('fehlercode');
+		$fehlerRes = $this->_ci->FehlerModel->loadWhere(
+			array(
+				'fehlercode_extern' => $fehlercode_extern,
+				'app' => $this->_app
+			)
 		);
 
 		if (isError($fehlerRes))
@@ -113,10 +105,8 @@ class IssuesLib
 		// check if there is a predefined custom error for the external issue
 		if (hasData($fehlerRes))
 		{
-			// if found, use the code
-			$fehlerData = getData($fehlerRes);
-			if (count($fehlerData) > 1) return error("Multiple fehlercode_extern ".$fehlercode_extern. " for app ".$this->_app);
 			$fehlerData = getData($fehlerRes)[0];
+			// if found, use the code
 			$fehlercode = $fehlerData->fehlercode;
 		}
 		else
@@ -138,9 +128,9 @@ class IssuesLib
 	public function setBehoben($issue_id, $user)
 	{
 		$data = array(
-			self::STATUS_KURZBZ => self::STATUS_BEHOBEN,
-			self::VERARBEITET_VON => $user,
-			self::VERARBEITET_AMUM => date('Y-m-d H:i:s')
+			'status_kurzbz' => self::STATUS_BEHOBEN,
+			'verarbeitetvon' => $user,
+			'verarbeitetamum' => date('Y-m-d H:i:s')
 		);
 
 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -155,8 +145,8 @@ class IssuesLib
 	public function setInBearbeitung($issue_id, $user)
 	{
 		$data = array(
-			self::STATUS_KURZBZ => self::STATUS_IN_BEARBEITUNG,
-			self::VERARBEITET_VON => $user
+			'status_kurzbz' => self::STATUS_IN_BEARBEITUNG,
+			'verarbeitetvon' => $user
 		);
 
 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -171,9 +161,9 @@ class IssuesLib
 	public function setNeu($issue_id, $user)
 	{
 		$data = array(
-			self::STATUS_KURZBZ => self::STATUS_NEU,
-			self::VERARBEITET_VON => null,
-			self::VERARBEITET_AMUM => null
+			'status_kurzbz' => self::STATUS_NEU,
+			'verarbeitetvon' => null,
+			'verarbeitetamum' => null
 		);
 
 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -195,18 +185,13 @@ class IssuesLib
 			return error("Issue Id must be set correctly.");
 
 		// check if given status is same as existing
-		$this->_ci->IssueModel->addSelect(self::STATUS_KURZBZ.', '.self::VERARBEITET_AMUM);
+		$this->_ci->IssueModel->addSelect('status_kurzbz');
 		$currStatus = $this->_ci->IssueModel->load($issue_id);
 
 		if (hasData($currStatus))
 		{
-			$currStatusData = getData($currStatus)[0];
-			// if same status set, and verarbeitet amum is not being newly set
-			if ($currStatusData->{self::STATUS_KURZBZ} == $data[self::STATUS_KURZBZ]
-				&& !(isset($data[self::VERARBEITET_AMUM]) && !isset($currStatusData->{self::VERARBEITET_AMUM}))
-			) {
+			if (getData($currStatus)[0]->status_kurzbz == $data['status_kurzbz'])
 				return success("Same status already set");
-			}
 		}
 		else
 			return error("Error when getting status");
@@ -242,10 +227,11 @@ class IssuesLib
 		$fehlercode_extern = null,
 		$inhalt_extern = null
 	) {
-		if (!is_numeric($person_id) && isEmptyString($oe_kurzbz)) return error("Person_id or oe_kurzbz must be set, fehlercode: $fehlercode");
+		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
+			return error("Person_id or oe_kurzbz must be set.");
 
 		// get fehlertextVorlage and replace it with params
-		$fehlerRes = $this->_ci->FehlerModel->loadWhere(['fehlercode' => $fehlercode]);
+		$fehlerRes = $this->_ci->FehlerModel->load($fehlercode);
 
 		if (hasData($fehlerRes))
 		{
@@ -255,7 +241,7 @@ class IssuesLib
 			if (!isEmptyArray($fehlertext_params))
 			{
 				if (count($fehlertext_params) != substr_count($fehlertextVorlage, '%s'))
-					return error('Wrong number of parameters for Fehlertext, fehlercode ' . $fehlercode);
+					return error('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehlercode);
 
 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}

application/libraries/StundenplanLib.php

@@ -94,13 +94,13 @@ class StundenplanLib
 		if (isError($benutzer_gruppen))
 			return $benutzer_gruppen;
 		$benutzer_gruppen = getData($benutzer_gruppen);
-
+		$this->_ci->addMeta('spezialgruppen', $benutzer_gruppen);
 		// getting the student_lehrverbaende of the student in the different studiensemester
 		$student_lehrverband = $this->fetchStudentlehrverbandFromStudiensemester($student_uid, $semester_range);
 		if (isError($student_lehrverband))
 			return $student_lehrverband;
 		$student_lehrverband = getData($student_lehrverband);
-		
+		$this->_ci->addMeta('studentlehrvebaende', $student_lehrverband);
 		$stundenplan_query = $this->_ci->StundenplanModel->getStundenplanQuery(
 			$start,
 			$end,
@@ -632,6 +632,7 @@ class StundenplanLib
 						$result->semester = $item->semester;
 						$result->verband = $item->verband;
 						$result->gruppe = $item->gruppe;
+						$result->studiensemester_kurzbz = $item->studiensemester_kurzbz;
 						return $result;
 					},
 					$lehrverband_query_result);

application/libraries/issues/PlausicheckDefinitionLib.php

@@ -9,40 +9,48 @@ class PlausicheckDefinitionLib
 {
 	// set fehler for core plausichecks
 	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerKurzbz = array(
-		'AbbrecherAktiv',
-		'AbschlussstatusFehlt',
-		'AktSemesterNull',
-		'AktiverStudentOhneStatus',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen',
-		'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde',
-		'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform',
-		'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher',
+	private $_fehlerLibMappings = array(
+		'AbbrecherAktiv' => 'AbbrecherAktiv',
+		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
+		'AktSemesterNull' => 'AktSemesterNull',
+		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
+		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
+		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
+		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
+		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
+		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
+		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
+		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
+		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
+		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
+		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
+		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
+		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
+		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
+		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
+		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
+		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
+		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
-		//'StudienplanUngueltig',
-		//'BewerberNichtZumRtAngetreten'
+		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);
 
+	/**
+	 * Gets all fehler_kurzbz-library mappings for fehler which need to be checked.
+	 */
+	public function getFehlerLibMappings()
+	{
+		return $this->_fehlerLibMappings;
+	}
+
 	/**
 	 * Gets all fehler_kurzbz for fehler which need to be checked.
 	 */
 	public function getFehlerKurzbz()
 	{
-		return $this->_fehlerKurzbz;
+		return array_keys($this->_fehlerLibMappings);
 	}
 }

application/libraries/issues/PlausicheckProducerLib.php

@@ -6,43 +6,36 @@ class PlausicheckProducerLib
 {
 	const CI_PATH = 'application';
 	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
 	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
 	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const CONFIG_FEHLER_INDEX = 'fehler';
-	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
-	const PRODUCER_LIB_NAME = 'producerLibName';
-	const EXTENSION_NAME = 'extensionName';
 
 	private $_ci; // ci instance
+	private $_extensionName; // name of extension
 	private $_konfiguration = []; // configuration parameters
-	private $_fehlerKurzbz = []; // fehler to produce
 	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
-	private $_apps = []; // apps of fehler to produce
+	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
 
 	public function __construct($params = null)
 	{
-		// set application(s))
-		if (isset($params['apps']))
-		{
-			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
-			if (is_array($params['apps'])) $this->_apps = $params['apps'];
-		}
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
+		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
+
+		// set application
+		$app = isset($params['app']) ? $params['app'] : null;
 
 		$this->_ci =& get_instance(); // get ci instance
 
 		// load libraries
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('ExtensionsLib');
 
 		// load models
-		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');
 
-		$this->_ci->load->config(self::CONFIG_FEHLER_NAME);
-
-		// get all configuration parameters for the application(s))
-		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($this->_apps);
+		// get all configuration parameters for the application
+		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($app);
 
 		if (hasData($fehlerkonfigurationRes))
 		{
@@ -53,88 +46,10 @@ class PlausicheckProducerLib
 				$this->_konfiguration[$fk->fehler_kurzbz][$fk->konfigurationstyp_kurzbz] = $fk->konfiguration;
 			}
 		}
-
-		// get all fehler to be produced (by kurzbz array or app)
-		if (isset($params['fehlerKurzbz']) && !isEmptyArray($params['fehlerKurzbz']))
-		{
-			$this->_fehlerKurzbz = $params['fehlerKurzbz'];
-		}
-		else
-		{
-			// get fehler by apps
-			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
-
-			if (hasData($fehlerRes)) $this->_fehlerKurzbz = array_column(getData($fehlerRes), 'fehler_kurzbz');
-		}
-
-		// get producer file paths for the fehler
-
-		// Load Fehler Entries of Core
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
-
-		if (isset($configArray) && is_array($configArray))
-		{
-			foreach ($configArray as $coreEntry)
-			{
-				if (!isset($coreEntry[self::FEHLER_KURZBZ_NAME])
-					|| !isset($coreEntry[self::PRODUCER_LIB_NAME])
-					|| !in_array($coreEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
-				) {
-					continue;
-				}
-
-				$this->_fehlerLibMappings[$coreEntry[self::FEHLER_KURZBZ_NAME]][self::PRODUCER_LIB_NAME] = $coreEntry[self::PRODUCER_LIB_NAME];
-			}
-		}
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$configFilePath = ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
-				$configFilename = APPPATH.'config/'.$configFilePath;
-
-				// if fehler config file exists in extension
-				if (file_exists($configFilename))
-				{
-					$config = array(); // default value
-
-					// include the config file
-					include($configFilename);
-
-					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
-					{
-						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
-						{
-							if (
-								!isset($extensionEntry[self::FEHLER_KURZBZ_NAME])
-								|| !isset($extensionEntry[self::PRODUCER_LIB_NAME])
-								|| !in_array($extensionEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
-							) {
-								continue;
-							}
-
-							// add extension config data to fehler lib mappings
-							$fehler_kurzbz = $extensionEntry[self::FEHLER_KURZBZ_NAME];
-
-							$this->_fehlerLibMappings[$fehler_kurzbz][self::PRODUCER_LIB_NAME] = $extensionEntry[self::PRODUCER_LIB_NAME];
-							$this->_fehlerLibMappings[$fehler_kurzbz][self::EXTENSION_NAME] = $ext->name;
-						}
-					}
-				}
-			}
-		}
 	}
 
 	/**
-	 * Produces multiple plausicheck issues at once, and saves them in the database.
+	 * Produces multiple plausicheck issues at once and saved them to db.
 	 * @param array $params passed to each plausicheck
 	 * @return result object with occured error and info
 	 */
@@ -144,17 +59,10 @@ class PlausicheckProducerLib
 		$result->errors = [];
 		$result->infos = [];
 
-		$mappingFehlerKurbz = array_keys($this->_fehlerLibMappings);
-
-		// check if all issues to produce could be found in database
-		//~ $notFoundFehlerKurzbz = array_diff($this->_fehlerKurzbz, $mappingFehlerKurbz);
-
-		//~ if (!isEmptyArray($notFoundFehlerKurzbz))
-			//~ $result->errors[] = error('Fehler to produce not defined in config: '.implode(', ', $notFoundFehlerKurzbz));
-
-		foreach ($mappingFehlerKurbz as $fehler_kurzbz)
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
 		{
 			$plausicheckRes = $this->producePlausicheckIssue(
+				$libName,
 				$fehler_kurzbz,
 				$params
 			);
@@ -188,23 +96,14 @@ class PlausicheckProducerLib
 
 	/**
 	 * Executes plausicheck using a given library, returns the result.
+	 * @param $libName string name of library producing the issue
 	 * @param $fehler_kurzbz string unique short name of fehler, for which issue is produced
 	 * @param $params parameters passed to issue production method
 	 */
-	public function producePlausicheckIssue($fehler_kurzbz, $params)
+	public function producePlausicheckIssue($libName, $fehler_kurzbz, $params)
 	{
-		//if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return error("Mapping for Fehler " . $fehler_kurzbz . " was not found");
-		if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return success(null);
-
-		$mapping = $this->_fehlerLibMappings[$fehler_kurzbz];
-
-		if (!isset($mapping[self::PRODUCER_LIB_NAME]) || isEmptyString($mapping[self::PRODUCER_LIB_NAME]))
-			return error("No producer lib name set for Fehler " . $fehler_kurzbz);
-
-		$libName = $mapping[self::PRODUCER_LIB_NAME];
-
 		// if called from extension (extension name set), path includes extension names
-		$libRootPath = isset($mapping[self::EXTENSION_NAME]) ? ExtensionsLib::EXTENSIONS_DIR_NAME . '/' . $mapping[self::EXTENSION_NAME] . '/' : '';
+		$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
 
 		// path for loading issue library
 		$issuesLibPath = $libRootPath . self::PLAUSI_ISSUES_FOLDER . '/';
@@ -222,7 +121,7 @@ class PlausicheckProducerLib
 		// load library connected to fehlercode
 		$this->_ci->load->library(
 			$issuesLibPath . $libName,
-			['configurationParams' => $config]
+			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
 		);
 
 		$lowercaseLibName = mb_strtolower($libName);
@@ -234,13 +133,4 @@ class PlausicheckProducerLib
 		// call the function for checking for issue production
 		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($params);
 	}
-
-	/**
-	 * Get fehler kurzbz -> library mappings.
-	 * @return array with fehler kurzbz as key and fehlerinfo as values
-	 */
-	public function getFehlerMappings()
-	{
-		return $this->_fehlerLibMappings;
-	}
 }

application/libraries/issues/PlausicheckResolverLib.php

@@ -9,177 +9,43 @@ class PlausicheckResolverLib
 	const EXTENSIONS_FOLDER = 'extensions';
 	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
 	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const FEHLERCODE_NAME = 'fehlercode';
-	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
-	const RESOLVER_LIB_NAME = 'resolverLibName';
-	const PRODUCER_IS_RESOLVER_NAME = 'producerIsResolver';
-	const EXTENSION_NAME = 'extensionName';
-
 
 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_fehlercodes = []; // fehlercodes to resolve
-	private $_apps = []; // apps for which issues should be resolved
 	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
-	private $_defaultIssueParams = ['issue_id' => 'issue_id', 'issue_person_id' => 'person_id', 'issue_oe_kurzbz' => 'oe_kurzbz'];
+	private $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced
 
 	public function __construct($params = null)
 	{
-		// set application(s))
-		if (isset($params['apps']))
-		{
-			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
-			if (is_array($params['apps'])) $this->_apps = $params['apps'];
-		}
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
+		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];
 
 		$this->_ci =& get_instance(); // get ci instance
 
-		// get all fehler to be produced (by kurzbz array or app)
-		if (isset($params['fehlercodes']) && !isEmptyArray($params['fehlercodes']))
-		{
-			$this->_fehlercodes = $params['fehlercodes'];
-		}
-		elseif (isset($params['apps']) && !isEmptyArray($params['apps']))
-		{
-			$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
-			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
-
-			if (hasData($fehlerRes))
-			{
-				$this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
-			}
-		}
-
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('ExtensionsLib');
-
-		$this->_ci->load->config('fehler');
-
-		// Load Fehler Entries of Core
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_NAME);
-
-		foreach ($configArray as $coreEntry)
-		{
-			// each entry must have fehlercode
-			if (!isset($coreEntry[self::FEHLERCODE_NAME])
-				|| !in_array($coreEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
-			) {
-				continue;
-			}
-
-			// fill code lib mappings with needed values
-			$fehlercode = $coreEntry[self::FEHLERCODE_NAME];
-
-			if (isset($coreEntry[self::FEHLER_KURZBZ_NAME]))
-				$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $coreEntry[self::FEHLER_KURZBZ_NAME];
-
-			$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME] = $coreEntry[self::RESOLVER_LIB_NAME] ?? null;
-			$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
-				= $coreEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
-		}
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$configFilename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
-
-				// if fehler config file exists in teh extension
-				if (file_exists($configFilename))
-				{
-					$config = array(); // default value
-
-					// include config data
-					include($configFilename);
-
-					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
-					{
-						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
-						{
-							if (
-								!isset($extensionEntry[self::FEHLERCODE_NAME])
-								|| !in_array($extensionEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
-							) {
-								continue;
-							}
-
-							// add extension config data to fehlercode lib mappings
-							$fehlercode = $extensionEntry[self::FEHLERCODE_NAME];
-							if (isset($extensionEntry[self::FEHLER_KURZBZ_NAME]))
-								$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $extensionEntry[self::FEHLER_KURZBZ_NAME];
-
-							$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME]
-								= $extensionEntry[self::RESOLVER_LIB_NAME] ?? null;
-							$this->_codeLibMappings[$fehlercode][self::EXTENSION_NAME] = $ext->name;
-							$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
-								= $extensionEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
-						}
-					}
-				}
-			}
-		}
+		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
 	}
 
 	/**
 	 * Reseolves multiple plausicheck issues at once.
-	 * @param array $openIssues passed issues to resolve. If null, issues with fehlercodes in _fehlercodes property are loaded
+	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
+	 * @param array $openIssues passed issues to resolve
 	 * @return result object with occured error and info
 	 */
-	public function resolvePlausicheckIssues($openIssues = null)
+	public function resolvePlausicheckIssues($openIssues)
 	{
-		// loading producer lib with fehler kurzbz of provided code mappings, for "self resolving" issues
-		$this->_ci->load->library(
-			'issues/PlausicheckProducerLib',
-			['fehlerKurzbz' => array_column($this->_codeLibMappings, self::FEHLER_KURZBZ_NAME)], 'PlausicheckResolverProducerLib'
-		);
-
-		if (!isset($openIssues))
-		{
-			if (!isEmptyArray($this->_fehlercodes))
-			{
-				$this->_ci->load->model('system/Issue_model', 'IssueModel');
-
-				// load open issues with given errorcodes
-				$openIssuesRes = $this->_ci->IssueModel->getOpenIssues(
-					$this->_fehlercodes
-				);
-
-				$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
-			}
-		}
-
-
 		$result = new StdClass();
 		$result->errors = [];
 		$result->infos = [];
 
-		// check if all issues to resolve could be found in database
-		//~ $mappingFehlerCodes = array_keys($this->_codeLibMappings);
-		//~ $notFoundFehlerCodes = array_diff($this->_fehlercodes, $mappingFehlerCodes);
-
-		//~ if (!isEmptyArray($notFoundFehlerCodes))
-			//~ $result->errors[] = error('Fehler to resolve not defined in config: '.implode(', ', $notFoundFehlerCodes));
-
 		foreach ($openIssues as $issue)
 		{
-			$params = [];
-			foreach ($this->_defaultIssueParams as $index => $propertyName)
-			{
-				$params[$index] = $issue->{$propertyName};
-			}
-
 			// add person id and oe kurzbz automatically as params, merge it with additional params
 			// decode bewerbung_parameter into assoc array
 			$params = array_merge(
-				$params,
+				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
 				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
 			);
 
@@ -188,72 +54,69 @@ class PlausicheckResolverLib
 			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
 			if (isset($this->_codeLibMappings[$issue->fehlercode]))
 			{
-				$codeLibMapping = $this->_codeLibMappings[$issue->fehlercode];
-				$libName = $codeLibMapping[self::RESOLVER_LIB_NAME] ?? null;
-				$extensionName = $codeLibMapping[self::EXTENSION_NAME] ?? null;
-				$producerIsResolver = $codeLibMapping[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
+				$libName = $this->_codeLibMappings[$issue->fehlercode];
 
-				if ($producerIsResolver)
+				// if called from extension (extension name set), path includes extension names
+				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+				// path for loading issue library
+				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+				// file path of library for check if file exists
+				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+				// check if library file exists
+				if (!file_exists($issuesLibFilePath))
 				{
-					// execute same check as used for issue production
-					$issueResolvedRes = $this->_ci->PlausicheckResolverProducerLib->producePlausicheckIssue(
-						$issue->fehler_kurzbz,
-						$params
-					);
+					// log error and continue with next issue if not
+					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+					continue;
+				}
 
-					if (isError($issueResolvedRes))
-					{
-						$result->errors[] = getError($issueResolvedRes);
-					}
-					else
-					{
-						$issueResolved = !hasData($issueResolvedRes);
-					}
+				// load library connected to fehlercode
+				$this->_ci->load->library($issuesLibPath . $libName);
+
+				$lowercaseLibName = mb_strtolower($libName);
+
+				// check if method is defined in library class
+				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+				{
+					// log error and continue with next issue if not
+					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+					continue;
+				}
+
+				// call the function for checking for issue resolution
+				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
 				}
 				else
 				{
-					// if called from extension (extension name set), path includes extension names
-					$libRootPath = isset($extensionName) ? self::EXTENSIONS_FOLDER . '/' . $extensionName . '/' : '';
+					$issueResolved = getData($issueResolvedRes) === true;
+				}
+			}
+			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
+			{
+				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];
 
-					// path for loading issue library
-					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+				// execute same check as used for issue production 
+				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
+					$libName,
+					$issue->fehler_kurzbz,
+					$params
+				);
 
-					// file path of library for check if file exists
-					$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-						. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-					// check if library file exists
-					if (!file_exists($issuesLibFilePath))
-					{
-						// log error and continue with next issue if not
-						$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-						continue;
-					}
-
-					// load library connected to fehlercode
-					$this->_ci->load->library($issuesLibPath . $libName);
-
-					$lowercaseLibName = mb_strtolower($libName);
-
-					// check if method is defined in library class
-					if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-					{
-						// log error and continue with next issue if not
-						$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
-						continue;
-					}
-
-					// call the function for checking for issue resolution
-					$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-					if (isError($issueResolvedRes))
-					{
-						$result->errors[] = getError($issueResolvedRes);
-					}
-					else
-					{
-						$issueResolved = getData($issueResolvedRes) === true;
-					}
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = !hasData($issueResolvedRes);
 				}
 			}
 

application/libraries/issues/plausichecks/AbbrecherAktiv.php

@@ -23,11 +23,7 @@ class AbbrecherAktiv extends PlausiChecker
 			AND benutzer.aktiv=true";
 
 	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
-	protected $_params_for_checking = [
-		'studiengang_kz' => " AND stg.studiengang_kz = ?",
-		'prestudent_id' => " AND pre.prestudent_id = ?",
-		'person_id' => " AND pre.person_id = ?"
-	];
+	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
 	protected $_fehlertext_params = ['prestudent_id'];
 	protected $_resolution_params = ['prestudent_id'];
 }

application/libraries/issues/plausichecks/AbschlussstatusFehlt.php

@@ -19,14 +19,12 @@ class AbschlussstatusFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAbschlussstatusFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -57,7 +55,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,7 +62,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -136,12 +132,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/AktSemesterNull.php

@@ -19,10 +19,9 @@ class AktSemesterNull extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -57,17 +56,11 @@ class AktSemesterNull extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktSemesterNull(
-		$studiensemester_kurzbz,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
+	public function getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
 		$params = array($studiensemester_kurzbz);
 
 		$qry = "
@@ -96,12 +89,6 @@ class AktSemesterNull extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php

@@ -18,10 +18,9 @@ class AktiverStudentOhneStatus extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -49,11 +48,10 @@ class AktiverStudentOhneStatus extends PlausiChecker
 	 * Students with active Benutzer should have a status in the current semester.
 	 * @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 person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();
 
@@ -90,12 +88,6 @@ class AktiverStudentOhneStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php

@@ -19,14 +19,12 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAktiverStudentstatusOhneKontobuchung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -63,7 +61,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -71,7 +68,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -113,13 +109,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php

@@ -19,14 +19,12 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -66,7 +64,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -74,7 +71,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz, $studiensemester_kurzbz, $studiensemester_kurzbz);
@@ -109,12 +105,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php

@@ -19,14 +19,12 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getBewerberNichtZumRtAngetreten(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -60,7 +58,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
@@ -116,12 +112,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php

@@ -19,14 +19,12 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumAbschlusspruefungFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -60,7 +58,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -116,12 +112,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/DatumSponsionFehlt.php

@@ -19,14 +19,12 @@ class DatumSponsionFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumSponsionFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -60,7 +58,6 @@ class DatumSponsionFehlt extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class DatumSponsionFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -116,12 +112,6 @@ class DatumSponsionFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php

@@ -18,10 +18,9 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -51,16 +50,11 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 	 * Status Dates and status studysemester dates should be in correct order.
 	 * @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 person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if check is to be executed only for certain Studiengaenge
 	 * @return success with prestudents or error
 	 */
-	public function getDatumStudiensemesterFalscheReihenfolge(
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
+	public function getDatumStudiensemesterFalscheReihenfolge($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
 		$params = array();
 
 		// all active students with Status student in current semester
@@ -103,12 +97,6 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/DualesStudiumOhneMarkierung.php

@@ -19,14 +19,12 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -63,7 +61,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -71,7 +68,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -136,12 +132,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php

@@ -19,14 +19,12 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getFalscheAnzahlAbschlusspruefungen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -57,7 +55,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,7 +62,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -115,12 +111,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php

@@ -19,13 +19,12 @@ class FalscheAnzahlHeimatadressen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$personRes = $this->getFalscheAnzahlHeimatadressen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);
 

application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php

@@ -19,13 +19,12 @@ class FalscheAnzahlZustelladressen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$personRes = $this->getFalscheAnzahlZustelladressen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);
 

application/libraries/issues/plausichecks/FalscherIncomingZweckPlausi.php

@@ -1,131 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscherIncomingZweckPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getFalscherIncomingZweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Incomings should have the correct Zweck.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getFalscherIncomingZweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-		$studiensemester_clause = '';
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$studiensemester_clause = "AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$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
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-				AND status.status_kurzbz = 'Incoming'
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				{$studiensemester_clause}
-		) zwecke
-		WHERE anzahl = 1 AND zweck_code NOT IN ('1', '2', '3')";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND zwecke.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND zwecke.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/GbDatumWeitZurueck.php

@@ -19,10 +19,9 @@ class GbDatumWeitZurueck extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, $person_id, $exkludierte_studiengang_kz);
+		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($personRes)) return $personRes;
 

application/libraries/issues/plausichecks/GeburtsnationFehlt.php

@@ -1,108 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class GeburtsnationFehlt extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_getGeburtsnationFehlt(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'fehlertext_params' => array(),
-					'resolution_params' => array()
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Geburtsnation is missing.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getGeburtsnationFehlt(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT person_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				(geburtsnation IS NULL OR geburtsnation = '')
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php

@@ -19,14 +19,12 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getInaktiverStudentAktiverStatus(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -60,26 +58,21 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
 	public function getInaktiverStudentAktiverStatus(
-		$studiensemester_kurzbz = null,
+		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
-		if (!isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
-			$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
+		$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);
 
@@ -110,12 +103,6 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php

@@ -19,13 +19,12 @@ class IncomingHeimatNationOesterreich extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$personRes = $this->getIncomingHeimatNationOesterreich(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);
 

application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php

@@ -18,10 +18,9 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -49,11 +48,10 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 	 * Incoming should have IN/OUT data.
 	 * @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 person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();
 
@@ -87,12 +85,6 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php

@@ -19,14 +19,12 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getIncomingOrGsFoerderrelevant(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -57,7 +55,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 	 * @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
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return object success or error
 	 */
@@ -65,7 +62,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -118,12 +114,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php

@@ -19,14 +19,12 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getInskriptionVorLetzerBismeldung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -61,7 +59,7 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 
 	/**
 	 * 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.2022
+	 * 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 studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
@@ -73,14 +71,11 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		// get Bismeldedatum
 		$datumBis = $this->_getBisdateFromSemester($studiensemester_kurzbz);
 
-		if (!$datumBis) return success([]);
-
 		$params = array($datumBis, $studiensemester_kurzbz, $datumBis);
 
 		// get active students
@@ -122,12 +117,6 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -143,16 +132,17 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 	 */
 	private function _getBisdateFromSemester($studiensemester_kurzbz)
 	{
-		$bisdate = null;
+		$semesterYear = substr($studiensemester_kurzbz, 2, 6);
+		$semesterType = substr($studiensemester_kurzbz, 0, 2);
 
-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$prevSemester = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-		if (!hasData($prevSemester)) return null;
-		$prevSemester = getData($prevSemester)[0]->studiensemester_kurzbz;
+		if ($semesterType == 'SS')
+		{
+			return date_format(date_create(($semesterYear - 1)."-11-15"), 'Y-m-d');
+		}
 
-		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-		$bisDate = $this->_ci->BismeldestichtagModel->getLastReachedMeldestichtag($prevSemester);
-		if (!hasData($bisDate)) return null;
-		return getData($bisDate)[0]->meldestichtag;
+		if ($semesterType == 'WS')
+		{
+			return date_format(date_create($semesterYear."-04-15"), 'Y-m-d');
+		}
 	}
 }

application/libraries/issues/plausichecks/KeinAufenthaltszweckPlausi.php

@@ -1,125 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class KeinAufenthaltszweckPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getKeinAufenthaltszweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Students with mobility should have Aufenthaltszweck.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getKeinAufenthaltszweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-
-		$qry = "
-			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
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-				LEFT JOIN bis.tbl_bisio_zweck zw USING (bisio_id)
-			WHERE
-				(zw.zweck_code IS NULL OR zw.zweck_code = '')
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND bisio.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php

@@ -18,12 +18,11 @@ class NationNichtOesterreichAberGemeinde extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$personRes = $this->getNationNichtOesterreichAberGemeinde(
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);
 

application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php

@@ -19,14 +19,12 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getOrgformStgUngleichOrgformPrestudent(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -72,7 +70,6 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -119,12 +116,6 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/OutgoingAngerechneteEctsFehlenPlausi.php

@@ -1,129 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class OutgoingAngerechneteEctsFehlenPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getAngerechneteEctsFehlen(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Outgoing should have angerechnete ECTS.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getAngerechneteEctsFehlen(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
-				stg.studiengang_kz, bisio.bisio_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-			WHERE
-				bisio.bis IS NOT NULL
-				AND bisio.bis::date <= NOW()
-				AND bisio.bis::date - bisio.von::date >= 29
-				AND bisio.ects_angerechnet IS NULL
-				AND NOT EXISTS (SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz = 'Incoming' AND prestudent_id = pre.prestudent_id)
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND bisio.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/OutgoingAufenthaltfoerderungfehltPlausi.php

@@ -1,128 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class OutgoingAufenthaltfoerderungfehltPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getAufenthaltsfoerderungFehlt(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Student with mobility should have Aufenthaltsfoerderung.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getAufenthaltsfoerderungFehlt(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
-				stg.studiengang_kz, bisio.bisio_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-				LEFT JOIN bis.tbl_bisio_aufenthaltfoerderung foerd USING (bisio_id)
-			WHERE
-				bisio.bis IS NOT NULL
-				AND bisio.bis::date - bisio.von::date >= 29
-				AND foerd.aufenthaltfoerderung_code IS NULL
-				AND NOT EXISTS (SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz = 'Incoming' AND prestudent_id = pre.prestudent_id)
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND bisio.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/OutgoingErworbeneEctsFehlenPlausi.php

@@ -1,128 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class OutgoingErworbeneEctsFehlenPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getAngerechneteEctsFehlen(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Outgoing should have erworbene ECTS.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getAngerechneteEctsFehlen(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
-				stg.studiengang_kz, bisio.bisio_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-			WHERE
-				bisio.bis IS NOT NULL
-				AND bisio.bis::date <= NOW()
-				AND bisio.bis::date - bisio.von::date >= 29
-				AND bisio.ects_erworben IS NULL
-				AND NOT EXISTS (SELECT 1 FROM public.tbl_prestudentstatus WHERE status_kurzbz = 'Incoming' AND prestudent_id = pre.prestudent_id)
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND bisio.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/PlausiChecker.php

@@ -5,12 +5,12 @@
  */
 abstract class PlausiChecker
 {
-	const ISSUE_ID_NAME = 'issue_id';
-
 	protected $_ci; // code igniter instance
 	protected $_config; // all applicable configuration parameters for this plausicheck
 	protected $_db; // database for queries
 
+	protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
+
 	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
 	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]
 
@@ -24,6 +24,8 @@ abstract class PlausiChecker
 		// set configuration
 		$this->_config = $params['configurationParams'] ?? [];
 
+		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
+
 		// get database for queries
 		$this->_db = new DB_Model();
 	}
@@ -39,20 +41,15 @@ abstract class PlausiChecker
 		$params = [];
 		$qry = $this->_base_sql;
 
-		// if issue id is set, issue is resolving - check if behebung parameter are present
-		if (isset($paramsForChecking[self::ISSUE_ID_NAME]))
+		if ($this->_isForResolutionCheck == true)
 		{
 			foreach ($this->_resolution_params as $resParam)
 			{
 				if (!isset($paramsForChecking[$resParam]))
-					return error("$resParam missing"
-						.(isset($paramsForChecking[self::ISSUE_ID_NAME]) ? ", issue ID: ".$paramsForChecking[self::ISSUE_ID_NAME] : ""));
+					return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
 			}
 		}
 
-		// get fehlertext and resolution params
-
-
 		// add config params to query
 		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
 		{

application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php

@@ -19,14 +19,12 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getPrestudentMischformOhneOrgform(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -70,7 +68,6 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -101,12 +98,6 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php

@@ -18,10 +18,9 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -52,7 +51,7 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();
 
@@ -80,12 +79,6 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php

@@ -18,10 +18,9 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -57,7 +56,6 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 		$studiengang_kz = null,
 		$prestudent_id = null,
 		$studienordnung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -95,12 +93,6 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 			$params[] = $studienordnung_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php

@@ -18,10 +18,9 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 
 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
-		$prestudentRes = $this->getStudentstatusNachAbbrecher($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStudentstatusNachAbbrecher($studiengang_kz, null, $exkludierte_studiengang_kz);
 
 		if (isError($prestudentRes)) return $prestudentRes;
 
@@ -52,7 +51,7 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();
 
@@ -80,12 +79,6 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/StudienplanUngueltig.php

@@ -19,14 +19,12 @@ class StudienplanUngueltig extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
 
 		// get all students failing the plausicheck
 		$prestudentRes = $this->getStudienplanUngueltig(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);
 
@@ -71,7 +69,6 @@ class StudienplanUngueltig extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -118,12 +115,6 @@ class StudienplanUngueltig extends PlausiChecker
 			$params[] = $prestudent_id;
 		}
 
-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";

application/libraries/issues/plausichecks/UhstatPersonkennungFehltCore.php

@@ -1,112 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class UhstatPersonkennungFehltCore extends PlausiChecker
-{
-	const PERSONKENNUNG_KENNZEICHEN_TYPEN = ['vbpkAs', 'vbpkBf'];
-
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getUhstatPersonkennungFehlt(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id
-					//'fehlertext_params' => array('person_id' => $prestudent->person_id),
-					//'resolution_params' => array('person_id' => $prestudent->person_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Student should have Personenkennung for UHSTAT reporting.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getUhstatPersonkennungFehlt(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (person_id) prestudent_id, person_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				stg.melderelevant
-				AND pre.bismelden
-				AND EXISTS (SELECT 1 FROM bis.tbl_uhstat1daten WHERE person_id = pers.person_id)
-				AND (SELECT COUNT (DISTINCT kennzeichentyp_kurzbz) FROM public.tbl_kennzeichen WHERE person_id = pers.person_id AND kennzeichentyp_kurzbz IN ('vbpkAs', 'vbpkBf')) < 2
-				AND pers.ersatzkennzeichen IS NULL";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZgvDatumInZukunft.php

@@ -1,135 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvDatumInZukunft extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvDatumInZukunft(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV date should be in the past.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvDatumInZukunft(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvdatum::date > NOW()
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-			//~ $prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			//~ if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			//~ if (hasData($prevStudiensemesterRes))
-			//~ {
-				//~ // if Studiensemester given, check only if has status in current or previous semester
-				//~ $prevStudiensemester = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-				//~ $qry .= " AND EXISTS (
-							//~ SELECT 1
-							//~ FROM public.tbl_prestudentstatus ps
-							//~ WHERE studiensemester_kurzbz IN (?, ?)
-							//~ AND ps.prestudent_id = pre.prestudent_id
-						//~ )";
-				//~ $params[] = $prevStudiensemester;
-				//~ $params[] = $studiensemester_kurzbz;
-			//~ }
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZgvDatumVorGeburtsdatum.php

@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvDatumVorGeburtsdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvDatumVorGeburtsdatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Zgv date should be after birthdate.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvDatumVorGeburtsdatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvdatum::date < pers.gebdatum
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZgvMasterDatumInZukunft.php

@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumInZukunft extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumInZukunft(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be in the past.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumInZukunft(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date > NOW()
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZgvMasterDatumVorGeburtsdatum.php

@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumVorGeburtsdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumVorGeburtsdatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be after birthdate.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumVorGeburtsdatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date < pers.gebdatum
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZgvMasterDatumVorZgvdatum.php

@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumVorZgvdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumVorZgvDatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be before ZGV date.
-	 * @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
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumVorZgvDatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date < pre.zgvdatum::date
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/plausichecks/ZuVieleZweckeIncomingPlausi.php

@@ -1,129 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZuVieleZweckeIncomingPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getFalscherIncomingZweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('anzahl' => $prestudent->anzahl),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * There should be exactly one Incoming Zweck.
-	 * @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 bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getFalscherIncomingZweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-		$studiensemester_clause = '';
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$studiensemester_clause = "AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$qry = "
-		SELECT * FROM (
-			SELECT
-				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)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				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
-			WHERE
-				stg.melderelevant
-				AND pre.bismelden
-				AND status.status_kurzbz = 'Incoming'
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				{$studiensemester_clause}
-		) zwecke
-		WHERE anzahl > 1";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND zwecke.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND zwecke.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}

application/libraries/issues/resolvers/CORE_INOUT_0005.php

@@ -16,7 +16,7 @@ class CORE_INOUT_0005 implements IIssueResolvedChecker
 
 		$this->_ci->load->model('codex/Bisio_model', 'BisioModel');
 
-		// get bisio
+		// get all Zwecke
 		$this->_ci->BisioModel->addSelect('ects_angerechnet');
 		$bisioRes = $this->_ci->BisioModel->loadWhere(array('bisio_id' => $params['bisio_id']));
 

application/libraries/issues/resolvers/CORE_PERSON_0005.php

@@ -0,0 +1,36 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Geburtsnation missing
+ */
+class CORE_PERSON_0005 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+
+		// load geburtsnation for the given person
+		$this->_ci->PersonModel->addSelect('geburtsnation');
+		$personRes = $this->_ci->PersonModel->load($params['issue_person_id']);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			// get person data
+			$personData = getData($personRes)[0];
+
+			// if geburtsnation present, issue is resolved
+			return success(!isEmptyString($personData->geburtsnation));
+		}
+		else
+			return success(false); // if no person found, not resolved
+	}
+}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php

@@ -12,13 +12,16 @@ 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(
-			null,
+			$params['studiensemester_kurzbz'],
 			null,
 			$params['prestudent_id']
 		);

application/libraries/tags/CoreMissingZgvTagLib.php

@@ -28,10 +28,21 @@ class CoreMissingZgvTagLib
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+
 		$result = $this->ci->PrestudentModel-> loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester
 		));
 
@@ -60,16 +71,36 @@ class CoreMissingZgvTagLib
 		$semester = $params['studiensemester_kurzbz'];
 		$prestudent_id = $params['id'];
 
+		$this->ci->PrestudentModel->addSelect('prestudent_id');
+		$this->ci->PrestudentModel->addSelect('start as von');
+		$this->ci->PrestudentModel->addSelect('ende as bis');
 		$this->ci->PrestudentModel->addJoin('public.tbl_prestudentstatus', 'prestudent_id');
+
+		//add studiensemester also here for manual rebuild
+		$this->ci->PrestudentModel->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+
 		$this->ci->PrestudentModel->addJoin('public.tbl_benutzer bn', 'person_id');
 		$this->ci->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$result = $this->ci->PrestudentModel->loadWhere(array(
-			'bn.aktiv' => true, //check if necessary
-			'zgvdatum' => null,
-			'typ' => 'b',
+
+		$this->ci->PrestudentModel->db->group_start();
+
+		$this->ci->PrestudentModel->db->where('zgvdatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'b');
+
+		$this->ci->PrestudentModel->db->or_group_start();
+		$this->ci->PrestudentModel->db->where('zgvmadatum', null);
+		$this->ci->PrestudentModel->db->where('typ', 'm');
+		$this->ci->PrestudentModel->db->group_end();
+
+		$this->ci->PrestudentModel->db->group_end();
+		$this->ci->PrestudentModel->db->limit(1);
+
+		$result = $this->ci->PrestudentModel-> loadWhere(array(
+			'bn.aktiv' => true,
 			'studiensemester_kurzbz' => $semester,
 			'prestudent_id' => $prestudent_id
 		));
+
 		if(hasData($result))
 		{
 			return $result;

application/models/accounting/Vertrag_model.php

@@ -31,18 +31,20 @@ class Vertrag_model extends DB_Model
      */
 	public function save($person_id, $mitarbeiter_uid, $lehrveranstaltung_id, $lehreinheit_id, $projektarbeit_id = null, $vertragsstunden, $betrag, $studiensemester_kurzbz)
     {
-        $person_id = (isset($person_id) && is_numeric($person_id))
+		$vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
+		$person_id = (isset($person_id) && is_numeric($person_id))
             ? $person_id
             : show_error('peron_id must be set and numeric.');
-        $lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
-            ? $lehreinheit_id
-            : show_error('lehreinheit_id must be set and numeric.');
         $lehrveranstaltung_id = (isset($lehrveranstaltung_id) && is_numeric($lehrveranstaltung_id))
             ? $lehrveranstaltung_id
             : show_error('lehrveranstaltung_id must be set and numeric.');
         $projektarbeit_id = (isset($projektarbeit_id) && is_numeric($projektarbeit_id))
             ? $projektarbeit_id
             : null;
+		$lehreinheit_id = (isset($lehreinheit_id) && is_numeric($lehreinheit_id))
+			? $lehreinheit_id
+			: (($vertragstyp_kurzbz == 'Betreuung') ? null : show_error('lehreinheit_id must be set and numeric.'));
         $vertragsstunden = (isset($vertragsstunden) && is_numeric($vertragsstunden))
             ? $vertragsstunden
             : 0;
@@ -53,7 +55,7 @@ class Vertrag_model extends DB_Model
             ? $mitarbeiter_uid
             : show_error('mitarbeiter_uid must be set and a string value.');;
 
-        $vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
+        
 
         // First check if Vertrag already exists for that Lehrauftrag or for that Projektbetreuerauftrag
         if ($vertragstyp_kurzbz == 'Lehrauftrag')
@@ -257,7 +259,7 @@ class Vertrag_model extends DB_Model
         }
         elseif ($vertragstyp_kurzbz == 'Betreuung')
         {
-            $this->addSelect('lehreinheit_id');
+            $this->addSelect('lehreinheit_id, lehre.tbl_projektarbeit.lehrveranstaltung_id, lehre.tbl_projektarbeit.studiensemester_kurzbz');
             $this->addJoin('lehre.tbl_projektbetreuer', 'vertrag_id');
             $this->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
             if ($result = $this->loadWhere(array('vertrag_id' => $vertrag_id)))
@@ -281,17 +283,22 @@ class Vertrag_model extends DB_Model
     {
         if ($result = getData($this->getLehreinheitID($vertrag_id)))
         {
-            $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
-            $this->LehreinheitModel->addSelect($select);
+            if (!empty($result[0]->lehreinheit_id))
+            {
+                $this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
+                $this->LehreinheitModel->addSelect($select);
 
-            if($result = $this->LehreinheitModel->load($result[0]->lehreinheit_id))
-            {
-                return success($result->retval);
-            }
-            else
-            {
-                return error('Fehler beim Laden der Lehreinheit');
+                if ($result = $this->LehreinheitModel->load($result[0]->lehreinheit_id))
+                {
+                    return success($result->retval);
+                }
+                else
+                {
+                    return error('Fehler beim Laden der Lehreinheit');
+                }
             }
+
+            return success($result);
         }
         else
         {
@@ -563,14 +570,13 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektarbeit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 		WHERE
 			tbl_projektbetreuer.person_id=?
 			AND vertrag_id IS NULL
@@ -619,14 +625,13 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_lehreinheit.studiensemester_kurzbz,
+			tbl_projektarbeit.studiensemester_kurzbz,
 			tbl_projektbetreuer.betreuerart_kurzbz,
 			(SELECT nachname || ' ' || vorname FROM public.tbl_person JOIN public.tbl_benutzer USING(person_id) WHERE uid=tbl_projektarbeit.student_uid)
 			as bezeichnung, vertrag_id
 		FROM
 			lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING(projektarbeit_id)
-			JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 		WHERE
 			tbl_projektbetreuer.person_id=?
 			AND vertrag_id = ?

application/models/crm/Prestudentstatus_model.php

@@ -177,7 +177,7 @@ class Prestudentstatus_model extends DB_Model
 	 * @param prestudent_id ID of the Prestudent.
 	 * @param $status_kurzbz kurzbz of the status.
 	 * @param $ausbildungssemester ausbildungssemester of the status.
-	 * @param $studiensemester_kurzbz studiensemster of the status.
+	 * @param $studiensemester_kurzbz studiensemester of the status.
 	 *
 	 * @return result object with all the status entries
 	 */

application/models/crm/Student_model.php

@@ -204,7 +204,7 @@ class Student_model extends DB_Model
 
 		Events::trigger(
 			'generate_student_uid',
-			function ($value) use ($uid) {
+			function ($value) use (&$uid) {
 				$uid = $value;
 			},
 			$stgkzl,

application/models/education/Lehreinheitmitarbeiter_model.php

@@ -85,9 +85,18 @@ class Lehreinheitmitarbeiter_model extends DB_Model
 
 	public function getLektorenByLe($lehreinheit_id)
 	{
-		$this->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant');
+		$this->addSelect('tbl_person.vorname, tbl_person.nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant, 
+		COALESCE(insertvonperson.vorname || \' \' || insertvonperson.nachname, tbl_lehreinheitmitarbeiter.insertvon) as insertvon,
+		COALESCE(updatevonperson.vorname || \' \' || updatevonperson.nachname, tbl_lehreinheitmitarbeiter.updatevon) as updatevon');
 		$this->addJoin('tbl_benutzer', 'uid = mitarbeiter_uid');
 		$this->addJoin('tbl_person', 'person_id');
+		$this->addJoin('tbl_benutzer insertvonbenutzer', 'insertvonbenutzer.uid = tbl_lehreinheitmitarbeiter.insertvon', 'LEFT');
+		$this->addJoin('tbl_person insertvonperson', 'insertvonperson.person_id = insertvonbenutzer.person_id', 'LEFT');
+
+		$this->addJoin('tbl_benutzer updatevonbenutzer', 'updatevonbenutzer.uid = tbl_lehreinheitmitarbeiter.updatevon', 'LEFT');
+		$this->addJoin('tbl_person updatevonperson', 'updatevonperson.person_id = updatevonbenutzer.person_id', 'LEFT');
+
+
 
 		$this->addJoin('(
 			SELECT 1 as verplant, lehreinheit_id, mitarbeiter_uid

application/models/education/Lehrveranstaltung_model.php

@@ -1263,6 +1263,39 @@ class Lehrveranstaltung_model extends DB_Model
 		";
 	}
 
+	/**
+	 * Gets lehrveranstaltungen of Studienplan of a certain lva_id set
+	 * used if a bigger set of lva id is already available and it needs to be checked against a certain studienplan aswell
+	 * @param $studienplan_id ID des Studienplans
+	 * @param $lva_ids LVA_ID welche abgegleicht werden sollen
+	 * @return array|null
+	 */
+	public function getLvsByStudienplanByLvaIDs($studienplan_id, $lva_ids)
+	{
+		$params = array($studienplan_id, $lva_ids);
+
+		$qry = "SELECT tbl_lehrveranstaltung.*,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id,
+			tbl_studienplan_lehrveranstaltung.semester as stpllv_semester,
+			tbl_studienplan_lehrveranstaltung.pflicht as stpllv_pflicht,
+			tbl_studienplan_lehrveranstaltung.koordinator as stpllv_koordinator,
+			tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent,
+			tbl_studienplan_lehrveranstaltung.sort stpllv_sort,
+			tbl_studienplan_lehrveranstaltung.curriculum,
+			tbl_studienplan_lehrveranstaltung.export,
+			tbl_studienplan_lehrveranstaltung.genehmigung
+		FROM lehre.tbl_lehrveranstaltung
+		JOIN lehre.tbl_studienplan_lehrveranstaltung
+		USING(lehrveranstaltung_id)
+		WHERE tbl_studienplan_lehrveranstaltung.studienplan_id = ? 
+			AND tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id IN ?
+		";
+
+		$qry .= " ORDER BY stpllv_sort, semester, sort";
+
+		return $this->execQuery($qry, $params);
+	}
+
 	public function getAllOe($lv_id)
 	{
 		$qry = "SELECT DISTINCT oe_kurzbz

application/models/education/Paabgabe_model.php

@@ -50,8 +50,7 @@ class Paabgabe_model extends DB_Model
 					JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
 					JOIN public.tbl_benutzer bn_student ON(tbl_projektarbeit.student_uid=bn_student.uid)
 					JOIN public.tbl_person person_student ON(bn_student.person_id=person_student.person_id)
-					JOIN lehre.tbl_lehreinheit ON(tbl_projektarbeit.lehreinheit_id=tbl_lehreinheit.lehreinheit_id)
-					JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+					JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 					JOIN public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
 					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE
@@ -68,14 +67,13 @@ class Paabgabe_model extends DB_Model
 			   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 			   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
 			   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
-			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.studiensemester_kurzbz,
 			   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 		FROM campus.tbl_paabgabe
 				 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 				 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-				 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-				 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
-				 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+				 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+				 JOIN public.tbl_studiengang ON(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
@@ -93,7 +91,7 @@ class Paabgabe_model extends DB_Model
 					   campus.tbl_paabgabe.insertvon, campus.tbl_paabgabe.insertamum, campus.tbl_paabgabe.updatevon, campus.tbl_paabgabe.updateamum,
 					   campus.tbl_paabgabe.note, upload_allowed, beurteilungsnotiz, student_uid, tbl_projektarbeit.note, lehre.tbl_projektarbeit.titel,
 					   UPPER(tbl_studiengang.typ) as stgtyp, UPPER(tbl_studiengang.kurzbz) as stgkz, public.tbl_studiengang.studiengang_kz,
-					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.studiensemester_kurzbz,
+					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_projektarbeit.studiensemester_kurzbz,
 					   lehre.tbl_projektbetreuer.betreuerart_kurzbz, lehre.tbl_projektbetreuer.person_id,
 					   public.tbl_person.anrede, public.tbl_person.titelpre, public.tbl_person.vorname, public.tbl_person.nachname, public.tbl_person.titelpost
 				
@@ -101,8 +99,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN campus.tbl_paabgabetyp USING (paabgabetyp_kurzbz)
 						 JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 						 JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-						 JOIN lehre.tbl_lehreinheit using(lehreinheit_id)
-						 JOIN lehre.tbl_lehrveranstaltung using(lehrveranstaltung_id)
+						 JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 						 JOIN public.tbl_studiengang on(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
 						 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)

application/models/education/Projektarbeit_model.php

@@ -25,7 +25,7 @@ class Projektarbeit_model extends DB_Model
 	{
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
-					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
+					pa.studiensemester_kurzbz, pa.lehrveranstaltung_id,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -41,7 +41,6 @@ class Projektarbeit_model extends DB_Model
 				FROM
 					lehre.tbl_projektarbeit pa
 					JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-					JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
 					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
 					LEFT JOIN public.tbl_firma USING (firma_id)
 				WHERE
@@ -57,7 +56,7 @@ class Projektarbeit_model extends DB_Model
 
 		if (isset($studiensemester_kurzbz))
 		{
-			$qry .= ' AND tbl_lehreinheit.studiensemester_kurzbz=?';
+			$qry .= ' AND tbl_projektarbeit.studiensemester_kurzbz=?';
 			$params[] = $studiensemester_kurzbz;
 		}
 
@@ -134,7 +133,7 @@ class Projektarbeit_model extends DB_Model
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
 			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
-			lehre.tbl_lehreinheit.studiensemester_kurzbz,
+			lehre.tbl_projektarbeit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
 			lehre.tbl_projektarbeit.note as note,
@@ -157,7 +156,6 @@ class Projektarbeit_model extends DB_Model
 				 LEFT JOIN public.tbl_benutzer USING(person_id)
 				 LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
 				 LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-				 LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
 				 LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
 				 LEFT JOIN public.tbl_mitarbeiter ON(public.tbl_mitarbeiter.mitarbeiter_uid = public.tbl_benutzer.uid)
 				 LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
@@ -366,7 +364,7 @@ class Projektarbeit_model extends DB_Model
 					tbl_studiengang.typ, tbl_studiengang.kurzbz,
 					tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, 
 					tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id, tbl_projektarbeit.note,
-					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
+					student_benutzer.uid, tbl_student.matrikelnr, tbl_projektarbeit.studiensemester_kurzbz, public.tbl_student.student_uid,
 		
 					lehre.tbl_projektarbeit.sprache,
 					 lehre.tbl_projektarbeit.seitenanzahl,
@@ -430,7 +428,6 @@ class Projektarbeit_model extends DB_Model
 					LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 					LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 					LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-					LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 					LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 					LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 					LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
@@ -503,7 +500,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
+				 tbl_projektarbeit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -565,7 +562,6 @@ class Projektarbeit_model extends DB_Model
 				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
@@ -633,7 +629,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_lehreinheit.studiensemester_kurzbz,
+				 tbl_projektarbeit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -695,7 +691,6 @@ class Projektarbeit_model extends DB_Model
 				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
 				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
 				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
-				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
 				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
 				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
 				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)

application/models/organisation/Studiensemester_model.php

@@ -218,7 +218,7 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemster of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemester of a date or the next closest previous studiensemester if a date is not within a studiensemester
 		$query = "
 			SELECT  studiensemester_kurzbz, start, ende
 			FROM	public.tbl_studiensemester

application/models/person/Notiz_model.php

@@ -98,7 +98,7 @@ class Notiz_model extends DB_Model
 	/**
 	 * Add a Notiz for a given person
 	 */
-	public function addNotizForPerson($person_id, $titel, $text, $erledigt, $verfasser_uid)
+	public function addNotizForPerson($person_id, $titel, $text, $erledigt, $verfasser_uid, $insertvon = null)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -106,8 +106,15 @@ class Notiz_model extends DB_Model
 		// Start DB transaction
 		$this->db->trans_start(false);
 
-		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
-			"insertvon" => $verfasser_uid));
+		$result = $this->insert(
+			array(
+				'titel' => $titel,
+				'text' => $text,
+				'erledigt' => $erledigt,
+				'verfasser_uid' => $verfasser_uid,
+				'insertvon' => $insertvon ?? $verfasser_uid
+			)
+		);
 
 		if (isSuccess($result))
 		{

application/models/ressource/Stundenplan_model.php

@@ -604,11 +604,17 @@ class Stundenplan_model extends DB_Model
 		{
 			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
-				if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
+				if(!array_key_exists($sem,$studentlehrverbaende) || count($studentlehrverbaende[$sem]) == 0)
 				{
 					continue;
 				}
-				foreach($studentlehrverbaende[$sem_date] as $key=>$lehrverband)
+				$studlvbds = array_filter(
+					$studentlehrverbaende[$sem],
+					function($value) use ($sem_date) {
+						return $value->studiensemester_kurzbz === $sem_date;
+					}
+				);
+				foreach($studlvbds as $key=>$lehrverband)
 				{
 					$query .= "(((sp.studiengang_kz = ".$this->escape($lehrverband->studiengang_kz)." AND sp.semester = ".$this->escape($lehrverband->semester)." AND sp.verband = ".$this->escape($lehrverband->verband)." AND sp.gruppe = ".$this->escape($lehrverband->gruppe)." AND sp.datum BETWEEN ".$this->escape($sem_date_range->start)." AND ".$this->escape($sem_date_range->ende).")";
 					// Eintraege fuer den ganzen Verband

application/models/system/App_model.php

@@ -1,14 +0,0 @@
-<?php
-class App_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_app';
-		$this->pk = 'app';
-	}
-}

application/models/system/FehlerApp_model.php

@@ -1,15 +0,0 @@
-<?php
-class FehlerApp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_fehler_app';
-		$this->pk = array('fehlercode', 'app');
-		$this->hasSequence = false;
-	}
-}

application/models/system/Fehler_model.php

@@ -9,44 +9,6 @@ class Fehler_model extends DB_Model
 	{
 		parent::__construct();
 		$this->dbTable = 'system.tbl_fehler';
-		$this->pk = array('fehlercode');
-		$this->hasSequence = false;
-	}
-
-	/**
-	 * Gets all fehler for particular apps.
-	 * @param $apps string of one app or array with multiple
-	 * @return object success or error
-	 */
-	public function getByApps($apps)
-	{
-		if (is_string($apps)) $apps = [$apps];
-
-		$params = [];
-
-		$qry = "
-			SELECT
-				fehlercode, fehler_kurzbz, fehlercode_extern, fehlertext, fehlertyp_kurzbz
-			FROM
-				system.tbl_fehler fe";
-
-		if (!isEmptyArray($apps))
-		{
-			$qry .= "
-				WHERE EXISTS (
-					SELECT 1
-					FROM
-						system.tbl_fehler_app
-					WHERE
-						fehlercode = fe.fehlercode
-						AND app IN ?
-				)";
-
-			$params[] = $apps;
-		}
-
-		$qry .= " ORDER BY fehlercode;";
-
-		return $this->execReadOnlyQuery($qry, $params);
+		$this->pk = 'fehlercode';
 	}
 }

application/models/system/Fehlerkonfiguration_model.php

@@ -15,21 +15,17 @@ class Fehlerkonfiguration_model extends DB_Model
 
 	/**
 	 * Retrieve all set configuration parameters, optionally filtered by app.
-	 * @param string $apps
+	 * @param string $app
 	 * @return object success or error
 	 */
-	public function getKonfiguration($apps = null)
+	public function getKonfiguration($app = null)
 	{
-		if (is_string($apps)) $apps = [$apps];
 		$fehlerkonfiguration = array();
 
-		$this->addDistinct();
-		$this->addSelect('fehler.fehlercode, konftyp.konfigurationstyp_kurzbz, tbl_fehler_konfiguration.konfiguration, fehler.fehler_kurzbz');
+		$this->addSelect('fehlercode, konfigurationstyp_kurzbz, konfiguration, fehler_kurzbz');
 		$this->addJoin('system.tbl_fehler_konfigurationstyp konftyp', 'konfigurationstyp_kurzbz');
 		$this->addJoin('system.tbl_fehler fehler', 'fehlercode');
-		$this->addJoin('system.tbl_fehler_app fe_app', 'fehlercode');
-		if (isset($apps) && !isEmptyArray($apps)) $this->db->where_in('fe_app.app', $apps);
-		$fehlerkonfigurationRes = $this->load();
+		$fehlerkonfigurationRes = isset($app) ? $this->loadWhere(array('fehler.app' => $app)) : $this->load();
 
 		if (isError($fehlerkonfigurationRes)) return $fehlerkonfigurationRes;
 

application/models/system/Fehlerkonfigurationstyp_model.php

@@ -11,4 +11,37 @@ class Fehlerkonfigurationstyp_model extends DB_Model
 		$this->dbTable = 'system.tbl_fehler_konfigurationstyp';
 		$this->pk = array('konfigurationstyp_kurzbz');
 	}
+
+	/**
+	 * Retrieve all set configuration parameters, optionally filtered by app.
+	 * @param string $app
+	 * @return object success or error
+	 */
+	public function getKonfiguration($app = null)
+	{
+		$fehlerkonfiguration = array();
+
+		$this->addSelect('fehlercode, konfigurationstyp_kurzbz, konfiguration, fehler_kurzbz');
+		$this->addJoin('system.tbl_fehler_konfigurationstyp konftyp', 'konfigurationstyp_kurzbz');
+		$this->addJoin('system.tbl_fehler fehler', 'fehlercode');
+		$fehlerkonfigurationRes = isset($app) ? $this->loadWhere(array('fehler.app' => $app)) : $this->load();
+
+		if (isError($fehlerkonfigurationRes)) return $fehlerkonfigurationRes;
+
+		if (hasData($fehlerkonfigurationRes))
+		{
+			$fehlerkonfigurationData = getData($fehlerkonfigurationRes);
+			foreach ($fehlerkonfigurationData as $fk)
+			{
+				$konf = json_decode($fk->konfiguration);
+				if (is_array($konf))
+				{
+					$fk->konfiguration = $konf;
+					$fehlerkonfiguration[] = $fk;
+				}
+			}
+		}
+
+		return success($fehlerkonfiguration);
+	}
 }

application/models/system/Fehlerzustaendigkeiten_model.php

@@ -12,67 +12,6 @@ class Fehlerzustaendigkeiten_model extends DB_Model
 		$this->pk = 'fehlerzustaendigkeiten_id';
 	}
 
-	/**
-	 * Get all Fehler for which user is hauptzuständig (is in charge).
-	 * @return object success or error
-	 */
-	public function getFehlerForUserHauptzustaendig()
-	{
-		$params = [getAuthPersonId()];
-
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		// get oes of uid for which there is a current funktion
-		$all_funktionen_oe_kurzbz = array();
-		$benutzerfunktionRes = $this->BenutzerfunktionModel->getBenutzerFunktionByUid(getAuthUID(), null, date('Y-m-d'), date('Y-m-d'));
-
-		if (isError($benutzerfunktionRes)) return $benutzerfunktionRes;
-
-		if (hasData($benutzerfunktionRes))
-		{
-			foreach (getData($benutzerfunktionRes) as $benutzerfunktion)
-			{
-				$all_funktionen_oe_kurzbz[$benutzerfunktion->oe_kurzbz][] = $benutzerfunktion->funktion_kurzbz;
-			}
-		}
-
-		$query = "WITH zustaendigkeiten AS (
-					SELECT fehlercode,
-						CASE
-							WHEN zst.person_id = ?";
-
-		if (!isEmptyArray($all_funktionen_oe_kurzbz))
-		{
-			$params[] = array_keys($all_funktionen_oe_kurzbz);
-			$query .= " OR (zst.oe_kurzbz IN ? AND zst.funktion_kurzbz IS NULL)  /* if oe is specified in fehler_zustaendigkeiten */";
-
-			// check for each oe for each function if zustaendig
-			foreach ($all_funktionen_oe_kurzbz as $oe_kurzbz => $funktionen_kurzbz)
-			{
-				foreach ($funktionen_kurzbz as $funktion_kurzbz)
-				{
-					$query .= " OR (zst.oe_kurzbz = '$oe_kurzbz' AND zst.funktion_kurzbz = '$funktion_kurzbz')";
-				}
-			}
-		}
-
-		$query .= " THEN TRUE
-					ELSE FALSE
-				END AS \"zustaendig\"
-			FROM system.tbl_fehler_zustaendigkeiten zst
-		)
-		SELECT
-			fehler.fehler_kurzbz, fehler.fehlercode
-		FROM
-			system.tbl_fehler fehler
-			LEFT JOIN zustaendigkeiten USING(fehlercode)
-		WHERE
-			zustaendigkeiten.fehlercode IS NULL
-			OR zustaendigkeiten.zustaendig = TRUE";
-
-		return $this->execReadOnlyQuery($query, $params);
-	}
-
 	/**
 	 * Gets active Mitarbeiter not assigned to a Fehler.
 	 * @param $fehlercode

application/models/system/Issue_model.php

@@ -20,20 +20,45 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern
 	 * @return object success with issues or error
 	 */
-	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $hauptzustaendig = false)
+	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
+		$params = array();
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
-		return $this->_getIssues(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz = null,
-			$apps = null,
-			$ist_verarbeitet = false,
-			$behebung_parameter = null,
-			$fehlercodes,
-			$fehlercode_extern,
-			$hauptzustaendig
-		);
+		$qry = 'SELECT
+					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
+					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
+					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
+				FROM
+					system.tbl_issue iss
+					JOIN system.tbl_fehler fe USING (fehlercode)
+				WHERE
+					verarbeitetamum IS NULL';
+
+		if (!isEmptyArray($fehlercodes))
+		{
+			$qry .= ' AND fehlercode IN ?';
+			$params[] = $fehlercodes;
+		}
+
+		if (!isEmptyString($fehlercode_extern))
+		{
+			$qry .= ' AND fehlercode_extern = ?';
+			$params[] = $fehlercode_extern;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= ' AND person_id = ?';
+			$params[] = $person_id;
+		}
+
+		if (isset($oe_kurzbz))
+		{
+			$qry .= ' AND oe_kurzbz = ?';
+			$params[] = $oe_kurzbz;
+		}
+
+		return $this->execQuery($qry, $params);
 	}
 
 	/**
@@ -44,14 +69,8 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
 	 * @return Object success with number of issues or error
 	 */
-	public function getOpenIssueCount(
-		$fehlercode,
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlercode_extern = null,
-		$behebung_parameter = null,
-		$hauptzustaendig = false
-	) {
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
+	{
 		$params = array($fehlercode);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
 		$qry = 'SELECT count(*) as anzahl_open_issues FROM system.tbl_issue
@@ -64,7 +83,7 @@ class Issue_model extends DB_Model
 			$params[] = $fehlercode_extern;
 		}
 
-		if (isset($person_id) && is_numeric($person_id))
+		if (isset($person_id))
 		{
 			$qry .= ' AND person_id = ?';
 			$params[] = $person_id;
@@ -91,149 +110,4 @@ class Issue_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
-
-	/**
-	 * Gets issues which are open, i.e. not resolved.
-	 * @param int $person_id
-	 * @param string $oe_kurzbz
-	 * @param string $fehlertyp_kurzbz
-	 * @param string|array $apps
-	 * @param array $behebung_parameter
-
-	 * @return object success with issues or error
-	 */
-	public function getOpenIssuesByProperties(
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlertyp_kurzbz = null,
-		$apps = null,
-		$behebung_parameter = null,
-		$hauptzustaendig = false
-	) {
-		return $this->_getIssues(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz,
-			$apps,
-			$ist_verarbeitet = false,
-			$behebung_parameter,
-			$fehlercodes = null,
-			$fehlercode_extern = null,
-			$hauptzustaendig
-		);
-	}
-
-	/**
-	 * Gets issues which are open, i.e. not resolved.
-	 * @param int $person_id
-	 * @param string $oe_kurzbz
-	 * @param string $fehlertyp_kurzbz
-	 * @param array $apps only issues for given apps are retrieved
-	 * @param bool $ist_verarbeitet wether the issue has already been resolved
-	 * @param array $behebung_parameter
-	 * @param array $fehlercodes
-	 * @param string $fehlercode_extern
-	 * @return object success with issues or error
-	 */
-	private function _getIssues(
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlertyp_kurzbz = null,
-		$apps = null,
-		$ist_verarbeitet = null,
-		$behebung_parameter = null,
-		$fehlercodes = null,
-		$fehlercode_extern = null,
-		$hauptzustaendig = false
-	) {
-		$params = array();
-
-		$qry = 'SELECT
-					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
-					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
-					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
-				FROM
-					system.tbl_issue iss
-					JOIN system.tbl_fehler fe USING (fehlercode)
-				WHERE
-					TRUE';
-
-		if (isset($person_id) && is_numeric($person_id))
-		{
-			$qry .= ' AND person_id = ?';
-			$params[] = $person_id;
-		}
-
-		if (isset($oe_kurzbz))
-		{
-			$qry .= ' AND oe_kurzbz = ?';
-			$params[] = $oe_kurzbz;
-		}
-
-		if (isset($fehlertyp_kurzbz))
-		{
-			$qry .= ' AND fehlertyp_kurzbz = ?';
-			$params[] = $fehlertyp_kurzbz;
-		}
-
-		if (isset($apps))
-		{
-			if (is_string($apps)) $apps = [$apps];
-
-			if (is_array($apps))
-			{
-				$qry .= ' AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode AND app IN ?)';
-				$params[] = $apps;
-			}
-		}
-
-		if (is_bool($ist_verarbeitet))
-		{
-			$qry .= $ist_verarbeitet ? ' AND verarbeitetamum IS NOT NULL' : ' AND verarbeitetamum IS NULL';
-		}
-
-		if (!isEmptyArray($behebung_parameter))
-		{
-			// convert array to JSON string for postgres
-			$behebung_parameter_string = json_encode($behebung_parameter);
-
-			if ($behebung_parameter_string)
-			{
-				// check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
-				$qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
-				$params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
-			}
-		}
-
-		// retrieving only fehler for which user is hauptzuständig
-		if ($hauptzustaendig === true)
-		{
-			$this->load->model('system/Fehlerzustaendigkeiten_model', 'FehlerzustaendigkeitenModel');
-
-			$result = $this->FehlerzustaendigkeitenModel->getFehlerForUserHauptzustaendig();
-
-
-			if (isError($result)) return $result;
-
-			if (hasData($result))
-			{
-				$fehlercodesZust = array_column(getData($result), 'fehlercode');
-				$fehlercodes = isEmptyArray($fehlercodes) ? $fehlercodesZust : array_intersect($fehlercodes, $fehlercodesZust);
-			}
-		}
-
-		if (!isEmptyArray($fehlercodes))
-		{
-			$qry .= ' AND fehlercode IN ?';
-			$params[] = $fehlercodes;
-		}
-
-		if (isset($fehlercode_extern))
-		{
-			$qry .= ' AND fehlercode_extern = ?';
-			$params[] = $fehlercode_extern;
-		}
-
-		return $this->execQuery($qry, $params);
-	}
 }

application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php

@@ -16,7 +16,7 @@ $query = '
 			anrechnung.begruendung_id,
 			anrechnung.dms_id,
 			CASE
-				WHEN stg.typ || stg.kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
+				WHEN stg.oe_kurzbz IN (' . $ORGANISATIONSEINHEITEN_SCHREIBBERECHTIGT . ') THEN TRUE
 				ELSE FALSE
 			END "schreibberechtigt",
 			anrechnung.studiensemester_kurzbz,

application/views/lehre/lehrauftrag/acceptLehrauftragData.php

@@ -232,8 +232,8 @@ FROM
                 SELECT
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
-                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -268,8 +268,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                      pb
                         JOIN lehre.tbl_projektarbeit               pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit                 le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung           lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung           lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit       oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person                     person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag                vertrag USING (vertrag_id)
@@ -280,7 +279,7 @@ FROM
                     /* filter projektbetreuuer */
                     pb.person_id =  \'' . $PERSON_ID . '\'
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */

application/views/lehre/lehrauftrag/approveLehrauftragData.php

@@ -242,8 +242,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    (pa.projektarbeit_id::text)                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    (pa.projektarbeit_id::text)                                                         AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -270,7 +270,7 @@ FROM
                         ELSE (oe.organisationseinheittyp_kurzbz ||
                               \' \' || oe.bezeichnung)
                         END                                                                             AS "lv_oe_kurzbz",
-                    (nachname || \' \' || vorname)                                                        AS "lektor",
+                    (nachname || \' \' || vorname)                                                      AS "lektor",
                     TRUNC(pb.stunden, 1)                                                                AS "stunden",
                     pb.stundensatz,
                     TRUNC((pb.stunden * pb.stundensatz), 2)                                             AS "betrag",
@@ -280,8 +280,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -291,7 +290,7 @@ FROM
                     /* filter organisationseinheit */
                     lv.oe_kurzbz IN (\'' . implode('\',\'', $ORGANISATIONSEINHEIT) . '\')
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
+                  AND pa.studiensemester_kurzbz =  \'' . $STUDIENSEMESTER . '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter active organisationseinheiten */

application/views/lehre/lehrauftrag/orderLehrauftragData.php

@@ -272,8 +272,8 @@ FROM
                     pa.lehreinheit_id,
                     lv.lehrveranstaltung_id,
                     lv.bezeichnung                                                                      AS "lv_bezeichnung",
-                    pa.projektarbeit_id::text                                                                 AS "projektarbeit_id",
-                    le.studiensemester_kurzbz,
+                    pa.projektarbeit_id::text                                                           AS "projektarbeit_id",
+                    pa.studiensemester_kurzbz,
                     stg.studiengang_kz,
                     upper(stg.typ || stg.kurzbz)                                                        AS "stg_typ_kurzbz",
                     lv.orgform_kurzbz,
@@ -310,8 +310,7 @@ FROM
                 FROM
                     lehre.tbl_projektbetreuer                pb
                         JOIN lehre.tbl_projektarbeit         pa USING (projektarbeit_id)
-                        JOIN lehre.tbl_lehreinheit           le USING (lehreinheit_id)
-                        JOIN lehre.tbl_lehrveranstaltung     lv USING (lehrveranstaltung_id)
+                        JOIN lehre.tbl_lehrveranstaltung     lv ON (pa.lehrveranstaltung_id = lv.lehrveranstaltung_id)
                         JOIN PUBLIC.tbl_organisationseinheit oe USING (oe_kurzbz)
                         JOIN PUBLIC.tbl_person               person USING (person_id)
                         LEFT JOIN lehre.tbl_vertrag          vertrag USING (vertrag_id)
@@ -321,7 +320,7 @@ FROM
                     /* filter studiengang */
                     lv.studiengang_kz IN ('. implode(',', $STUDIENGANG) . ')
                     /* filter studiensemester */
-                  AND le.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
+                  AND pa.studiensemester_kurzbz =  \''. $STUDIENSEMESTER. '\'
                     /* filter active lehrveranstaltungen */
                   AND lv.aktiv = TRUE
                     /* filter ausbildungssemester */

application/views/system/infocenter/infocenterDetails.php

@@ -57,7 +57,7 @@
 				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 					<div class="col-lg-8">
 						<h3 class="page-header">
-							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/studvw/stdsem/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">