Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features

Merge branch 'feature-70376/Lohnguide'
handle case where old value or new value and not both are null explicitly in markDirty Method
2026-06-01 20:29:29 +00:00 · 2026-05-26 13:30:13 +02:00 · 2026-05-13 11:53:14 +02:00 · 2026-05-13 11:42:25 +02:00 · 2026-05-13 11:16:18 +02:00 · 2026-05-13 11:15:07 +02:00
208 changed files with 7241 additions and 7876 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
+	)
+);
@@ -64,9 +64,6 @@ $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
 $route['Cis/LvPlan/.*'] = 'Cis/LvPlan/index/$1';
 $route['Cis/MyLvPlan/.*'] = 'Cis/MyLvPlan/index/$1';
 $route['Cis/MyLv/.*'] = 'Cis/MyLv/index/$1';
-$route['Cis/OtherLvPlan/.*'] = 'Cis/OtherLvPlan/index/$1';
-//Route for LV Plan Stg/Semester/Verband/Gruppe
-$route['Cis/StgOrgLvPlan/.*'] = 'Cis/StgOrgLvPlan/index/$1';

 $route['Abgabetool/Assistenz'] = 'Cis/Abgabetool/Assistenz';
 $route['Abgabetool/Assistenz/(:any)'] = 'Cis/Abgabetool/Assistenz/$1';
@@ -31,8 +31,12 @@ class Abgabetool extends Auth_Controller
 	{
 		// TODO: routing from index based on berechtigung?

+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Abgabetool']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Abgabetool']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'Abgabetool']);
 		}
@@ -40,8 +44,12 @@ class Abgabetool extends Auth_Controller

 	public function Student($student_uid_prop = '')
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+		
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolStudent']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolStudent']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolStudent', 'student_uid_prop' => $student_uid_prop]);
 		}
@@ -49,8 +57,12 @@ class Abgabetool extends Auth_Controller

 	public function Mitarbeiter()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolMitarbeiter']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolMitarbeiter']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolMitarbeiter']);
 		}
@@ -58,8 +70,13 @@ class Abgabetool extends Auth_Controller

 	public function Assistenz($stg_kz_prop = '')
 	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'AbgabetoolAssistenz']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'AbgabetoolAssistenz']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'AbgabetoolAssistenz', 'stg_kz_prop' => $stg_kz_prop]);
 		}
@@ -67,8 +84,12 @@ class Abgabetool extends Auth_Controller
 	
 	public function Deadlines()
 	{
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
 		if(defined('CIS4') && CIS4) {
-			$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'DeadlinesOverview']);
+			$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'DeadlinesOverview']);
 		} else {
 			$this->load->view('Cis/Abgabetool.php', ['uid' => getAuthUID(), 'route' => 'DeadlinesOverview']);
 		}
@@ -40,7 +40,7 @@ class Auth extends FHC_Controller

 		if ($this->form_validation->run())
 		{
-			redirect($this->authlib->getLandingPage('/Cis4'));
+			redirect($this->authlib->getLandingPage('/CisVue/Dashboard'));
 		}
 		else
 		{
@@ -28,6 +28,12 @@ class LvPlan extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'LvPlan']);
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'LvPlan']);
 	}
 }
@@ -26,6 +26,11 @@ class MyLv extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLv']);
+		
+		$viewData = array(
+
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
 	}
 }
@@ -27,7 +27,13 @@ class MyLvPlan extends Auth_Controller
 	 * @return void
 	 */
 	public function index()
-	{		
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'MyLvPlan']);
+	{
+		
+		$viewData = array(
+			'uid'=>getAuthUID(),
+			'timezone' => $this->config->item('timezone')
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLvPlan']);
 	}
 }
@@ -1,34 +0,0 @@
-<?php
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-/**
- *
- */
-class OtherLvPlan extends Auth_Controller
-{
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'index' => ['basis/other_lv_plan:r']
-        ]);
-
-        // Load Config
-        $this->load->config('calendar');
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * @return void
-     */
-    public function index()
-    {
-        $this->load->view('CisRouterView/CisRouterView.php', ['route' => 'OtherLvPlan']);
-    }
-}
@@ -55,7 +55,15 @@ class Profil extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilIndex']);
+		
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView(getAuthUID());
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>true,
+			'profil_data' => $profil_data,
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilIndex']);
 	}

 	/**
@@ -65,13 +73,23 @@ class Profil extends Auth_Controller
 	 */
 	public function View($uid)
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'profilViewUid']);
+		$this->load->library('ProfilLib');
+		$profil_data = $this->profillib->getView($uid);
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array (
+			'uid' => $uid,
+			'profil_data'=>$profil_data,
+		);
+		if($uid == getAuthUID()){
+			$viewData['editable'] = true;
+		}
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'profilViewUid']);
 	}

 	/**
-	 * checks whether a specific userID is a student or not (foreword declaration of the function isStudent in Student_model.php)
+	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
-	 * @param  $uid the userID used to check if it is a student
+	 * @param  $uid the userID used to check if it is a mitarbeiter
 	 * @return boolean 
 	 */
 	public function isStudent($uid)
@@ -101,7 +119,7 @@ class Profil extends Auth_Controller
 	}

 	/**
-	 * gets the adressen that are marked as zustell from the currently logged in user
+	 * gets the adressen that are marked as zustell from the currenlty logged in user
 	 * @access public
 	 * @return array a list of adresse_id's 
 	 */
@@ -244,23 +262,23 @@ class Profil extends Auth_Controller
 		$this->GemeindeModel->addDistinct();
 		$this->GemeindeModel->addSelect(["name"]);
 		if ($nation == "A") {
-			if (isset($zip) && $zip > 999 && $zip < 32000) {
+				if (isset($zip) && $zip > 999 && $zip < 32000) {

-				$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
-				if (isError($gemeinde_res)) {
-					show_error("error while trying to query bis.tbl_gemeinde");
+						$gemeinde_res = $this->GemeindeModel->loadWhere(['plz' => $zip]);
+						if (isError($gemeinde_res)) {
+								show_error("error while trying to query bis.tbl_gemeinde");
+						}
+						$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
+						$gemeinde_res = array_map(function ($obj) {
+								return $obj->name;
+						}, $gemeinde_res);
+						echo json_encode($gemeinde_res);
+
+				} else {
+						echo json_encode(error("ortschaftskennziffer code was not valid"));
 				}
-				$gemeinde_res = hasData($gemeinde_res) ? getData($gemeinde_res) : null;
-				$gemeinde_res = array_map(function ($obj) {
-					return $obj->name;
-				}, $gemeinde_res);
-				echo json_encode($gemeinde_res);
-
-			} else {
-				echo json_encode(error("ortschaftskennziffer code was not valid"));
-			}
 		} else {
-			echo json_encode(error("Nation was not 'A' (Austria)"));
+				echo json_encode(error("Nation was not 'A' (Austria)"));
 		}
 	}

@@ -732,4 +750,6 @@ class Profil extends Auth_Controller
 		$zutrittskarte_ausgegebenam = str_replace("-", ".", $zutrittskarte_ausgegebenam);
 		return $zutrittskarte_ausgegebenam;
 	}
+
+
 }
@@ -25,6 +25,11 @@ class Raumsuche extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'Raumsuche']);
+
+		$viewData = array(
+			'uid'=>getAuthUID(),
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'Raumsuche']);
 	}
 }
@@ -1,33 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- *
- */
-class StgOrgLvPlan extends Auth_Controller
-{
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct([
-			'index' => ['basis/cis:r']
-		]);
-
-		// Load Config
-		$this->load->config('calendar');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-	/**
-	 * @return void
-	 */
-	public function index()
-	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'StgOrgLvPlan']);
-	}
-}
@@ -29,7 +29,10 @@ class Studium extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'studium']);
+		$viewData = array(
+
+		);
+		$this->load->view('CisRouterView/CisRouterView.php',['viewData' => $viewData, 'route' => 'studium']);
 	}


@@ -1,7 +1,6 @@
 <?php

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 /**
 *
@@ -14,9 +13,9 @@ class Cis4 extends Auth_Controller
 	public function __construct()
 	{
 		parent::__construct(
-			array(
-				'index' => 'basis/cis:r'
-			)
+		    array(
+			'index' => 'basis/cis:r'
+		    )
 		);

 		// Load Config
@@ -31,6 +30,16 @@ class Cis4 extends Auth_Controller
 	 */
 	public function index()
 	{
-		$this->load->view('CisRouterView/CisRouterView.php', ['route' => 'FhcDashboard']);
+		$this->load->model('person/Person_model', 'PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+		
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id,
+			'timezone' => $this->config->item('timezone')
+		);
+
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'FhcDashboard']);
 	}
 }
@@ -0,0 +1,43 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Dashboard extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'dashboard/benutzer:r'
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @return void
+	 */
+	public function index()
+	{
+
+		$this->load->model('person/Person_model','PersonModel');
+		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];
+
+		$viewData = array(
+			'uid' => getAuthUID(),
+			'name' => $personData->vorname,
+			'person_id' => $personData->person_id
+		);
+		
+		$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData]);
+
+	}
+}
@@ -18,8 +18,6 @@

 if (! defined('BASEPATH')) exit('No direct script access allowed');

-use \DateTime as DateTime;
-
 class Bookmark extends FHCAPI_Controller
 {

@@ -30,162 +28,111 @@ class Bookmark extends FHCAPI_Controller
 	{
 		parent::__construct([
 			'getBookmarks' => self::PERM_LOGGED,
-			'delete' => self::PERM_LOGGED,
-			'insert' => self::PERM_LOGGED,
+            'delete' => self::PERM_LOGGED,
+            'insert' => self::PERM_LOGGED,
 			'update' => self::PERM_LOGGED,
-			'changeOrder' => self::PERM_LOGGED
-		]);
+        ]);

 		$this->load->model('dashboard/Bookmark_model', 'BookmarkModel');

 		$this->uid = getAuthUID();
 		$this->pid = getAuthPersonID();
+
 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

 	
-	/**
-	 * gets the bookmarks associated to a user
+    /**
+	 * gets the bookmarks associated to a user 
 	 * @access public
 	 * @return void
 	 */
 	public function getBookmarks()
 	{
-		$this->BookmarkModel->addOrder("sort");
+        $this->BookmarkModel->addOrder("bookmark_id");
 		$bookmarks = $this->BookmarkModel->loadWhere(["uid"=>$this->uid]);

-		$bookmarks = $this->getDataOrTerminateWithError($bookmarks);
+        $bookmarks = $this->getDataOrTerminateWithError($bookmarks);

-		$this->terminateWithSuccess($bookmarks);
-	}
+        $this->terminateWithSuccess($bookmarks);
+    }

-	/**
-	 * deletes bookmark from associated user
+    /**
+	 * deletes bookmark from associated user 
 	 * @access public
 	 * @return void
 	 */
-	public function delete($bookmark_id)
+    public function delete($bookmark_id)
 	{
-		$bookmark = $this->BookmarkModel->load($bookmark_id);
+        $bookmark = $this->BookmarkModel->load($bookmark_id);

-		$bookmark = current($this->getDataOrTerminateWithError($bookmark));
+        $bookmark = current($this->getDataOrTerminateWithError($bookmark));

-		// only delete bookmark if the user is the owner of the bookmark
-		if ($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')) {
-			$delete_result = $this->BookmarkModel->delete($bookmark_id);
+        // only delete bookmark if the user is the owner of the bookmark
+        if($bookmark->uid == $this->uid || $this->permissionlib->isBerechtigt('admin')){

-			$delete_result = $this->getDataOrTerminateWithError($delete_result);
+            $delete_result = $this->BookmarkModel->delete($bookmark_id);

-			$this->terminateWithSuccess($delete_result);
-		} else {
-			$this->_outputAuthError(['delete' => ['admin:rw']]);
-		}
-	}
+            $delete_result = $this->getDataOrTerminateWithError($delete_result);

-	/**
-	 * inserts new bookmark into the bookmark table
+            $this->terminateWithSuccess($delete_result);
+        }else{
+            $this->_outputAuthError(['delete' => ['admin:rw']]);
+        }
+    }
+
+    /**
+	 * inserts new bookmark into the bookmark table 
 	 * @access public
 	 * @return void
 	 */
-	public function insert()
+    public function insert()
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());

-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag); // convert PHP array to JSON string
-		}
-		$sort = $this->input->post('sort', true);
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);
+        $tag = $this->input->post('tag', true);

-		$insert_into_result = $this->BookmarkModel->insert([
-			'uid' => $this->uid,
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'insertvon' => $this->uid,
-			'updateamum' => null,
-			'updatevon' => null,
-			'sort' => $sort
-		]);
+        $insert_into_result = $this->BookmarkModel->insert(['uid'=>$this->uid, 'url'=>$url, 'title'=>$title,'tag'=>$tag, 'insertvon'=>$this->uid, 'updateamum'=>NULL, 'updatevon'=>NULL]);

-		$insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);
+        $insert_into_result = $this->getDataOrTerminateWithError($insert_into_result);

-		$this->terminateWithSuccess($insert_into_result);
-	}
+        $this->terminateWithSuccess($insert_into_result);
+
+    }

 	/**
-	 * updates bookmark in the bookmark table
+	 * updates bookmark in the bookmark table 
 	 * @access public
 	 * @return void
 	 */
-	public function update($bookmark_id)
+    public function update($bookmark_id)
 	{
-		// form validation
-		$this->load->library('form_validation');
-		$this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
-		$this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
-		if (!$this->form_validation->run())
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
+        // form validation
+        $this->load->library('form_validation');
+        $this->form_validation->set_rules('url', 'URL', 'required|valid_url|max_length[511]');
+        $this->form_validation->set_rules('title', 'Title', 'required|max_length[255]');
+        if($this->form_validation->run() == FALSE) $this->terminateWithValidationErrors($this->form_validation->error_array());

-		$url = $this->input->post('url', true);
-		$title = $this->input->post('title', true);
-		$tag = $this->input->post('tag', true);
-		if (is_array($tag)) {
-			$tag = json_encode($tag);
-		}
+        $url = $this->input->post('url',true);
+        $title = $this->input->post('title',true);

 		$now = new DateTime();
 		$now = $now->format('Y-m-d H:i:s');

-		$update_result = $this->BookmarkModel->update($bookmark_id, [
-			'url' => $url,
-			'title' => $title,
-			'tag' => $tag,
-			'updateamum' => $now
-		]);
+        $update_result = $this->BookmarkModel->update($bookmark_id,['url'=>$url, 'title'=>$title,'updateamum'=>$now]);

-		$update_result = $this->getDataOrTerminateWithError($update_result);
+        $update_result = $this->getDataOrTerminateWithError($update_result);

-		$this->terminateWithSuccess($update_result);
-	}
+        $this->terminateWithSuccess($update_result);

-	/**
-	 * changes sort of two bookmarks in the bookmark table
-	 * @access public
-	 * @return void
-	 */
-	public function changeOrder($bookmark_id1, $bookmark_id2)
-	{
-		$update_result = [];
-
-		$result1 = $this->BookmarkModel->load($bookmark_id1);
-		$data1 = $this->getDataOrTerminateWithError($result1);
-		$sort1 = current($data1)->sort;
-
-		$result2 = $this->BookmarkModel->load(["bookmark_id"=>$bookmark_id2]);
-		$data2 = $this->getDataOrTerminateWithError($result2);
-		$sort2 = current($data2)->sort;
-
-		$update_result1 = $this->BookmarkModel->update($bookmark_id1, [
-			'sort' => $sort2
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result1);
-
-		$update_result2 = $this->BookmarkModel->update($bookmark_id2, [
-			'sort' => $sort1
-		]);
-		$update_result[] = $this->getDataOrTerminateWithError($update_result2);
-
-		$this->terminateWithSuccess($update_result);
-	}
+    }
 }

@@ -27,7 +27,7 @@ class Cis4FhcApi extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'dashboardViewData' => self::PERM_LOGGED,
+			'getViewData' => self::PERM_LOGGED,
 		]);
 		
 	}
@@ -36,22 +36,17 @@ class Cis4FhcApi extends FHCAPI_Controller
 	// Public methods

 	/**
-     * retrieves view data for dashboard view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function dashboardViewData()
+	 * fetches ViewData
+	 */
+	public function getViewData()
 	{
 		$this->load->model('person/Person_model','PersonModel');
 		$personData = getData($this->PersonModel->getByUid(getAuthUID()))[0];

-		$this->load->config('calendar');
-
 		$viewData = array(
 			'uid' => getAuthUID(),
 			'name' => $personData->vorname,
-			'person_id' => $personData->person_id,
-			'timezone' => $this->config->item('timezone'),
+			'person_id' => $personData->person_id
 		);

 		$this->terminateWithSuccess($viewData);
@@ -16,13 +16,12 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');


 class CisMenu extends FHCAPI_Controller
 {
-
+	
 	/**
 	 * Object initialization
 	 */
@@ -32,95 +31,28 @@ class CisMenu extends FHCAPI_Controller
 			'getMenu' => self::PERM_LOGGED,
 		]);

-
+		

 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

-	/**
+    /**
 	 * fetches the menu for CIS from the database based on the userLanguage
 	 */
-	public function getMenu()
+    public function getMenu()
 	{
 		$this->load->model('content/Content_model', 'ContentModel');
 		$this->load->config('cis');
-		$cis4_content_id = $this->config->item('cis_menu_root_content_id');
-		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(), getUserLanguage());
+		$cis4_content_id =$this->config->item('cis_menu_root_content_id');
+		$result = $this->ContentModel->getMenu($cis4_content_id, getAuthUID(),getUserLanguage());
 		$result = $this->getDataOrTerminateWithError($result);
 		$menu = $result->childs ?? [];
-
-		$menu = $this->generateUrlsForMenuItems($menu);
 		$this->terminateWithSuccess($menu);
-	}
-
-	private function generateUrlsForMenuItems($menuItems)
-	{
-		return array_map(
-			function ($menuItem) {
-				return $this->generateUrlForMenuItem($menuItem);
-			},
-			$menuItems
-		);
-	}
-
-	private function generateUrlForMenuItem($menuItem)
-	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
-
-		if ($menuItem->childs && count($menuItem->childs)) {
-			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
-		}
-
-		return $menuItem;
-	}
-
-	private function menuItemUrlHelper($menuItem)
-	{
-		if ($menuItem->template_kurzbz !== 'redirect') {
-			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
-		}
-
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
-			return '';
-		}
-
-		$doc = new DOMDocument();
-		$doc->loadXML($menuItem->content);
-		$urlElem = $doc->getElementsByTagName('url')->item(0);
-
-		if (!$urlElem) {
-			return '';
-		}
-
-		$url = $urlElem->textContent;
-
-		if (strpos($url, '../cms/news.php') !== false) {
-			$newsRegex = '/^\.\.\/cms\/news\.php/';
-			$url = preg_replace($newsRegex, site_url("/CisVue/Cms/news"), $url);
-		}
-
-		if (strpos($url, '../cms/content.php?') !== false) {
-			$contentRegex = '/^\.\.\/cms\/content\.php\?content_id=([0-9]+)/';
-			$matches = [];
-			preg_match($contentRegex, $url, $matches);
-			$url = site_url('/CisVue/Cms/content/' . $matches[1]);
-		}
-
-		if (strpos($url, '../index.ci.php') !== false) {
-			$indexRegex = '/^\.\.\/index\.ci\.php/';
-			$url = preg_replace($indexRegex, site_url(), $url);
-		}
-
-		if (strpos($url, '../') !== false) {
-			$relativeRegex = '/^\.\.\//';
-			$url = preg_replace($relativeRegex, base_url(), $url);
-		}
-
-		return $url;
-	}
+    }

+	
+	
 }

@@ -16,8 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 use CI3_Events as Events;
 use \DateTime as DateTime;
@@ -34,25 +33,19 @@ class LvPlan extends FHCAPI_Controller

 		parent::__construct([
 			'getRoomplan' => self::PERM_LOGGED,
-			'Stunden' => self::PERM_LOGGED,
-			'getReservierungen' => self::PERM_LOGGED,
+            'Stunden' => self::PERM_LOGGED,
+            'getReservierungen' => self::PERM_LOGGED,
 			'LvPlanEvents' => self::PERM_LOGGED,
 			'eventsPersonal' => self::PERM_LOGGED,
 			'eventsLv' => self::PERM_LOGGED,
 			'getLehreinheitStudiensemester' => self::PERM_LOGGED,
 			'studiensemesterDateInterval' => self::PERM_LOGGED,
 			'getLvPlanForStudiensemester' => self::PERM_LOGGED,
-			'getLv' => self::PERM_LOGGED,
-			'eventsStgOrg' => self::PERM_LOGGED,
-			'fetchFerienEvents' => self::PERM_LOGGED,
-			'getStudiengaenge' => self::PERM_LOGGED,
-			'getLehrverband' => self::PERM_LOGGED,
-			'permissionOtherLvPlan' => self::PERM_LOGGED,
-			'compactibleEventTypes' => self::PERM_LOGGED,
+			'getLv' => self::PERM_LOGGED
 		]);

-		$this->load->library('LogLib');
-		$this->loglib->setConfigs(array(
+        $this->load->library('LogLib');
+        $this->loglib->setConfigs(array(
 			'classIndex' => 5,
 			'functionIndex' => 5,
 			'lineIndex' => 4,
@@ -60,17 +53,17 @@ class LvPlan extends FHCAPI_Controller
 			'dbExecuteUser' => 'RESTful API'
 		));

-		$this->load->library('form_validation');
+        $this->load->library('form_validation');
 	}

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods

 	/**
-	 * fetches LvPlan and Moodle events together
-	 * @access public
-	 *
-	 */
+     * fetches LvPlan and Moodle events together
+     * @access public
+     *
+     */
 	public function LvPlanEvents()
 	{
 		$hasLv = $this->input->post('lv_id');
@@ -90,30 +83,24 @@ class LvPlan extends FHCAPI_Controller
 		// form validation
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);
-
-		// disallow accessing other user's lv plan if missing permission
-		if ($uid && $uid !== getAuthUID() && !$this->permissionlib->isBerechtigt('basis/other_lv_plan')) {
-			$this->terminateWithError("Missing permission to view other users' timetables!");
-		}

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

 		// fetching moodle events
-		$moodleEvents = $uid ? [] : $this->fetchMoodleEvents($start_date, $end_date);
+		$moodleEvents = $this->fetchMoodleEvents($start_date, $end_date);

 		// fetching ferien events
-		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date, $uid);
-
+		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -122,45 +109,6 @@ class LvPlan extends FHCAPI_Controller
 		));
 	}

-	/**
-	 * fetches LvPlan for studiengang / semester / verband / gruppe
-	 *
-	 * @access public
-	 */
-	public function eventsStgOrg()
-	{
-		$this->load->library('StundenplanLib');
-
-		// form validation
-		$this->form_validation->set_rules('start_date', "start_date", "required");
-		$this->form_validation->set_rules('end_date', "end_date", "required");
-		//$this->form_validation->set_rules('stg_kz', "stg_kz", "required"); //no validation show empty calendar
-
-		if (!$this->form_validation->run()) {
-			$this->terminateWithValidationErrors($this->form_validation->error_array());
-			$stgOrgEvents = [];
-			$ferienEvents = [];
-		} else {
-			$start_date = $this->input->post('start_date', true);
-			$end_date = $this->input->post('end_date', true);
-			$stg_kz = $this->input->post('stg_kz', true);
-			$sem = $this->input->post('sem', true);
-			$verband = $this->input->post('verband', true);
-			$gruppe = $this->input->post('gruppe', true);
-
-			$result = $this->stundenplanlib->getEventsStgOrg($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe);
-			$stgOrgEvents = $this->getDataOrTerminateWithError($result);
-
-			$result = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $stg_kz);
-			$ferienEvents = $this->getDataOrTerminateWithError($result);
-		}
-
-		$this->terminateWithSuccess(array_merge(
-			$stgOrgEvents,
-			$ferienEvents
-		));
-	}
-
 	/**
 	 * fetches LvPlan and Ferien events together for the lv
 	 *
@@ -174,7 +122,7 @@ class LvPlan extends FHCAPI_Controller
 		$this->form_validation->set_rules('start_date', "start_date", "required");
 		$this->form_validation->set_rules('end_date', "end_date", "required");
 		$this->form_validation->set_rules('lv_id', "lv_id", "required|integer");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

@@ -189,6 +137,7 @@ class LvPlan extends FHCAPI_Controller

 		// fetching ferien events
 		$ferienEvents = $this->fetchFerienEvents($start_date, $end_date);
+		

 		$this->terminateWithSuccess(array_merge(
 			$lvplanEvents,
@@ -197,42 +146,40 @@ class LvPlan extends FHCAPI_Controller
 	}

 	//TODO: delete this function if we don't use the old calendar export endpoints anymore
-	public function studiensemesterDateInterval($date)
-	{
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$studiensemester = $this->StudiensemesterModel->getByDate(date_format(date_create($date), 'Y-m-d'));
-		$studiensemester = current($this->getDataOrTerminateWithError($studiensemester));
+	public function studiensemesterDateInterval($date){
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		$studiensemester =$this->StudiensemesterModel->getByDate(date_format(date_create($date),'Y-m-d'));
+		$studiensemester =current($this->getDataOrTerminateWithError($studiensemester));
 		$this->terminateWithSuccess($studiensemester);
 	}

-	public function getLvPlanForStudiensemester($studiensemester, $lvid)
-	{
+	public function getLvPlanForStudiensemester($studiensemester,$lvid){
 		$this->load->library('StundenplanLib');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-
-		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz" => $studiensemester]);
+		$this->load->model('organisation/Studiensemester_model','StudiensemesterModel');
+		
+		$studiensemester_result = $this->StudiensemesterModel->loadWhere(["studiensemester_kurzbz"=>$studiensemester]);
 		$studiensemester_result = current($this->getDataOrTerminateWithError($studiensemester_result));
 		$timespan_start = new DateTime($studiensemester_result->start);
 		$timespan_ende = new DateTime($studiensemester_result->ende);
-		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'), date_format($timespan_ende, 'Y-m-d'), $lvid);
+		$lvplan = $this->stundenplanlib->getStundenplan(date_format($timespan_start, 'Y-m-d'),date_format($timespan_ende, 'Y-m-d'), $lvid);
 		$this->terminateWithSuccess($lvplan);
-
+		
 	}
+		

-
-	/**
-	 * fetches Stunden layout from database
-	 * @access public
-	 *
-	 */
-	public function Stunden()
+    /**
+     * fetches Stunden layout from database
+     * @access public
+     *
+     */
+    public function Stunden()
 	{
 		$this->load->model('ressource/Stunde_model', 'StundeModel');

 		$this->StundeModel->addOrder('stunde', 'ASC');
 		$stunden = $this->StundeModel->load();

-		$stunden = $this->getDataOrTerminateWithError($stunden);
+        $stunden = $this->getDataOrTerminateWithError($stunden);

 		$this->terminateWithSuccess($stunden);
 	}
@@ -263,10 +210,10 @@ class LvPlan extends FHCAPI_Controller
 		$roomplan_data = $this->stundenplanlib->getRoomplan($ort_kurzbz, $start_date, $end_date);

 		$roomplan_data = $this->getDataOrTerminateWithError($roomplan_data);
-
+		
 		$this->terminateWithSuccess($roomplan_data);
 	}
-
+	
 	/**
 	 * gets the reservierungen of a room if the ort_kurzbz parameter is
 	 * supplied otherwise gets the reservierungen of the lvplan of a student
@@ -279,27 +226,25 @@ class LvPlan extends FHCAPI_Controller
 	{
 		$this->form_validation->set_rules('start_date', "StartDate", "required");
 		$this->form_validation->set_rules('end_date', "EndDate", "required");
-
+		
 		if (!$this->form_validation->run())
 			$this->terminateWithValidationErrors($this->form_validation->error_array());

 		// storing the post parameter in local variables
 		$start_date = $this->input->post('start_date', true);
 		$end_date = $this->input->post('end_date', true);
-		$uid = $this->input->post('uid', true);

 		// get data
 		$this->load->library('StundenplanLib');

-		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+		$result = $this->stundenplanlib->getReservierungen($start_date, $end_date, $ort_kurzbz);

 		$result = $this->getDataOrTerminateWithError($result);

 		$this->terminateWithSuccess($result);
 	}

-	public function getLehreinheitStudiensemester($lehreinheit_id)
-	{
+	public function getLehreinheitStudiensemester($lehreinheit_id){
 		$this->load->model('education/Lehreinheit_model', 'LehreinheitModel');
 		$this->LehreinheitModel->addSelect(["studiensemester_kurzbz"]);
 		$result = $this->LehreinheitModel->load($lehreinheit_id);
@@ -342,68 +287,6 @@ class LvPlan extends FHCAPI_Controller
 		return $this->terminateWithSuccess(current($result));
 	}

-	public function getStudiengaenge()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	public function getLehrverband($studiengang_kz, $semester = null, $verband = null)
-	{
-		$this->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
-
-		$where = [
-			'aktiv' => true,
-			'studiengang_kz' => $studiengang_kz,
-		];
-
-		if ($semester !== null && $semester !== 'null' && $semester !== 'undefined') {
-			$where['semester'] = $semester;
-		}
-		if ($verband !== null && $verband !== 'null' && $verband !== 'undefined') {
-			$where['verband'] = $verband;
-		}
-
-		$this->LehrverbandModel->addOrder('studiengang_kz');
-		$this->LehrverbandModel->addOrder('semester');
-		$this->LehrverbandModel->addOrder('verband');
-		$this->LehrverbandModel->addOrder('gruppe');
-		$result = $this->LehrverbandModel->loadWhere($where);
-
-		$data = $this->getDataOrTerminateWithError($result);
-
-		return $this->terminateWithSuccess($data);
-	}
-
-	/**
-	 * Checks if the current user has permission to view other users' timetables
-	 *
-	 * @return void
-	 */
-	public function permissionOtherLvPlan()
-	{
-		$this->terminateWithSuccess($this->permissionlib->isBerechtigt('basis/other_lv_plan'));
-	}
-
-	/**
-	 * get event types which can be compacted in lv plan display
-	 *
-	 * @return void
-	 */
-	public function compactibleEventTypes()
-	{
-		$this->terminateWithSuccess(["lehreinheit", "reservierung"]);
-	}
-
 	/**
 	 * fetch moodle events
 	 *
@@ -416,19 +299,19 @@ class LvPlan extends FHCAPI_Controller
 		$this->load->config('calendar');

 		$tz = new DateTimeZone($this->config->item('timezone'));
-
+		
 		$start = new DateTime($start_date);
 		$start->setTimezone($tz);
-
+		
 		$end = new DateTime($end_date);
 		$end->setTimezone($tz);
 		$end->modify('+1 day -1 second');
-
+		
 		$moodle_events = [];
-
+		
 		Events::trigger(
 			'moodleCalendarEvents',
-			function &() use (&$moodle_events) {
+			function & () use (&$moodle_events) {
 				return $moodle_events;
 			},
 			[
@@ -448,23 +331,23 @@ class LvPlan extends FHCAPI_Controller
 	 * @param string		$end_date
 	 * @return array
 	 */
-	private function fetchFerienEvents($start_date, $end_date, $uid = null)
+	private function fetchFerienEvents($start_date, $end_date)
 	{
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 		$this->load->model('education/Studentlehrverband_model', 'StudentLehrverbandModel');

 		$currentStudiensemester = $this->StudiensemesterModel->getByDate($start_date);
 		$currentStudiensemester = $this->getDataOrTerminateWithError($currentStudiensemester);
-
+		
 		if ($currentStudiensemester) {
 			$studentsemester_kurzbz = current($currentStudiensemester)->studiensemester_kurzbz;

 			$studiengang = $this->StudentLehrverbandModel->loadWhere([
-				"student_uid" => $uid ?? getAuthUID(),
+				"student_uid" => getAuthUID(),
 				"studiensemester_kurzbz" => $studentsemester_kurzbz
 			]);
 			$studiengang = $this->getDataOrTerminateWithError($studiengang);
-
+			
 			if ($studiengang)
 				$studiengang_kz = current($studiengang)->studiengang_kz;
 			else
@@ -474,7 +357,7 @@ class LvPlan extends FHCAPI_Controller
 		}

 		$ferienEvents = $this->stundenplanlib->fetchFerienTageEvents($start_date, $end_date, $studiengang_kz);
-
+		
 		return $this->getDataOrTerminateWithError($ferienEvents);
 	}
 }
@@ -1,76 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class OtherLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-            'otherLvPlanViewData' => ['basis/other_lv_plan:r'],
-        ]);
-
-        $this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
-        $this->load->model('person/Benutzer_model', 'BenutzerModel');
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-     * retrieves viewData for other lv plan view
-     * @access public
-     * @param  $uid the userID for which the other lv plan is being viewed
-     */
-    public function otherLvPlanViewData($uid)
-    {
-        $isMitarbeiterResult = $this->MitarbeiterModel->isMitarbeiter($uid);
-        $isMitarbeiter = getData($isMitarbeiterResult);
-        $isStudent = !$isMitarbeiter;
-
-        $this->BenutzerModel->addSelect(["foto", "vorname", "nachname"]);
-        $this->BenutzerModel->addJoin("tbl_person", "person_id");
-        $personResult = $this->BenutzerModel->load([$uid]);
-        $person = hasData($personResult) ? getData($personResult) : null;
-
-        $viewData = [
-            "user_data" => [
-                "username" => $uid,
-                "is_student" => $isStudent,
-                "is_mitarbeiter" => $isMitarbeiter,
-                "foto" => $person[0]->foto,
-                "vorname" => $person[0]->vorname,
-                "nachname" => $person[0]->nachname,
-            ],
-        ];
-
-        $this->terminateWithSuccess($viewData);
-    }
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-
@@ -16,8 +16,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-if (!defined('BASEPATH'))
-	exit('No direct script access allowed');
+if (! defined('BASEPATH')) exit('No direct script access allowed');

 class Profil extends FHCAPI_Controller
 {
@@ -28,13 +27,13 @@ class Profil extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'fotoSperre' => self::PERM_LOGGED,
+            'fotoSperre' => self::PERM_LOGGED,
 			'getGemeinden' => self::PERM_LOGGED,
 			'getAllNationen' => self::PERM_LOGGED,
 			'isMitarbeiter' => self::PERM_LOGGED,
 			'profilViewData' => self::PERM_LOGGED,
 		]);
-
+		
 		$this->load->library('PermissionLib');

 		$this->load->model('ressource/mitarbeiter_model', 'MitarbeiterModel');
@@ -49,37 +48,28 @@ class Profil extends FHCAPI_Controller

 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
-
-	/**
-     * retrieves view data for profile view
-     * @access public
-     * @param  $uid the userID for which profile is being viewed, null or missing value implies one's own profile
-     */
-	public function profilViewData($uid = null)
-	{
-		$authUid = getAuthUID();
-		$isProfilOfAuthUser = !$uid || $uid === $authUid;
-
+	public function profilViewData($uid=null){
 		$this->load->library('ProfilLib');
-		$profileData = $this->profillib->getView($uid ?? $authUid);
-		$profileData = hasData($profileData) ? getData($profileData) : null;
-
-		$viewData = [
-			'editable' => $isProfilOfAuthUser,
-			'profil_data' => $profileData,
-			'permissions' => [
-				'basis/other_lv_plan' => $this->permissionlib->isBerechtigt(('basis/other_lv_plan'))
-			]
-		];
-
-		if ($isProfilOfAuthUser) {
-			$viewData['calendar_sync_urls'] = $this->getCalendarSyncUrlData();
+		$editable = false;
+		if(isset($uid) && $uid != null){
+			$profil_data = $this->profillib->getView($uid);
+			if($uid == getAuthUID()){
+				$editable = true;
+			}
+		}else{
+			$editable = true;
+			$profil_data = $this->profillib->getView(getAuthUID());
 		}
-
+		
+		$profil_data = hasData($profil_data) ? getData($profil_data) : null;
+		$viewData = array(
+			'editable'=>$editable,
+			'profil_data' => $profil_data,
+		);
 		$this->terminateWithSuccess($viewData);
 	}

-	/**
+    /**
 	 * update column foto_sperre in public.tbl_person
 	 * @access public
 	 * @param  boolean $value  new value for the column
@@ -87,9 +77,9 @@ class Profil extends FHCAPI_Controller
 	 */
 	public function fotoSperre($value)
 	{
-		if (!isset($value)) {
-			$this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
-		}
+        if(!isset($value)){
+            $this->terminateWithError("Missing parameter", self::ERROR_TYPE_GENERAL);
+        }

 		$res = $this->PersonModel->update($this->pid, ["foto_sperre" => $value]);
 		if (isError($res)) {
@@ -97,10 +87,10 @@ class Profil extends FHCAPI_Controller
 		}
 		$this->PersonModel->addSelect("foto_sperre");
 		$res = $this->PersonModel->load($this->pid);
-
-		$res = $this->getDataOrTerminateWithError($res);
-
-		$this->terminateWithSuccess(current($res));
+		
+        $res = $this->getDataOrTerminateWithError($res);
+		
+        $this->terminateWithSuccess(current($res));
 	}

 	/**
@@ -119,7 +109,7 @@ class Profil extends FHCAPI_Controller
 		if (isError($nation_res)) {
 			$this->terminateWithError("error while trying to query table codex.tbl_nation", self::ERROR_TYPE_GENERAL);
 		}
-
+		
 		$nation_res = $this->getDataOrTerminateWithError($nation_res);

 		$this->terminateWithSuccess($nation_res);
@@ -127,30 +117,30 @@ class Profil extends FHCAPI_Controller

 	public function getGemeinden($nation, $zip)
 	{
-		if (!isset($nation) || !isset($zip)) {
+		if(!isset($nation) || !isset($zip)){
 			echo json_encode(error("Missing parameters"));
 			return;
 		}
-
+		
 		$this->load->model('codex/Gemeinde_model', "GemeindeModel");
-
+		

 		$gemeinde_res = $this->GemeindeModel->getGemeindeByPlz($zip);
-
+		
 		if (isError($gemeinde_res)) {
-			$this->terminateWithError(getError($gemeinde_res), self::ERROR_TYPE_GENERAL);
+			$this->terminateWithError(getError($gemeinde_res),self::ERROR_TYPE_GENERAL);
 		}
 		$gemeinde_res = $this->getDataOrTerminateWithError($gemeinde_res);
-
+		
 		/* $gemeinde_res = array_map(function ($obj) {
 			return $obj->ortschaftsname;
 		}, $gemeinde_res); */

-		$this->terminateWithSuccess($gemeinde_res);
-
+		$this->terminateWithSuccess($gemeinde_res);	
+		
 	}

-
+    
 	/**
 	 * checks whether a specific userID is a mitarbeiter or not (foreword declaration of the function isMitarbeiter in Mitarbeiter_model.php)
 	 * @access public
@@ -160,48 +150,23 @@ class Profil extends FHCAPI_Controller
 	public function isMitarbeiter($uid)
 	{

-		if (!$uid)
-			$this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
-
-
+		if(!$uid) $this->terminateWithError("No uid provided", self::ERROR_TYPE_GENERAL);
+		
+		
 		$result = $this->MitarbeiterModel->isMitarbeiter($uid);
-
+		
 		if (isError($result)) {
 			$this->terminateWithError("error when calling Mitarbeiter_model function isMitarbeiter with uid " . $uid, self::ERROR_TYPE_GENERAL);
 		}

 		$result = $this->getDataOrTerminateWithError($result);
-
+		
 		$this->terminateWithSuccess($result);
 	}

 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods

-	/**
-	 * gets the identifier, phrase, and url for each calendar sync option
-	 * @access private
-	 * @return array array of arrays, where each child array is a sync option
-	 */
-	private function getCalendarSyncUrlData()
-	{
-		return [
-			[
-				"identifier" => "cal_dav",
-				"labelPhrase" => "profil/calendar_sync_cal_dav",
-				"url" => APP_ROOT . "webdav/lvplan.php/calendars/" . $this->uid . "/LVPlan-" . $this->uid,
-			],
-			[
-				"identifier" => "cal_dav_principal",
-				"labelPhrase" => "profil/calendar_sync_cal_dav_principal",
-				"url" => APP_ROOT . "webdav/lvplan.php/principals/" . $this->uid,
-			],
-			[
-				"identifier" => "i_cal",
-				"labelPhrase" => "profil/calendar_sync_i_cal",
-				"url" => APP_ROOT . "webdav/google.php?cal=" . encryptData($this->uid, LVPLAN_CYPHER_KEY) . "&" . microtime(true),
-			],
-		];
-	}
+	
 }

@@ -1,64 +0,0 @@
-<?php
-/**
- * Copyright (C) 2024 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (!defined('BASEPATH'))
-    exit('No direct script access allowed');
-
-class StgOrgLvPlan extends FHCAPI_Controller
-{
-
-    /**
-     * Object initialization
-     */
-    public function __construct()
-    {
-        parent::__construct([
-			'stgOrgLvPlanViewData' => self::PERM_LOGGED,
-        ]);
-
-    }
-
-    //------------------------------------------------------------------------------------------------------------------
-    // Public methods
-
-    /**
-	 * fetches view data for stg org lv plan
-	 * @access public
-	 */
-	public function stgOrgLvPlanViewData()
-	{
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->addOrder('typ');
-		$this->StudiengangModel->addOrder('kurzbz');
-		$result = $this->StudiengangModel->loadWhere([
-			'aktiv' => true
-		]);
-		$studiengaenge = $this->getDataOrTerminateWithError($result);
-
-		$viewData = array(
-			'studiengaenge' => $studiengaenge,
-		);
-
-        $this->terminateWithSuccess($viewData);
-	}
-
-    // -----------------------------------------------------------------------------------------------------------------
-    // Private methods
-
-}
-
@@ -62,36 +62,21 @@ class Studium extends FHCAPI_Controller

 		if($this->getDataOrTerminateWithError($this->StudentModel->isStudent(getAuthUID()))){
 			$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $aktuelles_studiensemester->studiensemester_kurzbz]);
-
-			//TODO(Manu) check if use Fallback or just comment out all paramschecks?
-			//add Fallback: if no LehrverbandData of actual semester, get Data of previous one
-			if(!hasData($studentLehrverband))
-			{
-				$result= $this->StudiensemesterModel->getPreviousFrom($aktuelles_studiensemester->studiensemester_kurzbz);
-
-				$data = $this->getDataOrTerminateWithError($result);
-				$vorheriges_studiensemester = current($data)->studiensemester_kurzbz;
-				$studentLehrverband =$this->StudentlehrverbandModel->loadWhere(["student_uid" => getAuthUID(), "studiensemester_kurzbz" => $vorheriges_studiensemester]);
-			}
-			$studentLehrverband = current(getData($studentLehrverband));
-
+			$studentLehrverband = current($this->getDataOrTerminateWithError($studentLehrverband));
+			
+			$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
+			$student_studiengang = $studentLehrverband->studiengang_kz;
+			$student_semester = $studentLehrverband->semester;
 			$student_studienplan = $this->getStudienPlanFromPrestudentStatus(getAuthPersonId())->studienplan_id;
 			
-			if(!isset($parameter_studiensemester)) {
-				$student_studiensemester = $studentLehrverband->studiensemester_kurzbz;
-				$parameter_studiensemester = $student_studiensemester;
-			}
-			if(!isset($parameter_studiengang)) {
-				$student_studiengang = $studentLehrverband->studiengang_kz;
-				$parameter_studiengang = $student_studiengang;
-			}
-			if(!isset($parameter_semester)) {
-				$student_semester = $studentLehrverband->semester;
-				$parameter_semester = $student_semester;
-			}
+			if(!isset($parameter_studiensemester))
+			$parameter_studiensemester = $student_studiensemester;
+			if(!isset($parameter_studiengang))
+			$parameter_studiengang = $student_studiengang;
+			if(!isset($parameter_semester))
+			$parameter_semester = $student_semester;
 			if(!isset($parameter_studienplan))
-				$parameter_studienplan = $student_studienplan;
-
+			$parameter_studienplan = $student_studienplan;
 		}  

 		if(isset($parameter_studiensemester)){
@@ -111,7 +96,8 @@ class Studium extends FHCAPI_Controller

 		// fetch studiensemester
 		$allStudienSemester = $this->getDataOrTerminateWithError($this->StudiensemesterModel->load());
-
+		
+		
 		if(isset($parameter_studiensemester) && !empty(array_filter($allStudienSemester, function($studiensemester) use($parameter_studiensemester){
 			return $studiensemester->studiensemester_kurzbz == $parameter_studiensemester->studiensemester_kurzbz;
 		}))){
@@ -230,8 +216,6 @@ class Studium extends FHCAPI_Controller
 		$studienplaene = array_map(function($studienplan){
 			$orgform = current($this->getDataOrTerminateWithError($this->OrgformModel->loadWhere(["orgform_kurzbz" => $studienplan->orgform_kurzbz])));
 			$studienplan->orgform_bezeichnung = $orgform->bezeichnung;
-			// bezeichnung_mehrsprachig
-			$studienplan->orgform_bezeichnung_english = $orgform->bezeichnung_mehrsprachig[1];
 			return $studienplan;
 		},$studienplaene);
 		return $studienplaene;
@@ -40,32 +40,11 @@ class Board extends FHCAPI_Controller

 	public function list()
 	{
-		$this->DashboardModel->addSelect('dashboard_id');
-		$this->DashboardModel->addSelect('dashboard_kurzbz');
-		$this->DashboardModel->addSelect('tbl_dashboard.beschreibung');
-		$this->DashboardModel->addSelect("(
-			SELECT json_agg(w.*) 
-			FROM dashboard.tbl_widget w 
-			JOIN dashboard.tbl_dashboard_widget dw 
-			USING(widget_id) 
-			WHERE dw.dashboard_id=tbl_dashboard.dashboard_id
-		) AS \"widgetSetup\"");
-
 		$result = $this->DashboardModel->load();

 		$data = $this->getDataOrTerminateWithError($result);

-		$data = array_map(function ($dashboard) {
-			$tmpSetups = json_decode($dashboard->widgetSetup);
-			$tmpSetups = array_map(function ($widget) {
-				$widget->setup->file = absoluteJsImportUrl($widget->setup->file);
-				return $widget;
-			}, $tmpSetups);
-			$dashboard->widgetSetup = $tmpSetups;
-			return $dashboard;
-		}, $data);
-
-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}

 	public function create()
@@ -103,7 +82,7 @@ class Board extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}

 	public function delete()
@@ -137,6 +116,6 @@ class Board extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

-		$this->terminateWithSuccess($data);
+		$this->terminateWithSuccess($result);
 	}
 }
@@ -120,7 +120,10 @@ class Preset extends FHCAPI_Controller
 			$conf = $this->dashboardlib->getPreset($db, $funktion);
 			if ($conf) {
 				$preset = json_decode($conf->preset, true);
-				$result[$funktion] = $preset;
+				if (!isset($preset[$funktion]) || !isset($preset[$funktion]['widgets']))
+					$result[$funktion] = [];
+				else
+					$result[$funktion] = $preset[$funktion]['widgets'];
 			} else {
 				$result[$funktion] = [];
 			}
@@ -151,7 +154,7 @@ class Preset extends FHCAPI_Controller

 		$preset_decoded = json_decode($preset->preset, true);
 		
-		$preset_decoded[$widget['widgetid']] = $widget;
+		$this->dashboardlib->addWidgetsToWidgets($preset_decoded, $dashboard_kurzbz, $funktion_kurzbz, [$widget]);

 		$preset->preset = json_encode($preset_decoded);

@@ -183,10 +186,8 @@ class Preset extends FHCAPI_Controller

 		$preset_decoded = json_decode($preset->preset, true);

-		if (!isset($preset_decoded[$widgetid]))
+		if (!$this->dashboardlib->removeWidgetFromWidgets($preset_decoded, $funktion_kurzbz, $widgetid))
 			show_404();
-		
-		unset($preset_decoded[$widgetid]);

 		$preset->preset = json_encode($preset_decoded);

@@ -48,9 +48,25 @@ class User extends FHCAPI_Controller
 		
 		$uid = $this->authlib->getAuthObj()->username;

-		$mergedconfig = $this->dashboardlib->getMergedUserConfig($dashboard->dashboard_id, $uid);
+		/*$mergedconfig = $this->dashboardlib->getMergedConfig($dashboard->dashboard_id, $uid);

-		$this->terminateWithSuccess($mergedconfig);
+		$this->terminateWithSuccess([
+			'general' => call_user_func_array(
+				'array_merge_recursive',
+				$mergedconfig
+			)
+		]);*/
+		$defaultconfig = $this->dashboardlib->getDefaultConfig($dashboard->dashboard_id);
+		$userconfig = $this->dashboardlib->getUserConfig($dashboard->dashboard_id, $uid);
+
+		$defaultconfig_squashed = $defaultconfig ? call_user_func_array('array_replace_recursive', $defaultconfig) : [];
+		$userconfig_squashed = $userconfig ? call_user_func_array('array_replace_recursive', $userconfig) : [];
+
+		$mergedconfig = array_replace_recursive($defaultconfig_squashed, $userconfig_squashed);
+
+		$this->terminateWithSuccess([
+			DashboardLib::SECTION_IF_FUNKTION_KURZBZ_IS_NULL => $mergedconfig
+		]);
 	}

 	public function addWidget()
@@ -70,15 +86,26 @@ class User extends FHCAPI_Controller
 		if (!isset($widget['widgetid']))
 			$widget['widgetid'] = $this->dashboardlib->generateWidgetId($dashboard_kurzbz);

-		if (isset($widget['source']))
-			unset($widget['source']);
-
 		$override = $this->dashboardlib->getOverrideOrCreateEmptyOverride($dashboard_kurzbz, $uid);
-
+		
 		$override_decoded = json_decode($override->override, true);

-		$override_decoded[$widget['widgetid']] = $widget;
+		if (!isset($override_decoded['general']) || !is_array($override_decoded['general']))
+			$override_decoded['general'] = [];

+		 if (!isset($override_decoded['general']['widgets']))
+				$override_decoded['general']['widgets'] = [];
+
+		$override_decoded['general']['widgets'][$widget['widgetid']] = $widget;
+
+		// NOTE(chris): remove doubles in other funktionen
+		foreach ($override_decoded as $funktion => $array) {
+			if ($funktion == 'general')
+				continue;
+			if (isset($array['widgets']) && isset($array['widgets'][$widget['widgetid']]))
+				unset($override_decoded[$funktion]['widgets'][$widget['widgetid']]);
+		}
+		
 		$override->override = json_encode($override_decoded);
 				
 		$result = $this->dashboardlib->insertOrUpdateOverride($override);
@@ -108,10 +135,18 @@ class User extends FHCAPI_Controller
 		
 		$override_decoded = json_decode($override->override, true);

-		if (!isset($override_decoded[$widget_id]))
-			show_404();
-		
-		unset($override_decoded[$widget_id]);
+		foreach (array_keys($override_decoded) as $k) {
+			if (!isset($override_decoded[$k]["widgets"])) {
+				unset($override_decoded[$k]);
+				continue;
+			}
+			if (isset($override_decoded[$k]["widgets"][$widget_id])) {
+				unset($override_decoded[$k]["widgets"][$widget_id]);
+			}
+			if (!$override_decoded[$k]["widgets"]) {
+				unset($override_decoded[$k]);
+			}
+		}

 		$override->override = json_encode($override_decoded);
 				
@@ -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'
+	//);
+}
@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);

 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);

-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];

-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);

 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}

 		$this->terminateWithSuccess($mergedArray);
@@ -48,7 +48,8 @@ class Konto extends FHCAPI_Controller

 		// Load language phrases
 		$this->loadPhrases([
-			'konto'
+			'konto',
+			'lehre'
 		]);
 	}

@@ -112,7 +113,7 @@ class Konto extends FHCAPI_Controller
 	 *
 	 * @return void
 	 */
-	public function getBuchungstypen()
+	public function getBuchungstypen($studiensemester_kurzbz = null)
 	{
 		$this->load->model('crm/Buchungstyp_model', 'BuchungstypModel');

@@ -122,6 +123,7 @@ class Konto extends FHCAPI_Controller

 		$data = $this->getDataOrTerminateWithError($result);

+		$this->_getOEHBeitrag($data, $studiensemester_kurzbz);
 		$this->terminateWithSuccess($data);
 	}

@@ -494,4 +496,43 @@ class Konto extends FHCAPI_Controller

 		$this->terminateWithSuccess();
 	}
+
+	private function _getOEHBeitrag(&$data, $studiensemester_kurzbz = null)
+	{
+		if (is_null($studiensemester_kurzbz))
+		{
+			$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+			$studiensemester_akt = $this->variablelib->getVar('semester_aktuell');
+		}
+		else
+		{
+			$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+			if ($this->StudiensemesterModel->isValidStudiensemester($studiensemester_kurzbz))
+				$studiensemester_akt = $studiensemester_kurzbz;
+			else
+				$this->terminateWithError($this->p->t('lehre', 'error_noStudiensemester'));
+		}
+
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$oehBeitrag = $this->OehbeitragModel->getByStudiensemester($studiensemester_akt);
+
+		$oehStandardbetrag = null;
+		if (hasData($oehBeitrag))
+		{
+			$oeh = getData($oehBeitrag)[0];
+			$summe = ($oeh->studierendenbeitrag + $oeh->versicherung) * -1;
+			$oehStandardbetrag = number_format((float)$summe, 2, '.', '');
+		}
+
+		if ($oehStandardbetrag !== null)
+		{
+			$data = array_map(function ($buchungstyp) use ($oehStandardbetrag) {
+				if (isset($buchungstyp->buchungstyp_kurzbz) && (strtolower($buchungstyp->buchungstyp_kurzbz) === 'oeh'))
+				{
+					$buchungstyp->standardbetrag = $oehStandardbetrag;
+				}
+				return $buchungstyp;
+			}, $data);
+		}
+	}
 }
@@ -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();
 	}

 	/**
@@ -1,5 +1,6 @@
+<?php
 /**
- * Copyright (C) 2026 fhcomplete.org
+ * 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
@@ -15,12 +16,42 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-export default {
-	getAllStudienSemester(studiensemester, studiengang, semester, studienplan) {
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/Studium/getStudienAllSemester/',
-			params: {studiensemester, studiengang, semester, studienplan}
-		};
-	},
+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);
+	}
+}
@@ -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
 					{
@@ -157,7 +151,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 +162,9 @@ class Plausichecks extends Auth_Controller
 			FROM
 				system.tbl_fehler
 			WHERE
-				fehler_kurzbz IN ?',
+				fehler_kurzbz IN ?
+			ORDER BY
+				fehler_kurzbz, fehlercode',
 			array($fehlerKurzbz)
 		);

@@ -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);
@@ -417,6 +417,7 @@ abstract class Notiz_Controller extends FHCAPI_Controller
 		$notiz_id = $this->input->post('notiz_id');

 		$this->NotizModel->addSelect('campus.tbl_dms_version.*');
+		$this->NotizModel->addSelect($this->NotizModel->escape(base_url('content/notizdokdownload.php?id=')) . ' || public.tbl_notiz_dokument.dms_id AS preview');

 		$this->NotizModel->addJoin('public.tbl_notiz_dokument', 'ON (public.tbl_notiz_dokument.notiz_id = public.tbl_notiz.notiz_id)');
 		$this->NotizModel->addJoin('campus.tbl_dms_version', 'ON (public.tbl_notiz_dokument.dms_id = campus.tbl_dms_version.dms_id)');
@@ -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");
@@ -1,517 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Base Site URL
-|--------------------------------------------------------------------------
-|
-| URL to your CodeIgniter root. Typically this will be your base URL,
-| WITH a trailing slash:
-|
-|	http://example.com/
-|
-| If this is not set then CodeIgniter will try guess the protocol, domain
-| and path to your installation. However, you should always configure this
-| explicitly and never rely on auto-guessing, especially in production
-| environments.
-|
-*/
-$config['base_url'] = 'https://c3p0.dev.technikum-wien.at/ma1434/core/FHC-Core/';
-
-/*
-|--------------------------------------------------------------------------
-| Index File
-|--------------------------------------------------------------------------
-|
-| Typically this will be your index.php file, unless you've renamed it to
-| something else. If you are using mod_rewrite to remove the page set this
-| variable so that it is blank.
-|
-*/
-$config['index_page'] = 'index.ci.php';
-
-/*
-|--------------------------------------------------------------------------
-| URI PROTOCOL
-|--------------------------------------------------------------------------
-|
-| This item determines which server global should be used to retrieve the
-| URI string.  The default setting of 'REQUEST_URI' works for most servers.
-| If your links do not seem to work, try one of the other delicious flavors:
-|
-| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
-| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
-| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
-|
-| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
-*/
-$config['uri_protocol']	= 'REQUEST_URI';
-
-/*
-|--------------------------------------------------------------------------
-| URL suffix
-|--------------------------------------------------------------------------
-|
-| This option allows you to add a suffix to all URLs generated by CodeIgniter.
-| For more information please see the user guide:
-|
-| http://codeigniter.com/user_guide/general/urls.html
-*/
-$config['url_suffix'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Default Language
-|--------------------------------------------------------------------------
-|
-| This determines which set of language files should be used. Make sure
-| there is an available translation if you intend to use something other
-| than english.
-|
-*/
-$config['language']	= '';
-
-/*
-|--------------------------------------------------------------------------
-| Default Character Set
-|--------------------------------------------------------------------------
-|
-| This determines which character set is used by default in various methods
-| that require a character set to be provided.
-|
-| See http://php.net/htmlspecialchars for a list of supported charsets.
-|
-*/
-$config['charset'] = 'UTF-8';
-
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Hooks
-|--------------------------------------------------------------------------
-|
-| If you would like to use the 'hooks' feature you must enable it by
-| setting this variable to TRUE (boolean).  See the user guide for details.
-|
-*/
-$config['enable_hooks'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Class Extension Prefix
-|--------------------------------------------------------------------------
-|
-| This item allows you to set the filename/classname prefix when extending
-| native libraries.  For more information please see the user guide:
-|
-| http://codeigniter.com/user_guide/general/core_classes.html
-| http://codeigniter.com/user_guide/general/creating_libraries.html
-|
-*/
-$config['subclass_prefix'] = 'FHC_';
-
-/*
-|--------------------------------------------------------------------------
-| Composer auto-loading
-|--------------------------------------------------------------------------
-|
-| Enabling this setting will tell CodeIgniter to look for a Composer
-| package auto-loader script in application/vendor/autoload.php.
-|
-|	$config['composer_autoload'] = TRUE;
-|
-| Or if you have your vendor/ directory located somewhere else, you
-| can opt to set a specific path as well:
-|
-|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
-|
-| For more information about Composer, please visit http://getcomposer.org/
-|
-| Note: This will NOT disable or override the CodeIgniter-specific
-|	autoloading (application/config/autoload.php)
-*/
-$config['composer_autoload'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Allowed URL Characters
-|--------------------------------------------------------------------------
-|
-| This lets you specify which characters are permitted within your URLs.
-| When someone tries to submit a URL with disallowed characters they will
-| get a warning message.
-|
-| As a security measure you are STRONGLY encouraged to restrict URLs to
-| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
-|
-| Leave blank to allow all characters -- but only if you are insane.
-|
-| The configured value is actually a regular expression character group
-| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
-|
-| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
-|
-*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
-
-/*
-|--------------------------------------------------------------------------
-| Enable Query Strings
-|--------------------------------------------------------------------------
-|
-| By default CodeIgniter uses search-engine friendly segment based URLs:
-| example.com/who/what/where/
-|
-| By default CodeIgniter enables access to the $_GET array.  If for some
-| reason you would like to disable it, set 'allow_get_array' to FALSE.
-|
-| You can optionally enable standard query string based URLs:
-| example.com?who=me&what=something&where=here
-|
-| Options are: TRUE or FALSE (boolean)
-|
-| The other items let you set the query string 'words' that will
-| invoke your controllers and its functions:
-| example.com/index.php?c=controller&m=function
-|
-| Please note that some of the helpers won't work as expected when
-| this feature is enabled, since CodeIgniter is designed primarily to
-| use segment based URLs.
-|
-*/
-$config['allow_get_array'] = TRUE;
-$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-$config['directory_trigger'] = 'd';
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Threshold
-|--------------------------------------------------------------------------
-|
-| You can enable error logging by setting a threshold over zero. The
-| threshold determines what gets logged. Threshold options are:
-|
-|	0 = Disables logging, Error logging TURNED OFF
-|	1 = Error Messages (including PHP errors)
-|	2 = Debug Messages
-|	3 = Informational Messages
-|	4 = All Messages
-|
-| You can also pass an array with threshold levels to show individual error types
-|
-| 	array(2) = Debug Messages, without Error Messages
-|
-| For a live site you'll usually only enable Errors (1) to be logged otherwise
-| your log files will fill up very fast.
-|
-*/
-$config['log_threshold'] = 1;
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/logs/ directory. Use a full server path with trailing slash.
-|
-*/
-$config['log_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Extension
-|--------------------------------------------------------------------------
-|
-| The default filename extension for log files. The default 'php' allows for
-| protecting the log files via basic scripting, when they are to be stored
-| under a publicly accessible directory.
-|
-| Note: Leaving it blank will default to 'php'.
-|
-*/
-$config['log_file_extension'] = 'log';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Permissions
-|--------------------------------------------------------------------------
-|
-| The file system permissions to be applied on newly created log files.
-|
-| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
-|            integer notation (i.e. 0700, 0644, etc.)
-*/
-$config['log_file_permissions'] = 0644;
-
-/*
-|--------------------------------------------------------------------------
-| Date Format for Logs
-|--------------------------------------------------------------------------
-|
-| Each item that is logged has an associated date. You can use PHP date
-| codes to set your own date formatting
-|
-*/
-$config['log_date_format'] = 'Y-m-d H:i:s';
-
-/*
-|--------------------------------------------------------------------------
-| Error Views Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/views/errors/ directory.  Use a full server path with trailing slash.
-|
-*/
-$config['error_views_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/cache/ directory.  Use a full server path with trailing slash.
-|
-*/
-$config['cache_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Include Query String
-|--------------------------------------------------------------------------
-|
-| Whether to take the URL query string into consideration when generating
-| output cache files. Valid options are:
-|
-|	FALSE      = Disabled
-|	TRUE       = Enabled, take all query parameters into account.
-|	             Please be aware that this may result in numerous cache
-|	             files generated for the same page over and over again.
-|	array('q') = Enabled, but only take into account the specified list
-|	             of query parameters.
-|
-*/
-$config['cache_query_string'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Encryption Key
-|--------------------------------------------------------------------------
-|
-| If you use the Encryption class, you must set an encryption key.
-| See the user guide for more info.
-|
-| http://codeigniter.com/user_guide/libraries/encryption.html
-|
-*/
-$config['encryption_key'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Session Variables
-|--------------------------------------------------------------------------
-|
-| 'sess_driver'
-|
-|	The storage driver to use: files, database, redis, memcached
-|
-| 'sess_cookie_name'
-|
-|	The session cookie name, must contain only [0-9a-z_-] characters
-|
-| 'sess_expiration'
-|
-|	The number of SECONDS you want the session to last.
-|	Setting to 0 (zero) means expire when the browser is closed.
-|
-| 'sess_save_path'
-|
-|	The location to save sessions to, driver dependent.
-|
-|	For the 'files' driver, it's a path to a writable directory.
-|	WARNING: Only absolute paths are supported!
-|
-|	For the 'database' driver, it's a table name.
-|	Please read up the manual for the format with other session drivers.
-|
-|	IMPORTANT: You are REQUIRED to set a valid save path!
-|
-| 'sess_match_ip'
-|
-|	Whether to match the user's IP address when reading the session data.
-|
-| 'sess_time_to_update'
-|
-|	How many seconds between CI regenerating the session ID.
-|	NOTE: Keep it as it is to prevent security issues (https://en.wikipedia.org/wiki/Session_fixation)
-|
-| 'sess_regenerate_destroy'
-|
-|	Whether to destroy session data associated with the old session ID
-|	when auto-regenerating the session ID. When set to FALSE, the data
-|	will be later deleted by the garbage collector.
-|
-| Other session cookie settings are shared with the rest of the application,
-| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
-|
-*/
-$config['sess_driver'] = 'files';
-$config['sess_cookie_name'] = 'sess_ci_session';
-$config['sess_expiration'] = 1800; // Session expires every 30 minutes
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
-$config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cookie Related Variables
-|--------------------------------------------------------------------------
-|
-| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
-| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
-| 'cookie_path'     = Typically will be a forward slash
-| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
-| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
-|
-| Note: These settings (with the exception of 'cookie_prefix' and
-|       'cookie_httponly') will also affect sessions.
-|
-*/
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Standardize newlines
-|--------------------------------------------------------------------------
-|
-| Determines whether to standardize newline characters in input data,
-| meaning to replace \r\n, \r, \n occurrences with the PHP_EOL value.
-|
-| This is particularly useful for portability between UNIX-based OSes,
-| (usually \n) and Windows (\r\n).
-|
-*/
-$config['standardize_newlines'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Global XSS Filtering
-|--------------------------------------------------------------------------
-|
-| Determines whether the XSS filter is always active when GET, POST or
-| COOKIE data is encountered
-|
-| WARNING: This feature is DEPRECATED and currently available only
-|          for backwards compatibility purposes!
-|
-*/
-$config['global_xss_filtering'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cross Site Request Forgery
-|--------------------------------------------------------------------------
-| Enables a CSRF cookie token to be set. When set to TRUE, token will be
-| checked on a submitted form. If you are accepting user data, it is strongly
-| recommended CSRF protection be enabled.
-|
-| 'csrf_token_name' = The token name
-| 'csrf_cookie_name' = The cookie name
-| 'csrf_expire' = The number in seconds the token should expire.
-| 'csrf_regenerate' = Regenerate token on every submission
-| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
-*/
-$config['csrf_protection'] = FALSE;
-$config['csrf_token_name'] = 'csrf_test_name';
-$config['csrf_cookie_name'] = 'csrf_cookie_name';
-$config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
-$config['csrf_exclude_uris'] = array();
-
-/*
-|--------------------------------------------------------------------------
-| Output Compression
-|--------------------------------------------------------------------------
-|
-| Enables Gzip output compression for faster page loads.  When enabled,
-| the output class will test whether your server supports Gzip.
-| Even if it does, however, not all browsers support compression
-| so enable only if you are reasonably sure your visitors can handle it.
-|
-| Only used if zlib.output_compression is turned off in your php.ini.
-| Please do not use it together with httpd-level output compression.
-|
-| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
-| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts.  For
-| compression to work, nothing can be sent before the output buffer is called
-| by the output class.  Do not 'echo' any values with compression enabled.
-|
-*/
-$config['compress_output'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Master Time Reference
-|--------------------------------------------------------------------------
-|
-| Options are 'local' or any PHP supported timezone. This preference tells
-| the system whether to use your server's local time as the master 'now'
-| reference, or convert it to the configured one timezone. See the 'date
-| helper' page of the user guide for information regarding date handling.
-|
-*/
-$config['time_reference'] = 'local';
-
-/*
-|--------------------------------------------------------------------------
-| Rewrite PHP Short Tags
-|--------------------------------------------------------------------------
-|
-| If your PHP installation does not have short tag support enabled CI
-| can rewrite the tags on-the-fly, enabling you to utilize that syntax
-| in your view files.  Options are TRUE or FALSE (boolean)
-|
-| Note: You need to have eval() enabled for this to work.
-|
-*/
-$config['rewrite_short_tags'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Reverse Proxy IPs
-|--------------------------------------------------------------------------
-|
-| If your server is behind a reverse proxy, you must whitelist the proxy
-| IP addresses from which CodeIgniter should trust headers such as
-| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
-| the visitor's IP address.
-|
-| You can use both an array or a comma-separated list of proxy addresses,
-| as well as specifying whole subnets. Here are a few examples:
-|
-| Comma-separated:	'10.0.1.200,192.168.5.0/24'
-| Array:		array('10.0.1.200', '192.168.5.0/24')
-*/
-$config['proxy_ips'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| FHComplete Build Version
-|--------------------------------------------------------------------------
-|
-| Version Number of the Current Build
-| This is used to invalidate Cache for JS and CSS Files
-| 
-| Example: 2019102901
-*/
-$config['fhcomplete_build_version'] = '2019102903';
@@ -1,122 +0,0 @@
-<?php
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-defined('DB_HOST') OR require_once './config/system.config.inc.php'; // For CLI-Migrations
-
-/*
-| -------------------------------------------------------------------
-| DATABASE CONNECTIVITY SETTINGS
-| -------------------------------------------------------------------
-| This file will contain the settings needed to access your database.
-|
-| For complete instructions please consult the 'Database Connection'
-| page of the User Guide.
-|
-| -------------------------------------------------------------------
-| EXPLANATION OF VARIABLES
-| -------------------------------------------------------------------
-|
-|	['dsn']      The full DSN string describe a connection to the database.
-|	['hostname'] The hostname of your database server.
-|	['username'] The username used to connect to the database
-|	['password'] The password used to connect to the database
-|	['database'] The name of the database you want to connect to
-|	['dbdriver'] The database driver. e.g.: mysqli.
-|			Currently supported:
-|				 cubrid, ibase, mssql, mysql, mysqli, oci8,
-|				 odbc, pdo, postgre, sqlite, sqlite3, sqlsrv
-|	['dbprefix'] You can add an optional prefix, which will be added
-|				 to the table name when using the  Query Builder class
-|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
-|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
-|	['cache_on'] TRUE/FALSE - Enables/disables query caching
-|	['cachedir'] The path to the folder where cache files should be stored
-|	['char_set'] The character set used in communicating with the database
-|	['dbcollat'] The character collation used in communicating with the database
-|				 NOTE: For MySQL and MySQLi databases, this setting is only used
-| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
-|				 (and in table creation queries made with DB Forge).
-| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
-| 				 can make your site vulnerable to SQL injection if you are using a
-| 				 multi-byte character set and are running versions lower than these.
-| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
-|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
-|	['encrypt']  Whether or not to use an encrypted connection.
-|
-|			'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
-|			'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
-|
-|				'ssl_key'    - Path to the private key file
-|				'ssl_cert'   - Path to the public key certificate file
-|				'ssl_ca'     - Path to the certificate authority file
-|				'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
-|				'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-|				'ssl_verify' - TRUE/FALSE; Whether verify the server certificate or not ('mysqli' only)
-|
-|	['compress'] Whether or not to use client compression (MySQL only)
-|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
-|							- good for ensuring strict SQL while developing
-|	['ssl_options']	Used to set various SSL options that can be used when making SSL connections.
-|	['failover'] array - A array with 0 or more data for connections if the main should fail.
-|	['save_queries'] TRUE/FALSE - Whether to "save" all executed queries.
-| 				NOTE: Disabling this will also effectively disable both
-| 				$this->db->last_query() and profiling of DB queries.
-| 				When you run a query, with this setting set to TRUE (default),
-| 				CodeIgniter will store the SQL statement for debugging purposes.
-| 				However, this may cause high memory usage, especially if you run
-| 				a lot of SQL queries ... disable this to avoid that problem.
-|
-| The $active_group variable lets you choose which connection group to
-| make active.  By default there is only one group (the 'default' group).
-|
-| The $query_builder variables lets you determine whether or not to load
-| the query builder class.
-*/
-$active_group = 'default';
-$query_builder = TRUE;
-
-$db['default'] = array(
-	'dsn'	=> '',
-	'hostname' => DB_HOST,
-	'username' => DB_USER,
-	'password' => DB_PASSWORD,
-	'port' 	   => DB_PORT,
-	'database' => DB_NAME,
-	'dbdriver' => 'postgre',
-	'dbprefix' => '',
-	'pconnect' => DB_CONNECT_PERSISTENT,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
-);
-
-$db['system'] = array(
-	'dsn'	=> '',
-	'hostname' => DB_HOST,
-	'username' => 'fhcomplete',
-	'password' => 'Fhcomplet3Onc4p1',
-	'database' => DB_NAME,
-	'port'     => DB_PORT,
-	'dbschema' => 'public',
-	'dbdriver' => 'postgre',
-	'dbprefix' => '',
-	'pconnect' => DB_CONNECT_PERSISTENT,
-	'db_debug' => (ENVIRONMENT !== 'production'),
-	'cache_on' => FALSE,
-	'cachedir' => '',
-	'char_set' => 'utf8',
-	'dbcollat' => 'utf8_general_ci',
-	'swap_pre' => '',
-	'encrypt' => FALSE,
-	'compress' => FALSE,
-	'stricton' => FALSE,
-	'failover' => array(),
-	'save_queries' => TRUE
-);
@@ -0,0 +1,382 @@
+<?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)
+			{
+				// 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");
@@ -228,10 +243,10 @@ class IssuesLib
 		$inhalt_extern = null
 	) {
 		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
-			return error("Person_id or oe_kurzbz must be set.");
+			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 +256,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);
 			}
@@ -40,16 +40,13 @@ class StundenplanLib
 	 * @return stdClass
 	 * @access public
 	 */
-	public function getEventsUser($start, $end, $uid = null)
+	public function getEventsUser($start, $end)
 	{
 		$this->_ci =& get_instance();

 		$this->_ci->load->model('ressource/Mitarbeiter_model', 'MitarbeiterModel');

-		if (!$uid) {
-			$uid = getAuthUID();
-		}
-		
+		$uid = getAuthUID();
 		if (is_null($uid))
 			return error("No UID");
 		
@@ -220,7 +217,7 @@ class StundenplanLib
 	 * @param string	$ort_kurzbz
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '', $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = '')
 	{
 		$this->_ci =& get_instance();

@@ -231,14 +228,14 @@ class StundenplanLib
 		$this->_ci->load->model('ressource/Reservierung_model', 'ReservierungModel');
 		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');

-		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter($uid ?? getAuthUID()));
+		$is_mitarbeiter = getData($this->_ci->MitarbeiterModel->isMitarbeiter(getAuthUID()));

 		if ($is_mitarbeiter && empty($ort_kurzbz)) {
 			// request for personal lvplan show only reservations of logged in user
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungenMitarbeiter($start_date, $end_date);
 		} else {
 			// querying the reservierungen
-			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz, $uid);
+			$reservierungen = $this->_ci->ReservierungModel->getReservierungen($start_date, $end_date, $ort_kurzbz);
 		}
 		
 		if (isError($reservierungen))
@@ -448,24 +445,6 @@ class StundenplanLib
 		return success($ferienEventsFlattened);
 	}

-	public function getEventsStgOrg( $start, $end, $stg_kz, $sem, $verband, $gruppe)
-	{
-		$this->_ci =& get_instance();
-
-		$this->_ci->load->model('ressource/Stundenplan_model', 'StundenplanModel');
-
-		$stundenplan_data = $this->_ci->StundenplanModel->getStundenplanStudiengang($start, $end, $stg_kz, $sem, $verband, $gruppe);
-		if (isError($stundenplan_data))
-			return $stundenplan_data;
-		$stundenplan_data = getData($stundenplan_data) ?? [];
-
-		$function_error = $this->expandObjectInformation($stundenplan_data);
-		if ($function_error)
-			return $function_error;
-
-		return success($stundenplan_data);
-	}
-
 	// start of the private functions ########################################################################################################

 	// function used to sort an array of studiensemester strings
@@ -37,9 +37,7 @@ class DashboardLib
 	
 	public function getDashboardByKurzbz($dashboard_kurzbz)
 	{
-		$result = $this->_ci->DashboardModel->loadWhere([
-			'dashboard_kurzbz' => $dashboard_kurzbz
-		]);
+		$result = $this->_ci->DashboardModel->getDashboardByKurzbz($dashboard_kurzbz);

 		if (hasData($result))
 		{
@@ -49,21 +47,17 @@ class DashboardLib
 		return null;
 	}
 	
-	public function getMergedUserConfig($dashboard_id, $uid)
+	public function getMergedConfig($dashboard_id, $uid)
 	{
-		$defaultconfig = $this->getUserBaseConfig($dashboard_id);
-		$userconfig = $this->getUserOverrideConfig($dashboard_id, $uid);
+		$defaultconfig = $this->getDefaultConfig($dashboard_id);
+		$userconfig = $this->getUserConfig($dashboard_id, $uid);
 		
-		$sourceconfig = array_map(function ($value) {
-			return ['source' => $value['source']];
-		}, $defaultconfig);
-		
-		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig, $sourceconfig);
+		$mergedconfig = array_replace_recursive($defaultconfig, $userconfig);
 		
 		return $mergedconfig;
 	}
 	
-	protected function getUserBaseConfig($dashboard_id)
+	public function getDefaultConfig($dashboard_id)
 	{
 		$funktion_kurzbzs = [];
 		$rights = $this->_ci->permissionlib->getAccessRights();
@@ -93,11 +87,7 @@ class DashboardLib
 				$preset = json_decode($presetobj->preset, true);
 				if (null !== $preset)
 				{
-					$preset = array_map(function ($value) use ($presetobj) {
-						$value['source'] = $presetobj->funktion_kurzbz ?: self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
-						return $value;
-					}, $preset);
-					$defaultconfig = array_merge_recursive($defaultconfig, $preset);
+					$defaultconfig = array_replace_recursive($defaultconfig, $preset);
 				}
 			}
 		}
@@ -105,7 +95,7 @@ class DashboardLib
 		return $defaultconfig;
 	}
 	
-	protected function getUserOverrideConfig($dashboard_id, $uid)
+	public function getUserConfig($dashboard_id, $uid)
 	{
 		$res_userconfig = $this->_ci->DashboardOverrideModel->getOverride($dashboard_id, $uid);
 		
@@ -134,7 +124,7 @@ class DashboardLib
 		$emptyoverride = new stdClass();
 		$emptyoverride->dashboard_id = $dashboard->dashboard_id;
 		$emptyoverride->uid = $uid;
-		$emptyoverride->override = '[]';
+		$emptyoverride->override = '{"' . self::USEROVERRIDE_SECTION . '": {"widgets":{}}, "custom": { "widgets" : {}}}';
 		
 		return $emptyoverride;
 	}
@@ -153,7 +143,8 @@ class DashboardLib
 		$emptypreset = new stdClass();
 		$emptypreset->dashboard_id = $dashboard->dashboard_id;
 		$emptypreset->funktion_kurzbz = $funktion_kurzbz;
-		$emptypreset->preset = '[]';
+		$section = ($funktion_kurzbz !== null) ? $funktion_kurzbz : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		$emptypreset->preset = '{"' . $section . '": { "widgets" : {}},"custom": { "widgets" : {}}}';
 		
 		return $emptypreset;
 	}
@@ -218,4 +209,44 @@ class DashboardLib
 		
 		return $result;
 	}
+
+	public function addWidgetsToWidgets(&$widgets, $dashboard_kurzbz, $section, $addwigets)
+	{
+		foreach ($addwigets as $widget)
+		{
+			if(!isset($widget['widgetid']))
+			{
+				$widget['widgetid'] = $this->generateWidgetId($dashboard_kurzbz);
+			}
+			$this->addWidgetToWidgets($widgets, $section, $widget, $widget['widgetid']);
+		}
+	}
+	
+	public function addWidgetToWidgets(&$widgets, $section, $widget, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (!isset($widgets[$section]) || !isset($widgets[$section]["widgets"]) || !is_array($widgets[$section]))
+		{
+			$widgets[$section] = array();
+			$widgets[$section]["widgets"] = array();
+		}
+		
+		$widgets[$section]["widgets"][$widgetid] = $widget;
+	}
+	
+	public function removeWidgetFromWidgets(&$widgets, $section, $widgetid)
+	{
+		$section = ($section !== null) ? $section : self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL;
+		if (isset($widgets[$section]) && isset($widgets[$section]["widgets"][$widgetid]))
+		{
+			unset($widgets[$section]["widgets"][$widgetid]);
+			if(empty($widgets[$section]["widgets"]) && $section !== self::USEROVERRIDE_SECTION) {
+				unset($widgets[$section]);
+			}
+			return true;
+		}
+		else {
+			return false;
+		}
+	}
 }
@@ -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']
 		);
@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}
@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}

-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }
@@ -234,9 +234,9 @@ class Content_model extends DB_Model
 							FROM
 								campus.tbl_content c1
 							LEFT JOIN
-								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=? AND sichtbar=true
+								campus.tbl_contentsprache s1 ON c1.content_id=s1.content_id AND s1.sprache=?
 							WHERE
-								c1.aktiv = true
+								sichtbar=true
 						) s2
 						LEFT JOIN
 							campus.tbl_contentsprache s3 USING(content_id, sprache)
@@ -277,7 +277,7 @@ class Content_model extends DB_Model
 			JOIN 
 				campus.tbl_contentsprache s USING(contentsprache_id)
 			LEFT JOIN 
-				campus.tbl_contentchild k ON(m.content_id=k.content_id) and c.aktiv = true
+				campus.tbl_contentchild k ON(m.content_id=k.content_id)
 			WHERE EXISTS (
 				SELECT 1 
 				FROM campus.tbl_contentgruppe 
@@ -11,4 +11,8 @@ class Bookmark_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_bookmark';
 		$this->pk = 'bookmark_id';
 	}
+
+
+	
+
 }
@@ -11,4 +11,15 @@ class Dashboard_model extends DB_Model
 		$this->dbTable = 'dashboard.tbl_dashboard';
 		$this->pk = 'dashboard_id';
 	}
+
+
+	/**
+	 * Get Dashboard by kurzbz.
+	 * @param string dashboard_kurzbz
+	 * @return array
+	 */
+	public function getDashboardByKurzbz($dashboard_kurzbz)
+	{
+		return $this->loadWhere(array('dashboard_kurzbz' => $dashboard_kurzbz));
+	}
 }
@@ -18,10 +18,10 @@ class Reservierung_model extends DB_Model
 	 * 
 	 * @return stdClass
 	 */
-	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null, $uid = null)
+	public function getReservierungen($start_date, $end_date, $ort_kurzbz = null)
 	{
-
-		$lvplan_reservierungen_query = "SELECT r.* , stund.beginn, stund.ende,
+		
+		$lvplan_reservierungen_query="SELECT r.* , stund.beginn, stund.ende,
 			CASE
 				WHEN r.gruppe_kurzbz IS NOT NULL THEN r.gruppe_kurzbz 
 				ELSE CONCAT(UPPER(studg.typ),UPPER(studg.kurzbz),'-',COALESCE(CAST(r.semester AS varchar),'/'),COALESCE(CAST(r.verband AS varchar),'/')) 
@@ -35,7 +35,7 @@ class Reservierung_model extends DB_Model
 			LEFT JOIN public.tbl_studiensemester ss2 ON slv.studiensemester_kurzbz = ss2.studiensemester_kurzbz AND ss2.start <=r.datum AND ss2.ende >= r.datum 
 			WHERE datum >= ? AND datum <= ? AND (ss1.studiensemester_kurzbz IS NOT NULL
 			OR ss2.studiensemester_kurzbz IS NOT NULL)";
-
+		
 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
 			CASE
 				WHEN res.gruppe_kurzbz IS NOT NULL THEN res.gruppe_kurzbz 
@@ -46,9 +46,9 @@ class Reservierung_model extends DB_Model
 			JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = res.stunde
 			WHERE res.ort_kurzbz = ? AND datum >= ? AND datum <= ?";

-		$subquery = is_null($ort_kurzbz) ? $lvplan_reservierungen_query : $raum_reservierungen_query;
-
-		$query_result = $this->execReadOnlyQuery("
+		$subquery = is_null($ort_kurzbz)? $lvplan_reservierungen_query:$raum_reservierungen_query;
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -59,15 +59,15 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			" . $subquery . "
+			". $subquery ."
 		) AS subquery

 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", is_null($ort_kurzbz) ? [$uid ?? getAuthUID(), $uid ?? getAuthUID(), $start_date, $end_date] : [$ort_kurzbz, $start_date, $end_date]);
-
+		", is_null($ort_kurzbz) ?[getAuthUID(), getAuthUID(),$start_date,$end_date]: [$ort_kurzbz, $start_date, $end_date]);

+		
 		return $query_result;
 	}

@@ -76,7 +76,7 @@ class Reservierung_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getReservierungenMitarbeiter($start_date, $end_date, $uid = null)
+	public function getReservierungenMitarbeiter($start_date, $end_date)
 	{

 		$raum_reservierungen_query = "SELECT res.*, beginn, ende,
@@ -91,8 +91,8 @@ class Reservierung_model extends DB_Model

 		$subquery = $raum_reservierungen_query;

-
-		$query_result = $this->execReadOnlyQuery("
+		
+		$query_result= $this->execReadOnlyQuery("
 		SELECT 
 		'reservierung' as type, beginn, ende, datum,
 		COALESCE(titel, beschreibung) as topic,
@@ -103,13 +103,13 @@ class Reservierung_model extends DB_Model
 		
 		FROM 
 		(
-			" . $subquery . "
+			". $subquery ."
 		) AS subquery

 		GROUP BY datum, beginn, ende, ort_kurzbz, titel, beschreibung
 		
 		ORDER BY datum, beginn
-		", [$uid ?? getAuthUID(), $start_date, $end_date]);
+		", [getAuthUID(), $start_date, $end_date]);


 		return $query_result;
@@ -129,9 +129,9 @@ class Reservierung_model extends DB_Model
 		$this->addJoin('public.tbl_studiensemester ss2', 'slv.studiensemester_kurzbz=ss2.studiensemester_kurzbz AND ss2.start<=r.datum AND ss2.ende>=r.datum', 'LEFT');
 		$this->db->or_where('ss1.studiensemester_kurzbz IS NOT NULL', null, false);
 		$this->db->or_where('ss2.studiensemester_kurzbz IS NOT NULL', null, false);
-
+		
 		$query = $this->db->get_compiled_select('campus.vw_reservierung r');
-
+		
 		return $this->execQuery($query, [$uid, $uid]);
 	}

@@ -388,84 +388,6 @@ class Stundenplan_model extends DB_Model
 		
 		ORDER BY datum, beginn", [$start_date, $end_date, $ma_uid]);
 	}
-
-	/**
-	 * queries Stundenplan and filters by studiengang, semester, verband gruppe
-	 *
-	 * @return void
-	 */
-	public function getStundenplanStudiengang($start_date, $end_date, $stg_kz, $sem, $verband, $gruppe) {
-
-		$qry_params = [$start_date, $end_date, $stg_kz];
-
-		$qry = "
-		SELECT
-			'lehreinheit' as type, beginn, ende, datum,
-			CONCAT(lehrfach,'-',lehrform) as topic,
-			array_agg(DISTINCT lektor) as lektor,
-			array_agg(DISTINCT (gruppe,verband,semester,studiengang_kz,gruppen_kuerzel)) as gruppe,
-			string_agg(DISTINCT ort_kurzbz, '/') as ort_kurzbz,
-			array_agg(DISTINCT lehreinheit_id) as lehreinheit_id,
-			titel, lehrfach, lehrform, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		FROM
-			(
-				SELECT unr,datum,beginn, ende,
-					   CASE
-						   WHEN sp.mitarbeiter_kurzbz IS NOT NULL THEN sp.mitarbeiter_kurzbz
-						   ELSE sp.lektor
-						   END as lektor,
-					   CASE
-						   WHEN gruppe_kurzbz IS NOT NULL THEN gruppe_kurzbz
-						   ELSE CONCAT(UPPER(sp.stg_typ),UPPER(sp.stg_kurzbz),'-',COALESCE(CAST(sp.semester AS varchar),'/'),COALESCE(CAST(sp.verband AS varchar),'/'))
-						   END as gruppen_kuerzel,
-					   (SELECT bezeichnung
-						FROM public.tbl_organisationseinheit
-						WHERE oe_kurzbz IN(
-							SELECT oe_kurzbz
-							FROM lehre.tbl_lehrveranstaltung
-							WHERE lehrveranstaltung_id = sp.lehrveranstaltung_id
-						)) as organisationseinheit,
-					   sp.ort_kurzbz, sp.studiengang_kz, sp.titel,sp.lehreinheit_id,sp.lehrfach_id,sp.anmerkung,fix,lehrveranstaltung_id,stg_kurzbzlang,stg_bezeichnung,stg_typ,fachbereich_kurzbz,lehrfach,lehrfach_bez,farbe,lehrform,anmerkung_lehreinheit,gruppe, verband, semester,stg_kurzbz
-				FROM (
-						 SELECT sp.*
-						 FROM lehre.vw_stundenplan sp
-						 WHERE
-							 sp.datum >= ?
-						   AND sp.datum <= ?
-					 ) sp
-						 JOIN lehre.tbl_stunde ON lehre.tbl_stunde.stunde = sp.stunde
-						WHERE studiengang_kz = ? ";
-
-		if($sem != NULL)
-		{
-			$qry_params[] = $sem;
-			$qry .= " AND (semester = ? OR semester IS NULL)";
-		}
-		if($verband != NULL)
-		{
-			$qry_params[] = $verband;
-			$qry .= " AND (verband = ? OR verband IS NULL OR verband = '0' OR verband = '')";
-		}
-		if($gruppe != NULL)
-		{
-			$qry_params[] = $gruppe;
-			$qry .= " AND (gruppe = ? OR gruppe IS NULL	OR gruppe = '0' OR gruppe = '')	";
-		}
-		$qry.= " AND (
-			gruppe_kurzbz is null OR EXISTS(
-			   SELECT 1
-			  FROM
-				public.tbl_gruppe WHERE gruppe_kurzbz = sp.gruppe_kurzbz AND direktinskription = false
-			)
-		  )";
-
-		$qry.= "	) as subquery
-
-		GROUP BY unr, datum, beginn, ende,  titel, lehrform, lehrfach, lehrfach_bez, organisationseinheit, farbe, lehrveranstaltung_id
-		ORDER BY datum, beginn; ";
-
-		return $this->execReadOnlyQuery($qry, $qry_params);
-	}
 	
 	/**
 	 * NO STANDALONE FUNCTION - Generates a SQL query string to fetch 'stundenplan' events for a specific student within the current semester.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Alexei Karpenko	2076752f40	Merge branch 'master' into feature-68834/Fehlermonitoring_Issues_weitere_features	2026-05-26 13:30:13 +02:00
Harald Bamberger	cb7a0f7669	Merge branch 'feature-70376/Lohnguide'	2026-05-13 11:53:14 +02:00
Harald Bamberger	68d97a5e97	handle case where old value or new value and not both are null explicitly in markDirty Method	2026-05-13 11:42:25 +02:00
Harald Bamberger	d27071528f	revert change to comparision in markDirty Method	2026-05-13 11:16:18 +02:00
Harald Bamberger	17772c3738	Merge branch 'master' into feature-70376/Lohnguide	2026-05-13 11:15:07 +02:00
Harald Bamberger	bbb4f8a01c	Merge branch 'bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument'	2026-05-06 16:13:50 +02:00
Harald Bamberger	fdbb93a5c5	bugfix download booking receipt failed. only fetch oehbeitrag from bis.tbl_oehbeitrag if a user is logged in	2026-05-05 14:36:07 +02:00
Harald Bamberger	b7e48633ab	Merge branch 'master' into bug-76146/studvw_karteireiter_dokumente_akzeptiert_eintraege_ohne_vorhandenes_dokument	2026-05-05 13:33:38 +02:00
Harald Bamberger	04dc1eb07b	Merge branch 'bug-76519/StudVW_Messages_Table_column_Stati'	2026-05-05 13:04:58 +02:00
Harald Bamberger	50b229090b	prefetch phrases and then render filter component instead of redrawing the table	2026-05-05 13:04:11 +02:00
Harald Bamberger	2d27a998c4	Merge branch 'bug-76109/VVW_Details_und_Status_not_Loading'	2026-05-05 11:17:49 +02:00
Harald Bamberger	090e535466	add header filters, increase height of tables, use correct category for phrase lehreinheit_id	2026-05-05 11:04:48 +02:00
Harald Bamberger	c4d35181db	Merge branch 'master' into bug-76109/VVW_Details_und_Status_not_Loading	2026-05-05 09:01:49 +02:00
Harald Bamberger	0ac6ef4599	Merge branch 'feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle'	2026-05-05 08:46:22 +02:00
Werner Masik	7f13c128f1	allow null value for vordienstzeit; changed comparison in markDirty to !== (because of 0 vs. null issue)	2026-05-04 20:35:51 +02:00
Harald Bamberger	cb60ddcc94	Merge branch 'master' into feature-62607/konto_oh_beitrag_betrag_aus_eigener_tabelle	2026-05-04 15:41:52 +02:00
Harald Bamberger	bd4ced9559	bugfix: comma as decimal separator prevents saving booking, bugfix messages tinymce not resizeable	2026-05-04 14:39:19 +02:00
Andreas Österreicher	a04d2acb86	Fixed Blank on Phrase for Abgabetool	2026-05-04 10:49:33 +02:00
Harald Bamberger	de2aabf00b	readd dokument preview link to api response	2026-05-04 09:30:16 +02:00
ma0068	685fc69e5d	update css and add provisional height	2026-04-30 18:02:38 +02:00
Werner Masik	58a921b500	changed lohnguide kommentar data type to text	2026-04-30 09:47:12 +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
ma0068	26db4a5e7a	adding redraw tabulator and fallback to avoid empty column	2026-04-20 09:31:52 +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
ma0048	21d80905a2	akzeptierte dokumente anzeigen, auch wenn kein dokument vorhanden ist	2026-04-13 13:04:46 +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
ma0068	298dbbf400	use context vm for tabulator event, refactor function toggleRowClick, delete unused commented sections	2026-04-02 10:58:49 +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
ma0048	ba6224bc78	oeh betrag aus der eigener tabelle holen studentenverwaltung bei jedem studiensemester wechsel fas nur einmalig ueber die variable	2025-09-02 11:18:24 +02:00