Plausichecks GUI: changed Studierendenverwaltung link to new Plausichecks

plausichecks gui: correct default studiensemester even if in summer gap
Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features
2026-10-12 15:04:04 +00:00 · 2026-08-20 13:25:07 +02:00 · 2026-08-19 17:12:00 +02:00 · 2026-08-19 17:07:40 +02:00 · 2026-08-19 15:55:53 +02:00 · 2026-05-26 13:30:13 +02:00
229 changed files with 4946 additions and 4581 deletions
@@ -0,0 +1,448 @@
+<?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
+	)
+);
@@ -3,4 +3,3 @@
 if (! defined('BASEPATH')) exit('No direct script access allowed');

 $config['infocenter_studiengang_kz'] = '10021, 10027, 10002';
-$config['infocenter_qualifikationskurs_kz'] = '10002';
@@ -129,19 +129,13 @@ $route['api/frontend/v1/treemenudata/stv/.*'] = 'api/frontend/v1/stv/students/in
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
-
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/semester/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3/$4';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStgOrgform/$1/$2/$3';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';
+$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/stg/(:any)/orgform/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByStg/$1/$2/$3';

 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';
 $route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/emp/(:any)/stg/(:any)/.*'] = 'api/frontend/v1/Lehrveranstaltung/getByEmp/$1/$2/$3';

-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/le/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLe/$1/$2';
-$route['api/frontend/v1/treemenudata/lvverwaltung/stdsem/(:any)/lv/(:any)'] = 'api/frontend/v1/Lehrveranstaltung/getByLv/$1/$2';
-

 // load routes from extensions, also look for environment-specific configs
 $subdirs = ['application/config/extensions', 'application/config/' . ENVIRONMENT . '/extensions'];
@@ -26,8 +26,7 @@ $config['root'] = [
 			'verband' => [
 				'group'
 			]
-		]
+		],
+		'orgform'
 	]
 ];
-
-$config['root']['stg']['orgform'] = $config['root']['stg'];
@@ -1,44 +0,0 @@
-<?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']);
-	}
-
-}
@@ -1916,7 +1916,7 @@ class Abgabe extends FHCAPI_Controller

 				if (!$mailres)
 				{
-					$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailZweitBegutachterv2'), 'general');
+					$this->terminateWithError($this->p->t('abgabetool', 'c4fehlerMailBegutachterv2'), 'general');
 				}

 			}
@@ -67,11 +67,8 @@ class CisMenu extends FHCAPI_Controller

 	private function generateUrlForMenuItem($menuItem)
 	{
-		if(!isset($menuItem->url))
-		{
-			$menuItem->url = $this->menuItemUrlHelper($menuItem);
-			unset($menuItem->content);
-		}
+		$menuItem->url = $this->menuItemUrlHelper($menuItem);
+		unset($menuItem->content);

 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -86,7 +83,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}

-		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}

@@ -94,8 +91,6 @@ class CisMenu extends FHCAPI_Controller
 		$doc->loadXML($menuItem->content);
 		$urlElem = $doc->getElementsByTagName('url')->item(0);

-		$this->menuItemUrlTargetHelper($menuItem, $doc);
-
 		if (!$urlElem) {
 			return '';
 		}
@@ -127,18 +122,5 @@ 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;
-		}
-	}
 }

@@ -28,10 +28,7 @@ class Lehrveranstaltung extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getByEmp' => ['admin:r', 'assistenz:r'],
-			'getByLe' => ['admin:r', 'assistenz:r'],
-			'getByLv' => ['admin:r', 'assistenz:r'],
 			'getByStg' => ['admin:r', 'assistenz:r'],
-			'getByStgOrgform' => ['admin:r', 'assistenz:r'],
 			'loadByLV' => ['admin:r', 'assistenz:r'],
 		]);

@@ -80,117 +77,41 @@ class Lehrveranstaltung extends FHCAPI_Controller

 		$this->terminateWithSuccess($tree);
 	}
-
-	public function getByLe($studiensemester_kurzbz = null, $lehreinheit_id = null)
-	{
-		if (is_null($lehreinheit_id))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-
-		$lehreinheiten = $this->_ci->LehreinheitModel->getByLeStudiensemester($lehreinheit_id, $studiensemester_kurzbz);
-		$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-		$this->terminateWithSuccess($lehreinheiten_data);
-	}
-
-	public function getByLv($studiensemester_kurzbz = null, $lehrveranstaltung_id = null)
-	{
-		if (is_null($lehrveranstaltung_id))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
-
-		$tree = [];
-
-		$this->_ci->LehrveranstaltungModel->addSelect('studiengang_kz');
-		$lv = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
-		$lv = $this->getDataOrTerminateWithError($lv);
-
-		if (empty($lv))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
-
-		$lehrveranstaltungen_data = array();
-		foreach ($this->_loadLvRows(current($lv)->studiengang_kz, $studiensemester_kurzbz) as $row)
-		{
-			if ((string)$row->lehrveranstaltung_id === (string)$lehrveranstaltung_id)
-			{
-				$lehrveranstaltungen_data[] = $row;
-				break;
-			}
-		}
-
-		if (empty($lehrveranstaltungen_data))
-		{
-
-			$this->_ci->LehrveranstaltungModel->addSelect('
-				tbl_lehrveranstaltung.*,
-				tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
-				lehrveranstaltung_id,
-				lehrtyp_kurzbz,
-				studiengang_kz as lv_studiengang_kz,
-				UPPER(CONCAT(tbl_studiengang.typ, tbl_studiengang.kurzbz)) as studiengang,
-				semester as semester,
-				tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-				ects as lv_ects,
-				lehreverzeichnis as lv_lehreverzeichnis,
-				planfaktor as lv_planfaktor,
-				planlektoren as lv_planlektoren,
-				planpersonalkosten as lv_planpersonalkosten,
-				plankostenprolektor as lv_plankostenprolektor,
-				tbl_lehrveranstaltung.orgform_kurzbz as orgform_kurzbz,
-				tbl_lehrveranstaltung.sprache as sprache,
-				lehrform_kurzbz as lv_lehrform_kurzbz,
-				tbl_lehrveranstaltung.bezeichnung_english as lv_bezeichnung_english,
-				semesterstunden as lv_semesterstunden,
-			');
-			$this->_ci->LehrveranstaltungModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-			$lehrveranstaltungen = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id);
-			$lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen);
-		}
-
-		foreach ($lehrveranstaltungen_data as $lehrveranstaltung)
-		{
-			$lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz);
-			$lehreinheiten_data = $this->getDataOrTerminateWithError($lehreinheiten);
-
-			if (!isset($lehrveranstaltung->_children))
-			{
-				$lehrveranstaltung->_children = $lehreinheiten_data;
-			}
-			$tree[] = $lehrveranstaltung;
-		}
-
-		$counter = 0;
-		$this->assignUniqueIndex($tree, $counter);
-		$this->terminateWithSuccess($tree);
-	}
-
 	public function getByStg($studiensemester_kurzbz = null, $stg_kz = null, $semester = null)
-	{
-		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, null);
-	}
-
-	public function getByStgOrgform($studiensemester_kurzbz = null, $stg_kz = null, $orgform = null, $semester = null)
-	{
-		$orgform_kurzbz = $this->getOrgformKurzbz($orgform);
-		$this->_getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz);
-	}
-
-	private function _getLvTree($studiensemester_kurzbz, $stg_kz, $semester, $orgform_kurzbz)
 	{
 		$studiengang_kz = $this->getStudiengangKz($stg_kz);

-		if (is_null($studiengang_kz) || !preg_match("/^(-?[1-9][0-9]*|0)$/", (string)$studiengang_kz))
+		if (is_null($studiengang_kz) || !preg_match("/^-?[1-9][0-9]*$/", (string)$studiengang_kz))
 			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);

-		if (!is_null($semester) && !ctype_digit((string)$semester))
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+		$verband = null;
+		if (!is_null($semester) && !is_numeric($semester))
+		{
+			$verband = $this->getOrgformKurzbz($semester);
+			$semester = null;
+		}
+
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');

 		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);
+		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $verband);

-		$lehrveranstaltungen_data = $this->_loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
+		$studienplan_ids = array();
+		$only_ids = array();
+		$placeholders = array();
+
+		if (hasData($studienplan_data))
+		{
+			foreach (getData($studienplan_data) as $studienplan) {
+				$placeholders[] = "(?, ?)";
+				$studienplan_ids[] = $studienplan->studienplan_id;
+				$studienplan_ids[] = $studienplan->semester;
+				$only_ids[] = $studienplan->studienplan_id;
+			}
+		}
+
+		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $verband);
+		$lehrveranstaltungen_data = hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();

 		$tree = [];
 		foreach ($lehrveranstaltungen_data as $row)
@@ -323,31 +244,6 @@ class Lehrveranstaltung extends FHCAPI_Controller

 		$this->LehreinheitModel->getLvsByFachbereich($fachbereich, $studiensemester_kurzbz, $mitarbeiter_uid);
 	}*/
-
-	private function _loadLvRows($studiengang_kz, $studiensemester_kurzbz, $semester = null, $orgform_kurzbz = null)
-	{
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
-
-		$studienplan_data = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
-
-		$studienplan_ids = array();
-		$only_ids = array();
-		$placeholders = array();
-
-		if (hasData($studienplan_data))
-		{
-			foreach (getData($studienplan_data) as $studienplan) {
-				$placeholders[] = "(?, ?)";
-				$studienplan_ids[] = $studienplan->studienplan_id;
-				$studienplan_ids[] = $studienplan->semester;
-				$only_ids[] = $studienplan->studienplan_id;
-			}
-		}
-
-		$lehrveranstaltungen_data = $this->_ci->LehrveranstaltungModel->getLvsByStudiengang($studienplan_ids, $placeholders, $only_ids, $studiengang_kz, $studiensemester_kurzbz, $semester, $orgform_kurzbz);
-		return hasData($lehrveranstaltungen_data) ? getData($lehrveranstaltungen_data) : array();
-	}
-
 	private function _setAuthUID()
 	{
 		$this->_uid = getAuthUID();
@@ -413,8 +309,8 @@ class Lehrveranstaltung extends FHCAPI_Controller
 		$data = $this->getDataOrTerminateWithError($result);

 		if (!$data)
-			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+			return $orgform_kurzbz;

 		return current($data)->orgform_kurzbz;
 	}
-}
+}
@@ -114,7 +114,6 @@ class LvPlan extends FHCAPI_Controller

 		// fetching lvplan events
 		$result = $this->stundenplanlib->getEventsUser($start_date, $end_date, $uid);
-
 		$lvplanEvents = $this->getDataOrTerminateWithError($result);

 		// fetching moodle events
@@ -167,9 +167,7 @@ class Studium extends FHCAPI_Controller
 		if($aktuelles_studienplan){
 			$lehrveranstaltungen = $this->computeStudienplanLehrveranstaltungen($aktuelles_studienplan->studienplan_id, $aktuelles_semester);
 			foreach($lehrveranstaltungen as $lehrv){
-				// a lehrveranstaltung without a modul has no children and gets its lektoren directly
-				$lvs = isset($lehrv->lehrveranstaltungen) ? $lehrv->lehrveranstaltungen : [$lehrv];
-				foreach($lvs as $lv){
+				foreach($lehrv->lehrveranstaltungen as $lv){
 					$lvLektoren =$this->computeLektorenFromLehrveranstaltung($lv->lehrveranstaltung_id,$aktuelles_semester, $aktuelles_studiengang->studiengang_kz, $aktuelles_studiensemester->studiensemester_kurzbz);
 					$lv->lektoren = $lvLektoren;
 				}
@@ -288,7 +286,6 @@ 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;
@@ -305,17 +302,12 @@ SELECT tbl_lehrveranstaltung.*,
 			}
 			else{
 				$parent =array_filter($carry, function($item)use($lehrv){
-					return isset($item->lehrveranstaltungen)
-						&& $item->studienplan_lehrveranstaltung_id == $lehrv->studienplan_lehrveranstaltung_id_parent;
+					return $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;
 		}, []);
@@ -101,9 +101,6 @@ class Widget extends FHCAPI_Controller
 			$tmpsetup = json_decode($widget->setup);
 			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
 			$widget->setup = $tmpsetup;
-			$widget->permitted = empty($widget->berechtigung_kurzbz) 
-				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
-
 			return $widget;
 		}, $widgets);

@@ -0,0 +1,200 @@
+<?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);
+		}
+	}
+}
@@ -0,0 +1,104 @@
+<?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());
+		}
+	}
+}
@@ -0,0 +1,17 @@
+<?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'
+	//);
+}
@@ -28,8 +28,7 @@ class Studiensemester extends FHCAPI_Controller
 				'getStudienjahrByStudiensemester' => self::PERM_LOGGED,
 				'getAllStudiensemesterAndAktOrNext' => self::PERM_LOGGED,
 				'current' => self::PERM_LOGGED,
-				'set' => self::PERM_LOGGED,
-				'getContainingOrNearestByDateRange' => self::PERM_LOGGED,
+				'set' => self::PERM_LOGGED
 			)
 		);
 		// Load model StudiensemesterModel
@@ -204,15 +203,4 @@ class Studiensemester extends FHCAPI_Controller

 		$this->terminateWithSuccess(true);
 	}
-
-	public function getContainingOrNearestByDateRange()
-	{
-		$from = $this->input->get("from");
-		$to = $this->input->get("to");
-
-		$result = $this->StudiensemesterModel->getContainingOrNearestByDateRange($from, $to);
-		$data = $this->getDataOrTerminateWithError($result);
-
-		$this->terminateWithSuccess($data);
-	}
 }
@@ -574,19 +574,6 @@ class Kontakt extends FHCAPI_Controller
 		$person_id = $this->input->post('person_id');
 		$standort_id = $this->input->post('standort_id');

-		//check person_id: allow editing only of persons who are no mitarbeiter
-		if($person_id)
-		{
-			$this->load->model('person/Benutzer_model', 'BenutzerModel');
-			$this->BenutzerModel->addJoin('public.tbl_mitarbeiter ma', 'ON (ma.mitarbeiter_uid = public.tbl_benutzer.uid)');
-
-			$result = $this->BenutzerModel->loadWhere([
-				'person_id' => $person_id
-			]);
-			if(hasData($result))
-				return $this->terminateWithError($this->p->t('ui', 'editingMitarbeiterPVonly'), self::ERROR_TYPE_GENERAL);
-		}
-
 		$result = $this->KontaktModel->update(
 			[
 				'kontakt_id' => $kontakt_id
@@ -370,7 +370,6 @@ 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));
@@ -42,8 +42,6 @@ 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');
@@ -102,16 +100,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,
-			tbl_projektarbeit.studiensemester_kurzbz, 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, 
+			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)
 		);
+
 	}

 	/**
@@ -248,38 +246,14 @@ 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('Studiensemester missing', self::ERROR_TYPE_GENERAL);
+		if (!isset($studiensemester_kurzbz)) $this->terminateWithError('Studiensemster missing', self::ERROR_TYPE_GENERAL);

-		// 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
+		// get Lvs
 		$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)
 		{
@@ -346,18 +320,11 @@ class Projektarbeit extends FHCAPI_Controller
 			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Projekttyp'])
 		]);

-		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'is_natural', [
+		$this->form_validation->set_rules('lehreinheit_id', 'Lehreinheit', 'required|is_natural', [
+			'required' => $this->p->t('ui', 'error_fieldRequired', ['field' => 'Lehreinheit']),
 			'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'])
 		]);
@@ -387,8 +354,6 @@ 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,
@@ -108,7 +108,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);

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

 		$this->studentlistlib->addJoin(
 			"(
@@ -215,7 +213,6 @@ class Students extends FHCAPI_Controller
 			'studiensemester_kurzbz' => $studiensemester_kurzbz
 		]);
 		
-		$studiensemester_kurzbz = $this->getStudiensemesterKurzbz($studiensemester_kurzbz);

 		$this->studentlistlib->addJoin(
 			"(
@@ -5,58 +5,46 @@
 */
 class IssueResolver extends IssueResolver_Controller
 {
-	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',
-		);
-	}
+	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'
+	);
 }
@@ -6,7 +6,7 @@
 class PlausiIssueProducer extends PlausiIssueProducer_Controller
 {
 	private $_currentStudiensemester;
-	protected $_app = 'core';
+	protected $_apps = '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->getAkt();
+		$studiensemesterRes = $this->StudiensemesterModel->getAktOrNextSemester(62);
 		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->_fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+		$this->_fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
 	}

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

@@ -0,0 +1,57 @@
+<?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));
+	}
+}
@@ -0,0 +1,46 @@
+<?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);
+	}
+}
@@ -34,9 +34,6 @@ 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
@@ -178,7 +175,6 @@ 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');
@@ -1456,100 +1452,6 @@ 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

@@ -2044,17 +1946,6 @@ 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,
@@ -2064,9 +1955,7 @@ class InfoCenter extends Auth_Controller
 			'messages' => $messages->retval,
 			'logs' => $logs,
 			'notizen' => $notizen->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
+			'notizenbewerbung' => $notizen_bewerbung->retval
 		);

 		return $data;
@@ -2486,4 +2375,97 @@ 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");
+	}
 }
@@ -7,8 +7,6 @@ class Rueckstellung extends Auth_Controller
 	private $_ci; // Code igniter instance
 	private $_uid;

-	const ZGV_UEBERPRUEFUNG_MAIL_VORLAGE = 'ZGVUEP';
-
 	public function __construct()
 	{
 		parent::__construct(
@@ -25,7 +23,6 @@ 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
 		
@@ -81,8 +78,6 @@ class Rueckstellung extends Auth_Controller
 		
 		$this->_log($person_id, $status_kurzbz);

-		if  ($status_kurzbz === 'onhold_zgv')
-			$this->sendRueckstellungMessage($person_id);
 		$this->outputJson($result);
 	}

@@ -109,10 +104,6 @@ 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!");
 	}
@@ -169,26 +160,4 @@ 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'
-			);
-		}
-	}
 }
@@ -88,9 +88,11 @@ 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['app'] = $app;
+		if (!isEmptyString($app)) $params['tbl_fehler_app.app'] = $app;
 		$fehlerRes = $this->FehlerModel->loadWhere($params);

 		if (isError($fehlerRes)) $this->terminateWithJsonError($this->p->t('fehlermonitoring', 'fehlerFehlerLaden'));
@@ -69,10 +69,7 @@ class IssuesZustaendigkeiten extends Auth_Controller
 	{
 		$app = $this->input->get('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();
+		$fehlerRes = $this->FehlerModel->getByApps($app);

 		$this->outputJson($fehlerRes);
 	}
@@ -5,6 +5,7 @@ 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()
 	{
@@ -16,8 +17,7 @@ class Plausichecks extends Auth_Controller
 		);

 		// Load libraries
-		$this->load->library('issues/PlausicheckProducerLib', array('app' => 'core'));
-		$this->load->library('issues/PlausicheckDefinitionLib');
+		$this->load->library('issues/PlausicheckProducerLib', array('apps' => self::APPS));
 		$this->load->library('WidgetLib');

 		// Load models
@@ -46,37 +46,31 @@ class Plausichecks extends Auth_Controller

 		// issues array for passing issue texts
 		$allIssues = array();
-		// all fehler kurzbz which are going to be checked
-		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckdefinitionlib->getFehlerKurzbz();
-		$fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
+
+		$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);
+
 		// set Studiengang to null if not passed
 		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;

 		// get the data returned by Plausicheck
-		foreach ($fehlerKurzbz as $fehler_kurzbz)
+		foreach ($fehlerArr as $fehler)
 		{
-			// 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_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
-
-			// get library name for producing issue
-			$libName = $fehlerLibMappings[$fehler_kurzbz];
+			$allIssues[$fehler->fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());

 			// execute the check
 			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$libName,
-				$fehler_kurzbz,
+				$fehler->fehler_kurzbz,
 				array(
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'studiengang_kz' => $studiengang_kz
@@ -107,7 +101,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_kurzbz);
+								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler->fehler_kurzbz);

 							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
 						}
@@ -118,7 +112,7 @@ class Plausichecks extends Auth_Controller
 						$issueObj = new StdClass();
 						$issueObj->fehlertext = $fehlerText;
 						$issueObj->type = $fehlerTyp;
-						$allIssues[$fehler_kurzbz]['data'][] = $issueObj;
+						$allIssues[$fehler->fehler_kurzbz]['data'][] = $issueObj;
 					}
 					else // if no issue text found, use generic text
 					{
@@ -149,6 +143,12 @@ 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 = $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$fehlerKurzbz = array_keys($this->plausicheckproducerlib->getFehlerMappings());

 		$db = new DB_Model();

@@ -168,7 +168,9 @@ class Plausichecks extends Auth_Controller
 			FROM
 				system.tbl_fehler
 			WHERE
-				fehler_kurzbz IN ?',
+				fehler_kurzbz IN ?
+			ORDER BY
+				fehler_kurzbz, fehlercode',
 			array($fehlerKurzbz)
 		);

@@ -188,7 +190,8 @@ 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
+			'fehlerKurzbzCodeMappings' => $fehlerKurzbzCodeMappings,
+			'studiengang_kz' => $this->input->get('studiengang_kz') ?? ''
 		);
 	}
 }
@@ -5,11 +5,8 @@
 */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	// 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 = [];
+	// codes of fehler to be resolved
+	protected $_fehlercodes = [];

 	public function __construct()
 	{
@@ -24,25 +21,18 @@ abstract class IssueResolver_Controller extends JOB_Controller
 	 */
 	public function run()
 	{
+		// initialize librariy with provided fehlercodes
 		$this->load->library(
 			'issues/PlausicheckResolverLib',
 			[
-				'extensionName' => $this->_extensionName ?? null,
-				'codeLibMappings' => $this->_codeLibMappings,
-				'codeProducerLibMappings' => $this->_codeProducerLibMappings
+				'fehlercodes' => $this->_fehlercodes
 			]
 		);

 		$this->logInfo("Issue resolve job started");

-		// 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);
+		// resolve the issues
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues();

 		// log if error, or log info if inserted new issue
 		foreach ($result->errors as $error) $this->logError($error);
@@ -5,14 +5,23 @@
 */
 abstract class PlausiIssueProducer_Controller extends JOB_Controller
 {
-	protected $_fehlerLibMappings = [];
-	protected $_app;
+	protected $_fehlerKurzbz = [];
+	protected $_apps = [];
+
+	/**
+	 * Runs issue production job.
+	 */
+	public function run()
+	{
+		// producing issues
+		$this->producePlausicheckIssues(array());
+	}

 	protected function producePlausicheckIssues($params)
 	{
 		$this->load->library(
 			'issues/PlausicheckProducerLib',
-			['extensionName' => $this->_extensionName ?? null, 'app' => $this->_app, 'fehlerLibMappings' => $this->_fehlerLibMappings]
+			['apps' => $this->_apps, 'fehlerKurzbz' => $this->_fehlerKurzbz]
 		);

 		$this->logInfo("Plausicheck issue producer job started");
@@ -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 . '.pdf';
+		return 'Anrechnungsantrag'. $orgform_kurzbz .'_LV-'. $lehrveranstaltung_id. '_'. $fullname;
 	}
 	
 	public function LVhasLector($anrechnung_id)
@@ -0,0 +1,384 @@
+<?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);
+	}
+}
@@ -20,6 +20,10 @@ 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();
@@ -91,12 +95,16 @@ class IssuesLib
 			return error("fehlercode_extern missing");

 		// get external fehlercode (unique for each app)
-		$this->_ci->FehlerModel->addSelect('fehlercode');
-		$fehlerRes = $this->_ci->FehlerModel->loadWhere(
-			array(
-				'fehlercode_extern' => $fehlercode_extern,
-				'app' => $this->_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]
 		);

 		if (isError($fehlerRes))
@@ -105,8 +113,10 @@ class IssuesLib
 		// check if there is a predefined custom error for the external issue
 		if (hasData($fehlerRes))
 		{
-			$fehlerData = getData($fehlerRes)[0];
 			// 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];
 			$fehlercode = $fehlerData->fehlercode;
 		}
 		else
@@ -128,9 +138,9 @@ class IssuesLib
 	public function setBehoben($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_BEHOBEN,
-			'verarbeitetvon' => $user,
-			'verarbeitetamum' => date('Y-m-d H:i:s')
+			self::STATUS_KURZBZ => self::STATUS_BEHOBEN,
+			self::VERARBEITET_VON => $user,
+			self::VERARBEITET_AMUM => date('Y-m-d H:i:s')
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -145,8 +155,8 @@ class IssuesLib
 	public function setInBearbeitung($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_IN_BEARBEITUNG,
-			'verarbeitetvon' => $user
+			self::STATUS_KURZBZ => self::STATUS_IN_BEARBEITUNG,
+			self::VERARBEITET_VON => $user
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -161,9 +171,9 @@ class IssuesLib
 	public function setNeu($issue_id, $user)
 	{
 		$data = array(
-			'status_kurzbz' => self::STATUS_NEU,
-			'verarbeitetvon' => null,
-			'verarbeitetamum' => null
+			self::STATUS_KURZBZ => self::STATUS_NEU,
+			self::VERARBEITET_VON => null,
+			self::VERARBEITET_AMUM => null
 		);

 		return $this->_changeIssueStatus($issue_id, $data, $user);
@@ -185,13 +195,18 @@ class IssuesLib
 			return error("Issue Id must be set correctly.");

 		// check if given status is same as existing
-		$this->_ci->IssueModel->addSelect('status_kurzbz');
+		$this->_ci->IssueModel->addSelect(self::STATUS_KURZBZ.', '.self::VERARBEITET_AMUM);
 		$currStatus = $this->_ci->IssueModel->load($issue_id);

 		if (hasData($currStatus))
 		{
-			if (getData($currStatus)[0]->status_kurzbz == $data['status_kurzbz'])
+			$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}))
+			) {
 				return success("Same status already set");
+			}
 		}
 		else
 			return error("Error when getting status");
@@ -227,11 +242,10 @@ class IssuesLib
 		$fehlercode_extern = null,
 		$inhalt_extern = null
 	) {
-		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
-			return error("Person_id or oe_kurzbz must be set.");
+		if (!is_numeric($person_id) && isEmptyString($oe_kurzbz)) return error("Person_id or oe_kurzbz must be set, fehlercode: $fehlercode");

 		// get fehlertextVorlage and replace it with params
-		$fehlerRes = $this->_ci->FehlerModel->load($fehlercode);
+		$fehlerRes = $this->_ci->FehlerModel->loadWhere(['fehlercode' => $fehlercode]);

 		if (hasData($fehlerRes))
 		{
@@ -241,7 +255,7 @@ class IssuesLib
 			if (!isEmptyArray($fehlertext_params))
 			{
 				if (count($fehlertext_params) != substr_count($fehlertextVorlage, '%s'))
-					return error('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehlercode);
+					return error('Wrong number of parameters for Fehlertext, fehlercode ' . $fehlercode);

 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
@@ -33,7 +33,7 @@ class SearchBarLib
 	const ERROR_NOT_AUTH = 'ERR005';

 	// List of allowed types of search
-	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms', 'lehreinheit', 'lehrveranstaltung'];
+	const ALLOWED_TYPES = ['mitarbeiter', 'mitarbeiter_ohne_zuordnung', 'organisationunit', 'raum', 'person', 'student','studentStv', 'prestudent', 'document', 'cms'];

 	const PHOTO_IMG_URL = '/cis/public/bild.php?src=person&person_id=';

@@ -180,14 +180,10 @@ class SearchBarLib
 	protected function buildSearchClause(DB_Model $dbModel, array $columns, $searchstr)
 	{
 		$searchstr = preg_replace('/[[:punct:]]/', ' ', $searchstr);
-		$words = preg_split('/\s+/', trim($searchstr), -1, PREG_SPLIT_NO_EMPTY);
-
-		if (empty($words)) return array();
-
 		$document			 = implode(' || \' \' || ', $columns);
-		$query				 = '\'' . implode(':* & ', $words) . ':*\'';
-		$reversequery		 = '\'*:' . implode(' & *:', $words) . '\'';
-		$nospacequery		 = '\'' . implode('', $words) . ':*\'';
+		$query				 = '\'' . implode(':* & ', explode(' ', trim($searchstr))) . ':*\'';
+		$reversequery		 = '\'*:' . implode(' & *:', explode(' ', trim($searchstr))) . '\'';
+		$nospacequery		 = '\'' . implode('', explode(' ', trim($searchstr))) . ':*\'';

 		$searchclause = <<<EOSC
 			to_tsvector(lower(regexp_replace({$document}, '[[:punct:]]', ' ', 'g'))) @@ to_tsquery(lower({$query}))
@@ -600,98 +596,5 @@ EOSC;
 		// Otherwise return an empty array
 		return array();
 	}
-
-
-	private function _lehreinheit($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$idwhere = '';
-		if (ctype_digit(trim($searchstr)))
-		{
-			$id = (int)trim($searchstr);
-			$idwhere = ' OR le.lehreinheit_id = ' . $id;
-		}
-
-		$lehreinheit = $dbModel->execReadOnlyQuery('
-			SELECT
-				\'teachingunit\' AS renderer,
-				\''.$type.'\' AS type,
-				le.lehreinheit_id AS id,
-				le.studiensemester_kurzbz,
-				lv.bezeichnung,
-				\'lv_table_icon icon-\' AS foto,
-				UPPER(stg.typ || stg.kurzbz) AS studiengang,
-				le.lehrform_kurzbz,
-				lv.semester
-			FROM lehre.tbl_lehreinheit le
-				JOIN lehre.tbl_lehrveranstaltung lv ON (lv.lehrveranstaltung_id = le.lehrveranstaltung_id)
-				JOIN public.tbl_studiengang stg ON (stg.studiengang_kz = lv.studiengang_kz)
-				JOIN public.tbl_studiensemester sem ON (sem.studiensemester_kurzbz = le.studiensemester_kurzbz)
-			WHERE (' .
-				$this->buildSearchClause(
-					$dbModel,
-					array(
-						'(stg.typ || stg.kurzbz)',
-						'lv.semester',
-						'lv.bezeichnung'
-					),
-					$searchstr
-				) . ')' . $idwhere . '
-	');
-
-		// If something has been found then return it
-		if (hasData($lehreinheit)) return getData($lehreinheit);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
-	private function _lehrveranstaltung($searchstr, $type)
-	{
-		$dbModel = new DB_Model();
-
-		$idwhere = '';
-
-		if (ctype_digit(trim($searchstr)))
-		{
-			$id = (int)trim($searchstr);
-			$idwhere = ' OR tbl_lehrveranstaltung.lehrveranstaltung_id = ' . $id;
-		}
-
-		$lehreinheit = $dbModel->execReadOnlyQuery('
-			
-			SELECT
-				\'teachingunit\' AS renderer,
-				\''.$type.'\' AS type,
-				lehrveranstaltung_id as id,
-				tbl_lehrveranstaltung.bezeichnung,
-				\'lv_table_icon icon-lv\' as foto,
-				UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as studiengang,
-				semester,
-				lehrform_kurzbz,
-				tbl_organisationseinheit.bezeichnung as oe_bezeichnung
-			FROM lehre.tbl_lehrveranstaltung
-				JOIN public.tbl_studiengang USING(studiengang_kz)
-				JOIN public.tbl_organisationseinheit ON tbl_lehrveranstaltung.oe_kurzbz = tbl_organisationseinheit.oe_kurzbz
-			WHERE (' .
-				$this->buildSearchClause(
-					$dbModel,
-					array(
-						'(tbl_studiengang.typ || tbl_studiengang.kurzbz)',
-						'semester',
-						'tbl_lehrveranstaltung.bezeichnung'
-					),
-					$searchstr
-				) . ')' . $idwhere . '
-		');
-
-		// If something has been found then return it
-		if (hasData($lehreinheit)) return getData($lehreinheit);
-
-		// Otherwise return an empty array
-		return array();
-	}
-
 }

@@ -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,7 +632,6 @@ 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);
@@ -9,48 +9,40 @@ class PlausicheckDefinitionLib
 {
 	// set fehler for core plausichecks
 	// structure: fehler_kurzbz => class (library) name for resolving
-	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',
+	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',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
-		//'StudienplanUngueltig' => 'StudienplanUngueltig'
-		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
+		//'StudienplanUngueltig',
+		//'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 array_keys($this->_fehlerLibMappings);
+		return $this->_fehlerKurzbz;
 	}
 }
@@ -6,36 +6,43 @@ 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 $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them
+	private $_apps = []; // apps of fehler to produce

 	public function __construct($params = null)
 	{
-		// 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;
+		// 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'];
+		}

 		$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');

-		// get all configuration parameters for the application
-		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($app);
+		$this->_ci->load->config(self::CONFIG_FEHLER_NAME);
+
+		// get all configuration parameters for the application(s))
+		$fehlerkonfigurationRes = $this->_ci->FehlerkonfigurationModel->getKonfiguration($this->_apps);

 		if (hasData($fehlerkonfigurationRes))
 		{
@@ -46,10 +53,88 @@ 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 saved them to db.
+	 * Produces multiple plausicheck issues at once, and saves them in the database.
 	 * @param array $params passed to each plausicheck
 	 * @return result object with occured error and info
 	 */
@@ -59,10 +144,17 @@ class PlausicheckProducerLib
 		$result->errors = [];
 		$result->infos = [];

-		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
+		$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)
 		{
 			$plausicheckRes = $this->producePlausicheckIssue(
-				$libName,
 				$fehler_kurzbz,
 				$params
 			);
@@ -96,14 +188,23 @@ 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($libName, $fehler_kurzbz, $params)
+	public function producePlausicheckIssue($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($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+		$libRootPath = isset($mapping[self::EXTENSION_NAME]) ? ExtensionsLib::EXTENSIONS_DIR_NAME . '/' . $mapping[self::EXTENSION_NAME] . '/' : '';

 		// path for loading issue library
 		$issuesLibPath = $libRootPath . self::PLAUSI_ISSUES_FOLDER . '/';
@@ -121,7 +222,7 @@ class PlausicheckProducerLib
 		// load library connected to fehlercode
 		$this->_ci->load->library(
 			$issuesLibPath . $libName,
-			['configurationParams' => $config, 'isForResolutionCheck' => $this->_isForResolutionCheck]
+			['configurationParams' => $config]
 		);

 		$lowercaseLibName = mb_strtolower($libName);
@@ -133,4 +234,13 @@ 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;
+	}
 }
@@ -9,43 +9,177 @@ 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 $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced
+	private $_defaultIssueParams = ['issue_id' => 'issue_id', 'issue_person_id' => 'person_id', 'issue_oe_kurzbz' => 'oe_kurzbz'];

 	public function __construct($params = null)
 	{
-		// 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'];
+		// 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'];
+		}

 		$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('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
+		$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;
+						}
+					}
+				}
+			}
+		}
 	}

 	/**
 	 * Reseolves multiple plausicheck issues at once.
-	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
-	 * @param array $openIssues passed issues to resolve
+	 * @param array $openIssues passed issues to resolve. If null, issues with fehlercodes in _fehlercodes property are loaded
 	 * @return result object with occured error and info
 	 */
-	public function resolvePlausicheckIssues($openIssues)
+	public function resolvePlausicheckIssues($openIssues = null)
 	{
+		// 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(
-				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+				$params,
 				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
 			);

@@ -54,69 +188,72 @@ class PlausicheckResolverLib
 			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
 			if (isset($this->_codeLibMappings[$issue->fehlercode]))
 			{
-				$libName = $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;

-				// 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))
+				if ($producerIsResolver)
 				{
-					// log error and continue with next issue if not
-					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-					continue;
-				}
+					// execute same check as used for issue production
+					$issueResolvedRes = $this->_ci->PlausicheckResolverProducerLib->producePlausicheckIssue(
+						$issue->fehler_kurzbz,
+						$params
+					);

-				// 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);
+					if (isError($issueResolvedRes))
+					{
+						$result->errors[] = getError($issueResolvedRes);
+					}
+					else
+					{
+						$issueResolved = !hasData($issueResolvedRes);
+					}
 				}
 				else
 				{
-					$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];
+					// if called from extension (extension name set), path includes extension names
+					$libRootPath = isset($extensionName) ? self::EXTENSIONS_FOLDER . '/' . $extensionName . '/' : '';

-				// execute same check as used for issue production 
-				$issueResolvedRes = $this->_ci->plausicheckproducerlib->producePlausicheckIssue(
-					$libName,
-					$issue->fehler_kurzbz,
-					$params
-				);
+					// path for loading issue library
+					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';

-				if (isError($issueResolvedRes))
-				{
-					$result->errors[] = getError($issueResolvedRes);
-				}
-				else
-				{
-					$issueResolved = !hasData($issueResolvedRes);
+					// 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;
+					}
 				}
 			}

@@ -23,7 +23,11 @@ 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 = ?"];
+	protected $_params_for_checking = [
+		'studiengang_kz' => " AND stg.studiengang_kz = ?",
+		'prestudent_id' => " AND pre.prestudent_id = ?",
+		'person_id' => " AND pre.person_id = ?"
+	];
 	protected $_fehlertext_params = ['prestudent_id'];
 	protected $_resolution_params = ['prestudent_id'];
 }
@@ -19,12 +19,14 @@ 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
 		);

@@ -55,6 +57,7 @@ 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
 	 */
@@ -62,6 +65,7 @@ class AbschlussstatusFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -132,6 +136,12 @@ 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 ?";
@@ -19,9 +19,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -56,11 +57,17 @@ 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, $exkludierte_studiengang_kz = null)
-	{
+	public function getAktSemesterNull(
+		$studiensemester_kurzbz,
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
 		$params = array($studiensemester_kurzbz);

 		$qry = "
@@ -89,6 +96,12 @@ 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 ?";
@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -48,10 +49,11 @@ 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, $exkludierte_studiengang_kz = null)
+	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -88,6 +90,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -61,6 +63,7 @@ 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
 	 */
@@ -68,6 +71,7 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -109,6 +113,13 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -64,6 +66,7 @@ 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
 	 */
@@ -71,6 +74,7 @@ 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);
@@ -105,6 +109,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -58,6 +60,7 @@ 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
 	 */
@@ -65,6 +68,7 @@ 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');
@@ -112,6 +116,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -58,6 +60,7 @@ 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
 	 */
@@ -65,6 +68,7 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -112,6 +116,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -58,6 +60,7 @@ 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
 	 */
@@ -65,6 +68,7 @@ class DatumSponsionFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -112,6 +116,12 @@ 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 ?";
@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -50,11 +51,16 @@ 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, $exkludierte_studiengang_kz = null)
-	{
+	public function getDatumStudiensemesterFalscheReihenfolge(
+		$studiengang_kz = null,
+		$prestudent_id = null,
+		$person_id = null,
+		$exkludierte_studiengang_kz = null
+	) {
 		$params = array();

 		// all active students with Status student in current semester
@@ -97,6 +103,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -61,6 +63,7 @@ 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
 	 */
@@ -68,6 +71,7 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -132,6 +136,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -55,6 +57,7 @@ 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
 	 */
@@ -62,6 +65,7 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -111,6 +115,12 @@ 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 ?";
@@ -19,12 +19,13 @@ 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,
-			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -19,12 +19,13 @@ 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,
-			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -0,0 +1,131 @@
+<?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);
+	}
+}
@@ -19,9 +19,10 @@ 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, null, $exkludierte_studiengang_kz);
+		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, $person_id, $exkludierte_studiengang_kz);

 		if (isError($personRes)) return $personRes;

@@ -0,0 +1,108 @@
+<?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);
+	}
+}
@@ -19,12 +19,14 @@ 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
 		);

@@ -58,21 +60,26 @@ 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,
+		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
-		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
-		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
+		if (!isset($studiensemester_kurzbz))
+		{
+			$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+			$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();

-		if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;
+			if (isError($aktStudiensemesterRes)) return $aktStudiensemesterRes;

-		$studiensemester_kurzbz = hasData($aktStudiensemesterRes) ? getData($aktStudiensemesterRes)[0]->studiensemester_kurzbz : '';
+			$studiensemester_kurzbz = hasData($aktStudiensemesterRes) ? getData($aktStudiensemesterRes)[0]->studiensemester_kurzbz : '';
+		}

 		$params = array($studiensemester_kurzbz);

@@ -103,6 +110,12 @@ 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 ?";
@@ -19,12 +19,13 @@ 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,
-			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -48,10 +49,11 @@ 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, $exkludierte_studiengang_kz = null)
+	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -85,6 +87,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -55,6 +57,7 @@ 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
 	 */
@@ -62,6 +65,7 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -114,6 +118,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -59,7 +61,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.2020
+	 * e.g. If student studies in WS2022 datum of status shouldn't be before 15.4.2022
 	 * 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
@@ -71,11 +73,14 @@ 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
@@ -117,6 +122,12 @@ 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 ?";
@@ -132,17 +143,16 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 	 */
 	private function _getBisdateFromSemester($studiensemester_kurzbz)
 	{
-		$semesterYear = substr($studiensemester_kurzbz, 2, 6);
-		$semesterType = substr($studiensemester_kurzbz, 0, 2);
+		$bisdate = null;

-		if ($semesterType == 'SS')
-		{
-			return date_format(date_create(($semesterYear - 1)."-11-15"), 'Y-m-d');
-		}
+		$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 == 'WS')
-		{
-			return date_format(date_create($semesterYear."-04-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;
 	}
 }
@@ -0,0 +1,125 @@
+<?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);
+	}
+}
@@ -18,11 +18,12 @@ 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,
-			null,
+			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -19,12 +19,14 @@ 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
 		);

@@ -70,6 +72,7 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -116,6 +119,12 @@ 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 ?";
@@ -0,0 +1,129 @@
+<?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);
+	}
+}
@@ -0,0 +1,128 @@
+<?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);
+	}
+}
@@ -0,0 +1,128 @@
+<?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);
+	}
+}
@@ -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,8 +24,6 @@ abstract class PlausiChecker
 		// set configuration
 		$this->_config = $params['configurationParams'] ?? [];

-		$this->_isForResolutionCheck = $params['isForResolutionCheck'] ?? false;
-
 		// get database for queries
 		$this->_db = new DB_Model();
 	}
@@ -41,15 +39,20 @@ abstract class PlausiChecker
 		$params = [];
 		$qry = $this->_base_sql;

-		if ($this->_isForResolutionCheck == true)
+		// if issue id is set, issue is resolving - check if behebung parameter are present
+		if (isset($paramsForChecking[self::ISSUE_ID_NAME]))
 		{
 			foreach ($this->_resolution_params as $resParam)
 			{
 				if (!isset($paramsForChecking[$resParam]))
-					return error("$resParam missing".(isset($paramsForChecking['issue_id']) ? ", issue ID: ".$paramsForChecking['issue_id'] : ""));
+					return error("$resParam missing"
+						.(isset($paramsForChecking[self::ISSUE_ID_NAME]) ? ", issue ID: ".$paramsForChecking[self::ISSUE_ID_NAME] : ""));
 			}
 		}

+		// get fehlertext and resolution params
+
+
 		// add config params to query
 		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
 		{
@@ -19,12 +19,14 @@ 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
 		);

@@ -68,6 +70,7 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -98,6 +101,12 @@ 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 ?";
@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -51,7 +52,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, $exkludierte_studiengang_kz = null)
+	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -79,6 +80,12 @@ 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 ?";
@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -56,6 +57,7 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 		$studiengang_kz = null,
 		$prestudent_id = null,
 		$studienordnung_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -93,6 +95,12 @@ 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 ?";
@@ -18,9 +18,10 @@ 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, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStudentstatusNachAbbrecher($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);

 		if (isError($prestudentRes)) return $prestudentRes;

@@ -51,7 +52,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, $exkludierte_studiengang_kz = null)
+	public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -79,6 +80,12 @@ 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 ?";
@@ -19,12 +19,14 @@ 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
 		);

@@ -69,6 +71,7 @@ class StudienplanUngueltig extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
+		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -115,6 +118,12 @@ 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 ?";
@@ -0,0 +1,112 @@
+<?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);
+	}
+}
@@ -0,0 +1,135 @@
+<?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);
+	}
+}
@@ -0,0 +1,118 @@
+<?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);
+	}
+}
@@ -0,0 +1,118 @@
+<?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);
+	}
+}
@@ -0,0 +1,118 @@
+<?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);
+	}
+}
@@ -0,0 +1,118 @@
+<?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);
+	}
+}
@@ -0,0 +1,129 @@
+<?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);
+	}
+}
@@ -16,7 +16,7 @@ class CORE_INOUT_0005 implements IIssueResolvedChecker

 		$this->_ci->load->model('codex/Bisio_model', 'BisioModel');

-		// get all Zwecke
+		// get bisio
 		$this->_ci->BisioModel->addSelect('ects_angerechnet');
 		$bisioRes = $this->_ci->BisioModel->loadWhere(array('bisio_id' => $params['bisio_id']));

@@ -1,36 +0,0 @@
-<?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
-	}
-}
@@ -12,16 +12,13 @@ class CORE_STUDENTSTATUS_0004 implements IIssueResolvedChecker
 		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
 			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);

-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
 		$this->_ci =& get_instance(); // get code igniter instance

 		$this->_ci->load->library('issues/plausichecks/InaktiverStudentAktiverStatus');

 		// check if issue persists
 		$checkRes = $this->_ci->inaktiverstudentaktiverstatus->getInaktiverStudentAktiverStatus(
-			$params['studiensemester_kurzbz'],
+			null,
 			null,
 			$params['prestudent_id']
 		);
@@ -28,21 +28,10 @@ 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,
+			'bn.aktiv' => true, //check if necessary
+			'zgvdatum' => null,
+			'typ' => 'b',
 			'studiensemester_kurzbz' => $semester
 		));

@@ -71,36 +60,16 @@ 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');
-
-		$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,
+		$result = $this->ci->PrestudentModel->loadWhere(array(
+			'bn.aktiv' => true, //check if necessary
+			'zgvdatum' => null,
+			'typ' => 'b',
 			'studiensemester_kurzbz' => $semester,
 			'prestudent_id' => $prestudent_id
 		));
-
 		if(hasData($result))
 		{
 			return $result;
@@ -159,6 +159,8 @@ class LvVwLib
 		if (!$stg->mischform)
 			return [];
 		
+		$this->_ci->StudiengangModel->db->select('TRUE AS leaf', false);
+
 		return $this->_ci->stglib->orgform($path_template, $stg->studiengang_kz);
 	}

@@ -31,20 +31,18 @@ class Vertrag_model extends DB_Model
     */
 	public function save($person_id, $mitarbeiter_uid, $lehrveranstaltung_id, $lehreinheit_id, $projektarbeit_id = null, $vertragsstunden, $betrag, $studiensemester_kurzbz)
    {
-		$vertragstyp_kurzbz = (is_null($projektarbeit_id)) ? 'Lehrauftrag' : 'Betreuung';
-        
-		$person_id = (isset($person_id) && is_numeric($person_id))
+        $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;
@@ -55,7 +53,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')
@@ -259,7 +257,7 @@ class Vertrag_model extends DB_Model
        }
        elseif ($vertragstyp_kurzbz == 'Betreuung')
        {
-            $this->addSelect('lehreinheit_id, lehre.tbl_projektarbeit.lehrveranstaltung_id, lehre.tbl_projektarbeit.studiensemester_kurzbz');
+            $this->addSelect('lehreinheit_id');
            $this->addJoin('lehre.tbl_projektbetreuer', 'vertrag_id');
            $this->addJoin('lehre.tbl_projektarbeit', 'projektarbeit_id');
            if ($result = $this->loadWhere(array('vertrag_id' => $vertrag_id)))
@@ -283,22 +281,17 @@ class Vertrag_model extends DB_Model
    {
        if ($result = getData($this->getLehreinheitID($vertrag_id)))
        {
-            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))
            {
-                $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');
-                }
+                return success($result->retval);
+            }
+            else
+            {
+                return error('Fehler beim Laden der Lehreinheit');
            }
-
-            return success($result);
        }
        else
        {
@@ -570,13 +563,14 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden*tbl_projektbetreuer.stundensatz) as betrag1,
-			tbl_projektarbeit.studiensemester_kurzbz,
+			tbl_lehreinheit.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
@@ -625,13 +619,14 @@ SELECT
 			null::integer as pruefung_id,
 			projektarbeit_id,
 			(tbl_projektbetreuer.stunden * tbl_projektbetreuer.stundensatz) as betrag,
-			tbl_projektarbeit.studiensemester_kurzbz,
+			tbl_lehreinheit.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 = ?
@@ -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 studiensemester of the status.
+	 * @param $studiensemester_kurzbz studiensemster of the status.
 	 *
 	 * @return result object with all the status entries
 	 */
@@ -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,
@@ -340,20 +340,6 @@ EOSQL;
 	}


-	public function getByLeStudiensemester($lehreinheit_id, $studiensemester_kurzbz)
-	{
-		$qry = "WITH lehreinheiten AS (
-				SELECT *
-				FROM lehre.tbl_lehreinheit
-				WHERE lehreinheit_id = ?
-					AND studiensemester_kurzbz = ?
-			)," . $this->_getLeCTE();
-
-		$params = array($lehreinheit_id, $studiensemester_kurzbz);
-
-		return $this->execReadOnlyQuery($qry, $params);
-
-	}
 	public function getByLvidStudiensemester($lv_id, $studiensemester_kurzbz, $mitarbeiter_uid = null, $fachbereich_kurzbz = null)
 	{
 		$qry = "WITH lehreinheiten AS (
@@ -361,7 +347,35 @@ EOSQL;
 				FROM lehre.tbl_lehreinheit
 				WHERE lehrveranstaltung_id = ?
 					AND studiensemester_kurzbz = ?
-			)," . $this->_getLeCTE();
+			),
+				". $this->_getGruppenCTE() . ", 
+				". $this->_getLektorenCTE() . ", 
+				". $this->_getFachbereichCTE() . ",
+				". $this->_getTagsCTE() . "
+				
+				SELECT lehreinheiten.*,
+						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
+						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
+						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
+						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
+						gruppen.gruppen,
+						mitarbeiter.lektoren,
+						mitarbeiter.le_planstunden,
+						mitarbeiter.vorname,
+						mitarbeiter.nachname,
+						mitarbeiter.semesterstunden,
+						fachbereich.bezeichnung as fachbereich,
+						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
+						semester
+				FROM lehreinheiten
+					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
+					LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id
+					LEFT JOIN mitarbeiter ON lehreinheiten.lehreinheit_id = mitarbeiter.lehreinheit_id
+					LEFT JOIN fachbereich ON lehreinheiten.lehreinheit_id = fachbereich.lehreinheit_id
+					LEFT JOIN gruppen ON lehreinheiten.lehreinheit_id = gruppen.lehreinheit_id
+				WHERE true 
+				";

 		$params = array($lv_id, $studiensemester_kurzbz);

@@ -381,83 +395,9 @@ EOSQL;
 		return $this->execReadOnlyQuery($qry, $params);
 	}

-	public function getOffeneStunden($lehreinheit_ids)
+	private function getLVTmp($stg_kz = null)
 	{
-		if (!is_array($lehreinheit_ids))
-			$lehreinheit_ids = [$lehreinheit_ids];
-
-		if (empty($lehreinheit_ids))
-			return success([]);
-
-		$db = new DB_Model();
-		$placeholders = implode(',', array_fill(0, count($lehreinheit_ids), '?'));
-
-		$qry = "WITH eventdauer AS (
-					SELECT
-						tbl_kalender_lehreinheit.lehreinheit_id,
-						tbl_kalender.von,
-						tbl_kalender.bis,
-						tbl_kalender.kalender_id
-					FROM lehre.tbl_lehreinheit
-							JOIN lehre.tbl_kalender_lehreinheit USING(lehreinheit_id)
-							JOIN lehre.tbl_kalender USING(kalender_id)
-					WHERE tbl_lehreinheit.lehreinheit_id IN ($placeholders)
-						AND NOT EXISTS (SELECT 1 FROM lehre.tbl_kalender nachfolger
-										WHERE nachfolger.vorgaenger_kalender_id = tbl_kalender.kalender_id)
-						AND tbl_kalender.status_kurzbz NOT IN ('deleted', 'todelete', 'archived')
-					GROUP BY tbl_kalender_lehreinheit.lehreinheit_id, tbl_kalender.von, tbl_kalender.bis, tbl_kalender.kalender_id
-				),
-				raster AS (
-					SELECT
-						eventdauer.lehreinheit_id,
-						eventdauer.kalender_id,
-						eventdauer.von,
-						eventdauer.bis,
-						vonstunde.stunde AS vonstunde_nr,
-						bisstunde.stunde AS bisstunde_nr
-					FROM eventdauer
-						LEFT JOIN lehre.tbl_stunde vonstunde ON eventdauer.von::time = vonstunde.beginn
-						LEFT JOIN lehre.tbl_stunde bisstunde ON eventdauer.bis::time = bisstunde.ende
-				),
-				unterrichtsdauer AS (
-					SELECT
-						raster.lehreinheit_id,
-						raster.kalender_id,
-						sum(EXTRACT(EPOCH FROM (LEAST(stunde.ende, raster.bis::time) - GREATEST(stunde.beginn, raster.von::time))) / 60) AS minuten
-					FROM raster JOIN lehre.tbl_stunde stunde ON stunde.beginn < raster.bis::time AND stunde.ende > raster.von::time
-					WHERE raster.vonstunde_nr IS NULL OR raster.bisstunde_nr IS NULL
-					GROUP BY raster.lehreinheit_id, raster.kalender_id
-				),
-				verplantestunden AS (
-					SELECT raster.lehreinheit_id, raster.kalender_id,
-						CASE
-							WHEN raster.vonstunde_nr IS NOT NULL AND raster.bisstunde_nr IS NOT NULL
-								THEN (raster.bisstunde_nr - raster.vonstunde_nr + 1)
-							ELSE coalesce(unterrichtsdauer.minuten, 0) / 45
-						END AS verplantestunde
-					FROM raster LEFT JOIN unterrichtsdauer ON unterrichtsdauer.lehreinheit_id = raster.lehreinheit_id AND unterrichtsdauer.kalender_id = raster.kalender_id
-				),
-				verplant_gesamt AS (
-					SELECT lehreinheit_id, SUM(verplantestunde) AS verplant
-					FROM verplantestunden
-					GROUP BY lehreinheit_id
-				)
-				SELECT
-					lema.lehreinheit_id,
-					lema.mitarbeiter_uid,
-					lema.planstunden,
-					ROUND(coalesce(verplant_gesamt.verplant, 0), 2) AS verplant,
-					ROUND((lema.planstunden - coalesce(verplant_gesamt.verplant, 0)), 2) AS offenestunden
-				FROM lehre.tbl_lehreinheitmitarbeiter lema
-					LEFT JOIN verplant_gesamt ON verplant_gesamt.lehreinheit_id = lema.lehreinheit_id
-				WHERE lema.lehreinheit_id IN ($placeholders)";
-
-		return $db->execReadOnlyQuery($qry, array_merge($lehreinheit_ids, $lehreinheit_ids));
-	}
-
-	private function getLVTmp()
-	{
-		return "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
+		$qry = "SELECT DISTINCT ON(lehrveranstaltung_id) *, 
 						'' as stundenblockung,
 						'' as lehreinheit_id,
 						'' as wochenrythmus,
@@ -468,33 +408,24 @@ EOSQL;
 						'' as studienplan_beeichnung, 
 						UPPER(CONCAT(vw_lehreinheit.stg_typ, vw_lehreinheit.stg_kurzbz)) as studiengang
                FROM campus.vw_lehreinheit
-				WHERE studiensemester_kurzbz = ? ";
+				WHERE mitarbeiter_uid = ?
+				  AND studiensemester_kurzbz = ?";
+
+		if (!is_null($stg_kz)) {
+			$qry .= " AND lv_studiengang_kz = ?";
+		}
+
+		return $qry;
 	}

-	public function getLvsById($lehrveranstaltung_id, $studiensemester_kurzbz)
-	{
-		$where = ' AND lehrveranstaltung_id = ?';
-		$qry = "WITH lvs AS (" . $this->getLVTmp() . $where .")
-				SELECT lvs.*
-				FROM lvs
-			";
-
-		$params = array($studiensemester_kurzbz, $lehrveranstaltung_id);
-		return $this->execReadOnlyQuery($qry, $params);
-	}
 	public function getLvsByEmployee($mitarbeiter_uid, $studiensemester_kurzbz, $stg_kz = null)
 	{
-		$where = ' AND mitarbeiter_uid = ?';
-
-		if ($stg_kz != null)
-			$where .= " AND lv_studiengang_kz = ?";
-
-		$qry = "WITH lvs AS (" . $this->getLVTmp() . $where .")
+		$qry = "WITH lvs AS (" . $this->getLVTmp($stg_kz) . ")
 				SELECT lvs.*
-				FROM lvs";
-
-		$params = array($studiensemester_kurzbz, $mitarbeiter_uid);
+				FROM lvs
+				";

+		$params = array($mitarbeiter_uid, $studiensemester_kurzbz);
 		if (!is_null($stg_kz))
 		{
 			$params[] = $stg_kz;
@@ -701,36 +632,6 @@ EOSQL;
 		return success('Contract successfully updated.');
 	}

-	private function _getLeCTE()
-	{
-		return $this->_getGruppenCTE() . ",
-				". $this->_getLektorenCTE() . ",
-				". $this->_getFachbereichCTE() . ",
-				". $this->_getTagsCTE() . "
-
-				SELECT lehreinheiten.*,
-						lehreinheiten.lehrform_kurzbz as lv_lehrform_kurzbz,
-						tbl_lehrveranstaltung.kurzbz as lv_kurzbz,
-						tbl_lehrveranstaltung.bezeichnung as lv_bezeichnung,
-						COALESCE(tag_data_agg.tags, '[]'::json) AS tags,
-						gruppen.gruppen,
-						mitarbeiter.lektoren,
-						mitarbeiter.le_planstunden,
-						mitarbeiter.vorname,
-						mitarbeiter.nachname,
-						mitarbeiter.semesterstunden,
-						fachbereich.bezeichnung as fachbereich,
-						UPPER(CONCAT(tbl_studiengang.typ,tbl_studiengang.kurzbz)) as studiengang,
-						semester
-				FROM lehreinheiten
-					LEFT JOIN lehre.tbl_lehrveranstaltung ON tbl_lehrveranstaltung.lehrveranstaltung_id = lehreinheiten.lehrfach_id
-					LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-					LEFT JOIN tag_data_agg ON tag_data_agg.lehreinheit_id = lehreinheiten.lehreinheit_id
-					LEFT JOIN mitarbeiter ON lehreinheiten.lehreinheit_id = mitarbeiter.lehreinheit_id
-					LEFT JOIN fachbereich ON lehreinheiten.lehreinheit_id = fachbereich.lehreinheit_id
-					LEFT JOIN gruppen ON lehreinheiten.lehreinheit_id = gruppen.lehreinheit_id
-				WHERE true";
-	}
 	private function _getGruppenCTE()
 	{
 		return "gruppen AS (
@@ -85,18 +85,9 @@ class Lehreinheitmitarbeiter_model extends DB_Model

 	public function getLektorenByLe($lehreinheit_id)
 	{
-		$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->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant');
 		$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
@@ -1263,39 +1263,6 @@ 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
@@ -50,7 +50,8 @@ 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_lehrveranstaltung USING(lehrveranstaltung_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 public.tbl_studiengang ON(tbl_lehrveranstaltung.studiengang_kz=tbl_studiengang.studiengang_kz)
 					JOIN campus.tbl_paabgabetyp USING(paabgabetyp_kurzbz)
 				WHERE
@@ -67,13 +68,14 @@ 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_projektarbeit.studiensemester_kurzbz,
+			   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.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_lehrveranstaltung USING(lehrveranstaltung_id)
-				 JOIN public.tbl_studiengang ON(lehre.tbl_lehrveranstaltung.studiengang_kz = public.tbl_studiengang.studiengang_kz)
+				 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 public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
@@ -91,7 +93,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_projektarbeit.studiensemester_kurzbz,
+					   public.tbl_studiengang.oe_kurzbz as stg_oe_kurzbz, tbl_lehreinheit.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
 				
@@ -99,7 +101,8 @@ 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_lehrveranstaltung USING(lehrveranstaltung_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 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)
@@ -25,7 +25,7 @@ class Projektarbeit_model extends DB_Model
 	{
 		$qry = "SELECT
 					pa.*, tbl_projekttyp.bezeichnung,
-					pa.studiensemester_kurzbz, pa.lehrveranstaltung_id,
+					tbl_lehreinheit.studiensemester_kurzbz, tbl_lehrveranstaltung.lehrveranstaltung_id,
 					tbl_firma.name AS firma_name,
 					(
 						SELECT
@@ -41,6 +41,7 @@ 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
@@ -56,7 +57,7 @@ class Projektarbeit_model extends DB_Model

 		if (isset($studiensemester_kurzbz))
 		{
-			$qry .= ' AND tbl_projektarbeit.studiensemester_kurzbz=?';
+			$qry .= ' AND tbl_lehreinheit.studiensemester_kurzbz=?';
 			$params[] = $studiensemester_kurzbz;
 		}

@@ -133,7 +134,7 @@ class Projektarbeit_model extends DB_Model
 			projektarbeit_id,
 			lehre.tbl_projekttyp.bezeichnung as projekttypbezeichnung,
 			lehre.tbl_projekttyp.projekttyp_kurzbz as projekttypkurzbz,
-			lehre.tbl_projektarbeit.studiensemester_kurzbz,
+			lehre.tbl_lehreinheit.studiensemester_kurzbz,
 			lehre.tbl_lehrveranstaltung.studiengang_kz,
 			public.tbl_studiengang.kurzbzlang,
 			lehre.tbl_projektarbeit.note as note,
@@ -156,6 +157,7 @@ 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)
@@ -364,7 +366,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_projektarbeit.studiensemester_kurzbz, public.tbl_student.student_uid,
+					student_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz, public.tbl_student.student_uid,
 		
 					lehre.tbl_projektarbeit.sprache,
 					 lehre.tbl_projektarbeit.seitenanzahl,
@@ -428,6 +430,7 @@ 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)
@@ -500,7 +503,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_projektarbeit.studiensemester_kurzbz,
+				 tbl_lehreinheit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -562,6 +565,7 @@ 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)
@@ -629,7 +633,7 @@ class Projektarbeit_model extends DB_Model
 				 student_person.vorname                       AS student_vorname,
 				 student_person.nachname                      AS student_nachname,
 				 public.tbl_student.matrikelnr,
-				 tbl_projektarbeit.studiensemester_kurzbz,
+				 tbl_lehreinheit.studiensemester_kurzbz,
 				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
 				 betreuer_person.titelpre                     AS betreuer_titelpre,
 				 betreuer_person.vorname                      AS betreuer_vorname,
@@ -691,6 +695,7 @@ 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)
@@ -218,7 +218,7 @@ class Studiensemester_model extends DB_Model
 	 */
 	public function getByDate($date)
 	{
-		// gets the studiensemester of a date or the next closest previous studiensemester if a date is not within a studiensemester
+		// gets the studiensemster 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
@@ -292,29 +292,13 @@ class Studiensemester_model extends DB_Model
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_startdate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_startdate)
-				) AS studiensemester_kurzbz,
-				COALESCE(
-					(SELECT start FROM semester_interval_startdate),
-					(SELECT start FROM nearest_semester_interval_startdate)
-				) as start,
-				COALESCE(
-					(SELECT ende FROM semester_interval_startdate),
-					(SELECT ende FROM nearest_semester_interval_startdate)
-				) as ende
+				) AS studiensemester_kurzbz
 			UNION
 			SELECT
 				COALESCE(
 					(SELECT studiensemester_kurzbz FROM semester_interval_enddate),
 					(SELECT studiensemester_kurzbz FROM nearest_semester_interval_enddate)
-				) AS studiensemester_kurzbz,
-				COALESCE(
-					(SELECT start FROM semester_interval_enddate),
-					(SELECT start FROM nearest_semester_interval_enddate)
-				) as start,
-				COALESCE(
-					(SELECT ende FROM semester_interval_enddate),
-					(SELECT ende FROM nearest_semester_interval_enddate)
-				) as ende
+				) AS studiensemester_kurzbz

 EOSQL;

@@ -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, $insertvon = null)
+	public function addNotizForPerson($person_id, $titel, $text, $erledigt, $verfasser_uid)
 	{
 		// Loads model Notizzuordnung_model
 		$this->load->model('person/Notizzuordnung_model', 'NotizzuordnungModel');
@@ -106,15 +106,8 @@ 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' => $insertvon ?? $verfasser_uid
-			)
-		);
+		$result = $this->insert(array('titel' => $titel, 'text' => $text, 'erledigt' => $erledigt, 'verfasser_uid' => $verfasser_uid,
+			"insertvon" => $verfasser_uid));

 		if (isSuccess($result))
 		{
@@ -604,17 +604,11 @@ class Stundenplan_model extends DB_Model
 		{
 			foreach($semester_date_range as $sem_date => $sem_date_range)
 			{
-				if(!array_key_exists($sem,$studentlehrverbaende) || count($studentlehrverbaende[$sem]) == 0)
+				if(!array_key_exists($sem_date,$studentlehrverbaende) || count($studentlehrverbaende[$sem_date]) == 0)
 				{
 					continue;
 				}
-				$studlvbds = array_filter(
-					$studentlehrverbaende[$sem],
-					function($value) use ($sem_date) {
-						return $value->studiensemester_kurzbz === $sem_date;
-					}
-				);
-				foreach($studlvbds as $key=>$lehrverband)
+				foreach($studentlehrverbaende[$sem_date] 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
@@ -0,0 +1,14 @@
+<?php
+class App_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'system.tbl_app';
+		$this->pk = 'app';
+	}
+}
@@ -0,0 +1,15 @@
+<?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;
+	}
+}
@@ -9,6 +9,44 @@ class Fehler_model extends DB_Model
 	{
 		parent::__construct();
 		$this->dbTable = 'system.tbl_fehler';
-		$this->pk = 'fehlercode';
+		$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);
 	}
 }
@@ -15,17 +15,21 @@ class Fehlerkonfiguration_model extends DB_Model

 	/**
 	 * Retrieve all set configuration parameters, optionally filtered by app.
-	 * @param string $app
+	 * @param string $apps
 	 * @return object success or error
 	 */
-	public function getKonfiguration($app = null)
+	public function getKonfiguration($apps = null)
 	{
+		if (is_string($apps)) $apps = [$apps];
 		$fehlerkonfiguration = array();

-		$this->addSelect('fehlercode, konfigurationstyp_kurzbz, konfiguration, fehler_kurzbz');
+		$this->addDistinct();
+		$this->addSelect('fehler.fehlercode, konftyp.konfigurationstyp_kurzbz, tbl_fehler_konfiguration.konfiguration, fehler.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();
+		$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();

 		if (isError($fehlerkonfigurationRes)) return $fehlerkonfigurationRes;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexei Karpenko	10492dea0c	Plausichecks GUI: changed Studierendenverwaltung link to new Plausichecks	2026-08-20 13:25:07 +02:00
Alexei Karpenko	2e39da7d12	plausichecks gui: correct default studiensemester even if in summer gap	2026-08-19 17:12:00 +02:00
Alexei Karpenko	24b4981079	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-08-19 17:07:40 +02:00
Alexei Karpenko	b0d933a13f	FehlerUpdateLib: check that array index exists, IssuesLib: correct person Id check	2026-08-19 15:55:53 +02:00
Alexei Karpenko	2076752f40	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-05-26 13:30:13 +02:00
Alexei Karpenko	0c002b3969	issue checker: added space between heading and refresh symbol, removed px class for more flexibility	2026-04-29 16:13:46 +02:00
Alexei Karpenko	2307565696	Plausicheckresolverlib: changed comment	2026-04-20 15:37:08 +02:00
Alexei Karpenko	ace2057166	Plausichecks InaktiverStudentAktiverStatus, ZuVieleZweckeIncomingPlausi: ptimized for issue production without Datenverbund, semester for resolving InaktiverStudentAktiverStatus optional	2026-04-17 16:01:33 +02:00
Alexei Karpenko	2428589bca	Issues: Geburtsnation fehlt, Falscher Incoming Zweck: added person Id, added issue checker component to Studierendenverwaltung header, added comments to issues, set some issues to self-resolving, Plausicheck GUI: issues from core, dvuh and bis are displayed	2026-04-16 02:12:01 +02:00
Alexei Karpenko	953a04f24a	added person id param to core plausichecks	2026-04-13 11:37:36 +02:00
Alexei Karpenko	82d640b1f4	plausichecks: uhstatpersonenkennungfehlt issue: removed oe_kurzbz, added datenverbund issues to core plausicheck gui	2026-04-03 11:52:22 +02:00
Alexei Karpenko	5b4e632526	issues, plausichecks: added producer for some core issues, producer lib: fehler with no config mappings are just ignored, plausicheck page optimizations (sorting etc)	2026-03-25 11:44:36 +01:00
Alexei Karpenko	5c2038fb79	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-03-19 16:54:05 +01:00
Alexei Karpenko	1b400f7d42	issuechecker: made details list optional, producer_controller: default value for apps	2026-02-12 22:36:42 +01:00
Alexei Karpenko	43811d5724	fehler/issue monitoring: enabled resolving/producing by app only, improved error messages, code layout, removed error: fehler to produce is not defined in config	2026-02-12 14:46:49 +01:00
Alexei Karpenko	4c03668082	PlausiIssueProducer Controller: added default run method	2026-02-10 17:34:17 +01:00
Alexei Karpenko	10d52caa98	Issue system: adapted to work with multiple apps per fehler	2026-02-03 15:39:11 +01:00
Alexei Karpenko	2de6278603	IssueChecker: changed expected prop type of isseListStyle and issueListStyleBreakpoints	2026-01-29 11:46:52 +01:00
Alexei Karpenko	85db467cff	issuechecker: layout, commented out _app property	2026-01-28 17:50:37 +01:00
Alexei Karpenko	1c65d6e076	plausicheckproducerlib, plausicheckresolverlib: added comments, resolver lib: loading producer lib only when calling resolvePlausicheckIssues, because producerlib is only needed for self-resolving logic in the resolvePlausicheckIssues method	2026-01-28 17:49:06 +01:00
Alexei Karpenko	f72ea1a655	Pausicheckproducerlib: loading fehler config files with php without code igniter, due to naming index conflicts	2026-01-28 17:28:10 +01:00
Alexei Karpenko	413ccba64b	fehler.php config: changed some fehler to warnings	2026-01-23 14:18:33 +01:00
Alexei Karpenko	9ccbb7b9e2	issuechecker: detailed issue list on click	2026-01-21 16:16:33 +01:00
Alexei Karpenko	d6803a3947	Fehler update: enabled updating of fehler columns, added insertaum, insertvon, updateamum, insertvon	2026-01-20 18:56:43 +01:00
Alexei Karpenko	545e2b0445	Fehlerupdate: additional extension check, fehler_kurzbz optional	2026-01-20 17:02:47 +01:00
Alexei Karpenko	131ec86dee	fehlerupdate: added check for app (existing in database?), code layout	2026-01-19 15:27:54 +01:00
Alexei Karpenko	cd03264ab4	Fehler: added fehlerupdate for adding missing fehler from config files to database	2026-01-16 13:09:11 +01:00
Alexei Karpenko	c6232f7959	plausicheckresolver bugfixes, removed CONFIG_FEHLER_FILENAME constants	2026-01-15 17:08:05 +01:00
Alexei Karpenko	cf2cc796b3	plausicheckproducerlib: extension fehler config files are loaded using code igniter	2026-01-15 16:26:16 +01:00
Alexei Karpenko	475888d4ac	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-01-14 16:52:55 +01:00
Alexei Karpenko	4b8b3c90fb	plausicheck resolver: by default, all issues for fehlercodes provided in constructor are resolved	2026-01-14 16:15:33 +01:00
Alexei Karpenko	b168ebb5f6	issues: changed logic to read producable issues from config file	2026-01-14 14:13:23 +01:00
Alexei Karpenko	a259db2e7b	issues: renamed method PersonenMitOffenenIssues, added expose to components	2025-12-19 16:09:38 +01:00
Alexei Karpenko	3e77d80d26	Issues: added possibility to display issues only when user is hauptzustaendig	2025-12-18 15:19:02 +01:00
Alexei Karpenko	2d71a436f6	IssueList: possible to pass endpoint dynamically	2025-12-16 17:30:25 +01:00
Alexei Karpenko	026bd6e247	moved issues controller to another folder	2025-12-15 18:00:05 +01:00
Alexei Karpenko	9c37215e62	issues: added issue controller for displaying issues, added issuechecker controller and component	2025-12-15 17:20:56 +01:00
Alexei Karpenko	733a6a8c15	issues: added vue component for displaying issues in a table	2025-11-26 16:28:16 +01:00
Alexei Karpenko	a24483188b	issueproducer: use next studiensemester as well to avoid problems with semester august gap	2025-11-26 16:24:30 +01:00