fixed zeitsperren collision check

formatting
added collision checks on creation
2026-06-01 12:19:28 +00:00 · 2026-06-01 13:59:50 +02:00 · 2026-06-01 13:39:59 +02:00 · 2026-06-01 11:18:53 +02:00 · 2026-05-26 14:09:58 +02:00 · 2026-05-21 12:27:55 +02:00
211 changed files with 9475 additions and 13709 deletions
@@ -33,5 +33,27 @@ Events::on('loadRenderers', function ($renderers) {
 	);
 });

+//Tempus Renderers:
+Events::on('loadTempusRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["reservierung"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Reservierungen/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+Events::on('loadTempusRenderers', function ($renderers) {
+	$fhc_core_renderers =& $renderers();
+	$fhc_core_renderers["lehreinheit"] = array(
+		'calendarEvent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/calendarEvent.js'),
+		'modalTitle' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalTitle.js'),
+		'modalContent' => absoluteJsImportUrl('public/js/components/Tempus/Renderer/Lehreinheit/modalContent.js'),
+		'calendarEventStyles' => APP_ROOT . 'public/css/Cis4/CoreCalendarEvents.css'
+	);
+});
+
+


@@ -1,514 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-$config['fehler'] = array(
-	array(
-		'fehlercode' => 'CORE_ZGV_0001',
-		'fehler_kurzbz' => 'zgvDatumInZukunft',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Datum in Zukunft',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => array('core'),
-		'producerLibName' => 'ZgvDatumInZukunft',
-		'resolverLibName' => 'CORE_ZGV_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0002',
-		'fehler_kurzbz' => 'zgvDatumVorGeburtsdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Datum vor Geburtsdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvDatumVorGeburtsdatum',
-		'resolverLibName' => 'CORE_ZGV_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0003',
-		'fehler_kurzbz' => 'zgvMasterDatumInZukunft',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum in Zukunft',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumInZukunft',
-		'resolverLibName' => 'CORE_ZGV_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0004',
-		'fehler_kurzbz' => 'zgvMasterDatumVorZgvdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum vor Zgvdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumVorZgvdatum',
-		'resolverLibName' => 'CORE_ZGV_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_ZGV_0005',
-		'fehler_kurzbz' => 'zgvMasterDatumVorGeburtsdatum',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'ZGV Masterdatum vor Geburtsdatum',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZgvMasterDatumVorGeburtsdatum',
-		'resolverLibName' => 'CORE_ZGV_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0001',
-		'fehler_kurzbz' => 'keinAufenthaltszweckPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Aufenthaltszweck gefunden',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'KeinAufenthaltszweckPlausi',
-		'resolverLibName' => 'CORE_INOUT_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0002',
-		'fehler_kurzbz' => 'zuVieleZweckeIncomingPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es sind %s Aufenthaltszwecke eingetragen (max. 1 Zweck für Incomings)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'ZuVieleZweckeIncomingPlausi',
-		'resolverLibName' => 'CORE_INOUT_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0003',
-		'fehler_kurzbz' => 'falscherIncomingZweckPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aufenthaltszweckcode ist %s (für Incomings ist nur Zweck 1, 2, 3 erlaubt)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscherIncomingZweckPlausi',
-		'resolverLibName' => 'CORE_INOUT_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0004',
-		'fehler_kurzbz' => 'outgoingAufenthaltfoerderungfehltPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Keine Aufenthaltsfoerderung angegeben (bei Outgoings >= 29 Tage Monat im Ausland muss mind. 1 gemeldet werden)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingAufenthaltfoerderungfehltPlausi',
-		'resolverLibName' => 'CORE_INOUT_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0005',
-		'fehler_kurzbz' => 'outgoingAngerechneteEctsFehlenPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Angerechnete ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingAngerechneteEctsFehlenPlausi',
-		'resolverLibName' => 'CORE_INOUT_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0006',
-		'fehler_kurzbz' => 'outgoingErworbeneEctsFehlenPlausi',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Erworbene ECTS fehlen (Meldepflicht bei Outgoings >= 29 Tage Monat im Ausland)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OutgoingErworbeneEctsFehlenPlausi',
-		'resolverLibName' => 'CORE_INOUT_0006',
-		'producerIsResolver' => false
-	),
-
-	/** Plausichecks **/
-	array(
-		'fehlercode' => 'CORE_INOUT_0007',
-		'fehler_kurzbz' => 'IncomingHeimatNationOesterreich',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Heimatnation bei Incoming Österreich',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingHeimatNationOesterreich',
-		'resolverLibName' => 'CORE_INOUT_0007',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0008',
-		'fehler_kurzbz' => 'IncomingOhneIoDatensatz',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Incoming hat keinen IO Datensatz (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingOhneIoDatensatz',
-		'resolverLibName' => 'CORE_INOUT_0008',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_INOUT_0009',
-		'fehler_kurzbz' => 'IncomingOrGsFoerderrelevant',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Incoming oder gemeinsames Studium ist nicht als nicht förderrelevant markiert. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'IncomingOrGsFoerderrelevant',
-		'resolverLibName' => 'CORE_INOUT_0009',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0001',
-		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudent',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Studiengang des Prestudenten ist ungleich dem Studiengang des Studenten. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StgPrestudentUngleichStgStudent',
-		'resolverLibName' => 'CORE_STG_0001',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0002',
-		'fehler_kurzbz' => 'OrgformStgUngleichOrgformPrestudent',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Es ist kein Studienplan mit Studiengang (%s) und Organisationsform (%s) des Studenten zugewiesen. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OrgformStgUngleichOrgformPrestudent',
-		'resolverLibName' => 'CORE_STG_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0003',
-		'fehler_kurzbz' => 'PrestudentMischformOhneOrgform',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Organisationsform ist für Studierenden/BewerberIn in Mischformstudiengang nicht eingetragen. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'PrestudentMischformOhneOrgform',
-		'resolverLibName' => 'CORE_STG_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STG_0004',
-		'fehler_kurzbz' => 'StgPrestudentUngleichStgStudienplan',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Studiengang des Prestudenten passt nicht zu Studiengang des Studienplans. (prestudent_id %s, Studienplan %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StgPrestudentUngleichStgStudienplan',
-		'resolverLibName' => 'CORE_STG_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0001',
-		'fehler_kurzbz' => 'AbbrecherAktiv',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'AbbrecherIn hat aktiven Benutzer. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AbbrecherAktiv',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0002',
-		'fehler_kurzbz' => 'StudentstatusNachAbbrecher',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktiver Status nach Abbrecher Status. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StudentstatusNachAbbrecher',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0002',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0003',
-		'fehler_kurzbz' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Ausbildungssemester %s des aktuellen Status stimmt nicht mit Ausbildungssemester %s bei StudentIn (Lehrverband) überein. (student_uid %s, prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0003',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0004',
-		'fehler_kurzbz' => 'InaktiverStudentAktiverStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Inaktiver Benutzer hat aktiven Status. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'InaktiverStudentAktiverStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0004',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0005',
-		'fehler_kurzbz' => 'InskriptionVorLetzerBismeldung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Datum der Inskription liegt vor dem Datum der letzten BIS-Meldung %s. (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'InskriptionVorLetzerBismeldung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0005',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0006',
-		'fehler_kurzbz' => 'DatumStudiensemesterFalscheReihenfolge',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Datum und Studiensemester sind bei den Status in falscher Reihenfolge. (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumStudiensemesterFalscheReihenfolge',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0006',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0007',
-		'fehler_kurzbz' => 'AktiverStudentOhneStatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktive/r StudentIn ohne aktuellen Status (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktiverStudentOhneStatus',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0007',
-		'producerIsResolver' => false
-	),
-	//~ array(
-		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0008',
-		//~ 'fehler_kurzbz' => 'StudienplanUngueltig',
-		//~ 'fehlercode_extern' => null,
-		//~ 'fehlertext' => 'Studienplan %s ist im Ausbildungssemester %s nicht gültig (prestudent_id %s)',
-		//~ 'fehlertyp_kurzbz' => 'error',
-		//~ 'app' => 'core',
-		//~ 'producerLibName' => 'StudienplanUngueltig',
-		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0008',
-		//~ 'producerIsResolver' => false
-	//~ ),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0009',
-		'fehler_kurzbz' => 'FalscheAnzahlAbschlusspruefungen',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Mehrere oder keine bestandenen Abschlussprüfungen (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscheAnzahlAbschlusspruefungen',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0009',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0010',
-		'fehler_kurzbz' => 'DatumAbschlusspruefungFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Abschlussprüfung Datum (prestudent_id %s, abschlusspruefung_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumAbschlusspruefungFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0010',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0011',
-		'fehler_kurzbz' => 'DatumSponsionFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Sponsionsdatum (prestudent_id %s, abschlusspruefung_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DatumSponsionFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0011',
-		'producerIsResolver' => false
-	),
-	//~ array(
-		//~ 'fehlercode' => 'CORE_STUDENTSTATUS_0012',
-		//~ 'fehler_kurzbz' => 'BewerberNichtZumRtAngetreten',
-		//~ 'fehlercode_extern' => null,
-		//~ 'fehlertext' => 'Bewerber nicht zum Reihungstest angetreten (prestudent_id %s)',
-		//~ 'fehlertyp_kurzbz' => 'warning',
-		//~ 'app' => 'core',
-		//~ 'producerLibName' => 'BewerberNichtZumRtAngetreten',
-		//~ 'resolverLibName' => 'CORE_STUDENTSTATUS_0012',
-		//~ 'producerIsResolver' => false
-	//~ ),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0013',
-		'fehler_kurzbz' => 'AktSemesterNull',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Aktuelles Ausbildungssemester ist 0 (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktSemesterNull',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0013',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0014',
-		'fehler_kurzbz' => 'AbschlussstatusFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Kein Abschlussstatus (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'warning',
-		'app' => 'core',
-		'producerLibName' => 'AbschlussstatusFehlt',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0014',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0015',
-		'fehler_kurzbz' => 'AktiverStudentstatusOhneKontobuchung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Keine Kontobuchung bei aktivem Studentstatus (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AktiverStudentstatusOhneKontobuchung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0015',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0016',
-		'fehler_kurzbz' => 'DualesStudiumOhneMarkierung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'StudentIn in dualem Studiengang nicht als dual markiert (prestudent_id %s, Studienplan %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'DualesStudiumOhneMarkierung',
-		'resolverLibName' => 'CORE_STUDENTSTATUS_0016',
-		'producerIsResolver' => false
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0017',
-		'fehler_kurzbz' => 'BeginndatumVorBismeldung',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Statusdatum vor Bismeldedatum eingetragen, nachdem das Bismeldedatum erreicht wurde  (prestudent_id %s, Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'BeginndatumVorBismeldung',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0018',
-		'fehler_kurzbz' => 'StudentstatusNachDiplomand',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Studentstatus nach Diplomandenstatus (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StudentstatusNachDiplomand',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0019',
-		'fehler_kurzbz' => 'OrgformBewerberUngleichOrgformStudent',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Orgform des Bewerbers (Studienplan) stimmt nicht mit Orgform des ersten Studenten überein (prestudent_id %s, Student Studiensemester %s, Bewerber Studiensemester %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'OrgformBewerberUngleichOrgformStudent',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0020',
-		'fehler_kurzbz' => 'StartsemesterUngleichPersonenkennzeichen',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Semester des ersten Studentstatus stimmt nicht mit Personenkennzeichen überein (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'StartsemesterUngleichPersonenkennzeichen',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0021',
-		'fehler_kurzbz' => 'AbschlusspruefungOderAbsolventFehlt',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Keine Abschlussprüfung vor der Bismeldung oder kein Absolventenstatus vor der Bismeldung (prestudent_id %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'AbschlusspruefungOderAbsolventFehlt',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	array(
-		'fehlercode' => 'CORE_STUDENTSTATUS_0022',
-		'fehler_kurzbz' => 'FalscheStatusabfolgeVorStudentstatus',
-		'fehlercode_extern' => null,
-		'fehlertext' => 'Falsche Statusabfolge vor Studentstatus (prestudent_id %s, Studiensemester %s, richtige Abfolge: %s)',
-		'fehlertyp_kurzbz' => 'error',
-		'app' => 'core',
-		'producerLibName' => 'FalscheStatusabfolgeVorStudentstatus',
-		'resolverLibName' => null,
-		'producerIsResolver' => true
-	),
-	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
-	)
-);
@@ -0,0 +1,3 @@
+<?php
+
+$config['send_update_mails'] = false;
@@ -0,0 +1,40 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Tempus extends Auth_Controller
+{
+	public function __construct()
+	{
+		$permissions = [];
+		$router = load_class('Router');
+		$permissions[$router->method] = ['admin:r', 'assistenz:r'];
+		parent::__construct($permissions);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		
+		// Load Config
+		$this->load->config('calendar');
+	}
+
+	/**
+	 * @return void
+	 */
+	public function _remap()
+	{
+
+		$this->load->view('Tempus', [
+			'permissions' => [
+				'admin' => $this->permissionlib->isBerechtigt('admin')
+			],
+			'variables' => [
+				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell'),
+				'timezone' => $this->config->item('timezone')
+			]
+		]);
+	}
+}
@@ -31,7 +31,7 @@ class RendererLoader extends FHCAPI_Controller

 		parent::__construct([
 			'GetRenderers' => self::PERM_LOGGED,
-           
+			'GetTempusRenderers' => self::PERM_LOGGED,
 		]);

        $this->load->library('LogLib');
@@ -66,6 +66,26 @@ class RendererLoader extends FHCAPI_Controller
 		$this->terminateWithSuccess($renderer_paths);
 	}

+	public function GetTempusRenderers(){
+		$renderer_paths = [];
+		Events::trigger(
+				'loadRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+
+		Events::trigger(
+				'loadTempusRenderers',
+				function & () use (&$renderer_paths)
+				{
+					return $renderer_paths;
+				}
+			);
+		$this->terminateWithSuccess($renderer_paths);
+	}
+
 	
 	

@@ -1,200 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-class IssueChecker extends FHCAPI_Controller
-{
-	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
-
-	protected $person_id;
-	protected $_extensionName = null;
-	protected $_fehlercodes = [];
-	protected $_apps = [];
-
-	protected $errors = [];
-	protected $infos = [];
-
-	public function __construct($permissions = [])
-	{
-		$default_permissions = [
-			'checkPerson' => self::DEFAULT_PERMISSION,
-			'countPersonOpenIssues' => self::DEFAULT_PERMISSION
-		];
-
-		if(!is_array($permissions))
-		{
-			$this->terminateWithError("Issue Checker: permissions must be an array");
-		}
-
-		$merged_permissions = array_merge($default_permissions, $permissions);
-
-		parent::__construct($merged_permissions);
-
-		$this->load->model('system/Issue_model', 'IssueModel');
-		$this->load->model('system/Fehler_model', 'FehlerModel');
-		$this->load->model('person/Person_model', 'PersonModel');
-
-		$producerArgs = [];
-		$resolverArgs = [];
-
-		// get fehler kurzbz from fehlercodes, if fehlercodes provided
-		if (!isEmptyArray($this->_fehlercodes))
-		{
-			$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz');
-			$this->FehlerModel->db->where_in('tbl_fehler.fehlercode', $this->_fehlercodes);
-			$fehlerKurzbzRes = $this->FehlerModel->load();
-
-			if (isError($fehlerKurzbzRes)) $this->terminateWithError(getError($fehlerKurzbzRes), self::ERROR_TYPE_GENERAL);
-			if (hasData($fehlerKurzbzRes))
-			{
-				$producerArgs['fehlerKurzbz'] = array_column(getData($fehlerKurzbzRes), 'fehler_kurzbz');
-				$resolverArgs['fehlercode'] = array_column(getData($fehlerKurzbzRes), 'fehlercode');
-			}
-		}
-		elseif (!isEmptyArray($this->_apps)) // if apps are provided
-		{
-			// get fehlercodes for the apps
-			$fehlerRes = $this->FehlerModel->getByApps($this->_apps);
-			if (hasData($fehlerRes)) $this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
-
-			$producerArgs['apps'] = $this->_apps;
-			$resolverArgs['apps'] = $this->_apps;
-		}
-
-		// load producer and checker libraries with fehler kurbz and fehlercode list
-		$this->load->library(
-			'issues/PlausicheckProducerLib',
-			$producerArgs,
-			'PlausicheckProducerLib'
-		);
-
-		$this->load->library(
-			'issues/PlausicheckResolverLib',
-			$resolverArgs,
-			'PlausicheckResolverLib'
-		);
-
-		$this->load->library('PhrasesLib');
-
-		$this->loadPhrases(
-			array(
-				'ui'
-			)
-		);
-	}
-
-	public function checkPerson()
-	{
-		$person_id = $this->input->post('person_id', true);
-		$hauptzustaendig = filter_var($this->input->post('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-
-		$this->person_id = intval($person_id);
-		$this->hauptzustaendig = $hauptzustaendig;
-
-		$persRes = $this->PersonModel->load($this->person_id);
-		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
-
-		$this->_produceIssues();
-		$this->_resolveIssues();
-		$this->_produceIssues();
-
-		$openIssueCountRes = $this->_countOpenIssues();
-		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
-
-		$data = array(
-			'person_id' => $this->person_id,
-			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
-		);
-
-		$this->addMeta('errors', $this->errors);
-		$this->addMeta('infos', $this->infos);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	public function countPersonOpenIssues()
-	{
-		$person_id = $this->input->get('person_id', true);
-		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (!is_numeric($person_id)) $this->terminateWithError($this->p->t('ui', 'error_invalidId', ['id'=> 'Person ID']), self::ERROR_TYPE_GENERAL);
-
-		$this->person_id = intval($person_id);
-		$this->hauptzustaendig = $hauptzustaendig;
-
-		$persRes = $this->PersonModel->load($this->person_id);
-
-		if (!hasData($persRes)) $this->terminateWithError('Person with id ' . $this->person_id . ' not found.', self::ERROR_TYPE_GENERAL);
-
-		$openIssueCountRes = $this->_countOpenIssues();
-		if (isError($openIssueCountRes)) $this->terminateWithError(getError($openIssueCountRes), self::ERROR_TYPE_GENERAL);
-
-		$data = array(
-			'person_id' => $this->person_id,
-			'openissues' => hasData($openIssueCountRes) ? getData($openIssueCountRes) : 0
-		);
-
-		$this->addMeta('errors', $this->errors);
-		$this->addMeta('infos', $this->infos);
-
-		$this->terminateWithSuccess($data);
-	}
-
-	protected function _countOpenIssues()
-	{
-		if (isEmptyArray($this->_fehlercodes)) return success([]);
-
-		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			$this->_fehlercodes,
-			$this->person_id,
-			$oe_kurzbz = null,
-			$fehlercode_extern = null,
-			$this->hauptzustaendig
-		);
-
-		// log error if occured
-		if (isError($openIssuesRes)) return $openIssuesRes;
-
-		$issues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
-		$issuescount = is_array($issues) || $issues instanceof Countable ? count($issues) : 0;
-
-		return success($issuescount);
-	}
-
-	protected function _produceIssues()
-	{
-		$result = $this->PlausicheckProducerLib->producePlausicheckIssues(
-			array('person_id' => $this->person_id)
-		);
-
-		// log if error, or log info if inserted new issue
-		if (isset($result->errors))
-			$this->errors = array_merge($this->errors, $result->errors);
-		if (isset($result->infos))
-			$this->infos = array_merge($this->infos, $result->infos);
-	}
-
-	protected function _resolveIssues()
-	{
-		// load open issues with given errorcodes
-		$openIssuesRes = $this->IssueModel->getOpenIssues(
-			$this->_fehlercodes,
-			$this->person_id
-		);
-
-		if (hasData($openIssuesRes))
-		{
-			$openIssues = getData($openIssuesRes);
-
-			$result = $this->PlausicheckResolverLib->resolvePlausicheckIssues($openIssues);
-
-			// log if error, or log info if inserted new issue
-			if (isset($result->errors))
-				$this->errors = array_merge($this->errors, $result->errors);
-			if (isset($result->infos))
-				$this->infos = array_merge($this->infos, $result->infos);
-		}
-	}
-}
@@ -1,104 +0,0 @@
-<?php
-
-defined('BASEPATH') || exit('No direct script access allowed');
-
-
-class Issues extends FHCAPI_Controller
-{
-	const DEFAULT_PERMISSION = 'system/issues_verwalten:r';
-
-	public function __construct() {
-
-		parent::__construct(
-			array(
-				'getOpenIssuesByProperties' => Self::DEFAULT_PERMISSION,
-				'getPersonenMitOffenenIssues' => Self::DEFAULT_PERMISSION
-			)
-		);
-
-		// Loads authentication library and starts authenticationfetc
-		$this->load->library('AuthLib');
-
-		$this->load->model('extensions/FHC-Core-Personalverwaltung/Api_model','ApiModel');
-		$this->load->model('person/Person_model','PersonModel');
-		$this->load->model('system/Fehler_model','FehlerModel');
-		$this->load->model('system/Issue_model', 'IssueModel');
-		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-	}
-
-	public function getOpenIssuesByProperties()
-	{
-		$person_id = $this->input->get('person_id', true);
-		$oe_kurzbz = $this->input->get('oe_kurzbz', true);
-		$fehlertyp_kurzbz = $this->input->get('fehlertyp_kurzbz', true);
-		$apps = $this->input->get('apps', true);
-		$behebung_parameter = $this->input->get('behebung_parameter', true);
-		$hauptzustaendig = filter_var($this->input->get('hauptzustaendig', true), FILTER_VALIDATE_BOOLEAN);
-
-		if (isset($person_id) && !is_numeric($person_id))
-			$this->terminateWithError('person id is not numeric!');
-
-		if (isset($behebung_parameter) && !is_array($behebung_parameter))
-			$this->terminateWithError('Behebung parameter invalid');
-
-		$issueRes = $this->IssueModel->getOpenIssuesByProperties(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz,
-			$apps,
-			$behebung_parameter,
-			$hauptzustaendig
-		);
-
-		if (isError($issueRes))
-		{
-			$this->terminateWithError(getError($issueRes));
-		}
-
-		$this->terminateWithSuccess(hasData($issueRes) ? getData($issueRes) : []);
-	}
-
-	public function getPersonenMitOffenenIssues()
-	{
-
-		$sql = <<<EOSQL
-SELECT
-
-		person_id, uid, vorname, nachname, count(*) AS openissues ,
-		(select count(*) anz_aktiv
-		 from hr.tbl_dienstverhaeltnis dv
-		 where dv.mitarbeiter_uid=uid and dv.von<=now() and
-		       (dv.bis is null OR dv.bis>=now())
-		) aktiv
-FROM
-		system.tbl_issue
-JOIN
-		system.tbl_fehler USING (fehlercode)
-JOIN
-		public.tbl_person USING (person_id)
-JOIN
-		public.tbl_benutzer USING (person_id)
-JOIN
-		public.tbl_mitarbeiter ON uid = mitarbeiter_uid
-WHERE
-		app = 'personalverwaltung' AND verarbeitetamum IS NULL
-GROUP BY
-		person_id, uid, vorname, nachname
-HAVING
-		count(*) > 0
-ORDER BY
-		count(*) DESC;
-
-EOSQL;
-
-		$personenmitissues = $this->IssueModel->execReadOnlyQuery($sql);
-		if( hasData($personenmitissues) )
-		{
-			$this->terminateWithSuccess(getData($personenmitissues));
-		}
-		else
-		{
-			$this->terminateWithSuccess(array());
-		}
-	}
-}
@@ -1,17 +0,0 @@
-<?php
-defined('BASEPATH') || exit('No direct script access allowed');
-
-require_once APPPATH.'/controllers/api/frontend/v1/issues/IssueChecker.php';
-
-class StudentIssueChecker extends IssueChecker
-{
-	protected $_apps = array(
-		'core',
-		'dvuh',
-		'bis'
-	);
-
-	//protected $_fehlercodes = array(
-		//~ 'CORE_AA_0001'
-	//);
-}
@@ -118,54 +118,17 @@ class Gruppe extends FHCAPI_Controller

 		$query_words = explode(' ', $query);

-		$this->_ci->GruppeModel->addSelect('gruppe_kurzbz,
-											studiengang_kz,
-											semester,
-											bezeichnung,
-											gid,
-											\'false\' as lehrverband');
-		$this->_ci->GruppeModel->db->where(array('sichtbar' => true, 'aktiv' => true, 'lehre' => true, 'direktinskription' => false, 'semester IS NOT NULL' => null));
-		$this->_ci->GruppeModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->GruppeModel->db->group_start();
-			$this->_ci->GruppeModel->db->where('gruppe_kurzbz ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->or_where('bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->GruppeModel->db->group_end();
-		}
-		$this->_ci->GruppeModel->db->group_end();
-
-		$gruppen_result = $this->_ci->GruppeModel->load();
-
-		$gruppen_array = array();
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);

 		if (isError($gruppen_result))
 			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);

+		$gruppen_array = array();
+
 		if (hasData($gruppen_result))
 			$gruppen_array = getData($gruppen_result);

-		$this->_ci->LehrverbandModel->addSelect('CONCAT(UPPER(CONCAT(typ, kurzbz)), \'\', semester, verband, COALESCE(gruppe,\'\')) as gruppe_kurzbz,
-												studiengang_kz,
-												semester,
-												tbl_lehrverband.bezeichnung,
-												gid,
-												\'true\' as lehrverband');
-		$this->_ci->LehrverbandModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
-		$this->_ci->LehrverbandModel->addOrder('verband');
-		$this->_ci->LehrverbandModel->addOrder('gruppe');
-		$this->_ci->LehrverbandModel->db->where(array('tbl_lehrverband.aktiv' => true));
-
-		$this->_ci->LehrverbandModel->db->group_start();
-		foreach ($query_words as $word)
-		{
-			$this->_ci->LehrverbandModel->db->group_start();
-			$this->_ci->LehrverbandModel->db->where('CONCAT(CONCAT(typ, kurzbz), \'\', semester, verband, COALESCE(gruppe,\'\')) ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->or_where('tbl_lehrverband.bezeichnung ILIKE', "%" . $word . "%");
-			$this->_ci->LehrverbandModel->db->group_end();
-		}
-		$this->_ci->LehrverbandModel->db->group_end();
-		$lehrverband_result = $this->_ci->LehrverbandModel->load();
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);

 		$lehrverband_array = array();

@@ -42,22 +42,14 @@ class Messages extends FHCAPI_Controller
 		]);
 	}

-	public function getMessages($id, $type_id, $size=null, $page=null)
+	public function getMessages($id, $type_id, $size, $page)
 	{
 		if($type_id != 'person_id'){
 			$id = $this->_getPersonId($id, $type_id);
 		}

-		if(!(is_null($size) && is_null($page)))
-		{
-			$offset = $size * ($page - 1);
-			$limit = $size;
-		}
-		else
-		{
-			$offset = null;
-			$limit = null;
-		}
+		$offset = $size * ($page - 1);
+		$limit = $size;

 		$result = $this->MessageModel->getMessagesForTable($id, $offset, $limit);

@@ -78,32 +78,52 @@ 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);

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

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

 			if (isError($result))
+			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-
+			}
 			if (hasData($result))
 			{
-				foreach (getData($result) as $doc)
+				$data = getData($result);
+				foreach ($data as $value)
 				{
-					$merged = clone $doc;
-					$merged->docdatum = $pre->docdatum;
-					$merged->insertvonma = $pre->insertvonma;
-					$merged->bezeichnung = $pre->bezeichnung;
-					$mergedArray[] = $merged;
+					array_push($arrayAccepted, $value);
 				}
 			}
-			else
-			{
-				$mergedArray[] = $pre;
+		}
+
+		//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;
 			}
+
+			$mergedArray[] = $merged;
 		}

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

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

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

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

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

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

@@ -496,43 +494,4 @@ 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);
-		}
-	}
 }
@@ -626,7 +626,7 @@ class Students extends FHCAPI_Controller
 		$this->addFilter($studiensemester_kurzbz);

 		$result = $this->PrestudentModel->loadWhere($where);
-
+		
 		$data = $this->getDataOrTerminateWithError($result);

 		$this->terminateWithSuccess($data);
@@ -851,44 +851,40 @@ class Students extends FHCAPI_Controller
 		$stdsemEsc = $studiensemester_kurzbz ? $this->PrestudentModel->escape($studiensemester_kurzbz) : 'NULL';

 		$this->load->config('stv');
+		$tags = $this->config->item('stv_prestudent_tags');

-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$tags = $this->config->item('stv_prestudent_tags');
+		$whereTags = '';
+		if (is_array($tags) && !isEmptyArray($tags)) {
+			$tags = array_keys($tags);

-			$whereTags = '';
-			if (is_array($tags) && !isEmptyArray($tags)) {
-				$tags = array_keys($tags);
-
-				foreach ($tags as $key => $tag) {
-					$tags[$key] = $this->db->escape($tag);
-				}
-				$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
+			foreach ($tags as $key => $tag) {
+				$tags[$key] = $this->db->escape($tag);
 			}
-			$subQueryTag = "
-			  (
-				SELECT
-				  tag.prestudent_id,
-				  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
-				FROM (
-				  SELECT DISTINCT ON (n.notiz_id)
-					n.notiz_id AS id,
-					nt.typ_kurzbz,
-					array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
-					n.text AS notiz,
-					nt.style,
-					n.erledigt AS done,
-					nz.prestudent_id
-				  FROM public.tbl_notizzuordnung AS nz
-					JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
-					JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
-				. $whereTags .
-				"
-				) AS tag
-				GROUP BY tag.prestudent_id
-			  ) AS tag_data_agg
-			";
+			$whereTags = " AND nt.typ_kurzbz IN (" . implode(",", $tags) . ")";
 		}
+		$subQueryTag = "
+		  (
+			SELECT
+			  tag.prestudent_id,
+			  COALESCE(json_agg(tag ORDER BY tag.done), '[]'::json) AS tags
+			FROM (
+			  SELECT DISTINCT ON (n.notiz_id)
+				n.notiz_id AS id,
+				nt.typ_kurzbz,
+				array_to_json(nt.bezeichnung_mehrsprachig)->>0 AS beschreibung,
+				n.text AS notiz,
+				nt.style,
+				n.erledigt AS done,
+				nz.prestudent_id
+			  FROM public.tbl_notizzuordnung AS nz
+				JOIN public.tbl_notiz AS n ON nz.notiz_id = n.notiz_id
+				JOIN public.tbl_notiz_typ AS nt ON n.typ = nt.typ_kurzbz "
+			. $whereTags .
+			"
+			) AS tag
+			GROUP BY tag.prestudent_id
+		  ) AS tag_data_agg
+		";

 		$this->PrestudentModel->addJoin('public.tbl_studiengang stg', 'studiengang_kz', 'LEFT');
 		$this->PrestudentModel->addJoin('public.tbl_person p', 'person_id');
@@ -911,17 +907,11 @@ class Students extends FHCAPI_Controller
 			AND ps.studiensemester_kurzbz=public.get_stdsem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ') 
 			AND ps.ausbildungssemester=public.get_absem_prestudent(tbl_prestudent.prestudent_id, ' . $stdsemEsc . ')', 'LEFT');

-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');
-		}
+		$this->PrestudentModel->addJoin($subQueryTag, 'tag_data_agg.prestudent_id = tbl_prestudent.prestudent_id', 'LEFT');


 		$this->PrestudentModel->addSelect("b.uid");
-		if(defined('STV_TAGS_ENABLED') && STV_TAGS_ENABLED)
-		{
-			$this->PrestudentModel->addSelect('tag_data_agg.tags');
-		}
+		$this->PrestudentModel->addSelect('tag_data_agg.tags');
 		$this->PrestudentModel->addSelect('titelpre');
 		$this->PrestudentModel->addSelect('nachname');
 		$this->PrestudentModel->addSelect('vorname');
@@ -0,0 +1,116 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+
+class Config extends FHCAPI_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct([
+			'get' => ['admin:r', 'assistenz:r'],
+			'getHeader' => ['admin:r', 'assistenz:r'],
+			'set' => ['admin:r', 'assistenz:r'],
+		]);
+
+		// Load Phrases
+		$this->loadPhrases([
+			'ui',
+		]);
+
+		$this->_ci = &get_instance();
+		$this->_ci->load->model('ressource/Kalenderstatus_model', 'KalenderStatusModel');
+	}
+
+	public function get()
+	{
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+
+		$config = [];
+
+		$result = $this->_ci->VariableModel->getVariables(getAuthUID(), ['ignore_kollision', 'kollision_student', 'ignore_reservierung', 'ignore_zeitsperre']);
+
+		$data = $this->getDataOrTerminateWithError($result);
+		$config['ignore_kollision'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_kollision'),
+			"value" => ($data['ignore_kollision'] ?? 'false') === 'true'
+
+		];
+
+		$config['kollision_student'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'kollision_student'),
+			"value" => ($data['kollision_student'] ?? 'false') === 'true'
+		];
+
+		$config['ignore_reservierung'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_reservierung'),
+			"value" => ($data['ignore_reservierung'] ?? 'false') === 'true'
+
+		];
+
+		$config['ignore_zeitsperre'] = [
+			"type"  => "checkbox",
+			"label" => $this->p->t('ui', 'ignore_zeitsperre'),
+			"value" => ($data['ignore_zeitsperre'] ?? 'false') === 'true'
+		];
+
+
+
+		$this->terminateWithSuccess($config);
+	}
+	public function getHeader()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderStatusModel->addSelect('*, array_to_json(bezeichnung_mehrsprachig::varchar[])->>' . $language .' AS status');
+		$this->_ci->KalenderStatusModel->addOrder('sort');
+		$this->_ci->KalenderStatusModel->db->where_not_in('status_kurzbz', array('archived', 'deleted'));
+		$visible_status = $this->_ci->KalenderStatusModel->load();
+
+		$visible_status = getData($visible_status);
+
+		$config['visible_status']['all'] = 'Alle';
+
+		foreach ($visible_status as $status)
+		{
+			$config['visible_status'][$status->status_kurzbz] = $status->status;
+		}
+
+		$this->terminateWithSuccess($config);
+	}
+
+	public function set()
+	{
+		$this->_ci->load->model('system/Variable_model', 'VariableModel');
+
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_kollision',
+			$this->input->post('ignore_kollision') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'kollision_student',
+			$this->input->post('kollision_student') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_reservierung',
+			$this->input->post('ignore_reservierung') === true ? 'true' : 'false'
+		);
+		$this->_ci->VariableModel->setVariable(
+			getAuthUID(),
+			'ignore_zeitsperre',
+			$this->input->post('ignore_zeitsperre') === true ? 'true' : 'false'
+		);
+		$this->terminateWithSuccess();
+	}
+
+
+}
@@ -0,0 +1,254 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Coursepicker extends FHCAPI_Controller
+{
+	private $_ci;
+	public function __construct()
+	{
+		parent::__construct([
+			'search' => self::PERM_LOGGED,
+			'getByStg' => self::PERM_LOGGED
+		]);
+
+		$this->_ci = &get_instance();
+		$this->load->library('form_validation');
+
+		$this->_ci->load->model('education/lehreinheit_model', 'LehreinheitModel');
+		$this->_ci->load->model('education/Lehreinheitmitarbeiter_model', 'LehreinheitmitarbeiterModel');
+
+
+		$this->loadPhrases(['ui']);
+	}
+
+	public function search()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		//TODO Where weiter anpassen z.B. Fachbereich
+		$this->_ci->LehreinheitModel->addSelect('tbl_lehreinheit.lehreinheit_id,
+												tbl_lehreinheit.unr,
+												tbl_lehreinheit.lvnr,
+												tbl_lehreinheit.lehrfach_id,
+												lehrfach.kurzbz AS lehrfach,
+												lehrfach.bezeichnung AS lehrfach_bez,
+												lehrfach.farbe AS lehrfach_farbe,
+												tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+												lema.mitarbeiter_uid AS lektor_uid,
+												tbl_mitarbeiter.kurzbz AS lektor,
+												tbl_studiengang.studiengang_kz,
+												upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+												lvb.semester,
+												lvb.verband,
+												lvb.gruppe,
+												lvb.gruppe_kurzbz,
+												tbl_lehreinheit.raumtyp,
+												tbl_lehreinheit.raumtypalternativ,
+												tbl_lehreinheit.stundenblockung,
+												tbl_lehreinheit.wochenrythmus,
+												lema.semesterstunden,
+												lema.planstunden,
+												tbl_lehreinheit.start_kw,
+												tbl_lehreinheit.anmerkung,
+												tbl_lehreinheit.studiensemester_kurzbz');
+
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter', 'lema.mitarbeiter_uid = tbl_mitarbeiter.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+
+		foreach ($query_words as $word)
+		{
+			$this->_ci->LehreinheitModel->db->group_start();
+			$this->_ci->LehreinheitModel->db->where('lema.mitarbeiter_uid ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe_kurzbz ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.kurzbzlang ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.verband ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lvb.gruppe ILIKE', "%" . $word . "%");
+			$this->_ci->LehreinheitModel->db->or_where('lehrfach.bezeichnung ILIKE', "%" . $word . "%");
+
+			if (is_numeric($word))
+			{
+				$this->_ci->LehreinheitModel->db->or_where('tbl_studiengang.studiengang_kz', $word);
+				$this->_ci->LehreinheitModel->db->or_where('lvb.semester', $word);
+			}
+			$this->_ci->LehreinheitModel->db->group_end();
+
+		}
+		$this->_ci->LehreinheitModel->db->group_end();
+		$this->_ci->LehreinheitModel->db->where('tbl_lehreinheit.studiensemester_kurzbz = \'SS2025\'');
+		$this->_ci->LehreinheitModel->db->where(array('tbl_lehrform.verplanen' => true));
+
+		$result = $this->_ci->LehreinheitModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+	public function getByStg()
+	{
+		//TODO check einbauen ob studiensemester und stg vorhanden ist
+		$stg = $this->input->get('stg');
+		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
+		if (is_null($stg) || is_null($studiensemester_kurzbz))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$this->_ci->LehreinheitModel->addSelect('
+			tbl_lehreinheit.lehreinheit_id,
+			tbl_lehreinheit.unr,
+			tbl_lehreinheit.lvnr,
+			tbl_lehreinheit.lehrfach_id,
+			lehrfach.kurzbz AS lehrfach,
+			lehrfach.bezeichnung AS lehrfach_bez,
+			lehrfach.farbe AS lehrfach_farbe,
+			tbl_lehreinheit.lehrform_kurzbz AS lehrform,
+			lema.mitarbeiter_uid AS lektor_uid,
+			ma.kurzbz AS lektor,
+			tbl_person.vorname,
+			tbl_person.nachname,
+			tbl_studiengang.studiengang_kz,
+			upper(tbl_studiengang.typ::character varying::text || tbl_studiengang.kurzbz::text) AS studiengang,
+			lvb.semester,
+			lvb.verband,
+			lvb.gruppe,
+			lvb.gruppe_kurzbz,
+			tbl_lehreinheit.raumtyp,
+			tbl_lehreinheit.raumtypalternativ,
+			tbl_lehreinheit.stundenblockung,
+			tbl_lehreinheit.wochenrythmus,
+			lema.semesterstunden,
+			lema.planstunden,
+			tbl_lehreinheit.start_kw,
+			tbl_lehreinheit.anmerkung,
+			tbl_lehreinheit.studiensemester_kurzbz
+		');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitmitarbeiter lema', 'tbl_lehreinheit.lehreinheit_id = lema.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehreinheitgruppe lvb', 'tbl_lehreinheit.lehreinheit_id = lvb.lehreinheit_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_studiengang', 'lvb.studiengang_kz = tbl_studiengang.studiengang_kz');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrveranstaltung lehrfach', 'tbl_lehreinheit.lehrfach_id = lehrfach.lehrveranstaltung_id');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_mitarbeiter ma', 'lema.mitarbeiter_uid = ma.mitarbeiter_uid');
+		$this->_ci->LehreinheitModel->addJoin('lehre.tbl_lehrform', 'tbl_lehrform.lehrform_kurzbz = tbl_lehreinheit.lehrform_kurzbz');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_benutzer', 'ma.mitarbeiter_uid = tbl_benutzer.uid');
+		$this->_ci->LehreinheitModel->addJoin('public.tbl_person', 'tbl_benutzer.person_id = tbl_person.person_id');
+
+		$result = $this->_ci->LehreinheitModel->loadWhere(array(
+			'tbl_lehrform.verplanen' => true,
+			'tbl_studiengang.studiengang_kz' => $stg,
+			'tbl_lehreinheit.studiensemester_kurzbz' => $studiensemester_kurzbz
+		));
+
+		$result = hasData($result) ? getData($result) : array();
+		$grouped = array();
+
+		foreach ($result as $row)
+		{
+			$unr = $row->unr;
+			if (!isset($grouped[$unr]))
+			{
+				$grouped[$unr] = (object)array(
+					'unr' => $row->unr,
+					'lehrfach_id' => $row->lehrfach_id,
+					'lehrfach_bez' => $row->lehrfach_bez,
+					'lehrfach_farbe' => $row->lehrfach_farbe,
+					'studiengang_kz' => $row->studiengang_kz,
+					'studiengang' => $row->studiengang,
+					'semester' => $row->semester,
+					'verband' => $row->verband,
+					'gruppe' => $row->gruppe,
+					'gruppe_kurzbz' => $row->gruppe_kurzbz,
+					'raumtyp' => $row->raumtyp,
+					'raumtypalternativ' => $row->raumtypalternativ,
+					'anmerkung' => $row->anmerkung,
+					'studiensemester_kurzbz' => $row->studiensemester_kurzbz,
+					'fachbereich_kurzbz' => isset($row->fachbereich_kurzbz) ? $row->fachbereich_kurzbz : null,
+					'lektoren' => array(),
+					'lehreinheit_id' => array(),
+					'lvnr' => array(),
+					'lehrfach' => array(),
+					'lehrform' => array(),
+					'stundenblockung' => array(),
+					'wochenrythmus' => array(),
+					'planstunden' => array(),
+					'start_kw' => array(),
+					'verplant' => array(),
+					'offenestunden' => array(),
+					'lehrverband' => array(),
+					'lem' => array(),
+					'verplant_gesamt' => 0,
+				);
+			}
+
+			$group = $grouped[$unr];
+
+			$group->lektoren[$row->lektor_uid] = (object)array(
+				'uid' => $row->lektor_uid,
+				'kurzbz' => trim($row->lektor),
+				'name' => $row->vorname . ' ' . $row->nachname,
+			);
+
+			$group->lehreinheit_id[] = $row->lehreinheit_id;
+			$group->lvnr[] = $row->lvnr;
+			$group->lehrfach[] = $row->lehrfach;
+			$group->lehrform[] = $row->lehrform;
+			$group->stundenblockung[] = $row->stundenblockung;
+			$group->wochenrythmus[] = $row->wochenrythmus;
+			$group->planstunden[] = $row->planstunden;
+			$group->start_kw[] = $row->start_kw;
+			$group->verplant[] = isset($row->verplant) ? $row->verplant : 0;
+			$group->offenestunden[] = isset($row->offenestunden) ? $row->offenestunden : 0;
+			$group->verplant_gesamt += isset($row->verplant) ? $row->verplant : 0;
+
+			$lvb = $row->studiengang . '-' . $row->semester;
+
+			if ($row->verband != '' && $row->verband != ' ' && $row->verband != '0' && $row->verband != null)
+				$lvb .= $row->verband;
+
+			if ($row->gruppe != '' && $row->gruppe != ' ' && $row->gruppe != '0' && $row->gruppe != null)
+				$lvb .= $row->gruppe;
+
+			$group->lehrverband[] = ($row->gruppe_kurzbz != '' && $row->gruppe_kurzbz != null) ? $row->gruppe_kurzbz : $lvb;
+
+			$group->lem[] = array(
+				'lehreinheit_id' => $row->lehreinheit_id,
+				'mitarbeiter_uid' => $row->lektor_uid,
+			);
+		}
+
+		foreach ($grouped as $group)
+		{
+			$group->lektoren = array_values($group->lektoren);
+			$group->lehrverband = array_values(array_unique($group->lehrverband));
+			$group->lehrfach = $this->_formatArr($group->lehrfach);
+			$group->lehrform = $this->_formatArr($group->lehrform);
+			$group->stundenblockung = $this->_formatArr($group->stundenblockung);
+			$group->wochenrythmus = $this->_formatArr($group->wochenrythmus);
+			$group->planstunden = $this->_formatArr($group->planstunden);
+			$group->start_kw = $this->_formatArr($group->start_kw);
+			$group->verplant = $this->_formatArr($group->verplant);
+			$group->offenestunden = $this->_formatArr($group->offenestunden);
+		}
+
+		$this->terminateWithSuccess(array_values($grouped));
+	}
+
+	private function _formatArr($arr)
+	{
+		$values = array_values(array_unique($arr));
+		$formatted = implode(' ', $values);
+
+		if (count($formatted) > 1)
+			$formatted .= ' ?';
+
+		return $formatted;
+	}
+
+
+}
@@ -0,0 +1,416 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Kalender extends FHCAPI_Controller
+{
+
+	private $_ci;
+	const ALLOWED_PLAN_FILTER = ['ort', 'uid', 'stg'];
+	const ALLOWED_ROOM_FILTER = ['lehreinheit_id', 'kalender_id'];
+
+	const ALLOWED_TO_UPDATE = ['start_time', 'end_time', 'ort_kurzbz'];
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getStunden' => self::PERM_LOGGED,
+			'getPlan' => self::PERM_LOGGED,
+			'getPlanByOrt' => self::PERM_LOGGED,
+			'getRaumvorschlag' => self::PERM_LOGGED,
+			'getHistory' => 'lehre/lvplan:rw',
+			'deleteEntry' => 'lehre/lvplan:rw',
+			'syncToLecturer' => 'lehre/lvplan:rw',
+			'syncToStudent' => 'lehre/lvplan:rw',
+			'getPlanLecturer' =>'lehre/lvplan:rw',
+			'getPlanStudent' => 'lehre/lvplan:rw',
+			'getZeitwuensche' => self::PERM_LOGGED,
+			'getZeitsperren' => self::PERM_LOGGED,
+			'updateKalenderEvent' => 'lehre/lvplan:rw',
+			'addKalenderEvent' => 'lehre/lvplan:rw',
+			'addReservierung' => 'lehre/lvplan:rw',
+			'sync' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib');
+		$this->loadPhrases([
+			'ui'
+		]);
+
+
+		$this->_ci->loglib->setConfigs(array(
+			'classIndex' => 5,
+			'functionIndex' => 5,
+			'lineIndex' => 4,
+			'dbLogType' => 'API', // required
+			'dbExecuteUser' => 'RESTful API'
+		));
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+	/**
+	 * fetches Stunden layout from database
+	 * @access public
+	 *
+	 */
+	public function getStunden()
+	{
+		$this->load->model('ressource/Stunde_model', 'StundeModel');
+
+		$this->_ci->StundeModel->addOrder('stunde', 'ASC');
+		$stunden = $this->_ci->StundeModel->load();
+
+		$stunden = $this->getDataOrTerminateWithError($stunden);
+
+		$this->terminateWithSuccess($stunden);
+	}
+
+	public function getPlan()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$filter = $this->_checkFilter(self::ALLOWED_PLAN_FILTER);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForPlanner(
+			$start_date,
+			$end_date,
+			isset($filter->ort) ? $filter->ort : null,
+			isset($filter->uid) ? $filter->uid : null,
+			isset($filter->stg) ? $filter->stg : null
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanStudent()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForStudent(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanLecturer()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getPlanForLecturer(
+			$start_date,
+			$end_date
+		);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getPlanByOrt($start_date = null, $end_date = null, $ort = null)
+	{
+		if (!isset($start_date) || !isset($end_date) || !isset($ort))
+		{
+			$this->_ci->form_validation->set_data($_GET);
+			$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+			$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+			$this->_ci->form_validation->set_rules('ort',"ort","required");
+			if($this->_ci->form_validation->run() === FALSE)
+				$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+			$start_date = $this->_ci->input->get('start_date', TRUE);
+			$end_date = $this->_ci->input->get('end_date', TRUE);
+			$ort = $this->_ci->input->get('ort', TRUE);
+		}
+
+		$this->terminateWithSuccess($this->_ci->kalenderlib->getPlanByOrt($start_date, $end_date, $ort));
+	}
+
+	public function getZeitsperren()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitsperren($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function getZeitwuensche()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+		$this->_ci->form_validation->set_rules('emp',"emp","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+		$emp = $this->_ci->input->get('emp', TRUE);
+
+		$stundenplan_data = $this->_ci->kalenderlib->getZeitwuensche($start_date, $end_date, $emp);
+
+		$this->terminateWithSuccess($stundenplan_data);
+	}
+
+	public function updateKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$updateFields = $this->_checkUpdate($this->_ci->input->post('updatedInfos', TRUE));
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateKalenderEvent($kalender_id, $updateFields->ort_kurzbz ?? null,  $updateFields->start_time ?? null,  $updateFields->end_time ?? null);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	public function getRaumvorschlag()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$start_date = $this->_ci->input->get('start_date', TRUE);
+		$end_date = $this->_ci->input->get('end_date', TRUE);
+
+		$filter = $this->_checkFilter(self::ALLOWED_ROOM_FILTER);
+
+		if (isset($filter->lehreinheit_id))
+		{
+			$result = $this->_ci->kalenderlib->getRaumvorschlagByLehreinheitID(
+				$start_date,
+				$end_date,
+				$filter->lehreinheit_id
+			);
+		}
+
+		if (isset($filter->kalender_id))
+		{
+			$result = $this->_ci->kalenderlib->getRaumvorschlagByKalenderID(
+				$start_date,
+				$end_date,
+				$filter->kalender_id
+			);
+		}
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function getHistory()
+	{
+		$this->_ci->form_validation->set_data($_GET);
+		$this->_ci->form_validation->set_rules('kalender_id',"kalender_id","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->get('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->getHistory($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess(getData($result));
+	}
+
+	public function deleteEntry()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->deleteEntry($kalender_id);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+
+	public function sync()
+	{
+		$result = $this->_ci->kalenderlib->sync();
+		$this->terminateWithSuccess($result);
+	}
+	public function syncToLecturer()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_preview');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+	public function syncToStudent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('kalender_id', "kalender_id", "required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$kalender_id = $this->_ci->input->post('kalender_id', TRUE);
+
+		$result = $this->_ci->kalenderlib->updateStatus($kalender_id, 'sync_live');
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess($result);
+	}
+	public function addKalenderEvent()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('lehreinheit_id',"lehreinheit_id","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$lehreinheit_id = $this->_ci->input->post('lehreinheit_id', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+
+		$result = $this->_ci->kalenderlib->addKalenderEvent($start_date, $end_date, $lehreinheit_id, $ort_kurzbz);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	public function addReservierung()
+	{
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('titel',"titel","required");
+		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
+		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$titel = $this->_ci->input->post('titel', TRUE);
+		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+
+
+		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date);
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+	private function _checkFilter($filters)
+	{
+		$filter_valid = true;
+		$filter_object = new stdClass();
+		foreach ($filters as $filter)
+		{
+			if ($this->_ci->input->get($filter))
+			{
+				$filter_valid = true;
+				$filter_object->$filter = $this->_ci->input->get($filter);
+			}
+		}
+
+		if (!$filter_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		return $filter_object;
+	}
+
+	private function _checkUpdate($updateInfos)
+	{
+		$update_valid = false;
+		$update_object = new stdClass();
+		foreach (self::ALLOWED_TO_UPDATE as $filter)
+		{
+			if (isset($updateInfos[$filter]))
+			{
+				$update_valid = true;
+				$update_object->$filter = $updateInfos[$filter];
+			}
+		}
+
+		if (!$update_valid)
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+
+		return $update_object;
+	}
+}
@@ -0,0 +1,231 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Reservierung extends FHCAPI_Controller
+{
+	private $_ci;
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'addReservierung' => 'lehre/lvplan:rw',
+			'getRollen' => 'lehre/lvplan:rw',
+			'getInformation' => 'lehre/lvplan:rw',
+			'getLektor' => 'lehre/lvplan:rw',
+			'searchGroup' => 'lehre/lvplan:rw',
+		]);
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('LogLib');
+		$this->_ci->load->library('form_validation');
+		$this->_ci->load->library('KalenderLib');
+
+		$this->_ci->load->model('ressource/Ort_model', 'OrtModel');
+		$this->_ci->load->model('ressource/Kalender_Event_Rolle_model', 'KalenderEventRolleModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('organisation/gruppe_model', 'GruppeModel');
+
+
+		$this->loadPhrases([
+			'ui'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getInformation()
+	{
+		$return_array = array('berechtigt' => false, 'studiengaenge' => []);
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$raeume = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+		$return_array['raeume'] = hasData($raeume) ? getData($raeume) : [];
+
+		if (!$this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+			$this->terminateWithSuccess($return_array);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess($return_array);
+
+		$this->_ci->StudiengangModel->addSelect('studiengang_kz, UPPER(CONCAT(typ, kurzbz)) as kuerzel, kurzbzlang');
+		$this->_ci->StudiengangModel->addOrder('typ, kurzbz');
+		$this->_ci->StudiengangModel->db->where_in('studiengang_kz', $stg_berechtigungen);
+		$studiengaenge = $this->_ci->StudiengangModel->loadWhere(array('aktiv' => true));
+
+		if (isError($studiengaenge))
+			$this->terminateWithError($studiengaenge);
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$rollen = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->_ci->StudiensemesterModel->addOrder('start', 'DESC');
+		$studiensemester = $this->_ci->StudiensemesterModel->load();
+
+		$return_array['studiengaenge'] = hasData($studiengaenge) ? getData($studiengaenge) : [];
+		$return_array['berechtigt'] = true;
+		$return_array['rollen'] = hasData($rollen) ? getData($rollen) : [];
+		$return_array['studiensemester'] = hasData($studiensemester) ? getData($studiensemester) : [];
+
+
+		$this->terminateWithSuccess($return_array);
+	}
+	public function getRaeume()
+	{
+
+		$this->_ci->OrtModel->db->join("
+					(select ort,standort_id,strasse, plz
+					FROM public.tbl_standort
+					LEFT JOIN public.tbl_adresse USING(adresse_id)
+				) standort", "standort_id", "LEFT", false);
+
+		$result = $this->_ci->OrtModel->loadWhere(array('aktiv' => true, 'reservieren' => true));
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+
+	public function searchGroup()
+	{
+		$query = $this->input->get('query');
+		if (is_null($query))
+			$this->terminateWithError($this->_ci->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$stg_berechtigungen = $this->_ci->permissionlib->getSTG_isEntitledFor('lehre/reservierung');
+
+		if (isEmptyArray($stg_berechtigungen))
+			$this->terminateWithSuccess([]);
+
+
+		$query_words = explode(' ', urldecode($query));
+
+		$gruppen_result = $this->_ci->GruppeModel->search($query_words);
+
+		if (isError($gruppen_result))
+			$this->terminateWithError(getError($gruppen_result), self::ERROR_TYPE_GENERAL);
+
+		$gruppen_array = array();
+
+		if (hasData($gruppen_result))
+			$gruppen_array = getData($gruppen_result);
+
+		$lehrverband_result = $this->_ci->LehrverbandModel->search($query_words);
+
+		$lehrverband_array = array();
+
+		if (isError($lehrverband_result))
+			$this->terminateWithError(getError($lehrverband_result), self::ERROR_TYPE_GENERAL);
+
+		if (hasData($lehrverband_result))
+			$lehrverband_array = getData($lehrverband_result);
+
+		$all_gruppen = array_merge($gruppen_array, $lehrverband_array);
+
+		$gefilterte_gruppen = array_filter($all_gruppen, function($gruppe) use ($stg_berechtigungen)
+		{
+			return in_array($gruppe->studiengang_kz, $stg_berechtigungen);
+		});
+
+		$this->terminateWithSuccess($gefilterte_gruppen);
+	}
+
+	public function getRollen()
+	{
+		$language = getUserLanguage() == 'German' ? 0 : 1;
+
+		$this->_ci->KalenderEventRolleModel->addOrder('sort');
+		$this->_ci->KalenderEventRolleModel->addSelect('rolle_kurzbz, array_to_json(bezeichnung_mehrsprachig::varchar[])->>'. $language. ' as bezeichnung');
+
+		$result = $this->_ci->KalenderEventRolleModel->load();
+
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : []);
+	}
+	public function addReservierung()
+	{
+
+		$this->_ci->form_validation->set_data($_POST);
+		$this->_ci->form_validation->set_rules('titel',"titel","required");
+		$this->_ci->form_validation->set_rules('beschreibung',"beschreibung","required");
+		$this->_ci->form_validation->set_rules('ort_kurzbz',"ort_kurzbz","required");
+		$this->_ci->form_validation->set_rules('start_date',"start_date","required");
+		$this->_ci->form_validation->set_rules('end_date',"end_date","required");
+
+
+		if($this->_ci->form_validation->run() === FALSE)
+			$this->terminateWithValidationErrors($this->_ci->form_validation->error_array());
+
+		$titel = $this->_ci->input->post('titel', TRUE);
+		$beschreibung = $this->_ci->input->post('beschreibung', TRUE);
+		$ort_kurzbz = $this->_ci->input->post('ort_kurzbz', TRUE);
+		$start_date = $this->_ci->input->post('start_date', TRUE);
+		$end_date = $this->_ci->input->post('end_date', TRUE);
+		$teilnehmer = $this->_ci->input->post('teilnehmer', TRUE);
+		$specialGroups = $this->_ci->input->post('specialGroups', TRUE);
+		$specialFinalGroups = $this->_ci->input->post('specialFinalGroups', TRUE);
+		$groups = $this->_ci->input->post('groups', TRUE);
+
+		if ($this->_ci->permissionlib->isBerechtigt('lehre/reservierung'))
+		{
+			if (empty($teilnehmer) || !is_array($teilnehmer))
+			{
+				$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+			}
+		}
+		else
+			$teilnehmer[] = array('uid' => getAuthUID(), 'rolle' => 'organisator');
+
+
+		$result = $this->_ci->kalenderlib->addReservierung($titel, $beschreibung, $ort_kurzbz, $start_date, $end_date, $teilnehmer, $specialFinalGroups, $specialGroups, $groups);
+
+
+		if (isError($result))
+			$this->terminateWithError(getError($result));
+
+		$this->terminateWithSuccess('Erfolgreich');
+	}
+
+
+	public function getLektor()
+	{
+		$query = $this->input->get('query');
+
+		if (is_null($query))
+			$this->terminateWithError($this->p->t('ui', 'ungueltigeParameter'), self::ERROR_TYPE_GENERAL);
+
+		$query_words = explode(' ', $query);
+
+		$this->_ci->MitarbeiterModel->addSelect('uid, person_id, vorname, nachname');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_benutzer', 'uid = mitarbeiter_uid');
+		$this->_ci->MitarbeiterModel->addJoin('public.tbl_person', 'person_id');
+
+		$this->_ci->MitarbeiterModel->db->where('public.tbl_benutzer.aktiv', true);
+
+		$this->_ci->MitarbeiterModel->db->group_start();
+		foreach ($query_words as $word)
+		{
+			$this->_ci->MitarbeiterModel->db->group_start();
+			$this->_ci->MitarbeiterModel->db->where('tbl_person.vorname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('tbl_person.nachname ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->or_where('uid ILIKE', "%" . $word . "%");
+			$this->_ci->MitarbeiterModel->db->group_end();
+		}
+		$this->_ci->MitarbeiterModel->db->group_end();
+		$this->_ci->MitarbeiterModel->addOrder('nachname');
+		$this->_ci->MitarbeiterModel->addOrder('vorname');
+		$result = $this->_ci->MitarbeiterModel->load();
+		$this->terminateWithSuccess(hasData($result) ? getData($result) : array());
+	}
+
+}
@@ -81,7 +81,7 @@ class Bismeldestichtag extends Auth_Controller
 			tbl_bismeldestichtag.insertamum, tbl_bismeldestichtag.insertvon, tbl_bismeldestichtag.updateamum, tbl_bismeldestichtag.updatevon'
 		);
 		$this->BismeldestichtagModel->addJoin('public.tbl_studiensemester sem', 'studiensemester_kurzbz', 'LEFT');
-		$this->BismeldestichtagModel->addOrder('semester_start', 'DESC');
+		$this->BismeldestichtagModel->addOrder('semester_start');
 		$this->BismeldestichtagModel->addOrder('meldestichtag', 'DESC');
 		$this->BismeldestichtagModel->addOrder('meldestichtag_id', 'DESC');
 		$this->outputJson($this->BismeldestichtagModel->load());
@@ -5,51 +5,58 @@
 */
 class IssueResolver extends IssueResolver_Controller
 {
-	protected $_fehlercodes = array(
-		'CORE_ZGV_0001',
-		'CORE_ZGV_0002',
-		'CORE_ZGV_0003',
-		'CORE_ZGV_0004',
-		'CORE_ZGV_0005',
-		'CORE_INOUT_0001',
-		'CORE_INOUT_0002',
-		'CORE_INOUT_0003',
-		'CORE_INOUT_0004',
-		'CORE_INOUT_0005',
-		'CORE_INOUT_0006',
-		'CORE_INOUT_0007',
-		'CORE_INOUT_0008',
-		'CORE_INOUT_0009',
-		'CORE_STG_0001',
-		'CORE_STG_0002',
-		'CORE_STG_0003',
-		'CORE_STG_0004',
-		'CORE_STUDENTSTATUS_0001',
-		'CORE_STUDENTSTATUS_0002',
-		'CORE_STUDENTSTATUS_0003',
-		'CORE_STUDENTSTATUS_0004',
-		'CORE_STUDENTSTATUS_0005',
-		'CORE_STUDENTSTATUS_0006',
-		'CORE_STUDENTSTATUS_0007',
-		'CORE_STUDENTSTATUS_0008',
-		'CORE_STUDENTSTATUS_0009',
-		'CORE_STUDENTSTATUS_0010',
-		'CORE_STUDENTSTATUS_0011',
-		'CORE_STUDENTSTATUS_0012',
-		'CORE_STUDENTSTATUS_0013',
-		'CORE_STUDENTSTATUS_0014',
-		'CORE_STUDENTSTATUS_0015',
-		'CORE_STUDENTSTATUS_0016',
-		'CORE_STUDENTSTATUS_0018',
-		'CORE_STUDENTSTATUS_0019',
-		'CORE_STUDENTSTATUS_0020',
-		'CORE_STUDENTSTATUS_0021',
-		'CORE_STUDENTSTATUS_0022',
-		'CORE_PERSON_0001',
-		'CORE_PERSON_0002',
-		'CORE_PERSON_0003',
-		'CORE_PERSON_0004',
-		'CORE_PERSON_0005',
-		'CORE_PERSON_0006'
-	);
+	public function __construct()
+	{
+		parent::__construct();
+
+		// set fehler codes which can be resolved by the job, with own resolver defined
+		// structure: fehlercode => class (library) name for resolving in "resolvers" folder
+		$this->_codeLibMappings = array(
+			'CORE_ZGV_0001' => 'CORE_ZGV_0001',
+			'CORE_ZGV_0002' => 'CORE_ZGV_0002',
+			'CORE_ZGV_0003' => 'CORE_ZGV_0003',
+			'CORE_ZGV_0004' => 'CORE_ZGV_0004',
+			'CORE_ZGV_0005' => 'CORE_ZGV_0005',
+			'CORE_INOUT_0001' => 'CORE_INOUT_0001',
+			'CORE_INOUT_0002' => 'CORE_INOUT_0002',
+			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
+			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
+			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
+			'CORE_INOUT_0006' => 'CORE_INOUT_0006',
+			'CORE_INOUT_0007' => 'CORE_INOUT_0007',
+			'CORE_INOUT_0008' => 'CORE_INOUT_0008',
+			'CORE_INOUT_0009' => 'CORE_INOUT_0009',
+			'CORE_STG_0001' => 'CORE_STG_0001',
+			'CORE_STG_0002' => 'CORE_STG_0002',
+			'CORE_STG_0003' => 'CORE_STG_0003',
+			'CORE_STG_0004' => 'CORE_STG_0004',
+			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
+			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
+			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
+			'CORE_STUDENTSTATUS_0005' => 'CORE_STUDENTSTATUS_0005',
+			'CORE_STUDENTSTATUS_0006' => 'CORE_STUDENTSTATUS_0006',
+			'CORE_STUDENTSTATUS_0007' => 'CORE_STUDENTSTATUS_0007',
+			'CORE_STUDENTSTATUS_0008' => 'CORE_STUDENTSTATUS_0008',
+			'CORE_STUDENTSTATUS_0009' => 'CORE_STUDENTSTATUS_0009',
+			'CORE_STUDENTSTATUS_0010' => 'CORE_STUDENTSTATUS_0010',
+			'CORE_STUDENTSTATUS_0011' => 'CORE_STUDENTSTATUS_0011',
+			'CORE_STUDENTSTATUS_0012' => 'CORE_STUDENTSTATUS_0012',
+			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
+			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
+			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
+			'CORE_STUDENTSTATUS_0016' => 'CORE_STUDENTSTATUS_0016',
+			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
+			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
+			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
+			'CORE_PERSON_0004' => 'CORE_PERSON_0004',
+			'CORE_PERSON_0005' => 'CORE_PERSON_0005',
+			'CORE_PERSON_0006' => 'CORE_PERSON_0006'
+		);
+
+		// fehler which are resolved by the job the same way as they are produced
+		// structure: fehlercode => class (library) name for resolving in "plausichecks" folder
+		$this->_codeProducerLibMappings = array(
+			'CORE_STUDENTSTATUS_0001' => 'AbbrecherAktiv',
+		);
+	}
 }
@@ -6,7 +6,7 @@
 class PlausiIssueProducer extends PlausiIssueProducer_Controller
 {
 	private $_currentStudiensemester;
-	protected $_apps = 'core';
+	protected $_app = 'core';

 	public function __construct()
 	{
@@ -18,12 +18,12 @@ class PlausiIssueProducer extends PlausiIssueProducer_Controller
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');

 		// get current Studiensemester
-		$studiensemesterRes = $this->StudiensemesterModel->getAktOrNextSemester(62);
+		$studiensemesterRes = $this->StudiensemesterModel->getAkt();
 		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;

 		// set fehler which can be produced by the job
 		// structure: fehler_kurzbz => class (library) name for resolving
-		$this->_fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$this->_fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
 	}

 	/**
@@ -0,0 +1,27 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+class TempusJob extends JOB_Controller
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->helper('hlp_sancho_helper');
+		$this->_ci->load->library('KalenderLib');
+	}
+
+
+	public function sync()
+	{
+		$this->_ci->logInfo('Start job FHC-Core->Tempus->sync');
+		$this->_ci->kalenderlib->sync();
+		$this->_ci->logInfo('End job FHC-Core->Tempus->sync');
+	}
+
+}
@@ -0,0 +1,562 @@
+<?php
+/*
+ * Job zur einmaligen Migration des Stundenplans
+ *
+ * Aufruf
+ * php index.ci.php system/MigrateKalender
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class MigrateKalender extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct(array(
+			'migrateStundenplan' => ['admin:rw'],
+			'migrateReservierung' => ['admin:rw'],
+		));
+		$this->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->load->model('ressource/Kalender_Lehreinheit_model', 'KalenderLehreinheitModel');
+		$this->load->model('ressource/Kalender_Ort_model', 'KalenderOrtModel');
+		$this->load->model('ressource/Stundenplandev_Kalender_model', 'SyncModel');
+		$this->load->model('ressource/Reservierung_Kalender_model', 'SyncReservierungModel');
+		$this->load->model('ressource/Kalender_Event_Teilnehmer_model', 'KalenderEventTeilnehmerModel');
+		$this->load->model('ressource/Kalender_Event_model', 'KalenderEventModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('person/Benutzer_model', 'BenutzerModel');
+	}
+
+	/**
+	 * Everything has a beginning
+	 */
+	public function migrateStundenplan($von = null, $bis = null, $studiengang_kz = null)
+	{
+		$db = new DB_Model();
+
+		$stpldevsql = '
+			WITH eindeutige_stunden AS (
+				SELECT DISTINCT unr, datum, stunde
+				FROM lehre.tbl_stundenplandev
+				WHERE datum >= ? AND datum <= ?';
+
+		$params = [$von, $bis];
+
+		if (!is_null($studiengang_kz))
+		{
+			$stpldevsql .= ' AND studiengang_kz = ?';
+
+			$params[] = $studiengang_kz;
+		}
+
+		$stpldevsql .= '),
+			
+			block_keys AS (
+				SELECT
+					unr,
+					datum,
+					stunde,
+					stunde - ROW_NUMBER() OVER (PARTITION BY unr, datum ORDER BY stunde) AS block_nr
+				FROM eindeutige_stunden
+			),
+			blocks AS (
+				SELECT
+					bk.unr,
+					bk.datum,
+					bk.block_nr,
+					MIN(bk.stunde) AS stunde_von,
+					MAX(bk.stunde) AS stunde_bis,
+					MIN(sp.lehreinheit_id) AS lehreinheit_id,
+					MIN(sp.ort_kurzbz) AS ort_kurzbz,
+					array_agg(sp.stundenplandev_id ORDER BY bk.stunde) AS stundenplandev_ids,
+					MIN(sp.insertamum) AS insertamum,
+					(array_agg(sp.insertvon ORDER BY sp.insertamum ASC))[1] AS insertvon,
+					MAX(sp.updateamum) AS updateamum,
+					(array_agg(sp.updatevon ORDER BY sp.updateamum DESC))[1] AS updatevon
+				FROM block_keys bk JOIN lehre.tbl_stundenplandev sp ON sp.unr = bk.unr AND sp.datum = bk.datum AND sp.stunde = bk.stunde
+				WHERE sp.datum >= ? AND sp.datum <= ?
+				GROUP BY bk.unr, bk.datum, bk.block_nr
+			)
+			SELECT
+				b.stundenplandev_ids,
+				b.unr,
+				b.datum,
+				b.block_nr,
+				b.lehreinheit_id,
+				b.ort_kurzbz,
+				b.datum + stundevon.beginn AS von,
+				b.datum + stundebis.ende AS bis,
+				b.insertamum,
+				b.insertvon,
+				b.updateamum,
+				b.updatevon
+			FROM blocks b
+				JOIN lehre.tbl_stunde stundevon ON stundevon.stunde = b.stunde_von
+				JOIN lehre.tbl_stunde stundebis ON stundebis.stunde = b.stunde_bis
+			ORDER BY b.datum, b.unr, b.block_nr;';
+
+		array_push($params, $von, $bis);
+		$stpldev = $db->execReadOnlyQuery($stpldevsql, $params);
+
+		if (hasData($stpldev))
+		{
+			// Pruefen ob der Eintrag schon in Sync Tabelle vorhanden ist
+			// Wenn neuere Änderungen vorhanden dann Update
+			// Wenn keine Änderungen seit leztem Sync dann Ueberspringen
+			// Wenn noch nicht vorhanden neu anlegen
+			// Danach ggf pruefen welceh Eintraege in der zwischenzeit geloescht wurden und
+			// in der neuen Tabelle auch archivieren oder loeschen
+
+			$data = getData($stpldev);
+			foreach($data as $block)
+			{
+				$ids = is_array($block->stundenplandev_ids) ? $block->stundenplandev_ids : explode(',', $block->stundenplandev_ids);
+				/*$ids = array_map('intval', $ids);*/
+
+				$this->SyncModel->db->where('stundenplandev_id IN (' . implode(',', $ids) . ')');
+				$sync_result = $this->SyncModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'lehreinheit');
+					if ($kalender_id)
+					{
+						$this->_insertSync($block->stundenplandev_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'stundenplandev_id');
+
+					if ($block->updateamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->stundenplandev_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertSync($fehlende, $kalender_id);
+					}
+				}
+				/*if(hasData($SyncResult))
+				{
+					//bereits vorhanden
+					// TODO Update
+				}
+				else
+				{
+					// Neuen Eintrag anlegen
+
+					$von = $rowstpl->datum.' '.$rowstpl->beginn;
+					$bis = $rowstpl->datum.' '.$rowstpl->ende;
+					$typ = 'lehreinheit';
+					$status = 'live';
+					$insertamum = $rowstpl->insertamum;
+					$insertvon = $rowstpl->insertvon;
+					$updateamum = $rowstpl->updateamum;
+					$updatevon = $rowstpl->updatevon;
+
+					$resultKalenderInsert = $this->KalenderModel->insert(
+						array(
+							'von' => $von,
+							'bis' => $bis,
+							'typ' => $typ,
+							'status_kurzbz' => $status,
+							'vorgaenger_kalender_id' => null,
+							'insertamum' => $insertamum,
+							'insertvon' => $insertvon,
+							'updateamum' => $updateamum,
+							'updatevon' => $updatevon
+						)
+					);
+
+					if(isSuccess($resultKalenderInsert))
+					{
+						$kalender_id = getData($resultKalenderInsert);
+
+						$resultKalenderInsert = $this->KalenderLehreinheitModel->insert(
+							array(
+								'kalender_id' => $kalender_id,
+								'lehreinheit_id' => $rowstpl->lehreinheit_id,
+							)
+						);
+
+						$resultKalenderInsert = $this->KalenderOrtModel->insert(
+							array(
+								'kalender_id' => $kalender_id,
+								'ort_kurzbz' => $rowstpl->ort_kurzbz,
+							)
+						);
+
+						$resultSyncInsert = $this->SyncModel->insert(
+							array(
+								'stundenplandev_id' => $rowstpl->stundenplandev_id,
+								'kalender_id' => $kalender_id,
+								'lastupdate' => date('Y-m-d H:i:s')
+							)
+						);
+
+					}
+				}*/
+			}
+		}
+	}
+
+	public function migrateReservierung($von = null, $bis = null, $ort_kurzbz = null)
+	{
+		$db = new DB_Model();
+
+		$qry = "WITH eindeutige_stunden AS (
+					SELECT DISTINCT titel, beschreibung, datum, stunde
+					FROM campus.tbl_reservierung
+					WHERE datum >= ? AND datum <= ?";
+
+		$params = array($von, $bis);
+
+		if (!is_null($ort_kurzbz))
+		{
+			$qry .= " AND ort_kurzbz = ?";
+			$params[] = $ort_kurzbz;
+		}
+
+		$qry .=	"),
+					 block_keys AS (
+						 SELECT
+							 titel, beschreibung, datum, stunde,
+							 stunde - ROW_NUMBER() OVER (PARTITION BY titel, beschreibung, datum ORDER BY stunde) AS block_nr
+						 FROM eindeutige_stunden
+					 ),
+					 blocks AS (
+						 SELECT
+							 bk.titel,
+							 bk.beschreibung,
+							 bk.datum,
+							 bk.block_nr,
+							 MIN(bk.stunde) AS stunde_von,
+							 MAX(bk.stunde) AS stunde_bis,
+							 array_agg(DISTINCT r.reservierung_id::text) AS reservierung_ids,
+							 array_agg(DISTINCT r.uid) AS uids,
+							 array_agg(DISTINCT r.gruppe_kurzbz) AS gruppen_kurzbz,
+							 array_agg(DISTINCT ROW(r.semester, r.verband, r.gruppe)::text) AS svg_kombis,
+							 MIN(r.ort_kurzbz) AS ort_kurzbz,
+							 MIN(r.studiengang_kz) AS studiengang_kz,
+							 MIN(r.veranstaltung_id) AS veranstaltung_id,
+							 MIN(r.reservierung_id) AS reservierung_id,
+							 MAX(r.insertamum) AS insertamum,
+							 (array_agg(r.insertvon ORDER BY r.insertamum ASC))[1] AS insertvon
+						 FROM block_keys bk
+								  JOIN campus.tbl_reservierung r
+									   ON r.titel = bk.titel AND r.beschreibung = bk.beschreibung AND r.datum = bk.datum AND r.stunde = bk.stunde
+						 WHERE r.datum >= ? AND r.datum <= ?
+						 GROUP BY bk.titel, bk.beschreibung, bk.datum, bk.block_nr
+					 )
+				SELECT
+					b.*,
+					(b.datum + s_von.beginn) AS von,
+					(b.datum + s_bis.ende)   AS bis
+				FROM blocks b
+						 JOIN lehre.tbl_stunde s_von ON s_von.stunde = b.stunde_von
+						 JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = b.stunde_bis
+				ORDER BY b.reservierung_id DESC;";
+		/*$qry = "WITH per_stunde AS (
+					SELECT
+						datum,
+						titel,
+						beschreibung, ort_kurzbz, studiengang_kz, stunde,
+						veranstaltung_id,
+						array_agg(DISTINCT uid) AS uids,
+						array_agg(DISTINCT reservierung_id::text) AS reservierung_ids,
+						array_agg(DISTINCT ROW(semester, verband, gruppe)::text) AS svg_kombis,
+						array_agg(DISTINCT gruppe_kurzbz) AS gruppen_kurzbz,
+						MIN(reservierung_id) AS reservierung_id,
+						MAX(insertamum) AS insertamum,
+						MAX(insertvon) AS insertvon
+					FROM campus.tbl_reservierung
+					WHERE datum >= ? AND datum <= ?
+					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, stunde, veranstaltung_id
+				),
+				numbered AS (
+					SELECT
+						per_stunde.*,
+						stunde - ROW_NUMBER() OVER (PARTITION BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id ORDER BY stunde) AS grp
+					FROM per_stunde
+				),
+				grouped AS (
+					SELECT
+						MIN(reservierung_id) AS reservierung_id,
+						ort_kurzbz, studiengang_kz, datum,
+						MIN(stunde) AS stunde_von,
+						MAX(stunde) AS stunde_bis,
+						titel, beschreibung,
+						array_agg(DISTINCT gruppe_kurzbz_elem) AS gruppen_kurzbz,
+						array_agg(DISTINCT uid_elem) AS uids,
+						array_agg(DISTINCT res_id) AS reservierung_ids,
+						array_agg(DISTINCT svg_elem) AS svg_kombis,
+						veranstaltung_id,
+						MAX(insertamum) AS insertamum,
+						MAX(insertvon) AS insertvon
+					FROM numbered,
+						unnest(uids) AS uid_elem,
+						unnest(reservierung_ids) AS res_id,
+						unnest(gruppen_kurzbz) AS gruppe_kurzbz_elem,
+						unnest(svg_kombis) AS svg_elem
+					GROUP BY datum, titel, beschreibung, ort_kurzbz, studiengang_kz, veranstaltung_id, grp
+				)
+				SELECT
+					grouped.*,
+					(datum + s_von.beginn) AS von,
+					(datum + s_bis.ende) AS bis
+				FROM grouped
+					JOIN lehre.tbl_stunde s_von ON s_von.stunde = grouped.stunde_von
+					JOIN lehre.tbl_stunde s_bis ON s_bis.stunde = grouped.stunde_bis
+				ORDER BY grouped.reservierung_id DESC";*/
+
+		array_push($params, $von, $bis);
+		$reservierung_data = $db->execReadOnlyQuery($qry, $params);
+
+
+		if (hasData($reservierung_data))
+		{
+			$data = getData($reservierung_data);
+
+			foreach($data as $block)
+			{
+
+				$ids = is_array($block->reservierung_ids) ? $block->reservierung_ids : explode(',', $block->reservierung_ids);
+
+				$this->SyncReservierungModel->db->where('reservierung_id IN (' . implode(',', $ids) . ')');
+				$sync_result = $this->SyncReservierungModel->load();
+
+				if (!hasData($sync_result))
+				{
+					$kalender_id = $this->_insertKalender($block, 'reservierung');
+					if ($kalender_id)
+					{
+						$this->_insertReservierungSync($block->reservierung_ids, $kalender_id);
+					}
+				}
+				else
+				{
+					$syncData = getData($sync_result);
+					$kalender_id = $syncData[0]->kalender_id;
+					$last_sync = $syncData[0]->lastupdate;
+					$synced_ids = array_column($syncData, 'reservierung_id');
+
+					if ($block->insertamum > $last_sync)
+					{
+						$this->_updateKalender($kalender_id, $block);
+						$this->_updateReservierungSync($synced_ids, $kalender_id);
+					}
+
+					$fehlende = array_diff($block->reservierung_ids, $synced_ids);
+					if (!empty($fehlende))
+					{
+						$this->_insertReservierungSync($fehlende, $kalender_id);
+					}
+				}
+			}
+		}
+	}
+
+
+	private function _insertKalender($block, $typ)
+	{
+		$result = $this->KalenderModel->insert(
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'typ' => $typ,
+				'status_kurzbz'=> 'live',
+				'insertamum' => $block->insertamum,
+				'insertvon' => $block->insertvon,
+				'updateamum' => $block->updateamum ?? null,
+				'updatevon' => $block->updatevon ?? null
+			)
+		);
+		if(!isSuccess($result))
+			return null;
+
+		$kalender_id = getData($result);
+
+		if ($typ === 'lehreinheit')
+		{
+			$this->KalenderLehreinheitModel->insert(
+				array (
+					'kalender_id' => $kalender_id,
+					'lehreinheit_id'=> $block->lehreinheit_id
+				)
+			);
+		}
+		else if ($typ === 'reservierung')
+		{
+			$this->KalenderEventModel->insert(array(
+				'kalender_id' => $kalender_id,
+				'titel' => $block->titel,
+				'beschreibung' => $block->beschreibung
+			));
+
+
+			if ($block->insertvon)
+			{
+				$user = $this->BenutzerModel->load(array('uid' => $block->insertvon));
+
+				if (hasData($user))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'uid' => getData($user)[0]->uid,
+						'rolle_kurzbz' => 'organisator'
+					));
+				}
+			}
+
+			$uids = is_array($block->uids) ? $block->uids : explode(',', $block->uids);
+			foreach ($uids as $uid)
+			{
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'uid' => $uid,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+
+			$semester_range = $this->StudiensemesterModel->getByDateRange($block->von, $block->bis);
+			if (isError($semester_range)) return $semester_range;
+			$studiensemester_kurzbz = getData($semester_range)[0]->studiensemester_kurzbz ?? null;
+
+			$gruppen = is_array($block->gruppen_kurzbz) ? $block->gruppen_kurzbz : explode(',', $block->gruppen_kurzbz ?? '');
+
+			foreach ($gruppen as $gruppe_kurzbz)
+			{
+				$gruppe_kurzbz = trim($gruppe_kurzbz);
+				if (!empty($gruppe_kurzbz))
+				{
+					$this->KalenderEventTeilnehmerModel->insert(array(
+						'kalender_id' => $kalender_id,
+						'gruppe_kurzbz' => $gruppe_kurzbz,
+						'studiengang_kz' => $block->studiengang_kz,
+						'studiensemester_kurzbz' => $studiensemester_kurzbz,
+						'rolle_kurzbz' => 'teilnehmer'
+					));
+				}
+			}
+
+			foreach ($block->svg_kombis as $kombi_str)
+			{
+				$kombi_str = trim($kombi_str, '()');
+				list($sem, $verb, $grp) = explode(',', $kombi_str);
+
+				$sem = trim($sem) === '' ? null : trim($sem);
+				$verb = trim($verb) === '' ? null : trim($verb);
+				$grp = trim($grp) === '' ? null : trim($grp);
+
+				if (is_null($sem) && is_null($verb) && is_null($grp))
+					continue;
+
+				$this->KalenderEventTeilnehmerModel->insert(array(
+					'kalender_id' => $kalender_id,
+					'studiengang_kz' => $block->studiengang_kz,
+					'semester' => $sem,
+					'verband' => $verb,
+					'gruppe' => $grp,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz,
+					'rolle_kurzbz' => 'teilnehmer'
+				));
+			}
+		}
+
+
+		$this->KalenderOrtModel->insert(
+			array (
+				'kalender_id' => $kalender_id,
+				'ort_kurzbz' => $block->ort_kurzbz
+			)
+		);
+
+		return $kalender_id;
+	}
+
+	private function _insertSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->insert(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+	private function _insertReservierungSync($ids, $kalender_id)
+	{
+
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->insert(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id,
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateKalender($kalender_id, $block)
+	{
+		$this->KalenderModel->update(
+			array (
+				'kalender_id' => $kalender_id
+			),
+			array (
+				'von' => $block->von,
+				'bis' => $block->bis,
+				'updateamum'=> $block->updateamum,
+				'updatevon' => $block->updatevon
+			)
+		);
+	}
+
+	private function _updateSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncModel->update(
+				array (
+					'stundenplandev_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+
+	private function _updateReservierungSync($ids, $kalender_id)
+	{
+		foreach($ids as $id)
+		{
+			$this->SyncReservierungModel->update(
+				array (
+					'reservierung_id' => $id,
+					'kalender_id' => $kalender_id
+				),
+				array (
+					'lastupdate' => date('Y-m-d H:i:s')
+				)
+			);
+		}
+	}
+}
@@ -1,46 +0,0 @@
-<?php
-
-if (!defined("BASEPATH")) exit("No direct script access allowed");
-
-class Manager extends Auth_Controller
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'installAll' => 'admin:rw',
-				'installFromCore' => 'admin:rw'
-			)
-		);
-
-		// Load libraries
-		$this->load->library('FehlerUpdateLib');
-	}
-
-	/**
-	 *
-	 */
-	public function installAll()
-	{
-		$this->fehlerupdatelib->installAll();
-	}
-
-	/**
-	 *
-	 */
-	public function installFromCore()
-	{
-		$this->fehlerupdatelib->installFromCore();
-	}
-
-	/**
-	 *
-	 */
-	public function installFrom($fehlerConfigDirectory)
-	{
-		$this->fehlerupdatelib->installFrom($fehlerConfigDirectory);
-	}
-}
@@ -88,11 +88,9 @@ class IssuesKonfiguration extends Auth_Controller

 		// get all Fehler, optionally filtered by app
 		$params = array('fehlercode_extern' => null);
-		$this->FehlerModel->addDistinct();
 		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertyp_kurzbz, fehlertext');
-		$this->FehlerModel->addJoin('system.tbl_fehler_app', 'fehlercode');
 		$this->FehlerModel->addOrder('fehlercode');
-		if (!isEmptyString($app)) $params['tbl_fehler_app.app'] = $app;
+		if (!isEmptyString($app)) $params['app'] = $app;
 		$fehlerRes = $this->FehlerModel->loadWhere($params);

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

-		$fehlerRes = $this->FehlerModel->getByApps($app);
+		$this->FehlerModel->addSelect('fehlercode, fehler_kurzbz, fehlertext, fehlertyp_kurzbz, app');
+		$this->FehlerModel->addOrder('fehlercode');
+
+		$fehlerRes = isset($app) ? $this->FehlerModel->loadWhere(array('app' => $app)) : $this->FehlerModel->load();

 		$this->outputJson($fehlerRes);
 	}
@@ -5,7 +5,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 class Plausichecks extends Auth_Controller
 {
 	const GENERIC_ISSUE_OCCURED_TEXT = 'Issue aufgetreten';
-	const APPS = ['core', 'dvuh', 'bis'];

 	public function __construct()
 	{
@@ -17,7 +16,8 @@ class Plausichecks extends Auth_Controller
 		);

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

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

 		// issues array for passing issue texts
 		$allIssues = array();
-
-		$fehler_kurzbz_arr = isEmptyString($fehler_kurzbz) ? array_keys($this->plausicheckproducerlib->getFehlerMappings()) : [$fehler_kurzbz];
-
-		$this->FehlerModel->addOrder('fehler_kurzbz, fehlercode');
-		$this->FehlerModel->db->where_in('fehler_kurzbz', $fehler_kurzbz_arr);
-		$fehlerRes = $this->FehlerModel->load();
-
-		if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
-		if (!hasData($fehlerRes)) return $this->outputJsonSuccess([]);
-
-		// all fehler which are going to be checked
-		$fehlerArr = getData($fehlerRes);
-
+		// all fehler kurzbz which are going to be checked
+		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckdefinitionlib->getFehlerKurzbz();
+		$fehlerLibMappings = $this->plausicheckdefinitionlib->getFehlerLibMappings();
 		// set Studiengang to null if not passed
 		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;

 		// get the data returned by Plausicheck
-		foreach ($fehlerArr as $fehler)
+		foreach ($fehlerKurzbz as $fehler_kurzbz)
 		{
+			// get Text and fehlercode of the Fehler
+			$this->FehlerModel->addSelect('fehlercode, fehlertext, fehlertyp_kurzbz');
+			$fehlerRes = $this->FehlerModel->loadWhere(array('fehler_kurzbz' => $fehler_kurzbz));
+
+			if (isError($fehlerRes)) $this->terminateWithJsonError(getError($fehlerRes));
+
+			// do not check error if no data
+			if (!hasData($fehlerRes)) continue;
+
+			// get the error data
+			$fehler = getData($fehlerRes)[0];
+
 			// initialize issue array
-			$allIssues[$fehler->fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
+			$allIssues[$fehler_kurzbz] = array('fehlercode' => $fehler->fehlercode, 'data' => array());
+
+			// get library name for producing issue
+			$libName = $fehlerLibMappings[$fehler_kurzbz];

 			// execute the check
 			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue(
-				$fehler->fehler_kurzbz,
+				$libName,
+				$fehler_kurzbz,
 				array(
 					'studiensemester_kurzbz' => $studiensemester_kurzbz,
 					'studiengang_kz' => $studiengang_kz
@@ -101,7 +107,7 @@ class Plausichecks extends Auth_Controller
 						{
 							// replace placeholder with params, if present
 							if (count($fehlertext_params) != substr_count($fehlerText, '%s'))
-								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler->fehler_kurzbz);
+								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler_kurzbz);

 							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
 						}
@@ -112,7 +118,7 @@ class Plausichecks extends Auth_Controller
 						$issueObj = new StdClass();
 						$issueObj->fehlertext = $fehlerText;
 						$issueObj->type = $fehlerTyp;
-						$allIssues[$fehler->fehler_kurzbz]['data'][] = $issueObj;
+						$allIssues[$fehler_kurzbz]['data'][] = $issueObj;
 					}
 					else // if no issue text found, use generic text
 					{
@@ -151,7 +157,7 @@ class Plausichecks extends Auth_Controller

 		if (isError($studiengaengeRes)) show_error(getError($studiengaengeRes));

-		$fehlerKurzbz = array_keys($this->plausicheckproducerlib->getFehlerMappings());
+		$fehlerKurzbz = $this->plausicheckdefinitionlib->getFehlerKurzbz();

 		$db = new DB_Model();

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

@@ -180,8 +184,6 @@ class Plausichecks extends Auth_Controller
 			}
 		}

-		ksort($fehlerKurzbzCodeMappings);
-
 		return array(
 			'semester' => hasData($studiensemesterRes) ? getData($studiensemesterRes) : array(),
 			'currsemester' => hasData($currSemRes) ? getData($currSemRes) : array(),
@@ -0,0 +1,10 @@
+<?php
+interface ICollisionCheck
+{
+	public function getName();
+
+	public function check($data);
+
+	public function checkAll($kalender_ids);
+
+}
@@ -5,8 +5,11 @@
 */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	// codes of fehler to be resolved
-	protected $_fehlercodes = [];
+	// mappings in form fehlercode -> resolverlibrary name, fehler which have explicit resolver class defined
+	protected $_codeLibMappings = [];
+
+	// mappings in form fehlercode -> producer library name, fehler which are resolved the same way they are produced
+	protected $_codeProducerLibMappings = [];

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

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

-		// resolve the issues
-		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues();
+		// load open issues with given errorcodes
+		$openIssuesRes = $this->IssueModel->getOpenIssues(
+			array_merge(array_keys($this->_codeLibMappings), array_keys($this->_codeProducerLibMappings))
+		);
+
+		$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
+
+		$result = $this->plausicheckresolverlib->resolvePlausicheckIssues($openIssues);

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

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

 		$this->logInfo("Plausicheck issue producer job started");
@@ -128,7 +128,7 @@ class AntragLib
 			return $this->_ci->StudierendenantragstatusModel->resumeAntraegeForAbmeldungStgl($antrag_id);
 		}
 		// NOTE(chris): get last status that is not pause
-		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum', 'DESC');
+		$this->_ci->StudierendenantragstatusModel->addOrder('insertamum');
 		$this->_ci->StudierendenantragstatusModel->addLimit(1);
 		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
 			'studierendenantrag_id' => $antrag_id,
@@ -0,0 +1,65 @@
+<?php
+
+defined('BASEPATH') || exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+class CollisionChecker
+{
+	private $_checks = [];
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		$this->_ci->load->library('collision/checks/RoomCollisionCheck');
+		$this->_ci->load->library('collision/checks/LectureCollisionCheck');
+		$this->_ci->load->library('collision/checks/VerbandCollisionCheck');
+		$this->_ci->load->library('collision/checks/StudentCollisionCheck');
+		$this->register($this->_ci->roomcollisioncheck);
+		$this->register($this->_ci->lecturecollisioncheck);
+		$this->register($this->_ci->verbandcollisioncheck);
+		$this->register($this->_ci->studentcollisioncheck);
+		Events::trigger('collision_register', $this);
+	}
+
+	public function register(ICollisionCheck $check)
+	{
+		$this->_checks[$check->getName()] = $check;
+	}
+
+	public function run($data)
+	{
+		$errors = [];
+
+		foreach ($this->_checks as $check)
+		{
+			$result = $check->check($data);
+
+			if (!empty($result))
+			{
+				$errors[] = $result;
+			}
+		}
+
+		return $errors;
+	}
+
+	public function runAll($kalender_ids)
+	{
+		$results = array_fill_keys($kalender_ids, []);
+
+		foreach ($this->_checks as $check)
+		{
+			$batchResult = $check->checkAll($kalender_ids);
+			foreach ($batchResult as $kalender_id => $errors)
+			{
+				$results[$kalender_id] = array_merge($results[$kalender_id], $errors);
+			}
+		}
+
+		return $results;
+	}
+}
@@ -1,382 +0,0 @@
-<?php
-/**
- * Copyright (C) 2025 fhcomplete.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class FehlerUpdateLib
-{
-	// Who adds phrases into the database
-	const UPSERT_BY = 'FehlerUpdate';
-
-	const CONFIG_DIRECTORY = 'config';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const CONFIG_FEHLER_INDEX = 'fehler';
-
-	const TYPE_STRING = 'string';
-	const TYPE_ARRAY = 'array';
-
-	//~ // Array elements names
-	const FEHLERCODE = 'fehlercode';
-	const FEHLER_KURZBZ = 'fehler_kurzbz';
-	const FEHLERTEXT = 'fehlertext';
-	const FEHLERTYP_KURZBZ = 'fehlertyp_kurzbz';
-	const APP = 'app';
-	const FEHLERCODE_EXTERN = 'fehlercode_extern';
-
-	// structure of a fehler
-	// type default: string
-	const FEHLER_ATTRIBUTES = [
-		self::FEHLERCODE => ['required' => true],
-		self::FEHLER_KURZBZ  => ['required' => false],
-		self::FEHLERTEXT => ['required' => true, 'updateable' => false],
-		self::FEHLERTYP_KURZBZ => ['required' => false, 'updateable' => true],
-		self::APP => ['required' => true, 'types' => [self::TYPE_STRING, self::TYPE_ARRAY]],
-		self::FEHLERCODE_EXTERN => ['required' => false]
-	];
-
-	private $_ci; // Code igniter instance
-	private $_updateHistory = [];
-
-	/**
-	 * Loads parser library
-	 */
-	public function __construct()
-	{
-		$this->_ci =& get_instance();
-
-		// Loads EPrintfLib
-		$this->_ci->load->library('EPrintfLib');
-
-		// Loads the Models
-		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
-		$this->_ci->load->model('system/App_model', 'AppModel');
-
-		// Loads extensions lib
-		$this->_ci->load->library('ExtensionsLib');
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Public methods
-
-
-	/**
-	 * Install all possible fehler, from core and extensions
-	 */
-	public function installAll()
-	{
-		$this->installFromCore();
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$this->installFrom($ext->name);
-			}
-		}
-	}
-
-	/**
-	 * Install fehler from the core
-	 */
-	public function installFromCore()
-	{
-		$this->_installFehler();
-	}
-
-	/**
-	 * Install fehler from the given path
-	 */
-	public function installFrom($extensionName)
-	{
-		if (!isset($extensionName))
-		{
-			$this->_ci->eprintflib->printError('Extension name missing!');
-			return;
-		}
-
-		$this->_installFehler(ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$extensionName.'/'.FehlerUpdateLib::CONFIG_FEHLER_NAME);
-
-	}
-
-	// -----------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Install fehler from the given directory
-	 */
-	private function _installFehler($fehlerConfigDirectory = null)
-	{
-		// check that fehler config file exists
-		$configDir = isset($fehlerConfigDirectory) ? $fehlerConfigDirectory : self::CONFIG_FEHLER_NAME;
-
-		$configFilename = APPPATH.self::CONFIG_DIRECTORY.'/'.$configDir.'.php';
-
-		if (!file_exists($configFilename))
-		{
-			return;
-		}
-
-		// Load Fehler Entries
-		$this->_ci->load->config($configDir);
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
-
-		if (!isset($configArray) || !is_array($configArray)) // check if fehler config entries could be loaded
-		{
-			$this->_ci->eprintflib->printError(
-				'Fehler config array could not be loaded, directory '.$configDir.' index '.self::CONFIG_FEHLER_INDEX
-			);
-			return;
-		}
-
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
-		$this->_ci->eprintflib->printInfo('Fehler installation started, directory '.$configDir);
-
-		foreach ($configArray as $idx => $configEntry)
-		{
-			// create fehler from config entry
-			$createFehlerResult = $this->_createFehlerFromEntry($configEntry);
-
-			// write error if creation failed
-			if (isError($createFehlerResult))
-			{
-				$this->_ci->eprintflib->printError(
-					getError($createFehlerResult).', directory '.$configDir.', index '.$idx
-				);
-			}
-			elseif (hasData($createFehlerResult))
-			{
-				// add fehler to db
-				$addFehlerResult = $this->_updateFehler(getData($createFehlerResult));
-
-				if (isError($addFehlerResult))
-				{
-					$this->_ci->eprintflib->printError(
-						getError($addFehlerResult).', directory'.$configDir.', index '.$idx
-					);
-				}
-			}
-		}
-
-		$this->_ci->eprintflib->printInfo('Fehler installation ended');
-		$this->_ci->eprintflib->printInfo('------------------------------------------------------------------------------------------');
-	}
-
-	/**
-	 * Add a new fehler to the database
-	 */
-	private function _updateFehler($fehler)
-	{
-		$fehlerReferences = $fehler['references'];
-		$fehler = $fehler['fehler'];
-
-		// Checks if the fehler already exists in the database
-		$this->_ci->FehlerModel->db->where(self::FEHLERCODE.' = ', $fehler[self::FEHLERCODE]);
-		if (isset($fehler[self::FEHLER_KURZBZ]) && !isEmptyString($fehler[self::FEHLER_KURZBZ]))
-			$this->_ci->FehlerModel->db->or_where(self::FEHLER_KURZBZ.' = ', $fehler[self::FEHLER_KURZBZ]);
-		$fehlerResult = $this->_ci->FehlerModel->load();
-
-		// If an error occurred then return the error itself
-		if (isError($fehlerResult)) return $fehlerResult;
-
-		$updateRes = null;
-
-		// if fehler has been found
-		if (hasData($fehlerResult))
-		{
-			$foundFehler = getData($fehlerResult)[0];
-
-			// check if fehlercode - fehler kurzbz combination is correct
-			if ($foundFehler->{self::FEHLERCODE} != $fehler[self::FEHLERCODE]
-				|| $foundFehler->{self::FEHLER_KURZBZ} != ($fehler[self::FEHLER_KURZBZ] ?? null)
-			) {
-				return error("Wrong fehlercode - fehler kurzbz combination: ".$fehler[self::FEHLERCODE].", ".$fehler[self::FEHLER_KURZBZ]);
-			}
-
-			$this->_ci->eprintflib->printMessage(
-				"Fehler ".$fehler[self::FEHLERCODE]
-					.(isset($fehler[self::FEHLER_KURZBZ]) ? " (".$fehler[self::FEHLER_KURZBZ].")" : "")
-					." already exists in database"
-			);
-
-			$updateArr = [];
-
-			// update fehler, if needed
-			foreach (self::FEHLER_ATTRIBUTES as $attributeName => $attributeInfo)
-			{
-				// 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,10 +20,6 @@ class IssuesLib
 	const ERRORTYPE_CODE = 'error';
 	const WARNINGTYPE_CODE = 'warning';

-	const STATUS_KURZBZ = 'status_kurzbz';
-	const VERARBEITET_AMUM = 'verarbeitetamum';
-	const VERARBEITET_VON = 'verarbeitetvon';
-
 	public function __construct($params = null)
 	{
 		$this->_ci =& get_instance();
@@ -95,16 +91,12 @@ class IssuesLib
 			return error("fehlercode_extern missing");

 		// get external fehlercode (unique for each app)
-		$fehlerRes = $this->_ci->FehlerModel->execReadOnlyQuery(
-			'
-				SELECT
-					fehlercode
-				FROM
-					system.tbl_fehler fe
-				WHERE
-					fehlercode_extern = ?
-					AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode AND app = ?)',
-			[$fehlercode_extern, $this->_app]
+		$this->_ci->FehlerModel->addSelect('fehlercode');
+		$fehlerRes = $this->_ci->FehlerModel->loadWhere(
+			array(
+				'fehlercode_extern' => $fehlercode_extern,
+				'app' => $this->_app
+			)
 		);

 		if (isError($fehlerRes))
@@ -113,10 +105,8 @@ class IssuesLib
 		// check if there is a predefined custom error for the external issue
 		if (hasData($fehlerRes))
 		{
-			// if found, use the code
-			$fehlerData = getData($fehlerRes);
-			if (count($fehlerData) > 1) return error("Multiple fehlercode_extern ".$fehlercode_extern. " for app ".$this->_app);
 			$fehlerData = getData($fehlerRes)[0];
+			// if found, use the code
 			$fehlercode = $fehlerData->fehlercode;
 		}
 		else
@@ -138,9 +128,9 @@ class IssuesLib
 	public function setBehoben($issue_id, $user)
 	{
 		$data = array(
-			self::STATUS_KURZBZ => self::STATUS_BEHOBEN,
-			self::VERARBEITET_VON => $user,
-			self::VERARBEITET_AMUM => date('Y-m-d H:i:s')
+			'status_kurzbz' => self::STATUS_BEHOBEN,
+			'verarbeitetvon' => $user,
+			'verarbeitetamum' => date('Y-m-d H:i:s')
 		);

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

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

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

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

 		if (hasData($currStatus))
 		{
-			$currStatusData = getData($currStatus)[0];
-			// if same status set, and verarbeitet amum is not being newly set
-			if ($currStatusData->{self::STATUS_KURZBZ} == $data[self::STATUS_KURZBZ]
-				&& !(isset($data[self::VERARBEITET_AMUM]) && !isset($currStatusData->{self::VERARBEITET_AMUM}))
-			) {
+			if (getData($currStatus)[0]->status_kurzbz == $data['status_kurzbz'])
 				return success("Same status already set");
-			}
 		}
 		else
 			return error("Error when getting status");
@@ -243,10 +228,10 @@ class IssuesLib
 		$inhalt_extern = null
 	) {
 		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
-			return error("Person_id or oe_kurzbz must be set, fehlercode: $fehlercode");
+			return error("Person_id or oe_kurzbz must be set.");

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

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

 				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
 			}
@@ -0,0 +1,170 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class KalenderNotificationLib
+{
+	private $_ci;
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->library('MailLib');
+		$this->_ci->load->config('tempus');
+
+	}
+
+	public function sendMails($mail_infos)
+	{
+		if (!$this->_ci->config->item('send_update_mails'))
+			return true;
+
+		$lektor_added = array();
+		$lektor_changed = array();
+		$lektor_deleted = array();
+
+		$student_added = array();
+		$student_changed = array();
+		$student_deleted = array();
+
+		foreach ($mail_infos as $info)
+		{
+			$entry = $info['entry'];
+			$new_status = $info['new_status'];
+			$notify = $info['notify'];
+
+			$old_entry = null;
+			if ($entry->vorgaenger_kalender_id)
+			{
+				$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'tbl_kalender.kalender_id = tbl_kalender_ort.kalender_id', 'LEFT');
+				$vorgaenger = $this->_ci->KalenderModel->load(array('tbl_kalender.kalender_id' => $entry->vorgaenger_kalender_id));
+				if (hasData($vorgaenger))
+					$old_entry = getData($vorgaenger)[0];
+			}
+
+			if ($new_status === 'deleted')
+				$row = $this->_buildMailDeleted($entry);
+			else if ($old_entry)
+				$row = $this->_buildMailChanged($old_entry, $entry);
+			else
+				$row = $this->_buildMailNew($entry);
+
+			if (in_array('lektor', $notify))
+			{
+				if ($new_status === 'deleted')
+					$lektor_deleted[] = $row;
+				else if ($old_entry)
+					$lektor_changed[] = $row;
+				else
+					$lektor_added[] = $row;
+			}
+
+			if (in_array('student', $notify))
+			{
+				if ($new_status === 'deleted')
+					$student_deleted[] = $row;
+				else if ($old_entry)
+					$student_changed[] = $row;
+				else
+					$student_added[] = $row;
+			}
+		}
+
+		$lektor_entries = '';
+		$student_entries = '';
+
+		if (!empty($lektor_added))
+			$lektor_entries .= $this->_addToList($lektor_added, 'hinzugefügt') . '<hr/>';
+
+		if (!empty($lektor_changed))
+			$lektor_entries .= $this->_addToList($lektor_changed, 'geändert') . '<hr/>';
+
+		if (!empty($lektor_deleted))
+			$lektor_entries .= $this->_addToList($lektor_deleted, 'gelöscht') . '<hr/>';
+
+		if (!empty($student_added))
+			$student_entries .= $this->_addToList($student_added, 'hinzugefügt') . '<hr/>';
+
+		if (!empty($student_changed))
+			$student_entries .= $this->_addToList($student_changed, 'geändert') . '<hr/>';
+
+		if (!empty($student_deleted))
+			$student_entries .= $this->_addToList($student_deleted, 'gelöscht') . '<hr/>';
+
+		if (!empty($lektor_entries))
+			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Lektor Tempus Update', $lektor_entries);
+		if (!empty($student_entries))
+			$this->_ci->maillib->send('', 'ma0048@technikum-wien.at', 'Student Tempus Update', $student_entries);
+	}
+
+	private function _addToList($entries, $status)
+	{
+		return 'Folgende Einträge wurden <b>'. $status .'</b>: <ul>' . implode('', $entries) . '</ul>';
+
+	}
+	private function _buildMailNew($entry)
+	{
+		$von = date('d.m.Y H:i', strtotime($entry->von));
+		$bis = date('H:i', strtotime($entry->bis));
+
+		return '<li>
+					<b>Kalender ID ' . ($entry->kalender_id ?? '-') . '</b>
+					<ul>
+						<li><b>Uhrzeit:</b> ' . $von . ' - ' . $bis . '</li>
+						<li><b>Ort:</b> ' . ($entry->ort_kurzbz ?? '-') . '</li>
+					</ul>
+				</li>';
+	}
+
+	private function _buildMailChanged($old_entry, $new_entry)
+	{
+		$old_von = date('d.m.Y H:i', strtotime($old_entry->von));
+		$old_bis = date('H:i', strtotime($old_entry->bis));
+		$new_von = date('d.m.Y H:i', strtotime($new_entry->von));
+		$new_bis = date('H:i', strtotime($new_entry->bis));
+
+		$old_ort = $old_entry->ort_kurzbz ?? '-';
+		$new_ort = $new_entry->ort_kurzbz ?? '-';
+
+		$uhrzeit_changed = ($old_von . $old_bis) !== ($new_von . $new_bis);
+		$ort_changed = $old_ort !== $new_ort;
+
+		$changes = '';
+
+		if ($uhrzeit_changed)
+		{
+			$changes .= '<li>
+							<b>Uhrzeit:</b>
+							<s style="color:red;">' . $old_von . ' - ' . $old_bis . '</s>
+							<span style="color:green;">' . $new_von . ' - ' . $new_bis . '</span>
+						</li>';
+		}
+
+		if ($ort_changed)
+		{
+			$changes .= '<li>
+				<b>Ort:</b>
+				<s style="color:red;">' . $old_ort . '</s>
+				<span style="color:green;">' . $new_ort . '</span>
+			</li>';
+		}
+
+		return '<li>
+					<b>Kalender ID ' . ($new_entry->kalender_id ?? '-') . '</b>
+					<ul>' . $changes . '</ul>
+				</li>';
+	}
+
+	private function _buildMailDeleted($entry)
+	{
+		$von = date('d.m.Y H:i', strtotime($entry->von));
+		$bis = date('H:i', strtotime($entry->bis));
+
+		return '<li style="color:red;">
+					<b><s>Kalender ID ' . ($entry->kalender_id ?? '-') . '</s></b>
+					<ul>
+						<li><s>' . $von . ' - ' . $bis . '</s></li>
+						<li><s>' . ($entry->ort_kurzbz ?? '-') . '</s></li>
+					</ul>
+				</li>';
+	}
+}
@@ -0,0 +1,226 @@
+<?php
+
+class LectureCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->model('ressource/zeitsperre_model', 'ZeitsperreModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+
+	}
+
+	public function getName()
+	{
+		return 'lecture';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$uids = $this->_getUids($data->kalender_id);
+
+		if (empty($uids)) return [];
+
+		$collisions = [];
+
+		$collisions = array_merge($collisions, $this->_checkLehreinheit($uids, $data));
+		$collisions = array_merge($collisions, $this->_checkReservierung($uids, $data));
+		$collisions = array_merge($collisions, $this->_checkZeitsperre($uids, $data));
+
+		return $collisions;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+		$grouped = [];
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter other_lehreinheithreinheit_ma', 'other_lehreinheithreinheit_ma.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit other_lehreinheit', 'other_lehreinheit.lehreinheit_id = other_lehreinheithreinheit_ma.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit other_kalender_le', 'other_kalender_le.lehreinheit_id = other_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_kalender_le.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where(
+			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->load();
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer other_t', 'other_t.uid = current_lehreinheit_ma.mitarbeiter_uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event other_e', 'other_e.kalender_id = other_t.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_e.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where(
+			'other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->load();
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit current_kalender_le', 'current_kalender_le.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit current_lehreinheit', 'current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter current_lehreinheit_ma', 'current_lehreinheit_ma.lehreinheit_id = current_lehreinheit.lehreinheit_id');
+		$this->_ci->KalenderModel->addJoin('campus.tbl_zeitsperre z',
+			"z.mitarbeiter_uid = current_lehreinheit_ma.mitarbeiter_uid AND z.zeitsperretyp_kurzbz != 'ZVerfueg' AND z.vondatum < tbl_kalender.bis AND z.bisdatum > tbl_kalender.von");
+
+		$this->_ci->KalenderModel->db->where_not_in('current_lehreinheit_ma.mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$result = $this->_ci->KalenderModel->load();
+
+
+		if (!isError($result) && hasData($result))
+			foreach (getData($result) as $row)
+				$grouped[$row->kalender_id][] = true;
+
+
+		return $grouped;
+	}
+
+	private function _getUids($kalender_id)
+	{
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
+		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender_event_teilnehmer.uid');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'tbl_kalender.kalender_id' => $kalender_id
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$data = getData($result);
+		$mitarbeiter_uids = array_filter(array_column($data, 'mitarbeiter_uid'));
+		$event_teilnehmer = array_filter(array_column($data, 'uid'));
+
+		return array_unique(array_merge($mitarbeiter_uids, $event_teilnehmer));
+	}
+
+	private function _checkLehreinheit($uids, $data)
+	{
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+		$this->_ci->KalenderModel->addDistinct('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addSelect('mitarbeiter_uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_lehreinheit', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheit', 'lehreinheit_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_lehreinheitmitarbeiter', 'lehreinheit_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where_in('mitarbeiter_uid', $uids);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
+		$this->_ci->KalenderModel->db->where_not_in('mitarbeiter_uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where(
+			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'ma_le_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	private function _checkReservierung($uids, $data)
+	{
+		if ($this->_ci->variablelib->getVar('ignore_reservierung') === 'true') return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+
+
+		$this->_ci->KalenderModel->addDistinct('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addSelect('tbl_kalender_event_teilnehmer.uid, tbl_kalender.von, tbl_kalender.bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event', 'kalender_id', 'LEFT');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_event_teilnehmer', 'tbl_kalender_event.kalender_id = tbl_kalender_event_teilnehmer.kalender_id', 'LEFT');
+
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender_event_teilnehmer.uid', $uids);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', array('archived', 'deleted', 'to_delete'));
+		$this->_ci->KalenderModel->db->where_not_in('uid', $kollisionsfreie_user);
+		$this->_ci->KalenderModel->db->where(
+			'tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)',
+			null, false
+		);
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	private function _checkZeitsperre($uids, $data)
+	{
+		if ($this->_ci->variablelib->getVar('ignore_zeitsperre') === 'true') return [];
+
+		$this->_ci->ZeitsperreModel->addSelect('mitarbeiter_uid, vondatum as von, bisdatum as bis');
+		$this->_ci->ZeitsperreModel->db->where('zeitsperretyp_kurzbz !=', 'ZVerfueg');
+		$this->_ci->ZeitsperreModel->db->where_in('mitarbeiter_uid', $uids);
+
+		$result = $this->_ci->ZeitsperreModel->loadWhere(array(
+			'vondatum <=' => date('Y-m-d', strtotime($data->bis)),
+			'bisdatum >=' => date('Y-m-d', strtotime($data->von)),
+		));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		return array_map(function($row) {
+			return $this->_ci->phraseslib->t('ui', 'ma_zeitsperre_kollision') . ': ' . $row->mitarbeiter_uid . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+}
@@ -0,0 +1,75 @@
+<?php
+
+class RoomCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+	}
+
+	public function getName()
+	{
+		return 'room';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->ort_kurzbz, $data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$this->_ci->KalenderModel->addSelect('kalender_id, ort_kurzbz, von, bis');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort', 'kalender_id');
+
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id !=', $data->kalender_id);
+		$this->_ci->KalenderModel->db->where('tbl_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('tbl_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+
+		$result = $this->_ci->KalenderModel->loadWhere(array(
+			'von <' => $data->bis,
+			'bis >' => $data->von,
+			'ort_kurzbz' => $data->ort_kurzbz,
+		));
+
+		if (isError($result)) return [];
+		if (!hasData($result)) return [];
+
+		return array_map(function($row)
+		{
+			return $this->_ci->phraseslib->t('ui', 'raum_kollision') . ': ' . $row->ort_kurzbz . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+		}, getData($result));
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$this->_ci->KalenderModel->addSelect('DISTINCT ON (tbl_kalender.kalender_id) tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort current_ort', 'current_ort.kalender_id = tbl_kalender.kalender_id');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender_ort other_ort', 'other_ort.ort_kurzbz = current_ort.ort_kurzbz');
+		$this->_ci->KalenderModel->addJoin('lehre.tbl_kalender other_kalender', 'other_kalender.kalender_id = other_ort.kalender_id');
+
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id != tbl_kalender.kalender_id', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.von < tbl_kalender.bis', null, false);
+		$this->_ci->KalenderModel->db->where('other_kalender.bis > tbl_kalender.von', null, false);
+		$this->_ci->KalenderModel->db->where_not_in('other_kalender.status_kurzbz', ['archived', 'deleted', 'to_delete']);
+		$this->_ci->KalenderModel->db->where_in('tbl_kalender.kalender_id', $kalender_ids);
+		$this->_ci->KalenderModel->db->where('other_kalender.kalender_id NOT IN (SELECT vorgaenger_kalender_id FROM lehre.tbl_kalender WHERE vorgaenger_kalender_id IS NOT NULL)', null, false);
+
+		$result = $this->_ci->KalenderModel->load();
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+}
@@ -0,0 +1,238 @@
+<?php
+
+class StudentCollisionCheck implements ICollisionCheck
+{
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+	}
+
+	public function getName()
+	{
+		return 'student';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
+
+		$kollisionsfreie_user = unserialize(KOLLISIONSFREIE_USER);
+		$placeholders = implode(',', array_fill(0, count($kollisionsfreie_user), '?'));
+
+
+		$dbModel = new DB_Model();
+
+		$qry1 = "
+			SELECT DISTINCT tbl_benutzergruppe.uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe
+				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
+				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+
+			WHERE tbl_kalender.kalender_id = ?
+				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
+			UNION ALL
+
+			SELECT DISTINCT tbl_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit USING(kalender_id)
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband
+				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
+				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
+			WHERE tbl_kalender.kalender_id = ?
+				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
+
+		";
+
+		$result1 = $dbModel->execReadOnlyQuery($qry1, array_merge(
+			[$data->kalender_id],
+			$kollisionsfreie_user,
+			[$data->kalender_id],
+			$kollisionsfreie_user
+		));
+
+		if (isError($result1) || !hasData($result1)) return [];
+
+		$curUids = array_flip(array_column(getData($result1), 'uid'));
+
+		$qry2 = "
+			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_benutzergruppe.uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe
+				ON tbl_gruppe.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_gruppe.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_gruppe.gruppe_kurzbz = tbl_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe ON tbl_benutzergruppe.gruppe_kurzbz = tbl_gruppe.gruppe_kurzbz
+				AND tbl_benutzergruppe.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+			WHERE tbl_kalender.von < ?
+				AND tbl_kalender.bis > ?
+				AND tbl_kalender.kalender_id != ?
+				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND tbl_benutzergruppe.uid NOT IN ($placeholders)
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
+				)
+
+			UNION ALL
+			
+			SELECT DISTINCT tbl_kalender.kalender_id, tbl_kalender.von, tbl_kalender.bis, tbl_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender
+			JOIN lehre.tbl_kalender_lehreinheit ON tbl_kalender_lehreinheit.kalender_id = tbl_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband
+				ON tbl_studentlehrverband.studiengang_kz = tbl_lehreinheitgruppe.studiengang_kz
+				AND tbl_studentlehrverband.semester = tbl_lehreinheitgruppe.semester
+				AND tbl_studentlehrverband.studiensemester_kurzbz = tbl_lehreinheit.studiensemester_kurzbz
+				AND (tbl_lehreinheitgruppe.verband = tbl_studentlehrverband.verband OR tbl_lehreinheitgruppe.verband IS NULL OR btrim(tbl_lehreinheitgruppe.verband::text) = '' OR tbl_studentlehrverband.verband IS NULL)
+				AND (tbl_lehreinheitgruppe.gruppe = tbl_studentlehrverband.gruppe OR tbl_lehreinheitgruppe.gruppe IS NULL OR btrim(tbl_lehreinheitgruppe.gruppe::text) = '' OR tbl_studentlehrverband.gruppe IS NULL)
+			WHERE tbl_kalender.von < ?
+				AND tbl_kalender.bis > ?
+				AND tbl_kalender.kalender_id != ?
+				AND tbl_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND tbl_studentlehrverband.student_uid NOT IN ($placeholders)
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = tbl_kalender.kalender_id
+				)
+		";
+
+		$result2 = $dbModel->execReadOnlyQuery($qry2, array_merge(
+			[$data->bis, $data->von, $data->kalender_id],
+			$kollisionsfreie_user,
+			[$data->bis, $data->von, $data->kalender_id],
+			$kollisionsfreie_user
+		));
+
+		if (isError($result2) || !hasData($result2)) return [];
+
+		$conflicts = [];
+		foreach (getData($result2) as $row) {
+			if (isset($curUids[$row->uid])) {
+				$conflicts[] = $this->_ci->phraseslib->t('ui', 'student_kollision')
+					. ': ' . $row->uid
+					. ' (' . date('d.m.Y H:i', strtotime($row->von))
+					. ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		return $conflicts;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+
+		if (empty($kalender_ids)) return [];
+
+		if ($this->_ci->variablelib->getVar('kollision_student') !== 'true') return [];
+
+		$dbModel = new DB_Model();
+		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
+
+		$sql = "
+			SELECT DISTINCT current_kalender.kalender_id, current_benutzergruppe.uid
+			FROM lehre.tbl_kalender current_kalender
+			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe current_gruppe
+				ON current_gruppe.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
+				AND current_gruppe.semester = current_lehreinheitgruppe.semester
+				AND current_gruppe.gruppe_kurzbz = current_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe current_benutzergruppe ON current_benutzergruppe.gruppe_kurzbz = current_gruppe.gruppe_kurzbz
+					AND current_benutzergruppe.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
+				)
+			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
+			JOIN public.tbl_gruppe other_gruppe
+				ON other_gruppe.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
+				AND other_gruppe.semester = other_lehreinheitgruppe.semester
+				AND other_gruppe.gruppe_kurzbz = other_lehreinheitgruppe.gruppe_kurzbz
+			JOIN public.tbl_benutzergruppe other_benutzergruppe
+				ON other_benutzergruppe.gruppe_kurzbz = other_gruppe.gruppe_kurzbz
+				AND other_benutzergruppe.uid = current_benutzergruppe.uid
+				AND other_benutzergruppe.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
+
+
+			WHERE current_kalender.kalender_id IN ($placeholders)
+
+			UNION ALL
+
+			SELECT DISTINCT current_kalender.kalender_id, current_studentlehrverband.student_uid AS uid
+			FROM lehre.tbl_kalender current_kalender
+			JOIN lehre.tbl_kalender_lehreinheit current_kalender_le ON current_kalender_le.kalender_id = current_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit current_lehreinheit ON current_lehreinheit.lehreinheit_id = current_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe current_lehreinheitgruppe ON current_lehreinheitgruppe.lehreinheit_id = current_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband current_studentlehrverband
+				ON current_studentlehrverband.studiengang_kz = current_lehreinheitgruppe.studiengang_kz
+				AND current_studentlehrverband.semester = current_lehreinheitgruppe.semester
+				AND current_studentlehrverband.studiensemester_kurzbz = current_lehreinheit.studiensemester_kurzbz
+				AND (current_lehreinheitgruppe.verband = current_studentlehrverband.verband OR current_lehreinheitgruppe.verband IS NULL OR btrim(current_lehreinheitgruppe.verband::text) = '' OR current_studentlehrverband.verband IS NULL)
+				AND (current_lehreinheitgruppe.gruppe = current_studentlehrverband.gruppe OR current_lehreinheitgruppe.gruppe IS NULL OR btrim(current_lehreinheitgruppe.gruppe::text) = '' OR current_studentlehrverband.gruppe IS NULL)
+
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND NOT EXISTS (
+					SELECT 1 FROM lehre.tbl_kalender vorgaenger
+					WHERE vorgaenger.vorgaenger_kalender_id = other_kalender.kalender_id
+				)
+			JOIN lehre.tbl_kalender_lehreinheit other_kalender_le ON other_kalender_le.kalender_id = other_kalender.kalender_id
+			JOIN lehre.tbl_lehreinheit other_lehreinheit ON other_lehreinheit.lehreinheit_id = other_kalender_le.lehreinheit_id
+			JOIN lehre.tbl_lehreinheitgruppe other_lehreinheitgruppe ON other_lehreinheitgruppe.lehreinheit_id = other_lehreinheit.lehreinheit_id
+			JOIN public.tbl_studentlehrverband other_slv
+				ON other_slv.studiengang_kz = other_lehreinheitgruppe.studiengang_kz
+				AND other_slv.semester = other_lehreinheitgruppe.semester
+				AND other_slv.studiensemester_kurzbz = other_lehreinheit.studiensemester_kurzbz
+				AND other_slv.student_uid = current_studentlehrverband.student_uid
+				AND (other_lehreinheitgruppe.verband = other_slv.verband OR other_lehreinheitgruppe.verband IS NULL OR btrim(other_lehreinheitgruppe.verband::text) = '' OR other_slv.verband IS NULL)
+				AND (other_lehreinheitgruppe.gruppe = other_slv.gruppe OR other_lehreinheitgruppe.gruppe IS NULL OR btrim(other_lehreinheitgruppe.gruppe::text) = '' OR other_slv.gruppe IS NULL)
+
+			WHERE current_kalender.kalender_id IN ($placeholders)
+		";
+
+		$result = $dbModel->execReadOnlyQuery($sql, array_merge($kalender_ids, $kalender_ids));
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+}
@@ -0,0 +1,350 @@
+<?php
+
+class VerbandCollisionCheck implements ICollisionCheck
+{
+
+	private $_ci;
+
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+		$this->_ci->load->model('ressource/Kalender_model', 'KalenderModel');
+		$this->_ci->load->library('VariableLib', array('uid' => getAuthUID()));
+		$this->_ci->load->library('PhrasesLib', array('ui'));
+
+	}
+
+	public function getName()
+	{
+		return 'verband';
+	}
+
+	public function check($data)
+	{
+		if (!isset($data->von, $data->bis, $data->kalender_id)) return [];
+
+		if ($this->_ci->variablelib->getVar('ignore_kollision') === 'true') return [];
+
+		$kollision_student = $this->_ci->variablelib->getVar('kollision_student') === 'false';
+		$kollision_reservierung = $this->_ci->variablelib->getVar('ignore_reservierung') === 'false';
+
+		if (!$kollision_student && !$kollision_reservierung) return [];
+
+		$dbModel = new DB_Model();
+		$collisions = [];
+
+		if ($kollision_student)
+		{
+			$union_event = "";
+
+			if ($kollision_reservierung)
+			{
+				$union_event = "
+					UNION
+					SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe, tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+					FROM lehre.tbl_kalender_event_teilnehmer
+					WHERE tbl_kalender_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+				";
+			}
+
+			$sql_gruppen = "
+				SELECT
+					other_kalender.von,
+					other_kalender.bis,
+					COALESCE(
+						other_lehreinheitguppe.gruppe_kurzbz,
+						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_lehreinheitguppe.semester ||
+						COALESCE(other_lehreinheitguppe.verband::text, '') ||
+						COALESCE(other_lehreinheitguppe.gruppe::text, '')
+					) AS gruppenname
+				FROM lehre.tbl_kalender current_kalender
+
+				JOIN (
+					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+					FROM lehre.tbl_kalender_lehreinheit
+					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+					". $union_event ."
+				) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
+
+				LEFT JOIN public.tbl_gruppe current_gruppe
+					ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
+
+				JOIN lehre.tbl_kalender other_kalender
+					ON other_kalender.kalender_id != current_kalender.kalender_id
+					AND other_kalender.von < ?
+					AND other_kalender.bis > ?
+
+				JOIN (
+					SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+						tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+					FROM lehre.tbl_kalender_lehreinheit
+					JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+					JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+					". $union_event ."
+				) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
+
+				LEFT JOIN public.tbl_gruppe other_gruppe
+					ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
+
+				LEFT JOIN public.tbl_studiengang stg
+					ON stg.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+
+				WHERE current_kalender.kalender_id = ?
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+				AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
+				AND (
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND (
+							current_lehreinheitguppe.verband IS NULL
+							OR (
+								current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
+								AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
+							)
+						)
+					)
+					OR
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						(
+							current_lehreinheitguppe.gruppe_kurzbz IS NULL
+							AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+							AND other_gruppe.direktinskription IS NOT TRUE
+						)
+						OR
+						(
+							current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+							AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+							AND current_gruppe.direktinskription IS NOT TRUE
+						)
+					)
+				)
+				AND other_kalender.kalender_id NOT IN (
+					SELECT vorgaenger_kalender_id
+					FROM lehre.tbl_kalender
+					WHERE vorgaenger_kalender_id IS NOT NULL
+				)
+			";
+
+			$result = $dbModel->execReadOnlyQuery($sql_gruppen, [
+				$data->bis,
+				$data->von,
+				$data->kalender_id,
+			]);
+
+			if (!isError($result) && hasData($result))
+			{
+				foreach (getData($result) as $row)
+					$collisions[] = $this->_ci->phraseslib->t('ui', 'verband_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		if ($kollision_reservierung && !$kollision_student)
+		{
+			$sql_reservierung = "
+				SELECT
+					other_kalender.von,
+					other_kalender.bis,
+					COALESCE(
+						other_event_teilnehmer.gruppe_kurzbz,
+						UPPER(stg.typ::text || stg.kurzbz::text) || '-' || other_event_teilnehmer.semester ||
+						COALESCE(other_event_teilnehmer.verband::text, '') ||
+						COALESCE(other_event_teilnehmer.gruppe::text, '')
+					) AS gruppenname
+				FROM lehre.tbl_kalender_event_teilnehmer current_event_teilnehmer
+				LEFT JOIN public.tbl_gruppe current_gruppe
+					ON current_gruppe.gruppe_kurzbz = current_event_teilnehmer.gruppe_kurzbz
+
+				JOIN lehre.tbl_kalender other_kalender
+					ON other_kalender.kalender_id != ?
+					AND other_kalender.von < ?
+					AND other_kalender.bis > ?
+
+				JOIN lehre.tbl_kalender_event_teilnehmer other_event_teilnehmer
+					ON other_event_teilnehmer.kalender_id = other_kalender.kalender_id
+					AND other_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+
+				LEFT JOIN public.tbl_gruppe other_gruppe
+					ON other_gruppe.gruppe_kurzbz = other_event_teilnehmer.gruppe_kurzbz
+
+				LEFT JOIN public.tbl_studiengang stg
+					ON stg.studiengang_kz = other_event_teilnehmer.studiengang_kz
+
+				WHERE current_event_teilnehmer.kalender_id = ?
+				AND current_event_teilnehmer.rolle_kurzbz = 'teilnehmer'
+				AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+				AND current_event_teilnehmer.studiengang_kz = other_event_teilnehmer.studiengang_kz
+				AND current_event_teilnehmer.semester = other_event_teilnehmer.semester
+				AND (
+					(
+						current_event_teilnehmer.gruppe_kurzbz IS NULL
+						AND other_event_teilnehmer.gruppe_kurzbz IS NULL
+						AND (
+							current_event_teilnehmer.verband IS NULL
+							OR (
+								current_event_teilnehmer.verband = other_event_teilnehmer.verband
+								AND (current_event_teilnehmer.gruppe IS NULL OR other_event_teilnehmer.gruppe IS NULL OR current_event_teilnehmer.gruppe = other_event_teilnehmer.gruppe)
+							)
+						)
+					)
+					OR
+					(
+						current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+						AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						(
+							current_event_teilnehmer.gruppe_kurzbz IS NULL
+							AND other_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+							AND other_gruppe.direktinskription IS NOT TRUE
+						)
+						OR
+						(
+							current_event_teilnehmer.gruppe_kurzbz IS NOT NULL
+							AND other_event_teilnehmer.gruppe_kurzbz IS NULL
+							AND current_gruppe.direktinskription IS NOT TRUE
+						)
+					)
+				)
+				AND other_kalender.kalender_id NOT IN (
+					SELECT vorgaenger_kalender_id
+					FROM lehre.tbl_kalender
+					WHERE vorgaenger_kalender_id IS NOT NULL
+				)
+			";
+
+			$result = $dbModel->execReadOnlyQuery($sql_reservierung, [
+				$data->kalender_id,
+				$data->bis,
+				$data->von,
+				$data->kalender_id,
+			]);
+
+			if (!isError($result) && hasData($result))
+			{
+				foreach (getData($result) as $row)
+					$collisions[] = $this->_ci->phraseslib->t('ui', 'reservierung_kollision') . ': ' . $row->gruppenname . ' (' . date('d.m.Y H:i', strtotime($row->von)) . ' - ' . date('d.m.Y H:i', strtotime($row->bis)) . ')';
+			}
+		}
+
+		return $collisions;
+	}
+
+	public function checkAll($kalender_ids)
+	{
+		if (empty($kalender_ids)) return [];
+
+		$dbModel = new DB_Model();
+
+		$placeholders = implode(',', array_fill(0, count($kalender_ids), '?'));
+
+		$sql = "
+			SELECT DISTINCT ON (current_kalender.kalender_id) current_kalender.kalender_id
+			FROM lehre.tbl_kalender current_kalender
+	
+			JOIN (
+				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+				FROM lehre.tbl_kalender_lehreinheit
+				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				UNION
+				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
+					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+				FROM lehre.tbl_kalender_event_teilnehmer
+			) current_lehreinheitguppe ON current_lehreinheitguppe.kalender_id = current_kalender.kalender_id
+	
+			LEFT JOIN public.tbl_gruppe current_gruppe
+				ON current_gruppe.gruppe_kurzbz = current_lehreinheitguppe.gruppe_kurzbz
+	
+			JOIN lehre.tbl_kalender other_kalender
+				ON other_kalender.kalender_id != current_kalender.kalender_id
+				AND other_kalender.von < current_kalender.bis
+				AND other_kalender.bis > current_kalender.von
+	
+			JOIN (
+				SELECT tbl_lehreinheitgruppe.studiengang_kz, tbl_lehreinheitgruppe.semester, tbl_lehreinheitgruppe.verband, tbl_lehreinheitgruppe.gruppe,
+					tbl_lehreinheitgruppe.gruppe_kurzbz, tbl_kalender_lehreinheit.kalender_id
+				FROM lehre.tbl_kalender_lehreinheit
+				JOIN lehre.tbl_lehreinheit ON tbl_lehreinheit.lehreinheit_id = tbl_kalender_lehreinheit.lehreinheit_id
+				JOIN lehre.tbl_lehreinheitgruppe ON tbl_lehreinheitgruppe.lehreinheit_id = tbl_lehreinheit.lehreinheit_id
+				UNION
+				SELECT tbl_kalender_event_teilnehmer.studiengang_kz, tbl_kalender_event_teilnehmer.semester, tbl_kalender_event_teilnehmer.verband, tbl_kalender_event_teilnehmer.gruppe,
+					tbl_kalender_event_teilnehmer.gruppe_kurzbz, tbl_kalender_event_teilnehmer.kalender_id
+				FROM lehre.tbl_kalender_event_teilnehmer
+			) other_lehreinheitguppe ON other_lehreinheitguppe.kalender_id = other_kalender.kalender_id
+	
+			LEFT JOIN public.tbl_gruppe other_gruppe
+				ON other_gruppe.gruppe_kurzbz = other_lehreinheitguppe.gruppe_kurzbz
+	
+			WHERE current_kalender.kalender_id IN ({$placeholders})
+			AND other_kalender.status_kurzbz NOT IN ('archived', 'deleted', 'to_delete')
+			AND current_lehreinheitguppe.studiengang_kz = other_lehreinheitguppe.studiengang_kz
+			AND current_lehreinheitguppe.semester = other_lehreinheitguppe.semester
+			AND (
+				(
+					current_lehreinheitguppe.gruppe_kurzbz IS NULL
+					AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+					AND (
+						current_lehreinheitguppe.verband IS NULL
+						OR (
+							current_lehreinheitguppe.verband = other_lehreinheitguppe.verband
+							AND (current_lehreinheitguppe.gruppe IS NULL OR other_lehreinheitguppe.gruppe IS NULL OR current_lehreinheitguppe.gruppe = other_lehreinheitguppe.gruppe)
+						)
+					)
+				)
+				OR
+				(
+					current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+					AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+					AND current_gruppe.direktinskription IS NOT TRUE
+					AND other_gruppe.direktinskription IS NOT TRUE
+				)
+				OR
+				(
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_gruppe.direktinskription IS NOT TRUE
+					)
+					OR
+					(
+						current_lehreinheitguppe.gruppe_kurzbz IS NOT NULL
+						AND other_lehreinheitguppe.gruppe_kurzbz IS NULL
+						AND current_gruppe.direktinskription IS NOT TRUE
+					)
+				)
+			)
+			AND other_kalender.kalender_id NOT IN (
+				SELECT vorgaenger_kalender_id
+				FROM lehre.tbl_kalender
+				WHERE vorgaenger_kalender_id IS NOT NULL
+			)
+			
+		";
+
+		$result = $dbModel->execReadOnlyQuery($sql, $kalender_ids);
+
+		if (isError($result) || !hasData($result)) return [];
+
+		$grouped = [];
+		foreach (getData($result) as $row)
+			$grouped[$row->kalender_id][] = true;
+
+		return $grouped;
+	}
+
+}
@@ -9,45 +9,48 @@ class PlausicheckDefinitionLib
 {
 	// set fehler for core plausichecks
 	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerKurzbz = array(
-		'AbbrecherAktiv',
-		'AbschlussstatusFehlt',
-		'AbschlusspruefungOderAbsolventFehlt',
-		'AktSemesterNull',
-		'AktiverStudentOhneStatus',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen',
-		'FalscheStatusabfolgeVorStudentstatus',
-		'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde',
-		'OrgformBewerberUngleichOrgformStudent',
-		'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform',
-		'StartsemesterUngleichPersonenkennzeichen',
-		'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachDiplomand',
-		'StudentstatusNachAbbrecher',
-		'DualesStudiumOhneMarkierung'
-		//'StudienplanUngueltig'
-		//'BewerberNichtZumRtAngetreten'
+	private $_fehlerLibMappings = array(
+		'AbbrecherAktiv' => 'AbbrecherAktiv',
+		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
+		'AktSemesterNull' => 'AktSemesterNull',
+		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
+		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
+		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
+		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
+		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
+		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
+		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
+		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
+		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
+		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
+		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
+		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
+		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
+		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
+		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
+		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
+		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
+		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
+		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
+		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);

+	/**
+	 * Gets all fehler_kurzbz-library mappings for fehler which need to be checked.
+	 */
+	public function getFehlerLibMappings()
+	{
+		return $this->_fehlerLibMappings;
+	}
+
 	/**
 	 * Gets all fehler_kurzbz for fehler which need to be checked.
 	 */
 	public function getFehlerKurzbz()
 	{
-		return $this->_fehlerKurzbz;
+		return array_keys($this->_fehlerLibMappings);
 	}
 }
@@ -6,43 +6,36 @@ class PlausicheckProducerLib
 {
 	const CI_PATH = 'application';
 	const CI_LIBRARY_FOLDER = 'libraries';
+	const EXTENSIONS_FOLDER = 'extensions';
 	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
 	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const CONFIG_FEHLER_INDEX = 'fehler';
-	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
-	const PRODUCER_LIB_NAME = 'producerLibName';
-	const EXTENSION_NAME = 'extensionName';

 	private $_ci; // ci instance
+	private $_extensionName; // name of extension
 	private $_konfiguration = []; // configuration parameters
-	private $_fehlerKurzbz = []; // fehler to produce
 	private $_fehlerLibMappings = []; // mappings of fehler and libraries for producing them
-	private $_apps = []; // apps of fehler to produce
+	private $_isForResolutionCheck = false; // mappings of fehler and libraries for producing them

 	public function __construct($params = null)
 	{
-		// set application(s))
-		if (isset($params['apps']))
-		{
-			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
-			if (is_array($params['apps'])) $this->_apps = $params['apps'];
-		}
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['fehlerLibMappings'])) $this->_fehlerLibMappings = $params['fehlerLibMappings'];
+		if (isset($params['isForResolutionCheck'])) $this->_isForResolutionCheck = $params['isForResolutionCheck'];
+
+		// set application
+		$app = isset($params['app']) ? $params['app'] : null;

 		$this->_ci =& get_instance(); // get ci instance

 		// load libraries
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('ExtensionsLib');

 		// load models
-		$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
 		$this->_ci->load->model('system/Fehlerkonfiguration_model', 'FehlerkonfigurationModel');

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

 		if (hasData($fehlerkonfigurationRes))
 		{
@@ -53,88 +46,10 @@ class PlausicheckProducerLib
 				$this->_konfiguration[$fk->fehler_kurzbz][$fk->konfigurationstyp_kurzbz] = $fk->konfiguration;
 			}
 		}
-
-		// get all fehler to be produced (by kurzbz array or app)
-		if (isset($params['fehlerKurzbz']) && !isEmptyArray($params['fehlerKurzbz']))
-		{
-			$this->_fehlerKurzbz = $params['fehlerKurzbz'];
-		}
-		else
-		{
-			// get fehler by apps
-			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
-
-			if (hasData($fehlerRes)) $this->_fehlerKurzbz = array_column(getData($fehlerRes), 'fehler_kurzbz');
-		}
-
-		// get producer file paths for the fehler
-
-		// Load Fehler Entries of Core
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_INDEX);
-
-		if (isset($configArray) && is_array($configArray))
-		{
-			foreach ($configArray as $coreEntry)
-			{
-				if (!isset($coreEntry[self::FEHLER_KURZBZ_NAME])
-					|| !isset($coreEntry[self::PRODUCER_LIB_NAME])
-					|| !in_array($coreEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
-				) {
-					continue;
-				}
-
-				$this->_fehlerLibMappings[$coreEntry[self::FEHLER_KURZBZ_NAME]][self::PRODUCER_LIB_NAME] = $coreEntry[self::PRODUCER_LIB_NAME];
-			}
-		}
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$configFilePath = ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
-				$configFilename = APPPATH.'config/'.$configFilePath;
-
-				// if fehler config file exists in extension
-				if (file_exists($configFilename))
-				{
-					$config = array(); // default value
-
-					// include the config file
-					include($configFilename);
-
-					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
-					{
-						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
-						{
-							if (
-								!isset($extensionEntry[self::FEHLER_KURZBZ_NAME])
-								|| !isset($extensionEntry[self::PRODUCER_LIB_NAME])
-								|| !in_array($extensionEntry[self::FEHLER_KURZBZ_NAME], $this->_fehlerKurzbz)
-							) {
-								continue;
-							}
-
-							// add extension config data to fehler lib mappings
-							$fehler_kurzbz = $extensionEntry[self::FEHLER_KURZBZ_NAME];
-
-							$this->_fehlerLibMappings[$fehler_kurzbz][self::PRODUCER_LIB_NAME] = $extensionEntry[self::PRODUCER_LIB_NAME];
-							$this->_fehlerLibMappings[$fehler_kurzbz][self::EXTENSION_NAME] = $ext->name;
-						}
-					}
-				}
-			}
-		}
 	}

 	/**
-	 * Produces multiple plausicheck issues at once, and saves them in the database.
+	 * Produces multiple plausicheck issues at once and saved them to db.
 	 * @param array $params passed to each plausicheck
 	 * @return result object with occured error and info
 	 */
@@ -144,17 +59,10 @@ class PlausicheckProducerLib
 		$result->errors = [];
 		$result->infos = [];

-		$mappingFehlerKurbz = array_keys($this->_fehlerLibMappings);
-
-		// check if all issues to produce could be found in database
-		//~ $notFoundFehlerKurzbz = array_diff($this->_fehlerKurzbz, $mappingFehlerKurbz);
-
-		//~ if (!isEmptyArray($notFoundFehlerKurzbz))
-			//~ $result->errors[] = error('Fehler to produce not defined in config: '.implode(', ', $notFoundFehlerKurzbz));
-
-		foreach ($mappingFehlerKurbz as $fehler_kurzbz)
+		foreach ($this->_fehlerLibMappings as $fehler_kurzbz => $libName)
 		{
 			$plausicheckRes = $this->producePlausicheckIssue(
+				$libName,
 				$fehler_kurzbz,
 				$params
 			);
@@ -188,23 +96,14 @@ class PlausicheckProducerLib

 	/**
 	 * Executes plausicheck using a given library, returns the result.
+	 * @param $libName string name of library producing the issue
 	 * @param $fehler_kurzbz string unique short name of fehler, for which issue is produced
 	 * @param $params parameters passed to issue production method
 	 */
-	public function producePlausicheckIssue($fehler_kurzbz, $params)
+	public function producePlausicheckIssue($libName, $fehler_kurzbz, $params)
 	{
-		//if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return error("Mapping for Fehler " . $fehler_kurzbz . " was not found");
-		if (!isset($this->_fehlerLibMappings[$fehler_kurzbz])) return success(null);
-
-		$mapping = $this->_fehlerLibMappings[$fehler_kurzbz];
-
-		if (!isset($mapping[self::PRODUCER_LIB_NAME]) || isEmptyString($mapping[self::PRODUCER_LIB_NAME]))
-			return error("No producer lib name set for Fehler " . $fehler_kurzbz);
-
-		$libName = $mapping[self::PRODUCER_LIB_NAME];
-
 		// if called from extension (extension name set), path includes extension names
-		$libRootPath = isset($mapping[self::EXTENSION_NAME]) ? ExtensionsLib::EXTENSIONS_DIR_NAME . '/' . $mapping[self::EXTENSION_NAME] . '/' : '';
+		$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';

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

 		$lowercaseLibName = mb_strtolower($libName);
@@ -234,13 +133,4 @@ class PlausicheckProducerLib
 		// call the function for checking for issue production
 		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($params);
 	}
-
-	/**
-	 * Get fehler kurzbz -> library mappings.
-	 * @return array with fehler kurzbz as key and fehlerinfo as values
-	 */
-	public function getFehlerMappings()
-	{
-		return $this->_fehlerLibMappings;
-	}
 }
@@ -9,177 +9,43 @@ class PlausicheckResolverLib
 	const EXTENSIONS_FOLDER = 'extensions';
 	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
 	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
-	const CONFIG_FEHLER_NAME = 'fehler';
-	const FEHLERCODE_NAME = 'fehlercode';
-	const FEHLER_KURZBZ_NAME = 'fehler_kurzbz';
-	const RESOLVER_LIB_NAME = 'resolverLibName';
-	const PRODUCER_IS_RESOLVER_NAME = 'producerIsResolver';
-	const EXTENSION_NAME = 'extensionName';
-

 	private $_ci; // ci instance
 	private $_extensionName; // name of extension
-	private $_fehlercodes = []; // fehlercodes to resolve
-	private $_apps = []; // apps for which issues should be resolved
 	private $_codeLibMappings = []; // mappings for issues which explicitly defined resolver
-	private $_defaultIssueParams = ['issue_id' => 'issue_id', 'issue_person_id' => 'person_id', 'issue_oe_kurzbz' => 'oe_kurzbz'];
+	private $_codeProducerLibMappings = []; // mappings for issues which are resolved with the same check as they are produced

 	public function __construct($params = null)
 	{
-		// set application(s))
-		if (isset($params['apps']))
-		{
-			if (is_string($params['apps'])) $params['apps'] = [$params['apps']];
-			if (is_array($params['apps'])) $this->_apps = $params['apps'];
-		}
+		// set extension name if called from extension
+		if (isset($params['extensionName'])) $this->_extensionName = $params['extensionName'];
+		if (isset($params['codeLibMappings'])) $this->_codeLibMappings = $params['codeLibMappings'];
+		if (isset($params['codeProducerLibMappings'])) $this->_codeProducerLibMappings = $params['codeProducerLibMappings'];

 		$this->_ci =& get_instance(); // get ci instance

-		// get all fehler to be produced (by kurzbz array or app)
-		if (isset($params['fehlercodes']) && !isEmptyArray($params['fehlercodes']))
-		{
-			$this->_fehlercodes = $params['fehlercodes'];
-		}
-		elseif (isset($params['apps']) && !isEmptyArray($params['apps']))
-		{
-			$this->_ci->load->model('system/Fehler_model', 'FehlerModel');
-			$fehlerRes = $this->_ci->FehlerModel->getByApps($this->_apps);
-
-			if (hasData($fehlerRes))
-			{
-				$this->_fehlercodes = array_column(getData($fehlerRes), 'fehlercode');
-			}
-		}
-
 		$this->_ci->load->library('IssuesLib');
-		$this->_ci->load->library('ExtensionsLib');
-
-		$this->_ci->load->config('fehler');
-
-		// Load Fehler Entries of Core
-		$configArray = $this->_ci->config->item(self::CONFIG_FEHLER_NAME);
-
-		foreach ($configArray as $coreEntry)
-		{
-			// each entry must have fehlercode
-			if (!isset($coreEntry[self::FEHLERCODE_NAME])
-				|| !in_array($coreEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
-			) {
-				continue;
-			}
-
-			// fill code lib mappings with needed values
-			$fehlercode = $coreEntry[self::FEHLERCODE_NAME];
-
-			if (isset($coreEntry[self::FEHLER_KURZBZ_NAME]))
-				$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $coreEntry[self::FEHLER_KURZBZ_NAME];
-
-			$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME] = $coreEntry[self::RESOLVER_LIB_NAME] ?? null;
-			$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
-				= $coreEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
-		}
-
-		// load fehler entries of extensions
-		$extensions = $this->_ci->extensionslib->getInstalledExtensions();
-
-		if (hasData($extensions))
-		{
-			$extensionArray = array();
-
-			$extensionsData = getData($extensions);
-
-			foreach ($extensionsData as $ext)
-			{
-				$configFilename = APPPATH.'config/'.ExtensionsLib::EXTENSIONS_DIR_NAME.'/'.$ext->name.'/'.self::CONFIG_FEHLER_NAME.'.php';
-
-				// if fehler config file exists in teh extension
-				if (file_exists($configFilename))
-				{
-					$config = array(); // default value
-
-					// include config data
-					include($configFilename);
-
-					if (isset($config[self::CONFIG_FEHLER_NAME]) && is_array($config[self::CONFIG_FEHLER_NAME]))
-					{
-						foreach ($config[self::CONFIG_FEHLER_NAME] as $extensionEntry)
-						{
-							if (
-								!isset($extensionEntry[self::FEHLERCODE_NAME])
-								|| !in_array($extensionEntry[self::FEHLERCODE_NAME], $this->_fehlercodes)
-							) {
-								continue;
-							}
-
-							// add extension config data to fehlercode lib mappings
-							$fehlercode = $extensionEntry[self::FEHLERCODE_NAME];
-							if (isset($extensionEntry[self::FEHLER_KURZBZ_NAME]))
-								$this->_codeLibMappings[$fehlercode][self::FEHLER_KURZBZ_NAME] = $extensionEntry[self::FEHLER_KURZBZ_NAME];
-
-							$this->_codeLibMappings[$fehlercode][self::RESOLVER_LIB_NAME]
-								= $extensionEntry[self::RESOLVER_LIB_NAME] ?? null;
-							$this->_codeLibMappings[$fehlercode][self::EXTENSION_NAME] = $ext->name;
-							$this->_codeLibMappings[$fehlercode][self::PRODUCER_IS_RESOLVER_NAME]
-								= $extensionEntry[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
-						}
-					}
-				}
-			}
-		}
+		$this->_ci->load->library('issues/PlausicheckProducerLib', ['extensionName' => $this->_extensionName, 'isForResolutionCheck' => true]);
 	}

 	/**
 	 * Reseolves multiple plausicheck issues at once.
-	 * @param array $openIssues passed issues to resolve. If null, issues with fehlercodes in _fehlercodes property are loaded
+	 * @param array $codeLibMappings contains fehler type to check and library responsible for check (fehlercode => libName)
+	 * @param array $openIssues passed issues to resolve
 	 * @return result object with occured error and info
 	 */
-	public function resolvePlausicheckIssues($openIssues = null)
+	public function resolvePlausicheckIssues($openIssues)
 	{
-		// loading producer lib with fehler kurzbz of provided code mappings, for "self resolving" issues
-		$this->_ci->load->library(
-			'issues/PlausicheckProducerLib',
-			['fehlerKurzbz' => array_column($this->_codeLibMappings, self::FEHLER_KURZBZ_NAME)], 'PlausicheckResolverProducerLib'
-		);
-
-		if (!isset($openIssues))
-		{
-			if (!isEmptyArray($this->_fehlercodes))
-			{
-				$this->_ci->load->model('system/Issue_model', 'IssueModel');
-
-				// load open issues with given errorcodes
-				$openIssuesRes = $this->_ci->IssueModel->getOpenIssues(
-					$this->_fehlercodes
-				);
-
-				$openIssues = hasData($openIssuesRes) ? getData($openIssuesRes) : [];
-			}
-		}
-
-
 		$result = new StdClass();
 		$result->errors = [];
 		$result->infos = [];

-		// check if all issues to resolve could be found in database
-		//~ $mappingFehlerCodes = array_keys($this->_codeLibMappings);
-		//~ $notFoundFehlerCodes = array_diff($this->_fehlercodes, $mappingFehlerCodes);
-
-		//~ if (!isEmptyArray($notFoundFehlerCodes))
-			//~ $result->errors[] = error('Fehler to resolve not defined in config: '.implode(', ', $notFoundFehlerCodes));
-
 		foreach ($openIssues as $issue)
 		{
-			$params = [];
-			foreach ($this->_defaultIssueParams as $index => $propertyName)
-			{
-				$params[$index] = $issue->{$propertyName};
-			}
-
 			// add person id and oe kurzbz automatically as params, merge it with additional params
 			// decode bewerbung_parameter into assoc array
 			$params = array_merge(
-				$params,
+				array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
 				isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
 			);

@@ -188,72 +54,69 @@ class PlausicheckResolverLib
 			// ignore if Fehlercode is not in libmappings (shouldn't be checked)
 			if (isset($this->_codeLibMappings[$issue->fehlercode]))
 			{
-				$codeLibMapping = $this->_codeLibMappings[$issue->fehlercode];
-				$libName = $codeLibMapping[self::RESOLVER_LIB_NAME] ?? null;
-				$extensionName = $codeLibMapping[self::EXTENSION_NAME] ?? null;
-				$producerIsResolver = $codeLibMapping[self::PRODUCER_IS_RESOLVER_NAME] ?? false;
+				$libName = $this->_codeLibMappings[$issue->fehlercode];

-				if ($producerIsResolver)
+				// if called from extension (extension name set), path includes extension names
+				$libRootPath = isset($this->_extensionName) ? self::EXTENSIONS_FOLDER . '/' . $this->_extensionName . '/' : '';
+
+				// path for loading issue library
+				$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
+
+				// file path of library for check if file exists
+				$issuesLibFilePath = DOC_ROOT . self::CI_PATH
+					. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
+
+				// check if library file exists
+				if (!file_exists($issuesLibFilePath))
 				{
-					// execute same check as used for issue production
-					$issueResolvedRes = $this->_ci->PlausicheckResolverProducerLib->producePlausicheckIssue(
-						$issue->fehler_kurzbz,
-						$params
-					);
+					// log error and continue with next issue if not
+					$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
+					continue;
+				}

-					if (isError($issueResolvedRes))
-					{
-						$result->errors[] = getError($issueResolvedRes);
-					}
-					else
-					{
-						$issueResolved = !hasData($issueResolvedRes);
-					}
+				// load library connected to fehlercode
+				$this->_ci->load->library($issuesLibPath . $libName);
+
+				$lowercaseLibName = mb_strtolower($libName);
+
+				// check if method is defined in library class
+				if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+				{
+					// log error and continue with next issue if not
+					$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
+					continue;
+				}
+
+				// call the function for checking for issue resolution
+				$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
 				}
 				else
 				{
-					// if called from extension (extension name set), path includes extension names
-					$libRootPath = isset($extensionName) ? self::EXTENSIONS_FOLDER . '/' . $extensionName . '/' : '';
+					$issueResolved = getData($issueResolvedRes) === true;
+				}
+			}
+			elseif (isset($this->_codeProducerLibMappings[$issue->fehlercode])) // check if it is an issue without explicit resolver, "self-resolving"
+			{
+				$libName = $this->_codeProducerLibMappings[$issue->fehlercode];

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

-					// file path of library for check if file exists
-					$issuesLibFilePath = DOC_ROOT . self::CI_PATH
-						. '/' . $libRootPath . self::CI_LIBRARY_FOLDER . '/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-					// check if library file exists
-					if (!file_exists($issuesLibFilePath))
-					{
-						// log error and continue with next issue if not
-						$result->errors[] = "Issue library file " . $issuesLibFilePath . " does not exist";
-						continue;
-					}
-
-					// load library connected to fehlercode
-					$this->_ci->load->library($issuesLibPath . $libName);
-
-					$lowercaseLibName = mb_strtolower($libName);
-
-					// check if method is defined in library class
-					if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-					{
-						// log error and continue with next issue if not
-						$result->errors[] = "Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName";
-						continue;
-					}
-
-					// call the function for checking for issue resolution
-					$issueResolvedRes = $this->_ci->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-					if (isError($issueResolvedRes))
-					{
-						$result->errors[] = getError($issueResolvedRes);
-					}
-					else
-					{
-						$issueResolved = getData($issueResolvedRes) === true;
-					}
+				if (isError($issueResolvedRes))
+				{
+					$result->errors[] = getError($issueResolvedRes);
+				}
+				else
+				{
+					$issueResolved = !hasData($issueResolvedRes);
 				}
 			}

@@ -23,11 +23,7 @@ class AbbrecherAktiv extends PlausiChecker
 			AND benutzer.aktiv=true";

 	protected $_config_params = ['exkludierteStudiengaenge' => " AND stg.studiengang_kz NOT IN ?"];
-	protected $_params_for_checking = [
-		'studiengang_kz' => " AND stg.studiengang_kz = ?",
-		'prestudent_id' => " AND pre.prestudent_id = ?",
-		'person_id' => " AND pre.person_id = ?"
-	];
+	protected $_params_for_checking = ['studiengang_kz' => " AND stg.studiengang_kz = ?", 'prestudent_id' => " AND pre.prestudent_id = ?"];
 	protected $_fehlertext_params = ['prestudent_id'];
 	protected $_resolution_params = ['prestudent_id'];
 }
@@ -1,156 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AbschlusspruefungOderAbsolventFehlt 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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getAbschlusspruefungOderAbsolventFehlt(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_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, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * If there is a final exam, there should be an absolvent status (and vice versa).
-	 * @param studiensemester_kurzbz Status from this and previous semester is checked
-	 * @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
-	 */
-	public function getAbschlusspruefungOderAbsolventFehlt($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
-		$params = array();
-
-
-		$qry = "
-				SELECT DISTINCT ON (prestudent_id) person_id, prestudent_id, studiengang_kz, prestudent_stg_oe_kurzbz FROM (
-					WITH meldestichtag AS (
-						SELECT
-							meldestichtag, studiensemester_kurzbz
-						FROM
-							bis.tbl_bismeldestichtag";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			$semesterArr = array($studiensemester_kurzbz);
-
-			if (hasData($prevStudiensemesterRes))
-			{
-				// if Studiensemester given, check only if has status in current or previous semester
-				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-			}
-
-			$qry .= " WHERE studiensemester_kurzbz IN ?";
-
-			$params[] = $semesterArr;
-		}
-
-			$qry .= "
-					)
-					SELECT
-						prestudent.person_id, prestudent.prestudent_id,
-						stg.studiengang_kz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
-						EXISTS (
-							SELECT 1
-							FROM
-								lehre.tbl_abschlusspruefung pr
-							WHERE
-								student_uid = benutzer.uid
-								AND abschlussbeurteilung_kurzbz <> 'nicht'
-								AND pr.datum < meldestichtag.meldestichtag
-						) AS hat_pruefung,
-						(status.status_kurzbz IS NOT NULL) AS hat_absolvent,
-						(status.ausbildungssemester = stg.max_semester) AS absolvent_in_letztem_semester
-					FROM
-						meldestichtag
-						CROSS JOIN public.tbl_student student
-						JOIN public.tbl_prestudent prestudent USING (prestudent_id)
-						JOIN public.tbl_benutzer benutzer ON (benutzer.uid = student.student_uid)
-						JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
-						LEFT JOIN public.tbl_prestudentstatus status
-							ON status.prestudent_id = prestudent.prestudent_id
-							AND status.status_kurzbz = 'Absolvent'
-							AND status.datum < meldestichtag.meldestichtag
-						WHERE EXISTS (
-							SELECT 1
-							FROM
-								public.tbl_prestudentstatus
-							WHERE
-								prestudent_id = prestudent.prestudent_id
-								AND studiensemester_kurzbz = meldestichtag.studiensemester_kurzbz
-						)";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		$qry .=	"
-				) prestudenten
-				WHERE
-					(hat_absolvent AND absolvent_in_letztem_semester AND hat_pruefung = FALSE)
-					OR (hat_pruefung AND hat_absolvent = FALSE)";
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -19,14 +19,12 @@ class AbschlussstatusFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAbschlussstatusFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -57,7 +55,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,7 +62,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -105,26 +101,23 @@ class AbschlussstatusFehlt extends PlausiChecker

 		if (isset($studiensemester_kurzbz))
 		{
-			$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);

 			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;

-			$semesterArr = array($studiensemester_kurzbz);
-
 			if (hasData($prevStudiensemesterRes))
 			{
 				// if Studiensemester given, check only if has status in current or previous semester
-				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
+				$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;
 			}
-
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = pre.prestudent_id
-					)";
-			$params[] = $semesterArr;
 		}

 		if (isset($studiengang_kz))
@@ -139,12 +132,6 @@ class AbschlussstatusFehlt extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,10 +19,9 @@ class AktSemesterNull extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -57,17 +56,11 @@ class AktSemesterNull extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktSemesterNull(
-		$studiensemester_kurzbz,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
+	public function getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
 		$params = array($studiensemester_kurzbz);

 		$qry = "
@@ -96,12 +89,6 @@ class AktSemesterNull extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -18,10 +18,9 @@ class AktiverStudentOhneStatus extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getAktiverStudentOhneStatus($studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -49,11 +48,10 @@ class AktiverStudentOhneStatus extends PlausiChecker
 	 * Students with active Benutzer should have a status in the current semester.
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getAktiverStudentOhneStatus($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -90,12 +88,6 @@ class AktiverStudentOhneStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAktiverStudentstatusOhneKontobuchung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -63,7 +61,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -71,7 +68,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -113,13 +109,6 @@ class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -66,7 +64,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -74,7 +71,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz, $studiensemester_kurzbz, $studiensemester_kurzbz);
@@ -109,12 +105,6 @@ class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -1,122 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class BeginndatumVorBismeldung 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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getBeginndatumVorBismeldung(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_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,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz,
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Beginndatum shouldn't be before Bismeldedatum if the Bismeldedatum has already  been reached.
-	 * @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 exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getBeginndatumVorBismeldung(
-		$studiensemester_kurzbz,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-
-		$bismeldestichtagRes = $this->_ci->BismeldestichtagModel->getByStudiensemester($studiensemester_kurzbz);
-
-		if (isError($bismeldestichtagRes)) return $bismeldestichtagRes;
-
-		if (!hasData($bismeldestichtagRes)) return success(array());
-
-		$bismeldestichtag = getData($bismeldestichtagRes)[0]->meldestichtag;
-
-		$params = array($bismeldestichtag, $studiensemester_kurzbz, $bismeldestichtag);
-
-		$qry = "
-			SELECT
-				prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz
-			FROM
-				public.tbl_prestudent prestudent
-				JOIN public.tbl_prestudentstatus status ON(prestudent.prestudent_id=status.prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				LEFT JOIN bis.tbl_orgform USING(orgform_kurzbz)
-				JOIN public.tbl_studiengang stg USING(studiengang_kz)
-			WHERE
-				status.datum < ?::date
-				AND status.studiensemester_kurzbz = ?
-				AND status.insertamum > ?::date + interval '1' day
-				AND stg.melderelevant
-				AND prestudent.bismelden";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent.prestudent_id = ?";
-			$params[] = $prestudent_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,14 +19,12 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getBewerberNichtZumRtAngetreten(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -60,7 +58,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
@@ -116,12 +112,6 @@ class BewerberNichtZumRtAngetreten extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumAbschlusspruefungFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -60,7 +58,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param abschlusspruefung_id int if check is to be executed for a certain Abschlussprüfung
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -116,12 +112,6 @@ class DatumAbschlusspruefungFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class DatumSponsionFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDatumSponsionFehlt(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -60,7 +58,6 @@ class DatumSponsionFehlt extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param abschlusspruefung_id int if check is to be executed only for a certain Abschlussprüfung
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -68,7 +65,6 @@ class DatumSponsionFehlt extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$abschlusspruefung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -116,12 +112,6 @@ class DatumSponsionFehlt extends PlausiChecker
 			$params[] = $abschlusspruefung_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -18,10 +18,9 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -51,16 +50,11 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 	 * Status Dates and status studysemester dates should be in correct order.
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if check is to be executed only for certain Studiengaenge
 	 * @return success with prestudents or error
 	 */
-	public function getDatumStudiensemesterFalscheReihenfolge(
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
+	public function getDatumStudiensemesterFalscheReihenfolge($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
+	{
 		$params = array();

 		// all active students with Status student in current semester
@@ -103,12 +97,6 @@ class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getDualesStudiumOhneMarkierung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -63,7 +61,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -71,7 +68,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -136,12 +132,6 @@ class DualesStudiumOhneMarkierung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getFalscheAnzahlAbschlusspruefungen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -57,7 +55,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
@@ -65,7 +62,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -115,12 +111,6 @@ class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,13 +19,12 @@ class FalscheAnzahlHeimatadressen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$personRes = $this->getFalscheAnzahlHeimatadressen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);

@@ -19,13 +19,12 @@ class FalscheAnzahlZustelladressen extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$personRes = $this->getFalscheAnzahlZustelladressen(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);

@@ -1,186 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscheStatusabfolgeVorStudentstatus extends PlausiChecker
-{
-	private $_statusAbfolge = array('Interessent', 'Bewerber', 'Aufgenommener', 'Student');
-
-	public function executePlausiCheck($params)
-	{
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-
-		$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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getFalscheStatusabfolgeVorStudentstatus(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_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,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz,
-						'status_abfolge' => implode(', ', $this->_statusAbfolge)
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * There should be certain order of status before the student status.
-	 * @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 exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getFalscheStatusabfolgeVorStudentstatus(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array($this->_statusAbfolge);
-
-		$qry = "
-			SELECT
-				DISTINCT person_id, prestudent_id, prestudent_stg_oe_kurzbz, studiensemester_kurzbz
-			FROM
-			(
-				SELECT
-					prestudent.person_id, prestudent.prestudent_id,
-					stg.studiengang_kz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, status.studiensemester_kurzbz,
-					status.status_kurzbz, status.datum, status.insertamum, status.ext_id,
-					LAG(status.status_kurzbz, 1)
-						OVER (
-							PARTITION BY prestudent.prestudent_id
-							ORDER BY status.datum, status.insertamum, status.ext_id
-						) AS prev_status_kurzbz
-				FROM
-					public.tbl_prestudent prestudent
-					JOIN public.tbl_prestudentstatus status ON (prestudent.prestudent_id=status.prestudent_id)
-					JOIN public.tbl_person USING(person_id)
-					LEFT JOIN bis.tbl_orgform USING(orgform_kurzbz)
-					JOIN public.tbl_studiengang stg USING(studiengang_kz)
-				WHERE
-					status.status_kurzbz IN ?
-					AND stg.melderelevant
-					AND prestudent.bismelden
-					-- there should be a student already
-					AND EXISTS (
-						SELECT 1
-						FROM
-							public.tbl_prestudentstatus
-						WHERE
-							prestudent_id = prestudent.prestudent_id
-							AND status_kurzbz = 'Student'
-							AND datum >= status.datum
-					)
-			) prestudents
-			WHERE
-			(";
-
-		foreach ($this->_statusAbfolge as $idx => $status_kurzbz)
-		{
-			// previous status should be either same status, or previous status, or null in case of first status
-			if ($idx != 0)$qry .= " OR ";
-			$qry .= " (status_kurzbz = ? AND prev_status_kurzbz NOT IN ?";
-			$prev_status_kurzbz = array($status_kurzbz);
-
-			if ($idx == 0)
-				$qry .= " AND prev_status_kurzbz IS NOT NULL";
-			else
-				$prev_status_kurzbz[] = $this->_statusAbfolge[$idx - 1];
-
-			$qry .= ')';
-
-			$params[] = $status_kurzbz;
-			$params[] = $prev_status_kurzbz;
-		}
-
-		$qry .= "
-			)";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			$semesterArr = array($studiensemester_kurzbz);
-
-			if (hasData($prevStudiensemesterRes))
-			{
-				// if Studiensemester given, check only if has status in current or previous semester
-				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-			}
-
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = prestudents.prestudent_id
-					)";
-
-			$params[] = $semesterArr;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		$qry .= " ORDER BY person_id DESC, prestudent_id DESC, prestudent_stg_oe_kurzbz, studiensemester_kurzbz";
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,131 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscherIncomingZweckPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getFalscherIncomingZweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Incomings should have the correct Zweck.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param bisio_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getFalscherIncomingZweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-		$studiensemester_clause = '';
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$studiensemester_clause = "AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$qry = "
-		SELECT * FROM (
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, zw.zweck_code, stg.studiengang_kz,
-				bisio.bisio_id, COUNT(zw.zweck_code) OVER (PARTITION BY bisio_id) AS anzahl
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiensemester sem ON status.studiensemester_kurzbz = sem.studiensemester_kurzbz
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-				JOIN bis.tbl_bisio bisio ON stud.student_uid = bisio.student_uid
-				JOIN bis.tbl_bisio_zweck zw USING (bisio_id)
-			WHERE
-				stg.melderelevant
-				AND pre.bismelden
-				AND status.status_kurzbz = 'Incoming'
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				{$studiensemester_clause}
-		) zwecke
-		WHERE anzahl = 1 AND zweck_code NOT IN ('1', '2', '3')";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND zwecke.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND zwecke.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -19,10 +19,9 @@ class GbDatumWeitZurueck extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, $person_id, $exkludierte_studiengang_kz);
+		$personRes = $this->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz, null, $exkludierte_studiengang_kz);

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

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

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getInaktiverStudentAktiverStatus(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -60,26 +58,21 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
 	public function getInaktiverStudentAktiverStatus(
-		$studiensemester_kurzbz = null,
+		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
-		if (!isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
-			$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
+		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
+		$aktStudiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();

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

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

 		$params = array($studiensemester_kurzbz);

@@ -110,12 +103,6 @@ class InaktiverStudentAktiverStatus extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,13 +19,12 @@ class IncomingHeimatNationOesterreich extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$personRes = $this->getIncomingHeimatNationOesterreich(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);

@@ -18,10 +18,9 @@ class IncomingOhneIoDatensatz extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getIncomingOhneIoDatensatz($studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -49,11 +48,10 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 	 * Incoming should have IN/OUT data.
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getIncomingOhneIoDatensatz($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -87,12 +85,6 @@ class IncomingOhneIoDatensatz extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getIncomingOrGsFoerderrelevant(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -57,7 +55,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
 	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param person_id int if check is to be executed only for one person
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return object success or error
 	 */
@@ -65,7 +62,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 		$studiensemester_kurzbz = null,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -118,12 +114,6 @@ class IncomingOrGsFoerderrelevant extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -19,14 +19,12 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getInskriptionVorLetzerBismeldung(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -61,7 +59,7 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker

 	/**
 	 * Students of a semester shouldn't start studies before the date of Bismeldung.
-	 * e.g. If student studies in WS2022 datum of status shouldn't be before 15.4.2022
+	 * e.g. If student studies in WS2022 datum of status shouldn't be before 15.4.2020
 	 * e.g. If student studies in SS2022 datum of status shouldn't be before 15.11.2022
 	 * @param studiensemester_kurzbz string check is to be executed for certain Studiensemester
 	 * @param studiengang_kz int if check is to be executed for certain Studiengang
@@ -73,14 +71,11 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		// get Bismeldedatum
 		$datumBis = $this->_getBisdateFromSemester($studiensemester_kurzbz);

-		if (!$datumBis) return success([]);
-
 		$params = array($datumBis, $studiensemester_kurzbz, $datumBis);

 		// get active students
@@ -122,12 +117,6 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -143,16 +132,17 @@ class InskriptionVorLetzerBismeldung extends PlausiChecker
 	 */
 	private function _getBisdateFromSemester($studiensemester_kurzbz)
 	{
-		$bisdate = null;
+		$semesterYear = substr($studiensemester_kurzbz, 2, 6);
+		$semesterType = substr($studiensemester_kurzbz, 0, 2);

-		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$prevSemester = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-		if (!hasData($prevSemester)) return null;
-		$prevSemester = getData($prevSemester)[0]->studiensemester_kurzbz;
+		if ($semesterType == 'SS')
+		{
+			return date_format(date_create(($semesterYear - 1)."-11-15"), 'Y-m-d');
+		}

-		$this->_ci->load->model('codex/Bismeldestichtag_model', 'BismeldestichtagModel');
-		$bisDate = $this->_ci->BismeldestichtagModel->getLastReachedMeldestichtag($prevSemester);
-		if (!hasData($bisDate)) return null;
-		return getData($bisDate)[0]->meldestichtag;
+		if ($semesterType == 'WS')
+		{
+			return date_format(date_create($semesterYear."-04-15"), 'Y-m-d');
+		}
 	}
 }
@@ -1,125 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class KeinAufenthaltszweckPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getKeinAufenthaltszweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('bisio_id' => $prestudent->bisio_id),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Students with mobility should have Aufenthaltszweck.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getKeinAufenthaltszweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz,
-				zw.zweck_code, stg.studiengang_kz, bisio.bisio_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiensemester sem ON status.studiensemester_kurzbz = sem.studiensemester_kurzbz
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-				JOIN bis.tbl_bisio bisio ON stud.student_uid = bisio.student_uid
-				LEFT JOIN bis.tbl_bisio_zweck zw USING (bisio_id)
-			WHERE
-				(zw.zweck_code IS NULL OR zw.zweck_code = '')
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND bisio.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -18,12 +18,11 @@ class NationNichtOesterreichAberGemeinde extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$personRes = $this->getNationNichtOesterreichAberGemeinde(
 			$studiengang_kz,
-			$person_id,
+			null,
 			$exkludierte_studiengang_kz
 		);

@@ -1,149 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class OrgformBewerberUngleichOrgformStudent 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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getOrgformBewerberUngleichOrgformStudent(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_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,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz,
-						'bewerber_studiensemester_kurzbz' => $prestudent->bewerber_studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Orgform of Bewerber should be same as of student (Orgform of Status AND Studienplan)
-	 * @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 exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getOrgformBewerberUngleichOrgformStudent(
-		$studiensemester_kurzbz,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent.prestudent_id) prestudent.person_id, prestudent.prestudent_id, students.studiensemester_kurzbz,
-				bewerber_status.studiensemester_kurzbz AS bewerber_studiensemester_kurzbz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent prestudent
-				JOIN public.tbl_prestudentstatus bewerber_status
-					ON prestudent.prestudent_id = bewerber_status.prestudent_id AND bewerber_status.status_kurzbz = 'Bewerber'
-				JOIN lehre.tbl_studienplan bewerber_studienplan ON bewerber_status.studienplan_id = bewerber_studienplan.studienplan_id
-				JOIN (
-					SELECT
-						DISTINCT ON (prestudent_id) prestudent_id, st.studiensemester_kurzbz,
-						pl.orgform_kurzbz AS studienplan_orgform_kurzbz
-					FROM
-						public.tbl_prestudentstatus st
-						JOIN lehre.tbl_studienplan pl USING (studienplan_id)
-					WHERE
-						status_kurzbz = 'Student'
-					ORDER BY
-						st.prestudent_id, st.datum, st.insertamum, st.ext_id
-				) students ON prestudent.prestudent_id = students.prestudent_id
-				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
-			WHERE
-				prestudent.bismelden
-				AND stg.melderelevant
-				AND bewerber_studienplan.orgform_kurzbz <> students.studienplan_orgform_kurzbz";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			$semesterArr = array($studiensemester_kurzbz);
-
-			if (hasData($prevStudiensemesterRes))
-			{
-				// if Studiensemester given, check only if has status in current or previous semester
-				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-			}
-
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = prestudent.prestudent_id
-					)";
-
-			$params[] = $semesterArr;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND studiengang.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent.prestudent_id = ?";
-			$params[] = $prestudent_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,14 +19,12 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getOrgformStgUngleichOrgformPrestudent(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -72,7 +70,6 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -119,12 +116,6 @@ class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

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

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

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

-		// get fehlertext and resolution params
-
-
 		// add config params to query
 		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
 		{
@@ -19,14 +19,12 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getPrestudentMischformOhneOrgform(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -70,7 +68,6 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -101,12 +98,6 @@ class PrestudentMischformOhneOrgform extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -1,152 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StartsemesterUngleichPersonenkennzeichen 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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getStartsemesterUngleichPersonenkennzeichen(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_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);
-	}
-
-	/**
-	 * Bewerber should have participated in Reihungstest.
-	 * @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 exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	public function getStartsemesterUngleichPersonenkennzeichen(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-				SELECT
-					prestudent.person_id, prestudent.prestudent_id,
-					stg.studiengang_kz, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-				FROM
-					public.tbl_prestudent prestudent
-					JOIN public.tbl_studiengang stg USING (studiengang_kz)
-					JOIN public.tbl_student stud USING (prestudent_id)
-				WHERE
-					stg.melderelevant
-					AND prestudent.bismelden
-					AND
-					(
-						SELECT
-							substring(studiensemester_kurzbz, 5, 2)::integer -
-							(CASE
-								WHEN
-									substring(studiensemester_kurzbz, 1, 2) = 'SS'
-								THEN
-									1
-								ELSE
-									0
-							END)::integer
-						FROM
-							public.tbl_prestudentstatus
-						WHERE
-							prestudent_id = prestudent.prestudent_id
-							AND status_kurzbz = 'Student'
-						ORDER BY
-							datum, insertamum, ext_id
-						LIMIT 1
-					) <> substring(stud.matrikelnr, 1, 2)::integer";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-			$prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			$semesterArr = array($studiensemester_kurzbz);
-
-			if (hasData($prevStudiensemesterRes))
-			{
-				// if Studiensemester given, check only if has status in current or previous semester
-				$semesterArr[] = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-			}
-
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = prestudent.prestudent_id
-					)";
-
-			$params[] = $semesterArr;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent_id = ?";
-			$params[] = $prestudent_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,10 +18,9 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudent($studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -52,7 +51,7 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
 	 * @return success with prestudents or error
 	 */
-	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getStgPrestudentUngleichStgStudent($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -80,12 +79,6 @@ class StgPrestudentUngleichStgStudent extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -18,10 +18,9 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker

 		// pass parameters needed for plausicheck
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
-		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $person_id, $exkludierte_studiengang_kz);
+		$prestudentRes = $this->getStgPrestudentUngleichStgStudienplan($studiengang_kz, null, null, $exkludierte_studiengang_kz);

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

@@ -57,7 +56,6 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 		$studiengang_kz = null,
 		$prestudent_id = null,
 		$studienordnung_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array();
@@ -95,12 +93,6 @@ class StgPrestudentUngleichStgStudienplan extends PlausiChecker
 			$params[] = $studienordnung_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -17,18 +17,10 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 		$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->getStudentstatusNachAbbrecher(
-			$studiensemester_kurzbz = null,
-			$studiengang_kz,
-			null,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
+		$prestudentRes = $this->getStudentstatusNachAbbrecher($studiengang_kz, null, $exkludierte_studiengang_kz);

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

@@ -54,13 +46,12 @@ class StudentstatusNachAbbrecher extends PlausiChecker

 	/**
 	 * There shouldn't be any status after Abbrecher status.
-	 * @param studiensemester_kurzbz int 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
 	 */
-	public function getStudentstatusNachAbbrecher($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null, $person_id = null, $exkludierte_studiengang_kz = null)
+	public function getStudentstatusNachAbbrecher($studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
 	{
 		$params = array();

@@ -76,18 +67,6 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 				prestatus.status_kurzbz = 'Abbrecher'
 				AND get_rolle_prestudent(prestudent.prestudent_id, prestatus.studiensemester_kurzbz) <> 'Abbrecher'";

-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = prestudent.prestudent_id
-					)";
-
-			$params[] = [$studiensemester_kurzbz];
-		}
-
 		if (isset($studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz = ?";
@@ -100,12 +79,6 @@ class StudentstatusNachAbbrecher extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -1,113 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StudentstatusNachDiplomand 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;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->getStudentstatusNachDiplomand($studiensemester_kurzbz, $studiengang_kz, $prestudent_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);
-	}
-
-	/**
-	 * There shouldn't be any student status after Diplomand status.
-	 * @param studiensemester_kurzbz int 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
-	 */
-	public function getStudentstatusNachDiplomand($studiensemester_kurzbz = null, $studiengang_kz = null, $prestudent_id = null, $exkludierte_studiengang_kz = null)
-	{
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT prestudent.person_id, prestudent.prestudent_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_student student
-				JOIN public.tbl_prestudent prestudent USING(prestudent_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON prestudent.studiengang_kz = stg.studiengang_kz
-			WHERE
-				status.status_kurzbz = 'Diplomand'
-				AND EXISTS (
-					SELECT 1
-					FROM
-						public.tbl_prestudentstatus
-					WHERE
-						prestudent_id = prestudent.prestudent_id
-						AND status_kurzbz = 'Student'
-						AND datum::date > status.datum::date
-				)";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND EXISTS (
-						SELECT 1
-						FROM public.tbl_prestudentstatus ps
-						WHERE studiensemester_kurzbz IN ?
-						AND ps.prestudent_id = prestudent.prestudent_id
-					)";
-
-			$params[] = [$studiensemester_kurzbz];
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND prestudent.prestudent_id = ?";
-			$params[] = $prestudent_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,14 +19,12 @@ class StudienplanUngueltig extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

 		// get all students failing the plausicheck
 		$prestudentRes = $this->getStudienplanUngueltig(
 			$studiensemester_kurzbz,
 			$studiengang_kz,
 			null,
-			$person_id,
 			$exkludierte_studiengang_kz
 		);

@@ -71,7 +69,6 @@ class StudienplanUngueltig extends PlausiChecker
 		$studiensemester_kurzbz,
 		$studiengang_kz = null,
 		$prestudent_id = null,
-		$person_id = null,
 		$exkludierte_studiengang_kz = null
 	) {
 		$params = array($studiensemester_kurzbz);
@@ -118,12 +115,6 @@ class StudienplanUngueltig extends PlausiChecker
 			$params[] = $prestudent_id;
 		}

-		if (isset($person_id))
-		{
-			$qry .= " AND tbl_person.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -1,112 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class UhstatPersonkennungFehltCore extends PlausiChecker
-{
-	const PERSONKENNUNG_KENNZEICHEN_TYPEN = ['vbpkAs', 'vbpkBf'];
-
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getUhstatPersonkennungFehlt(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id
-					//'fehlertext_params' => array('person_id' => $prestudent->person_id),
-					//'resolution_params' => array('person_id' => $prestudent->person_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Student should have Personenkennung for UHSTAT reporting.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getUhstatPersonkennungFehlt(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (person_id) prestudent_id, person_id
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				stg.melderelevant
-				AND pre.bismelden
-				AND EXISTS (SELECT 1 FROM bis.tbl_uhstat1daten WHERE person_id = pers.person_id)
-				AND (SELECT COUNT (DISTINCT kennzeichentyp_kurzbz) FROM public.tbl_kennzeichen WHERE person_id = pers.person_id AND kennzeichentyp_kurzbz IN ('vbpkAs', 'vbpkBf')) < 2
-				AND pers.ersatzkennzeichen IS NULL";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,135 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvDatumInZukunft extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvDatumInZukunft(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV date should be in the past.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvDatumInZukunft(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvdatum::date > NOW()
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-			//~ $prevStudiensemesterRes = $this->_ci->StudiensemesterModel->getPreviousFrom($studiensemester_kurzbz);
-
-			//~ if (isError($prevStudiensemesterRes)) return $prevStudiensemesterRes;
-
-			//~ if (hasData($prevStudiensemesterRes))
-			//~ {
-				//~ // if Studiensemester given, check only if has status in current or previous semester
-				//~ $prevStudiensemester = getData($prevStudiensemesterRes)[0]->studiensemester_kurzbz;
-				//~ $qry .= " AND EXISTS (
-							//~ SELECT 1
-							//~ FROM public.tbl_prestudentstatus ps
-							//~ WHERE studiensemester_kurzbz IN (?, ?)
-							//~ AND ps.prestudent_id = pre.prestudent_id
-						//~ )";
-				//~ $params[] = $prevStudiensemester;
-				//~ $params[] = $studiensemester_kurzbz;
-			//~ }
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvDatumVorGeburtsdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvDatumVorGeburtsdatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * Zgv date should be after birthdate.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvDatumVorGeburtsdatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvdatum::date < pers.gebdatum
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pers.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumInZukunft extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumInZukunft(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be in the past.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumInZukunft(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date > NOW()
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumVorGeburtsdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumVorGeburtsdatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be after birthdate.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumVorGeburtsdatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person pers USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date < pers.gebdatum
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,118 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZgvMasterDatumVorZgvdatum extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$prestudent_id = isset($params['prestudent_id']) ? $params['prestudent_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getZgvMasterDatumVorZgvDatum(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$prestudent_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					//'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * ZGV master date should be before ZGV date.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param prestudent_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getZgvMasterDatumVorZgvDatum(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$prestudent_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-		$params = array();
-
-		$qry = "
-			SELECT
-				DISTINCT ON (prestudent_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-			WHERE
-				pre.zgvmadatum::date < pre.zgvdatum::date
-				AND stg.melderelevant
-				AND pre.bismelden";
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$qry .= " AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($prestudent_id))
-		{
-			$qry .= " AND pre.prestudent_id = ?";
-			$params[] = $prestudent_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,129 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class ZuVieleZweckeIncomingPlausi extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// get parameters from config
-		$exkludierte_studiengang_kz = isset($this->_config['exkludierteStudiengaenge']) ? $this->_config['exkludierteStudiengaenge'] : null;
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$bisio_id = isset($params['bisio_id']) ? $params['bisio_id'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_getFalscherIncomingZweck(
-			$studiensemester_kurzbz,
-			$studiengang_kz,
-			$bisio_id,
-			$person_id,
-			$exkludierte_studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('anzahl' => $prestudent->anzahl),
-					'resolution_params' => array('bisio_id' => $prestudent->bisio_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-
-	/**
-	 * There should be exactly one Incoming Zweck.
-	 * @param studiensemester_kurzbz string if check is to be executed for certain Studiensemester
-	 * @param studiengang_kz int if check is to be executed for certain Studiengang
-	 * @param bisio_id int if check is to be executed only for one prestudent
-	 * @param exkludierte_studiengang_kz array if certain Studiengänge have to be excluded from check
-	 * @return success with prestudents or error
-	 */
-	private function _getFalscherIncomingZweck(
-		$studiensemester_kurzbz = null,
-		$studiengang_kz = null,
-		$bisio_id = null,
-		$person_id = null,
-		$exkludierte_studiengang_kz = null
-	) {
-
-		$params = array();
-		$studiensemester_clause = '';
-
-		if (isset($studiensemester_kurzbz))
-		{
-			$studiensemester_clause = "AND status.studiensemester_kurzbz = ?";
-			$params[] = $studiensemester_kurzbz;
-		}
-
-		$qry = "
-		SELECT * FROM (
-			SELECT
-				DISTINCT ON (bisio_id) prestudent_id, person_id, stg.oe_kurzbz AS prestudent_stg_oe_kurzbz, stg.studiengang_kz,
-				bisio.bisio_id, (SELECT count(*) FROM bis.tbl_bisio_zweck WHERE bisio_id = bisio.bisio_id) AS anzahl
-			FROM
-				public.tbl_prestudent pre
-				JOIN public.tbl_student stud USING (prestudent_id)
-				JOIN public.tbl_person USING(person_id)
-				JOIN public.tbl_prestudentstatus status USING(prestudent_id)
-				JOIN public.tbl_studiensemester sem ON status.studiensemester_kurzbz = sem.studiensemester_kurzbz
-				JOIN public.tbl_studiengang stg ON pre.studiengang_kz = stg.studiengang_kz
-				JOIN bis.tbl_bisio bisio ON stud.student_uid = bisio.student_uid
-			WHERE
-				stg.melderelevant
-				AND pre.bismelden
-				AND status.status_kurzbz = 'Incoming'
-				AND bisio.von::date < sem.ende AND bisio.bis::date > sem.start
-				{$studiensemester_clause}
-		) zwecke
-		WHERE anzahl > 1";
-
-		if (isset($studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz = ?";
-			$params[] = $studiengang_kz;
-		}
-
-		if (isset($bisio_id))
-		{
-			$qry .= " AND zwecke.bisio_id = ?";
-			$params[] = $bisio_id;
-		}
-
-		if (isset($person_id))
-		{
-			$qry .= " AND zwecke.person_id = ?";
-			$params[] = $person_id;
-		}
-
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND zwecke.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
-		return $this->_db->execReadOnlyQuery($qry, $params);
-	}
-}
@@ -1,7 +1,5 @@
 <?php

-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
 /**
 * More than one Zweck for incoming
 */
@@ -16,7 +16,7 @@ class CORE_INOUT_0005 implements IIssueResolvedChecker

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

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

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

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

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

 		// check if issue persists
 		$checkRes = $this->_ci->inaktiverstudentaktiverstatus->getInaktiverStudentAktiverStatus(
-			null,
+			$params['studiensemester_kurzbz'],
 			null,
 			$params['prestudent_id']
 		);
@@ -40,9 +40,7 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if(is_null($old_value) xor is_null($new_value)) {
-			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {
+		} else if($old_value != $new_value) {		
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}
@@ -3,7 +3,6 @@ namespace vertragsbestandteil;

 use Exception;
 use vertragsbestandteil\VertragsbestandteilStunden;
-use vertragsbestandteil\VertragsbestandteilLohnguide;

 /**
 * Description of VertragsbestandteilFactory
@@ -23,7 +22,6 @@ class VertragsbestandteilFactory
 	const VERTRAGSBESTANDTEIL_URLAUBSANSPRUCH = 'urlaubsanspruch';
 	const VERTRAGSBESTANDTEIL_ZEITAUFZEICHNUNG = 'zeitaufzeichnung';
 	const VERTRAGSBESTANDTEIL_LEHRE = 'lehre';
-	const VERTRAGSBESTANDTEIL_LOHNGUIDE = 'lohnguide';
 	
 	public static function getVertragsbestandteil($data, $fromdb=false)
 	{
@@ -71,11 +69,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteil = new VertragsbestandteilZeitaufzeichnung();
 				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
 				break;
-
-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$vertragsbestandteil = new VertragsbestandteilLohnguide();
-				$vertragsbestandteil->hydrateByStdClass($data, $fromdb);
-				break;
 			
 			default:
 				throw new Exception('Unknown vertragsbestandteiltyp_kurzbz ' 
@@ -134,12 +127,6 @@ class VertragsbestandteilFactory
 				$vertragsbestandteildbmodel = $CI->VertragsbestandteilZeitaufzeichnung_model;
 				break;

-			case self::VERTRAGSBESTANDTEIL_LOHNGUIDE:
-				$CI->load->model('vertragsbestandteil/VertragsbestandteilLohnguide_model',
-					'VertragsbestandteilLohnguide_model');
-				$vertragsbestandteildbmodel = $CI->VertragsbestandteilLohnguide_model;
-				break;
-
 			default:
 				throw new Exception('Unknown vertragsbestandteil_kurzbz '
 					. $vertragsbestandteil_kurzbz);
@@ -10,7 +10,6 @@ require_once __DIR__ . '/VertragsbestandteilKuendigungsfrist.php';
 require_once __DIR__ . '/VertragsbestandteilUrlaubsanspruch.php';
 require_once __DIR__ . '/VertragsbestandteilFreitext.php';
 require_once __DIR__ . '/VertragsbestandteilKarenz.php';
-require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';

@@ -1,161 +0,0 @@
-<?php
-namespace vertragsbestandteil;
-
-use vertragsbestandteil\Vertragsbestandteil;
-use vertragsbestandteil\VertragsbestandteilFactory;
-
-class VertragsbestandteilLohnguide extends Vertragsbestandteil
-{
-	protected $stellenbezeichnung;
-	protected $vordienstzeit;
-	protected $fachrichtung_kurzbz;
-	protected $modellstelle_kurzbz;
-	protected $kommentar_person;
-	protected $kommentar_modellstelle;
-
-
-	public function __construct()
-	{
-		parent::__construct();
-		$this->setVertragsbestandteiltyp_kurzbz(
-			VertragsbestandteilFactory::VERTRAGSBESTANDTEIL_LOHNGUIDE);
-	}
-
-	public function getStellenbezeichnung()
-	{
-		return $this->stellenbezeichnung;
-	}
-
-	public function setStellenbezeichnung($stellenbezeichnung): self
-	{
-		$this->markDirty('stellenbezeichnung', $this->stellenbezeichnung, $stellenbezeichnung);
-		$this->stellenbezeichnung = $stellenbezeichnung;
-		return $this;
-	}
-
-	public function getVordienstzeit()
-	{
-		return $this->vordienstzeit;
-	}
-
-	public function setVordienstzeit($vordienstzeit): self
-	{
-		$this->markDirty('vordienstzeit', $this->vordienstzeit, $vordienstzeit);
-		$this->vordienstzeit = $vordienstzeit;
-		return $this;
-	}
-
-	public function getFachrichtung_kurzbz()
-	{
-		return $this->fachrichtung_kurzbz;
-	}
-
-	public function setFachrichtung_kurzbz($fachrichtung_kurzbz): self
-	{
-		$this->markDirty('fachrichtung_kurzbz', $this->fachrichtung_kurzbz, $fachrichtung_kurzbz);
-		$this->fachrichtung_kurzbz = $fachrichtung_kurzbz;
-		return $this;
-	}
-
-	public function getModellstelle_kurzbz()
-	{
-		return $this->modellstelle_kurzbz;
-	}
-
-	public function setModellstelle_kurzbz($modellstelle_kurzbz): self
-	{
-		$this->markDirty('modellstelle_kurzbz', $this->modellstelle_kurzbz, $modellstelle_kurzbz);
-		$this->modellstelle_kurzbz = $modellstelle_kurzbz;
-		return $this;
-	}
-
-	public function getKommentar_person()
-	{
-		return $this->kommentar_person;
-	}
-
-	public function setKommentar_person($kommentar_person): self
-	{
-		$this->markDirty('kommentar_person', $this->kommentar_person, $kommentar_person);
-		$this->kommentar_person = $kommentar_person;
-		return $this;
-	}
-
-	public function getKommentar_modellstelle()
-	{
-		return $this->kommentar_modellstelle;
-	}
-
-	public function setKommentar_modellstelle($kommentar_modellstelle): self
-	{
-		$this->markDirty('kommentar_modellstelle', $this->kommentar_modellstelle, $kommentar_modellstelle);
-		$this->kommentar_modellstelle = $kommentar_modellstelle;
-		return $this;
-	}
-
-	
-	
-	
-	public function hydrateByStdClass($data, $fromdb=false)
-	{
-		parent::hydrateByStdClass($data, $fromdb);
-		$this->fromdb = $fromdb;
-		isset($data->fachrichtung_kurzbz) && $this->setFachrichtung_kurzbz($data->fachrichtung_kurzbz);
-		isset($data->stellenbezeichnung) && $this->setStellenbezeichnung($data->stellenbezeichnung);
-		isset($data->vordienstzeit) && $this->setVordienstzeit($data->vordienstzeit);
-		isset($data->modellstelle_kurzbz) && $this->setModellstelle_kurzbz($data->modellstelle_kurzbz);
-		isset($data->kommentar_person) && $this->setKommentar_person($data->kommentar_person);
-		isset($data->kommentar_modellstelle) && $this->setKommentar_modellstelle($data->kommentar_modellstelle);
-		$this->fromdb = false;
-	}
-	
-	public function toStdClass(): \stdClass
-	{
-		$tmp = array(
-			'vertragsbestandteil_id' => $this->getVertragsbestandteil_id(),
-			'stellenbezeichnung' => $this->getStellenbezeichnung(),
-			'vordienstzeit' => $this->getVordienstzeit(),
-			'fachrichtung_kurzbz' => $this->getFachrichtung_kurzbz(),
-			'modellstelle_kurzbz' => $this->getModellstelle_kurzbz(),
-			'kommentar_person' => $this->getKommentar_person(),
-			'kommentar_modellstelle' => $this->getKommentar_modellstelle(),
-		);
-		
-		$tmp = array_filter($tmp, function($k) {
-			return in_array($k, $this->modifiedcolumns);
-		},  ARRAY_FILTER_USE_KEY);
-		
-		return (object) $tmp;
-	}
-	
-	public function __toString() 
-	{
-		$txt = <<<EOTXT
-		modellstelle_kurzbz: {$this->getModellstelle_kurzbz()}
-
-EOTXT;
-		return parent::__toString() . $txt;
-	}
-
-	public function validate()
-	{
-		$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();
-	} 
-}
@@ -402,17 +402,14 @@ class Lehrveranstaltung_model extends DB_Model
 			SELECT
 				vorname, nachname, mitarbeiter_uid, lehrfunktion_kurzbz
 			FROM
-				lehre.tbl_lehreinheit le
+				lehre.tbl_lehreinheit
 				JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id)
 				JOIN public.tbl_benutzer b ON b.uid = lema.mitarbeiter_uid
 				JOIN public.tbl_person p using (person_id) 
 			WHERE
-				le.lehrveranstaltung_id= ?
-				AND le.studiensemester_kurzbz = ?
+				tbl_lehreinheit.lehrveranstaltung_id= ?
+				AND tbl_lehreinheit.studiensemester_kurzbz = ?
 				AND lehrfunktion_kurzbz = 'LV-Leitung'
-				AND lema.mitarbeiter_uid NOT like '_Dummy%' 
-			  	AND b.aktiv = TRUE 
-			  	AND p.aktiv = TRUE
            ORDER BY 
                lema.insertamum DESC
 			LIMIT 1
@@ -79,10 +79,10 @@ class Paabgabe_model extends DB_Model
 				 JOIN public.tbl_benutzer ON (public.tbl_benutzer.uid = student_uid)
 				 JOIN public.tbl_person USING (person_id)
 		
-		WHERE (campus.tbl_paabgabe.insertamum::date = CURRENT_DATE - INTERVAL ?
-			OR campus.tbl_paabgabe.updateamum::date = CURRENT_DATE - INTERVAL ?)
-			AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
-		
+		WHERE (campus.tbl_paabgabe.insertamum >= NOW() - INTERVAL ?
+		   OR campus.tbl_paabgabe.updateamum >= NOW() - INTERVAL ?)
+		   AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
+
 		return $this->execQuery($query, [$interval, $interval, $relevantTypes]);
 	}

@@ -108,7 +108,7 @@ class Paabgabe_model extends DB_Model
 						 JOIN public.tbl_person ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
 				
 				WHERE campus.tbl_paabgabe.abgabedatum IS NOT NULL 
-				AND campus.tbl_paabgabe.abgabedatum = CURRENT_DATE - INTERVAL ?";
+				AND campus.tbl_paabgabe.abgabedatum >= NOW() - INTERVAL ?";
 		
 		if($relevantTypes !== null) {
 			$query .= " AND campus.tbl_paabgabe.paabgabetyp_kurzbz IN ?";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ma0048	e4a1264072	fixed zeitsperren collision check	2026-06-01 13:59:50 +02:00
ma0048	517f1a9d93	formatting	2026-06-01 13:39:59 +02:00
ma0048	e62848c773	added collision checks on creation	2026-06-01 11:18:53 +02:00
ma0048	9ac9804563	implement first version of collision checks	2026-05-26 14:09:58 +02:00
ma0048	24a0e74281	Fix: prevent duplicate entries	2026-05-21 12:27:55 +02:00
ma0048	57597dac29	- added reservierungen - added updatemails - added reservierungssync - updated status kurzbz - reservierung renderer for tempus	2026-04-28 20:17:50 +02:00
ma0048	7240b0c798	first version of history logic	2026-04-08 14:40:33 +02:00
ma0048	ab5294de2f	stylingaenderungen coursepicker umgebaut, keine backend suche mehr hinzugefuegt: - resizeHanlder funktion - broadcastchannel postMessage "dropped" - tbl_kalender_status column bezeichnung_mehrsprachig - tbl_kalender_status column sort	2026-04-01 10:53:31 +02:00
ma0048	8dd42361a0	Merge branch 'master' into feature-68298/Tempus_Grundstruktur # Conflicts: # public/js/components/Cis/Renderer/Lehreinheit/calendarEvent.js # system/dbupdate_3.4.php	2026-03-30 09:18:31 +02:00
ma0048	229de14f9c	tempus pre-alpha version - add missing file	2026-03-25 14:42:36 +01:00
ma0048	e990bb3d81	tempus pre-alpha version	2026-03-25 14:41:13 +01:00
ma0048	43a1d163a3	Merge branch 'master' into feature-68298/Tempus_Grundstruktur	2026-01-20 09:21:47 +01:00
Andreas Österreicher	93388ff06c	Merge branch 'master' into feature-68298/Tempus_Grundstruktur	2025-11-12 13:55:44 +01:00
Andreas Österreicher	352fc53e74	Erster Prototyp für Tempus Neu DB und GUI	2025-10-20 11:01:50 +02:00