replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes;

Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning
extracted date handling with luxon into dateUtils file and only work with those functions to completely avoid anymore timezone bugs due to js Dates. formatDate was still affected by timezone issues and was showing off by one dates in rare cases.
2026-07-25 00:24:35 +00:00 · 2026-05-26 17:06:39 +02:00 · 2026-05-26 12:58:57 +02:00 · 2026-05-22 11:17:37 +02:00 · 2026-05-22 09:55:25 +02:00 · 2026-05-20 13:52:32 +02:00
118 changed files with 4033 additions and 5135 deletions
@@ -43,3 +43,11 @@ $config['ASSISTENZ_SAMMELMAIL_BUTTON_STUDENT'] = true;
 $config['ASSISTENZ_SAMMELMAIL_BUTTON_BETREUER'] = true;

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

 		$ret = array(
 			'moodle_link' => $moodle_link,
+			'title_edit_allowed' => $title_edit_allowed,
+			'confetti_on_endupload' => $confetti_on_endupload
 		);

 		$this->terminateWithSuccess($ret);
@@ -187,8 +195,8 @@ class Abgabe extends FHCAPI_Controller
 		} else {
 			$result = $this->ProjektarbeitModel->getStudentProjektarbeitenWithBetreuer(getAuthUID());
 		}
-
-		$projektarbeiten = getData($result);
+		
+		$projektarbeiten = hasData($result) ? getData($result) : array();
 		
 		if(count($projektarbeiten)) {
 			foreach($projektarbeiten as $pa) {
@@ -448,7 +456,207 @@ class Abgabe extends FHCAPI_Controller
 		}

 	}
-	
+
+	/**
+	 * POST METHOD
+	 * allows a student (or assistenz on their behalf) to update the titel of their own projektarbeit.
+	 * blocked once the projektarbeit has been graded (checkProjektarbeitForFinishedStatus).
+	 */
+	public function postStudentProjektarbeitTitel()
+	{
+		if(!$this->config->item('STUDENT_EDIT_PROJEKTARBEIT_TITLE')) {
+			$this->terminateWithError($this->p->t('global', 'c4studentEditNotAllowed'), 'general');
+		};
+		
+		$projektarbeit_id = $this->input->post('projektarbeit_id');
+		$titel            = $this->input->post('titel');
+
+		if ($projektarbeit_id === NULL || trim((string)$projektarbeit_id) === ''
+			|| $titel === NULL || trim((string)$titel) === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		// strip all HTML tags to prevent XSS in mail bodies, table views and Projektarbeitsbenotung
+		$titel = trim(strip_tags($titel));
+		if ($titel === '') {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+
+		$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+
+		$this->load->model('education/Projektarbeit_model', 'ProjektarbeitModel');
+
+		// Verify the projektarbeit actually belongs to the supplied student_uid
+		$res = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if (isError($res) || !hasData($res)) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4projektarbeitNichtGefunden'), 'general');
+		}
+		$assignedStudentUid = getData($res)[0]->uid;
+
+		// A student may only update their own title; assistenz is covered by checkZuordnung
+		$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+		if (getAuthUID() !== $assignedStudentUid && !$zugeordnet) {
+			$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+		}
+
+		
+		
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$data = getData($result);
+		
+		$oldTitle = $data[0]->titel ?? '';
+		
+		$result = $this->ProjektarbeitModel->update(
+			$projektarbeit_id,
+			array(
+				'titel'      => $titel,
+				'updatevon'  => getAuthUID(),
+				'updateamum' => date('Y-m-d H:i:s')
+			)
+		);
+
+		$this->getDataOrTerminateWithError($result, 'general');
+
+		$this->logLib->logInfoDB(array(
+			'titelUpdate',
+			array(
+				'projektarbeit_id' => $projektarbeit_id,
+				'titel'            => $titel,
+				'updatevon'        => getAuthUID(),
+				'updateamum'       => date('Y-m-d H:i:s')
+			),
+			getAuthUID(),
+			getAuthPersonId()
+		));
+
+		$this->sendTitelChangedEmail(
+			$projektarbeit_id,
+			$titel,
+			$oldTitle,
+			$assignedStudentUid
+		);
+		
+		$result = $this->ProjektarbeitModel->load($projektarbeit_id);
+		$this->terminateWithSuccess($result);
+	}
+
+	/**
+	 * Notifies all betreuer of a projektarbeit and all assistenzen responsible for its studiengang
+	 * when a student updates the titel of their projektarbeit.
+	 *
+	 * Betreuer retrieval mirrors AbgabetoolJob->notifyBetreuerAboutChangedAbgaben.
+	 * Assistenz retrieval mirrors AbgabetoolJob->notifyAssistenzAboutChangedAbgaben.
+	 *
+	 * @param int    $projektarbeit_id
+	 * @param string $new_titel         The titel as it was saved
+	 * @param string $student_uid
+	 */
+	private function sendTitelChangedEmail($projektarbeit_id, $new_titel, $old_titel, $student_uid)
+	{
+		$this->load->model('education/Projektarbeit_model',      'ProjektarbeitModel');
+		$this->load->model('education/Projektbetreuer_model',    'ProjektbetreuerModel');
+		$this->load->model('organisation/Studiengang_model',     'StudiengangModel');
+		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		$this->load->model('person/Person_model',                     'PersonModel');
+
+		$this->load->model('person/Person_model', 'PersonModel');
+		$studentNameResult = $this->PersonModel->getFullName($student_uid);
+		$studentFullName   = hasData($studentNameResult) ? getData($studentNameResult) : $student_uid;
+
+		$studentInfoResult = $this->ProjektarbeitModel->getStudentInfoForProjektarbeitId($projektarbeit_id);
+		if (isError($studentInfoResult) || !hasData($studentInfoResult)) {
+			$this->logLib->logInfoDB(array('sendTitelChangedEmail: student info not found', $projektarbeit_id));
+			return;
+		}
+		$studentInfo    = getData($studentInfoResult)[0];
+		$studiengang_kz = $studentInfo->studiengang_kz;
+
+		$stgResult = $this->StudiengangModel->load($studiengang_kz);
+		$oe_kurzbz = null;
+		if (!isError($stgResult) && hasData($stgResult)) {
+			$oe_kurzbz = getData($stgResult)[0]->oe_kurzbz ?? null;
+		}
+
+		// build shared mail data
+		$base_mail_data = array(
+			'studentFullName'      => $studentFullName,
+			'new_titel'         => $new_titel,
+			'old_titel'         => $old_titel
+		);
+
+		// notify all betreuer
+		$betreuerResult = $this->ProjektbetreuerModel->getAllBetreuerOfProjektarbeit($projektarbeit_id);
+		if (!isError($betreuerResult) && hasData($betreuerResult)) {
+
+			$linkAbgabetool = APP_ROOT . $this->config->item('URL_MITARBEITER');
+			
+			foreach (getData($betreuerResult) as $betreuer) {
+				$email = $betreuer->uid ? $betreuer->uid . '@' . DOMAIN : ($betreuer->private_email ?? null);
+				if (!$email) {
+					$this->logLib->logInfoDB(array('sendTitelChangedEmail: no email for betreuer', $betreuer->person_id));
+					continue;
+				}
+
+				$anredeResult = $this->ProjektarbeitModel->getProjektbetreuerAnrede($betreuer->person_id);
+				$anrede       = (!isError($anredeResult) && hasData($anredeResult)) ? getData($anredeResult)[0] : null;
+
+				$mail_data = array_merge($base_mail_data, array(
+					'anredeFillString'        => ($anrede->anrede ?? '') === 'Herr' ? 'r' : '',
+					'anrede'                  => $anrede->anrede  ?? '',
+					'fullFormattedNameString'  => $anrede->first  ?? $email,
+					'linkAbgabetool'           => $linkAbgabetool,
+				));
+
+				sendSanchoMail(
+					'PATitleUpdated',
+					$mail_data,
+					$email,
+					$this->p->t('abgabetool', 'c4PATitleChanged')
+				);
+			}
+		}
+
+		// notify assistenz for the studiengang OE
+		if (!$oe_kurzbz) {
+			$this->logLib->logInfoDB(array('sendTitelChangedEmail: no oe_kurzbz resolved, skipping assistenz', $studiengang_kz));
+			return;
+		}
+
+		$assistenzResult = $this->OrganisationseinheitModel->getAssistenzForOE($oe_kurzbz);
+		if (isError($assistenzResult) || !hasData($assistenzResult)) {
+			return;
+		}
+
+		$linkAbgabetool = APP_ROOT . $this->config->item('URL_ASSISTENZ');
+		
+		// similar pattern as job uses via the assistenzMap
+		$sentTo = [];
+		foreach (getData($assistenzResult) as $assistenz) {
+			if (in_array($assistenz->person_id, $sentTo)) {
+				continue;
+			}
+			$sentTo[] = $assistenz->person_id;
+
+			$email = $assistenz->uid . '@' . DOMAIN;
+
+			$mail_data = array_merge($base_mail_data, array(
+				'anredeFillString'        => $assistenz->anrede === 'Herr' ? 'r' : '',
+				'anrede'                  => $assistenz->anrede ?? '',
+				'fullFormattedNameString'  => $assistenz->first  ?? ($assistenz->uid . '@' . DOMAIN),
+				'linkAbgabetool'           => $linkAbgabetool,
+			));
+			
+			sendSanchoMail(
+				'PATitleUpdated',
+				$mail_data,
+				$email,
+				$this->p->t('abgabetool', 'c4PATitleChanged')
+			);
+		}
+	}
+
+
 	// validate paabgabe deadline against servertime just in case a student spoofs their local clock and thus
 	// unlocks the upload ui
 	private function checkPaabgabeDeadline($paabgabe_id) {
@@ -687,6 +895,99 @@ class Abgabe extends FHCAPI_Controller
 		$this->terminateWithSuccess([$paabgabe, $existingPaabgabe]);
 	}

+	/**
+	 * called by abgabetool/assistenz when bulk-editing multiple abgabetermine via the flat termine table view
+	 * only fields present in the payload are updated - absent fields are left untouched
+	 */
+	public function patchProjektarbeitAbgabeMultiple() {
+		$paabgabe_ids = $this->input->post('paabgabe_ids');
+
+		if ($paabgabe_ids === NULL || !is_array($paabgabe_ids) || count($paabgabe_ids) === 0) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		// collect only fields that were actually sent
+		$updateFields = [];
+
+		$datum = $this->input->post('datum');
+		if ($datum !== NULL && trim((string)$datum) !== '') {
+			$updateFields['datum'] = $datum;
+		}
+
+		$paabgabetyp_kurzbz = $this->input->post('paabgabetyp_kurzbz');
+		if ($paabgabetyp_kurzbz !== NULL && trim((string)$paabgabetyp_kurzbz) !== '') {
+			$updateFields['paabgabetyp_kurzbz'] = $paabgabetyp_kurzbz;
+		}
+
+		$kurzbz = $this->input->post('kurzbz');
+		if ($kurzbz !== NULL) {
+			$updateFields['kurzbz'] = $kurzbz;
+		}
+
+		// booleans: only include if explicitly posted
+		$upload_allowed = $this->input->post('upload_allowed');
+		if ($upload_allowed !== NULL) {
+			$updateFields['upload_allowed'] = filter_var($upload_allowed, FILTER_VALIDATE_BOOLEAN);
+		}
+
+		$fixtermin = $this->input->post('fixtermin');
+		if ($fixtermin !== NULL) {
+			$updateFields['fixtermin'] = filter_var($fixtermin, FILTER_VALIDATE_BOOLEAN);
+		}
+
+		if (empty($updateFields)) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+
+		$results = [];
+		foreach ($paabgabe_ids as $paabgabe_id) {
+			$paabgabe_id = trim((string)$paabgabe_id);
+
+			if ($paabgabe_id === '') {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$projektarbeit_id = $this->getProjektarbeitIDForPaabgabeID($paabgabe_id);
+
+			$this->checkProjektarbeitForFinishedStatus($projektarbeit_id);
+
+			$zugeordnet = $this->checkZuordnung($projektarbeit_id, getAuthUID());
+			if (!$zugeordnet) {
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+			}
+
+			$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
+			$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult, 'general');
+
+			if (count($paabgabeArr) === 0) {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$result = $this->PaabgabeModel->update(
+				$paabgabe_id,
+				array_merge($updateFields, [
+					'updatevon' => getAuthUID(),
+					'updateamum' => date('Y-m-d H:i:s')
+				])
+			);
+
+			$this->getDataOrTerminateWithError($result, 'general');
+			$results[] = getData($this->PaabgabeModel->load($paabgabe_id))[0];
+
+			$this->logLib->logInfoDB(array(
+				'paabgabe bulk updated',
+				$paabgabe_id,
+				$updateFields,
+				getAuthUID(),
+				getAuthPersonId()
+			));
+		}
+
+		$this->terminateWithSuccess($results);
+	}
+
 	/**
 	 * called by abgabetool/mitarbeiter in mitarbeiterdetail.js when deleting an abgabetermin
 	 * deletion is only possible if user is assistenz OR betreuer deletes their own custom termin
@@ -719,11 +1020,55 @@ class Abgabe extends FHCAPI_Controller
 		$result = $this->PaabgabeModel->delete($paabgabe_id);
 		$result = $this->getDataOrTerminateWithError($result, 'general');

-		// TODO: consider this in nightly email job
 		$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
 		$this->terminateWithSuccess($result);
 	}

+	/**
+	 * called by abgabetool/assistenz when deleting multiple abgabetermine via the flat termine table view
+	 */
+	public function deleteProjektarbeitAbgabeMultiple() {
+		$paabgabe_ids = $this->input->post('paabgabe_ids');
+
+		if ($paabgabe_ids === NULL || !is_array($paabgabe_ids) || count($paabgabe_ids) === 0) {
+			$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+		}
+
+		$this->load->model('education/Paabgabe_model', 'PaabgabeModel');
+		
+		$results = [];
+		foreach ($paabgabe_ids as $paabgabe_id) {
+			$paabgabe_id = trim((string)$paabgabe_id);
+
+			if ($paabgabe_id === '') {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$this->checkProjektarbeitForFinishedStatus($this->getProjektarbeitIDForPaabgabeID($paabgabe_id));
+
+			$zugeordnet = $this->checkZuordnungByPaabgabe($paabgabe_id, getAuthUID());
+
+			if (!$zugeordnet) {
+				$this->terminateWithError($this->p->t('abgabetool', 'c4noZuordnungBetreuerStudent'), 'general');
+			}
+
+			$paabgabeResult = $this->PaabgabeModel->load($paabgabe_id);
+			$paabgabeArr = $this->getDataOrTerminateWithError($paabgabeResult, 'general');
+
+			if (count($paabgabeArr) == 0) {
+				$this->terminateWithError($this->p->t('global', 'wrongParameters'), 'general');
+			}
+
+			$result = $this->PaabgabeModel->delete($paabgabe_id);
+			$result = $this->getDataOrTerminateWithError($result, 'general');
+			$results[] = $result;
+			
+			$this->logLib->logInfoDB(array($paabgabeArr[0], getAuthUID(), getAuthPersonId()));
+		}
+
+		$this->terminateWithSuccess($results);
+	}
+
 	/**
 	 * endpoint for adding the same paabgabe for multiple projektarbeiten
 	 * can be slow for large n since it queries twice per projektarbeit_id
@@ -1206,7 +1551,7 @@ class Abgabe extends FHCAPI_Controller
 		};
 		Events::trigger('projektarbeit_is_current', $projektarbeit_id, $returnFunc);
 		if(!$projektarbeitIsCurrent) {
-			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeitv2'), 'general');
 		}

 		// Link to Abgabetool
@@ -1411,7 +1756,13 @@ class Abgabe extends FHCAPI_Controller

 		$data = getData($res)[0];
 		if($data->note !== NULL) {
-			$this->terminateWithError($this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeit'), 'general');
+			// hardcode this error msg cause phrasen arent reliable and people keep bugging why the cant edit old entries they definitely shouldnt update
+			$message = $this->p->t('abgabetool','c4fehlerAktualitaetProjektarbeitv2');
+			if(strpos($message, "<<") === 0) { // phrase could not be loaded
+				$this->terminateWithError('Die Projektarbeit wurde bereits benotet, Sie dürfen deshalb keine weiteren Termine anlegen oder bearbeiten.', 'general');
+			} else {
+				$this->terminateWithError($message);
+			}
 		}
 	}

@@ -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'
-	//);
-}
@@ -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);
-		}
-	}
 }
@@ -90,6 +90,15 @@ class Projektarbeit extends FHCAPI_Controller

 		if (!isset($projektarbeit_id) || !is_numeric($projektarbeit_id)) return $this->terminateWithError('Projektarbeit Id missing', self::ERROR_TYPE_GENERAL);

+		$result = $this->fetchProjektarbeitByID($projektarbeit_id);
+
+		$data = $this->getDataOrTerminateWithError($result);
+
+		$this->terminateWithSuccess(current($data));
+	}
+	
+	private function fetchProjektarbeitById($projektarbeit_id) {
+		$this->ProjektarbeitModel->resetQuery();
 		$this->ProjektarbeitModel->addSelect(
 			'lehre.tbl_projektarbeit.projektarbeit_id, titel, titel_english, themenbereich, projekttyp_kurzbz, lehrveranstaltung_id, lehreinheit_id, 
 			firma_id, beginn, ende, gesperrtbis, note, final, freigegeben, tbl_projektarbeit.anmerkung, fa.name AS firma_name'
@@ -97,13 +106,10 @@ class Projektarbeit extends FHCAPI_Controller
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
 		$this->ProjektarbeitModel->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
 		$this->ProjektarbeitModel->addJoin('public.tbl_firma fa', 'firma_id', 'LEFT');
-		$result = $this->ProjektarbeitModel->loadWhere(
+		return $this->ProjektarbeitModel->loadWhere(
 			array('projektarbeit_id' => $projektarbeit_id)
 		);

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

 	/**
@@ -132,7 +138,8 @@ class Projektarbeit extends FHCAPI_Controller
 		);

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

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

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

@@ -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");
@@ -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);
 			}
@@ -9,40 +9,48 @@ class PlausicheckDefinitionLib
 {
 	// set fehler for core plausichecks
 	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerKurzbz = array(
-		'AbbrecherAktiv',
-		'AbschlussstatusFehlt',
-		'AktSemesterNull',
-		'AktiverStudentOhneStatus',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen',
-		'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde',
-		'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform',
-		'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher',
+	private $_fehlerLibMappings = array(
+		'AbbrecherAktiv' => 'AbbrecherAktiv',
+		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
+		'AktSemesterNull' => 'AktSemesterNull',
+		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
+		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
+		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
+		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
+		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
+		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
+		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
+		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
+		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
+		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
+		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
+		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
+		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
+		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
+		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
+		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
+		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
+		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
+		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
+		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher',
 		'DualesStudiumOhneMarkierung' => 'DualesStudiumOhneMarkierung'
-		//'StudienplanUngueltig',
-		//'BewerberNichtZumRtAngetreten'
+		//'StudienplanUngueltig' => 'StudienplanUngueltig'
+		//'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten'
 	);

+	/**
+	 * Gets all fehler_kurzbz-library mappings for fehler which need to be checked.
+	 */
+	public function getFehlerLibMappings()
+	{
+		return $this->_fehlerLibMappings;
+	}
+
 	/**
 	 * Gets all fehler_kurzbz for fehler which need to be checked.
 	 */
 	public function getFehlerKurzbz()
 	{
-		return $this->_fehlerKurzbz;
+		return array_keys($this->_fehlerLibMappings);
 	}
 }
@@ -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'];
 }
@@ -19,14 +19,12 @@ class AbschlussstatusFehlt extends PlausiChecker
 		// pass parameters needed for plausicheck
 		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
 		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-		$person_id = isset($params['person_id']) ? $params['person_id'] : null;

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

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

-		if (isset($person_id))
-		{
-			$qry .= " AND pre.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -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 ?";
@@ -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,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
 		);

@@ -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,12 +5,12 @@
 */
 abstract class PlausiChecker
 {
-	const ISSUE_ID_NAME = 'issue_id';
-
 	protected $_ci; // code igniter instance
 	protected $_config; // all applicable configuration parameters for this plausicheck
 	protected $_db; // database for queries

+	protected $_isForResolutionCheck; // if true, additional parameters only needed for resolution are checked
+
 	protected $_config_params = []; // name of all config params which should be applied for this plausicheck, with sql [name] => [sql]
 	protected $_params_for_checking = []; // name of all passed params for checking, with sql [name] => [sql]

@@ -24,6 +24,8 @@ abstract class PlausiChecker
 		// set configuration
 		$this->_config = $params['configurationParams'] ?? [];

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

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

-		// get fehlertext and resolution params
-
-
 		// add config params to query
 		if (isset($this->_config_params) && !isEmptyArray($this->_config_params))
 		{
@@ -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 ?";
@@ -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 ?";
@@ -18,10 +18,9 @@ class StudentstatusNachAbbrecher extends PlausiChecker

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

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

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

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

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

-		if (isset($person_id))
-		{
-			$qry .= " AND prestudent.person_id = ?";
-			$params[] = $person_id;
-		}
-
 		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
 		{
 			$qry .= " AND stg.studiengang_kz NOT IN ?";
@@ -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);
-	}
-}
@@ -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;
 		}
 	}
@@ -137,25 +137,19 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}

-	public function validate()
+	/* 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.';
-			}
+		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
+				array(
+					'options' => array(
+						'min_range' => 1,
+						'max_range' => 50
+					)
+				)
+			)) ) {
+			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
 		}
 		
 		return parent::validate();
-	} 
+	} */
 }
@@ -341,172 +341,130 @@ class Projektarbeit_model extends DB_Model
 	
 	
 	public function getProjektarbeitenForStudiengang($studiengang_kz, $benotet) {
-		$new_qry = "SELECT DISTINCT ON(tmp.projektarbeit_id) *, campus.get_betreuer_details(tmp.zweitbetreuer_person_id) as zweitbetreuer_full_name, campus.get_betreuer_details(tmp.betreuer_person_id) as erstbetreuer_full_name
-       		FROM(
-			   SELECT
-				   DISTINCT ON(tbl_projektarbeit.projektarbeit_id)
-				   tbl_projektarbeit.projekttyp_kurzbz,
-				   tbl_projektarbeit.titel,
-				   tbl_projektarbeit.projektarbeit_id,
-				   tbl_studiengang.typ, tbl_studiengang.kurzbz,
-				   student_benutzer.uid as student_uid,
-				   student_person.vorname as student_vorname,
-				   student_person.nachname as student_nachname,
-				   tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz,
-				   betreuer_benutzer.uid as betreuer_benutzer_uid,
-				   betreuer_person.titelpre as betreuer_titelpre,
-				   betreuer_person.vorname as betreuer_vorname,
-				   betreuer_person.nachname as betreuer_nachname,
-				   betreuer_person.titelpost as betreuer_titelpost,
-				   lehre.tbl_projektbetreuer.betreuerart_kurzbz as betreuerart,
-				   lehre.tbl_projektbetreuer.person_id as betreuer_person_id,
-				   lehre.tbl_projektarbeit.sprache               as sprache,
-				   lehre.tbl_projektarbeit.seitenanzahl          as seitenanzahl,
-				   lehre.tbl_projektarbeit.kontrollschlagwoerter as kontrollschlagwoerter,
-				   lehre.tbl_projektarbeit.schlagwoerter         as schlagwoerter,
-				   lehre.tbl_projektarbeit.schlagwoerter_en      as schlagwoerter_en,
-				   lehre.tbl_projektarbeit.abstract              as abstract,
-				   lehre.tbl_projektarbeit.abstract_en           as abstract_en,
-				   lehre.tbl_projektarbeit.insertamum            as insertamum,
-				   lehre.tbl_projektarbeit.note					 as note,
-				   (
-					   SELECT orgform_kurzbz
-					   FROM tbl_prestudentstatus
-					   WHERE prestudent_id = (SELECT prestudent_id
-											  FROM tbl_student
-											  WHERE student_uid = student_benutzer.uid
-											  LIMIT 1)
-					   ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					   LIMIT 1
-				   )
-					   as organisationsform,
-				   (
-					   SELECT person_id
-					   FROM lehre.tbl_projektbetreuer
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   AS zweitbetreuer_person_id,
-				   (
-					   SELECT betreuerart_kurzbz
-					   FROM lehre.tbl_projektbetreuer
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   AS zweitbetreuer_betreuerart_kurzbz,
-				   (
-					   SELECT tbl_betreuerart.beschreibung
-					   FROM lehre.tbl_projektbetreuer
-								JOIN lehre.tbl_betreuerart USING (betreuerart_kurzbz)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   AS zweitbetreuer_betreuerart_beschreibung,
-				   (
-					   SELECT trim(COALESCE(titelpre, '') || ' ' || COALESCE(vorname, '') || ' ' || COALESCE(nachname, '') || ' ' ||
-								   COALESCE(titelpost, ''))
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_full_name,
-			       (
-					   SELECT titelpre
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_titelpre,
-			       (
-					   SELECT vorname
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_vorname,
-			       (
-					   SELECT nachname
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_nachname,
-			       (
-					   SELECT titelpost
-					   FROM public.tbl_person
-								JOIN lehre.tbl_projektbetreuer ON (lehre.tbl_projektbetreuer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_benutzer ON (public.tbl_benutzer.person_id = public.tbl_person.person_id)
-								LEFT JOIN public.tbl_mitarbeiter ON (public.tbl_benutzer.uid = public.tbl_mitarbeiter.mitarbeiter_uid)
-					   WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id
-						 AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied')
-					   LIMIT 1
-				   )
-					   as zweitbetreuer_titelpost,
-			       (
-					   SELECT
-						   COALESCE(tbl_studienplan.orgform_kurzbz,
-									tbl_prestudentstatus.orgform_kurzbz, tbl_studiengang.orgform_kurzbz) as
-							   orgform
-					   FROM
-						   public.tbl_prestudent
-							   JOIN public.tbl_prestudentstatus USING(prestudent_id)
-							   JOIN public.tbl_studiensemester USING(studiensemester_kurzbz)
-							   JOIN public.tbl_studiengang USING(studiengang_kz)
-							   LEFT JOIN lehre.tbl_studienplan USING(studienplan_id)
-					   WHERE
-						   prestudent_id=tbl_student.prestudent_id
-					   ORDER BY tbl_prestudentstatus.datum DESC LIMIT 1
-				   ) as orgform,
-				   (SELECT status_kurzbz FROM public.tbl_prestudentstatus
-					WHERE prestudent_id=tbl_student.prestudent_id
-					ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as studienstatus
-			   FROM lehre.tbl_projektarbeit
-						LEFT JOIN public.tbl_benutzer student_benutzer ON (student_benutzer.uid = lehre.tbl_projektarbeit.student_uid)
-						LEFT JOIN public.tbl_person student_person ON (student_benutzer.person_id = student_person.person_id)
-						LEFT JOIN public.tbl_student on(student_benutzer.uid = public.tbl_student.student_uid)
-						LEFT JOIN lehre.tbl_lehreinheit USING (lehreinheit_id)
-						LEFT JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
-						LEFT JOIN public.tbl_studiengang ON (public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz)
-						LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-						LEFT JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-						LEFT JOIN public.tbl_person betreuer_person ON (betreuer_person.person_id = lehre.tbl_projektbetreuer.person_id)
-						LEFT JOIN public.tbl_benutzer betreuer_benutzer ON (betreuer_person.person_id = betreuer_benutzer.person_id)
-			   WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
-				 AND student_benutzer.aktiv AND (
-				     lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbegutachter' 
-				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Begutachter'
-				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Betreuer'
-				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Erstbetreuer'
-				     OR lehre.tbl_projektbetreuer.betreuerart_kurzbz = 'Senatsvorsitz'
-				     )
-				 AND public.tbl_studiengang.studiengang_kz = ?";
+		$new_qry = "WITH secondary_betreuer AS (
+			SELECT DISTINCT ON (pb.projektarbeit_id)
+				pb.projektarbeit_id,
+				pb.person_id                  AS zweitbetreuer_person_id,
+				pb.betreuerart_kurzbz         AS zweitbetreuer_betreuerart_kurzbz,
+				ba.beschreibung               AS zweitbetreuer_betreuerart_beschreibung,
+				p.titelpre                    AS zweitbetreuer_titelpre,
+				p.vorname                     AS zweitbetreuer_vorname,
+				p.nachname                    AS zweitbetreuer_nachname,
+				p.titelpost                   AS zweitbetreuer_titelpost,
+				trim(
+						COALESCE(p.titelpre, '')  || ' ' ||
+						COALESCE(p.vorname, '')   || ' ' ||
+						COALESCE(p.nachname, '')  || ' ' ||
+						COALESCE(p.titelpost, '')
+				)                             AS zweitbetreuer_full_name
+			FROM lehre.tbl_projektbetreuer pb
+					 JOIN       public.tbl_person      p  ON p.person_id          = pb.person_id
+					 LEFT JOIN  public.tbl_benutzer    b  ON b.person_id          = p.person_id
+					 LEFT JOIN  lehre.tbl_betreuerart  ba ON ba.betreuerart_kurzbz = pb.betreuerart_kurzbz
+			WHERE pb.betreuerart_kurzbz = ANY('{Zweitbetreuer,Zweitbegutachter,Senatsmitglied}')
+			ORDER BY pb.projektarbeit_id  -- DISTINCT ON needs this to be deterministic
+		)
 		
-			     if($benotet == 0) {
-					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
-				 } else if ($benotet == 1) {
-					 $new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
-				 }
-				 
-			   $new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
+		SELECT DISTINCT ON (tmp.projektarbeit_id)
+			*,
+			campus.get_betreuer_details(tmp.zweitbetreuer_person_id) AS zweitbetreuer_full_name,
+			campus.get_betreuer_details(tmp.betreuer_person_id)      AS erstbetreuer_full_name
+		FROM (
+			 SELECT DISTINCT ON (tbl_projektarbeit.projektarbeit_id)
+				 tbl_projektarbeit.projekttyp_kurzbz,
+				 tbl_projektarbeit.titel,
+				 tbl_projektarbeit.projektarbeit_id,
+				 tbl_studiengang.typ,
+				 tbl_studiengang.kurzbz,
+				 student_benutzer.uid                         AS student_uid,
+				 student_person.vorname                       AS student_vorname,
+				 student_person.nachname                      AS student_nachname,
+				 public.tbl_student.matrikelnr,
+				 tbl_lehreinheit.studiensemester_kurzbz,
+				 betreuer_benutzer.uid                        AS betreuer_benutzer_uid,
+				 betreuer_person.titelpre                     AS betreuer_titelpre,
+				 betreuer_person.vorname                      AS betreuer_vorname,
+				 betreuer_person.nachname                     AS betreuer_nachname,
+				 betreuer_person.titelpost                    AS betreuer_titelpost,
+				 lehre.tbl_projektbetreuer.betreuerart_kurzbz AS betreuerart,
+				 lehre.tbl_projektbetreuer.person_id          AS betreuer_person_id,
+				 lehre.tbl_projektarbeit.sprache,
+				 lehre.tbl_projektarbeit.seitenanzahl,
+				 lehre.tbl_projektarbeit.kontrollschlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter,
+				 lehre.tbl_projektarbeit.schlagwoerter_en,
+				 lehre.tbl_projektarbeit.abstract,
+				 lehre.tbl_projektarbeit.abstract_en,
+				 lehre.tbl_projektarbeit.insertamum,
+				 lehre.tbl_projektarbeit.note,
+	
+				 sb.zweitbetreuer_person_id,
+				 sb.zweitbetreuer_betreuerart_kurzbz,
+				 sb.zweitbetreuer_betreuerart_beschreibung,
+				 sb.zweitbetreuer_full_name,
+				 sb.zweitbetreuer_titelpre,
+				 sb.zweitbetreuer_vorname,
+				 sb.zweitbetreuer_nachname,
+				 sb.zweitbetreuer_titelpost,
+	
+				 (
+					 SELECT orgform_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = (
+						 SELECT prestudent_id FROM public.tbl_student
+						 WHERE student_uid = student_benutzer.uid LIMIT 1
+					 )
+					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					 LIMIT 1
+				 ) AS organisationsform,
+				 (
+					 SELECT COALESCE(tbl_studienplan.orgform_kurzbz,
+									 tbl_prestudentstatus.orgform_kurzbz,
+									 tbl_studiengang.orgform_kurzbz)
+					 FROM public.tbl_prestudent
+						JOIN       public.tbl_prestudentstatus USING (prestudent_id)
+						JOIN       public.tbl_studiensemester  USING (studiensemester_kurzbz)
+						JOIN       public.tbl_studiengang      USING (studiengang_kz)
+						LEFT JOIN  lehre.tbl_studienplan        USING (studienplan_id)
+					 WHERE prestudent_id = public.tbl_student.prestudent_id
+					 ORDER BY tbl_prestudentstatus.datum DESC
+					 LIMIT 1
+				 ) AS orgform,
+				 (
+					 SELECT status_kurzbz
+					 FROM public.tbl_prestudentstatus
+					 WHERE prestudent_id = public.tbl_student.prestudent_id
+					 ORDER BY datum DESC, insertamum DESC, ext_id DESC
+					 LIMIT 1
+				 ) AS studienstatus
+	
+			 FROM lehre.tbl_projektarbeit
+				  LEFT JOIN  public.tbl_benutzer   student_benutzer ON student_benutzer.uid       = lehre.tbl_projektarbeit.student_uid
+				  LEFT JOIN  public.tbl_person     student_person   ON student_benutzer.person_id = student_person.person_id
+				  LEFT JOIN  public.tbl_student                     ON student_benutzer.uid       = public.tbl_student.student_uid
+				  LEFT JOIN  lehre.tbl_lehreinheit                  USING (lehreinheit_id)
+				  LEFT JOIN  lehre.tbl_lehrveranstaltung            USING (lehrveranstaltung_id)
+				  LEFT JOIN  public.tbl_studiengang                 ON public.tbl_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+				  LEFT JOIN  lehre.tbl_projekttyp                   USING (projekttyp_kurzbz)
+				  LEFT JOIN  lehre.tbl_projektbetreuer              USING (projektarbeit_id)
+				  LEFT JOIN  public.tbl_person     betreuer_person  ON betreuer_person.person_id  = lehre.tbl_projektbetreuer.person_id
+				  LEFT JOIN  public.tbl_benutzer   betreuer_benutzer ON betreuer_person.person_id = betreuer_benutzer.person_id
+				  LEFT JOIN  secondary_betreuer    sb               ON sb.projektarbeit_id        = tbl_projektarbeit.projektarbeit_id  -- ← THE NEW LINE
+	
+			 WHERE (projekttyp_kurzbz = 'Bachelor' OR projekttyp_kurzbz = 'Diplom')
+			 	AND student_benutzer.aktiv
+			 	AND lehre.tbl_projektbetreuer.betreuerart_kurzbz IN (
+																		'Erstbegutachter', 'Begutachter', 'Betreuer', 'Erstbetreuer', 'Senatsvorsitz'
+					 )
+			 	AND public.tbl_studiengang.studiengang_kz = ?";
+		
+					if($benotet == 0) {
+						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NULL ";
+					} else if ($benotet == 1) {
+						$new_qry .= " AND lehre.tbl_projektarbeit.note IS NOT NULL ";
+					}
+					 
+			 	$new_qry .= " ORDER BY tbl_projektarbeit.projektarbeit_id DESC, student_person.nachname ASC           
 		   ) as tmp";
 		
 		return $this->execReadOnlyQuery($new_qry, array($studiengang_kz));
@@ -1,14 +0,0 @@
-<?php
-class App_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_app';
-		$this->pk = 'app';
-	}
-}
@@ -1,15 +0,0 @@
-<?php
-class FehlerApp_model extends DB_Model
-{
-
-	/**
-	 * Constructor
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'system.tbl_fehler_app';
-		$this->pk = array('fehlercode', 'app');
-		$this->hasSequence = false;
-	}
-}
@@ -9,44 +9,6 @@ class Fehler_model extends DB_Model
 	{
 		parent::__construct();
 		$this->dbTable = 'system.tbl_fehler';
-		$this->pk = array('fehlercode');
-		$this->hasSequence = false;
-	}
-
-	/**
-	 * Gets all fehler for particular apps.
-	 * @param $apps string of one app or array with multiple
-	 * @return object success or error
-	 */
-	public function getByApps($apps)
-	{
-		if (is_string($apps)) $apps = [$apps];
-
-		$params = [];
-
-		$qry = "
-			SELECT
-				fehlercode, fehler_kurzbz, fehlercode_extern, fehlertext, fehlertyp_kurzbz
-			FROM
-				system.tbl_fehler fe";
-
-		if (!isEmptyArray($apps))
-		{
-			$qry .= "
-				WHERE EXISTS (
-					SELECT 1
-					FROM
-						system.tbl_fehler_app
-					WHERE
-						fehlercode = fe.fehlercode
-						AND app IN ?
-				)";
-
-			$params[] = $apps;
-		}
-
-		$qry .= " ORDER BY fehlercode;";
-
-		return $this->execReadOnlyQuery($qry, $params);
+		$this->pk = 'fehlercode';
 	}
 }
@@ -15,21 +15,17 @@ class Fehlerkonfiguration_model extends DB_Model

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

-		$this->addDistinct();
-		$this->addSelect('fehler.fehlercode, konftyp.konfigurationstyp_kurzbz, tbl_fehler_konfiguration.konfiguration, fehler.fehler_kurzbz');
+		$this->addSelect('fehlercode, konfigurationstyp_kurzbz, konfiguration, fehler_kurzbz');
 		$this->addJoin('system.tbl_fehler_konfigurationstyp konftyp', 'konfigurationstyp_kurzbz');
 		$this->addJoin('system.tbl_fehler fehler', 'fehlercode');
-		$this->addJoin('system.tbl_fehler_app fe_app', 'fehlercode');
-		if (isset($apps) && !isEmptyArray($apps)) $this->db->where_in('fe_app.app', $apps);
-		$fehlerkonfigurationRes = $this->load();
+		$fehlerkonfigurationRes = isset($app) ? $this->loadWhere(array('fehler.app' => $app)) : $this->load();

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

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

-	/**
-	 * Get all Fehler for which user is hauptzuständig (is in charge).
-	 * @return object success or error
-	 */
-	public function getFehlerForUserHauptzustaendig()
-	{
-		$params = [getAuthPersonId()];
-
-		$this->load->model('person/Benutzerfunktion_model', 'BenutzerfunktionModel');
-
-		// get oes of uid for which there is a current funktion
-		$all_funktionen_oe_kurzbz = array();
-		$benutzerfunktionRes = $this->BenutzerfunktionModel->getBenutzerFunktionByUid(getAuthUID(), null, date('Y-m-d'), date('Y-m-d'));
-
-		if (isError($benutzerfunktionRes)) return $benutzerfunktionRes;
-
-		if (hasData($benutzerfunktionRes))
-		{
-			foreach (getData($benutzerfunktionRes) as $benutzerfunktion)
-			{
-				$all_funktionen_oe_kurzbz[$benutzerfunktion->oe_kurzbz][] = $benutzerfunktion->funktion_kurzbz;
-			}
-		}
-
-		$query = "WITH zustaendigkeiten AS (
-					SELECT fehlercode,
-						CASE
-							WHEN zst.person_id = ?";
-
-		if (!isEmptyArray($all_funktionen_oe_kurzbz))
-		{
-			$params[] = array_keys($all_funktionen_oe_kurzbz);
-			$query .= " OR (zst.oe_kurzbz IN ? AND zst.funktion_kurzbz IS NULL)  /* if oe is specified in fehler_zustaendigkeiten */";
-
-			// check for each oe for each function if zustaendig
-			foreach ($all_funktionen_oe_kurzbz as $oe_kurzbz => $funktionen_kurzbz)
-			{
-				foreach ($funktionen_kurzbz as $funktion_kurzbz)
-				{
-					$query .= " OR (zst.oe_kurzbz = '$oe_kurzbz' AND zst.funktion_kurzbz = '$funktion_kurzbz')";
-				}
-			}
-		}
-
-		$query .= " THEN TRUE
-					ELSE FALSE
-				END AS \"zustaendig\"
-			FROM system.tbl_fehler_zustaendigkeiten zst
-		)
-		SELECT
-			fehler.fehler_kurzbz, fehler.fehlercode
-		FROM
-			system.tbl_fehler fehler
-			LEFT JOIN zustaendigkeiten USING(fehlercode)
-		WHERE
-			zustaendigkeiten.fehlercode IS NULL
-			OR zustaendigkeiten.zustaendig = TRUE";
-
-		return $this->execReadOnlyQuery($query, $params);
-	}
-
 	/**
 	 * Gets active Mitarbeiter not assigned to a Fehler.
 	 * @param $fehlercode
@@ -20,20 +20,45 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern
 	 * @return object success with issues or error
 	 */
-	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $hauptzustaendig = false)
+	public function getOpenIssues($fehlercodes, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null)
 	{
+		$params = array();
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
-		return $this->_getIssues(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz = null,
-			$apps = null,
-			$ist_verarbeitet = false,
-			$behebung_parameter = null,
-			$fehlercodes,
-			$fehlercode_extern,
-			$hauptzustaendig
-		);
+		$qry = 'SELECT
+					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
+					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
+					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
+				FROM
+					system.tbl_issue iss
+					JOIN system.tbl_fehler fe USING (fehlercode)
+				WHERE
+					verarbeitetamum IS NULL';
+
+		if (!isEmptyArray($fehlercodes))
+		{
+			$qry .= ' AND fehlercode IN ?';
+			$params[] = $fehlercodes;
+		}
+
+		if (!isEmptyString($fehlercode_extern))
+		{
+			$qry .= ' AND fehlercode_extern = ?';
+			$params[] = $fehlercode_extern;
+		}
+
+		if (isset($person_id))
+		{
+			$qry .= ' AND person_id = ?';
+			$params[] = $person_id;
+		}
+
+		if (isset($oe_kurzbz))
+		{
+			$qry .= ' AND oe_kurzbz = ?';
+			$params[] = $oe_kurzbz;
+		}
+
+		return $this->execQuery($qry, $params);
 	}

 	/**
@@ -44,14 +69,8 @@ class Issue_model extends DB_Model
 	 * @param string $fehlercode_extern if provided, only issues with this external fehlercode are counted (for identifying issues from external systems).
 	 * @return Object success with number of issues or error
 	 */
-	public function getOpenIssueCount(
-		$fehlercode,
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlercode_extern = null,
-		$behebung_parameter = null,
-		$hauptzustaendig = false
-	) {
+	public function getOpenIssueCount($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlercode_extern = null, $behebung_parameter = null)
+	{
 		$params = array($fehlercode);
 		// issue exists for a fehlercode (or fehlercode_extern), person_id, oe_kurzbz, if not verarbeitet yet
 		$qry = 'SELECT count(*) as anzahl_open_issues FROM system.tbl_issue
@@ -64,7 +83,7 @@ class Issue_model extends DB_Model
 			$params[] = $fehlercode_extern;
 		}

-		if (isset($person_id) && is_numeric($person_id))
+		if (isset($person_id))
 		{
 			$qry .= ' AND person_id = ?';
 			$params[] = $person_id;
@@ -91,149 +110,4 @@ class Issue_model extends DB_Model

 		return $this->execQuery($qry, $params);
 	}
-
-	/**
-	 * Gets issues which are open, i.e. not resolved.
-	 * @param int $person_id
-	 * @param string $oe_kurzbz
-	 * @param string $fehlertyp_kurzbz
-	 * @param string|array $apps
-	 * @param array $behebung_parameter
-
-	 * @return object success with issues or error
-	 */
-	public function getOpenIssuesByProperties(
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlertyp_kurzbz = null,
-		$apps = null,
-		$behebung_parameter = null,
-		$hauptzustaendig = false
-	) {
-		return $this->_getIssues(
-			$person_id,
-			$oe_kurzbz,
-			$fehlertyp_kurzbz,
-			$apps,
-			$ist_verarbeitet = false,
-			$behebung_parameter,
-			$fehlercodes = null,
-			$fehlercode_extern = null,
-			$hauptzustaendig
-		);
-	}
-
-	/**
-	 * Gets issues which are open, i.e. not resolved.
-	 * @param int $person_id
-	 * @param string $oe_kurzbz
-	 * @param string $fehlertyp_kurzbz
-	 * @param array $apps only issues for given apps are retrieved
-	 * @param bool $ist_verarbeitet wether the issue has already been resolved
-	 * @param array $behebung_parameter
-	 * @param array $fehlercodes
-	 * @param string $fehlercode_extern
-	 * @return object success with issues or error
-	 */
-	private function _getIssues(
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlertyp_kurzbz = null,
-		$apps = null,
-		$ist_verarbeitet = null,
-		$behebung_parameter = null,
-		$fehlercodes = null,
-		$fehlercode_extern = null,
-		$hauptzustaendig = false
-	) {
-		$params = array();
-
-		$qry = 'SELECT
-					iss.issue_id, iss.fehlercode, fe.fehler_kurzbz, iss.inhalt, iss.fehlercode_extern,
-					iss.inhalt_extern, iss.person_id, iss.oe_kurzbz, iss.behebung_parameter,
-					iss.datum, iss.verarbeitetvon, iss.verarbeitetamum
-				FROM
-					system.tbl_issue iss
-					JOIN system.tbl_fehler fe USING (fehlercode)
-				WHERE
-					TRUE';
-
-		if (isset($person_id) && is_numeric($person_id))
-		{
-			$qry .= ' AND person_id = ?';
-			$params[] = $person_id;
-		}
-
-		if (isset($oe_kurzbz))
-		{
-			$qry .= ' AND oe_kurzbz = ?';
-			$params[] = $oe_kurzbz;
-		}
-
-		if (isset($fehlertyp_kurzbz))
-		{
-			$qry .= ' AND fehlertyp_kurzbz = ?';
-			$params[] = $fehlertyp_kurzbz;
-		}
-
-		if (isset($apps))
-		{
-			if (is_string($apps)) $apps = [$apps];
-
-			if (is_array($apps))
-			{
-				$qry .= ' AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode AND app IN ?)';
-				$params[] = $apps;
-			}
-		}
-
-		if (is_bool($ist_verarbeitet))
-		{
-			$qry .= $ist_verarbeitet ? ' AND verarbeitetamum IS NOT NULL' : ' AND verarbeitetamum IS NULL';
-		}
-
-		if (!isEmptyArray($behebung_parameter))
-		{
-			// convert array to JSON string for postgres
-			$behebung_parameter_string = json_encode($behebung_parameter);
-
-			if ($behebung_parameter_string)
-			{
-				// check if jsonb value is equal to the passed parameters array (if value contains array and array contains value)
-				$qry .= ' AND behebung_parameter @> ? AND behebung_parameter <@ ?';
-				$params = array_merge($params, array($behebung_parameter_string, $behebung_parameter_string));
-			}
-		}
-
-		// retrieving only fehler for which user is hauptzuständig
-		if ($hauptzustaendig === true)
-		{
-			$this->load->model('system/Fehlerzustaendigkeiten_model', 'FehlerzustaendigkeitenModel');
-
-			$result = $this->FehlerzustaendigkeitenModel->getFehlerForUserHauptzustaendig();
-
-
-			if (isError($result)) return $result;
-
-			if (hasData($result))
-			{
-				$fehlercodesZust = array_column(getData($result), 'fehlercode');
-				$fehlercodes = isEmptyArray($fehlercodes) ? $fehlercodesZust : array_intersect($fehlercodes, $fehlercodesZust);
-			}
-		}
-
-		if (!isEmptyArray($fehlercodes))
-		{
-			$qry .= ' AND fehlercode IN ?';
-			$params[] = $fehlercodes;
-		}
-
-		if (isset($fehlercode_extern))
-		{
-			$qry .= ' AND fehlercode_extern = ?';
-			$params[] = $fehlercode_extern;
-		}
-
-		return $this->execQuery($qry, $params);
-	}
 }
@@ -38,7 +38,7 @@ $includesArray = array(

 $this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<div id="abgabetoolroot" class="h-100" style="max-width: 95%;" route=<?php echo json_encode($route) ?> 
+<div id="abgabetoolroot" class="h-100" style="max-width: 99%" route=<?php echo json_encode($route) ?> 
 	uid=<?php echo $uid ?> 
 	 student_uid_prop="<?php echo $student_uid_prop ?? '' ?>"
 	stg_kz_prop="<?php echo $stg_kz_prop ?? '' ?>"
@@ -49,8 +49,7 @@ $query .= "
 				inhalt AS \"Inhalt\", inhalt_extern AS \"Inhalt extern\", iss.person_id AS \"PersonId\", iss.oe_kurzbz AS \"OE\",
 				ftyp.bezeichnung_mehrsprachig[".$this->db->escape($language_index)."] AS \"Fehlertyp\",
 				stat.bezeichnung_mehrsprachig[".$this->db->escape($language_index)."] AS \"Fehlerstatus\",
-				verarbeitetvon AS \"Verarbeitet von\",verarbeitetamum AS \"Verarbeitet am\",
-				(SELECT STRING_AGG(app, ', ') FROM system.tbl_fehler_app WHERE fehlercode = fr.fehlercode GROUP BY fehlercode) AS \"Applikation\",
+				verarbeitetvon AS \"Verarbeitet von\",verarbeitetamum AS \"Verarbeitet am\", fr.app AS \"Applikation\",
 				fr.fehlertyp_kurzbz AS \"Fehlertypcode\", iss.status_kurzbz AS \"Statuscode\",
 				pers.vorname AS \"Vorname\", pers.nachname AS \"Nachname\",
 				(
@@ -169,7 +168,7 @@ $query .= 							")

 $query .= ") ";

-if (!isEmptyString($APPS)) $query .= " AND EXISTS (SELECT 1 FROM system.tbl_fehler_app WHERE fehlercode = fr.fehlercode AND app IN ".$APPS.")";
+if (!isEmptyString($APPS)) $query .= " AND fr.app IN ".$APPS;

 $query .= " ORDER BY
 			CASE
@@ -2,8 +2,7 @@

 // get assigned Konfiguration
 $query = "SELECT
-				konftyp.konfigurationstyp_kurzbz, fe.fehlercode, fe.fehler_kurzbz, konf.konfiguration,
-				(SELECT STRING_AGG(app, ', ') FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode GROUP BY fehlercode) AS app,
+				konftyp.konfigurationstyp_kurzbz, fe.fehlercode, fe.fehler_kurzbz, konf.konfiguration, fe.app,
 				konftyp.beschreibung AS  konfigurationsbeschreibung, konftyp.konfigurationsdatentyp, fe.fehlertext
 			FROM
 				system.tbl_fehler_konfiguration konf
@@ -1,8 +1,7 @@
 <?php

 // get assigned Zustaendigkeiten
-$query = "SELECT fehlerzustaendigkeiten_id, fe.fehlercode, fe.fehlercode_extern, fehler_kurzbz, fehlertext, fehlertyp_kurzbz,
-			(SELECT STRING_AGG(app, ', ') FROM system.tbl_fehler_app WHERE fehlercode = fe.fehlercode GROUP BY fehlercode) AS app,
+$query = "SELECT fehlerzustaendigkeiten_id, fe.fehlercode, fe.fehlercode_extern, fehler_kurzbz, fehlertext, fehlertyp_kurzbz, fe.app,
       		pers.person_id, pers.vorname, pers.nachname,
       		oe.oe_kurzbz, oe.bezeichnung AS oe_bezeichnung, funk.funktion_kurzbz, funk.beschreibung AS funktion_beschreibung
 			FROM system.tbl_fehler_zustaendigkeiten zst
@@ -25,7 +25,6 @@
 */
 require_once(dirname(__FILE__).'/basis_db.class.php');
 require_once(dirname(__FILE__).'/'.EXT_FKT_PATH.'/generateZahlungsreferenz.inc.php');
-require_once(dirname(__FILE__).'/variable.class.php');

 class konto extends basis_db
 {
@@ -433,8 +432,6 @@ class konto extends basis_db

 		$qry.=" ORDER BY beschreibung";

-		$oehBeitrag = $this->_getOEHBeitrag();
-
 		if($this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object())
@@ -443,15 +440,7 @@ class konto extends basis_db

 				$typ->buchungstyp_kurzbz = $row->buchungstyp_kurzbz;
 				$typ->beschreibung = $row->beschreibung;
-				if (strtolower($typ->buchungstyp_kurzbz) === 'oeh' && $oehBeitrag)
-				{
-					$typ->standardbetrag = $oehBeitrag;
-				}
-				else
-				{
-					$typ->standardbetrag = $row->standardbetrag;
-				}
-
+				$typ->standardbetrag = $row->standardbetrag;
 				$typ->standardtext = $row->standardtext;
 				$typ->credit_points = $row->credit_points;
 				$typ->aktiv = $this->db_parse_bool($row->aktiv);
@@ -1001,43 +990,6 @@ class konto extends basis_db
 			return false;
 		}
 	}
-
-	private function _getOEHBeitrag()
-	{
-		if(!is_user_logged_in())
-		{
-			return false;
-		}
-
-		$variablen_obj = new variable();
-		$variablen_obj->loadVariables(get_uid());
-
-		$qry = "WITH semstart AS (
-					SELECT start FROM public.tbl_studiensemester
-					WHERE studiensemester_kurzbz = '". $this->db_escape($variablen_obj->variable->semester_aktuell) . "'
-				)
-				SELECT * FROM bis.tbl_oehbeitrag oehb
-				JOIN public.tbl_studiensemester semvon ON oehb.von_studiensemester_kurzbz = semvon.studiensemester_kurzbz
-				LEFT JOIN public.tbl_studiensemester sembis ON oehb.bis_studiensemester_kurzbz = sembis.studiensemester_kurzbz
-				JOIN semstart ON semstart.start::date >= semvon.start::date AND (sembis.studiensemester_kurzbz IS NULL OR semstart.start::date <= sembis.start::date)
-				ORDER BY semvon.start
-				LIMIT 1";
-
-		if ($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$summe = ($row->studierendenbeitrag + $row->versicherung) * -1;
-				return number_format((float)$summe, 2, '.', '');
-			}
-			return false;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler bei der Abfrage aufgetreten';
-			return false;
-		}
-	}
 }

 ?>
@@ -197,6 +197,10 @@ html.fs_huge {
 	margin-bottom: -1px;
 }

+.tiny-90 div.tox.tox-tinymce {
+	height: 90% !important;
+}
+
 /* slim begin */
 .stv .form-label {
 	margin-bottom: .15rem;
@@ -277,3 +281,7 @@ html.fs_huge {
 }
 */
 /* slim ende */
+
+.fhc-xxl-modal {
+	min-width: 80vw;
+}
@@ -305,4 +305,94 @@
 /* If you use hover rows, you need to ensure the sticky cell matches the hover color */
 #abgabetable .tabulator-row:hover .tabulator-cell.sticky-col {
 	background-color: #ccc; /* Match your existing hover color */
-}
+}
+
+.tabulator-cell {
+	container-type: inline-size;
+}
+
+.tabulator-col-title {
+	container-type: inline-size;
+}
+
+@container (max-width: 100px) {
+	.full-text {
+		display: none !important;
+	}
+
+	.short-text {
+		display: inline-block !important;
+		width: 100%;
+	}
+}
+
+/*conditional tooltips fix*/
+.p-tooltip.custom-tooltip {
+	z-index: 8001 !important;
+}
+
+ /* Shrinks font and table rows for desktop users who have zoomed in their browser (150%+).
+   Does not affect mobile/touchscreen devices, which use touch input instead of a mouse. */
+@media (pointer: fine) and (min-resolution: 1.5dppx) {
+
+	html.abgabetool {
+		font-size: 0.5rem;
+	}
+
+	.abgabetool .tabulator-cell,
+	.abgabetool .tabulator-row {
+		 height: 20px;
+		 max-height: 20px;
+	 }
+	
+}
+
+/*confetti celebration on endupload - impossible to miss*/
+#confetti-container {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100vw;
+	height: 100vh;
+	pointer-events: none;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+.confetti-piece {
+	position: absolute;
+	opacity: 0;
+	will-change: top, transform, opacity;
+}
+
+/* Background Rain */
+@keyframes fallAndSpin {
+	0% {
+		top: var(--start-y);
+		transform: translate3d(0, 0, 0) rotateX(0deg) rotateY(0deg);
+		opacity: 1;
+	}
+	100% {
+		top: 105vh;
+		transform: translate3d(var(--drift), 0, 0) rotateX(720deg) rotateY(360deg);
+		opacity: 0.3;
+	}
+}
+
+/* Corner Cannons*/
+@keyframes cannonBlast {
+	0% {
+		transform: translate3d(0, 0, 0) scale(0.3) rotate(0deg);
+		opacity: 1;
+		animation-timing-function: cubic-bezier(0.1, 0.8, 0.2, 1);
+	}
+	30% {
+		transform: translate3d(var(--blast-x), var(--blast-y), 0) scale(1.2) rotate(270deg);
+		opacity: 1;
+		animation-timing-function: linear;
+	}
+	100% {
+		transform: translate3d(calc(var(--blast-x) * 1.4), 15vh, 0) scale(0.4) rotate(630deg);
+		opacity: 0;
+	}
+}
@@ -77,6 +77,13 @@ export default {
 			}
 		};
 	},
+	patchProjektarbeitAbgabeMultiple(payload) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/patchProjektarbeitAbgabeMultiple',
+			params: payload
+		};
+	},
 	deleteProjektarbeitAbgabe(paabgabe_id) {
 		return {
 			method: 'post',
@@ -84,6 +91,13 @@ export default {
 			params: { paabgabe_id }
 		};
 	},
+	deleteProjektarbeitAbgabeMultiple(paabgabe_ids) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/deleteProjektarbeitAbgabeMultiple',
+			params: { paabgabe_ids }
+		};
+	},
 	postSerientermin(datum, paabgabetyp_kurzbz, bezeichnung, kurzbz, upload_allowed, projektarbeit_ids, fixtermin) {
 		return {
 			method: 'post',
@@ -139,6 +153,14 @@ export default {
 			url: '/api/frontend/v1/Abgabe/getSignaturStatusForProjektarbeitAbgaben',
 			params: {paabgabe_ids, student_uid},

+		};
+	},
+	postStudentProjektarbeitTitel(projektarbeit_id, titel) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Abgabe/postStudentProjektarbeitTitel',
+			params: {projektarbeit_id, titel},
+
 		};
 	}
 };
@@ -1,20 +0,0 @@
-export default {
-
-	checkPerson(person_id)
-	{
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/issues/StudentIssueChecker/checkPerson',  
-			params: { person_id }
-		};
-	},
-	countPersonOpenIssues(person_id)
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/issues/StudentIssueChecker/countPersonOpenIssues',
-			params: { person_id }
-		};
-	}
-
-}
@@ -1,12 +0,0 @@
-export default {
-
-	getOpenIssuesByProperties(person_id, oe_kurzbz, fehlertyp_kurzbz, apps, behebung_parameter, hauptzustaendig)
-	{
-		return {
-			method: 'get',
-			url: '/api/frontend/v1/issues/Issues/getOpenIssuesByProperties',
-			params: { person_id, oe_kurzbz, fehlertyp_kurzbz, apps, behebung_parameter, hauptzustaendig }
-		};
-	}
-
-}
@@ -38,10 +38,6 @@ export default {
 		};
 	},
 	insert(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/insert',
@@ -56,10 +52,6 @@ export default {
 		};
 	},
 	edit(params) {
-		if(params.betrag)
-		{
-			params.betrag = params.betrag.replace(',', '.');
-		}
 		return {
 			method: 'post',
 			url: 'api/frontend/v1/stv/konto/update',
@@ -73,14 +65,10 @@ export default {
 			params: { buchungsnr }
 		};
 	},
-	getBuchungstypen(studiensemester_kurzbz) {
-		let url = 'api/frontend/v1/stv/konto/getBuchungstypen'
-		if (!!studiensemester_kurzbz)
-			url = url + '/' + encodeURIComponent(studiensemester_kurzbz);
-
+	getBuchungstypen() {
 		return {
 			method: 'get',
-			url: url
+			url: 'api/frontend/v1/stv/konto/getBuchungstypen'
 		};
-	},
+	}
 };
@@ -4,7 +4,9 @@ export default {
 	name: 'BootstrapModal',
 	data: () => ({
 		modal: null,
-		fullscreen: false
+		fullscreen: false,
+		expandBtnHovered: false,
+		expandBtnFocused: false,
 	}),
 	props: {
 		backdrop: {
@@ -70,6 +72,29 @@ export default {
 			this.$emit('toggleFullscreen')
 		}
 	},
+	computed: {
+		getExpandButtonStyles() {
+			const hovered = this.expandBtnHovered;
+			const focused = this.expandBtnFocused;
+			return `display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 1em;
+					height: 1em;
+					padding: 0;
+					border: 0;
+					background: transparent;
+					font-size: 1em;
+					opacity: 0.5;
+					color: inherit;
+					cursor: pointer;
+					line-height: 1;
+					transition: opacity 0.15s ease;
+					opacity: ${focused ? '1' : hovered ? '0.75' : '0.5'};
+					outline: ${focused ? '1px solid currentColor' : 'none'};
+					outline-offset: 2px;`
+		}	
+	},
 	mounted() {
 		if (this.$refs.modal)
 			this.modal = new bootstrap.Modal(this.$refs.modal, {
@@ -140,9 +165,13 @@ export default {
 					<div class="d-flex align-items-center ms-auto gap-2">
 						<button 
 							type="button" 
-							class="btn mb-1" 
+							:style="getExpandButtonStyles"
 							v-if="allowFullscreenExpand" 
 							@click="toggleFullscreen"
+							@mouseenter="expandBtnHovered = true"
+							@mouseleave="expandBtnHovered = false"
+							@focusin="expandBtnFocused = true"
+							@focusout="expandBtnFocused = false"
 							:aria-label="fullscreen ? 'Exit Fullscreen' : 'Enter Fullscreen'"
 						>
 							<i v-if="!fullscreen" class="fa-solid fa-expand"></i>
@@ -2,6 +2,7 @@ import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import { getDateStyleClass } from "./getDateStyleClass.js";
+import { compareISODateValues, formatISODate, getViennaTodayISO } from "./dateUtils.js";

 export const AbgabeMitarbeiterDetail = {
 	name: "AbgabeMitarbeiterDetail",
@@ -46,12 +47,7 @@ export const AbgabeMitarbeiterDetail = {
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
-			speedDialItems: [{
-				label: Vue.computed(() => this.$p.t('abgabetool/c4newAbgabetermin')),
-				icon: "fa fa-plus",
-				command: this.openCreateNewAbgabeModal,
-				disabled: Vue.computed(() => !this.getAllowedToCreateNewTermin)
-			},
+			speedDialItems: [
 			{
 				label: Vue.computed(() => this.$p.t('abgabetool/c4benoten')),
 				icon: "fa fa-user-check",
@@ -81,6 +77,9 @@ export const AbgabeMitarbeiterDetail = {
 		}
 	},
 	methods: {
+		terminIsInvalid(termin) {
+			return termin.note?.positiv == false && !termin.beurteilungsnotiz	
+		},
 		getNoteBezeichnung(termin){
 			if(termin.noteBackend?.bezeichnung) {
 				return termin.noteBackend?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
@@ -113,6 +112,8 @@ export const AbgabeMitarbeiterDetail = {
 					if(newTerminRes.note) {
 						newTerminRes.note = noteOpt
 						newTerminRes.noteBackend = noteOpt // certain UI elements should only reflect persisted state
+						termin.allowedToDelete = false
+						newTerminRes.allowedToDelete = false
 					}
 					newTerminRes.invertedFixtermin = !newTerminRes.fixtermin
 					const existingTerminRes = res.data[1]
@@ -132,13 +133,13 @@ export const AbgabeMitarbeiterDetail = {
 					} else {
 						const noteOptExisting = this.allowedNotenOptions.find(opt => opt.note == existingTerminRes.note)
 						existingTerminRes.note = noteOptExisting
-
+						
 						termin.paabgabetyp_kurzbz = newTerminRes.paabgabetyp_kurzbz
 						termin.noteBackend = noteOpt // do NOT take noteOptExisting -> should reflect the "yes the qgate grade is confirmed in backend ux behaviour"
 						termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 					}
 					
-					this.projektarbeit.abgabetermine.sort((a, b) =>new Date(a.datum) - new Date(b.datum))
+					this.projektarbeit.abgabetermine.sort((a, b) => compareISODateValues(a.datum, b.datum))
 					
 					const index = this.projektarbeit.abgabetermine.findIndex(t => termin.paabgabe_id == t.paabgabe_id)
 					
@@ -159,7 +160,7 @@ export const AbgabeMitarbeiterDetail = {
 							'fixtermin': false,
 							'invertedFixtermin': true,
 							'kurzbz': '', // todo kurzbz textfield value vorschlag für qualgates
-							'datum': new Date().toISOString().split('T')[0],
+							'datum': getViennaTodayISO(),
 							'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 							'beurteilungsnotiz': '',
 							'upload_allowed': false,
@@ -337,16 +338,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		formatDate(dateParam) {
-			// unsafe for datepickers, dont use there
-			const date = new Date(dateParam)
-			// handle missing leading 0
-			const padZero = (num) => String(num).padStart(2, '0');
-
-			const month = padZero(date.getMonth() + 1); // Months are zero-based
-			const day = padZero(date.getDate());
-			const year = date.getFullYear();
-			
-			return `${day}.${month}.${year}`
+			return formatISODate(dateParam)
 		},
 		openCreateNewAbgabeModal() {
 			if(this.projektarbeit?.betreuerart_kurzbz == 'Zweitbegutachter') {
@@ -364,7 +356,7 @@ export const AbgabeMitarbeiterDetail = {
 					'fixtermin': false,
 					'invertedFixtermin': true,
 					'kurzbz': '',
-					'datum': new Date().toISOString().split('T')[0],
+					'datum': getViennaTodayISO(),
 					'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 					'beurteilungsnotiz': '',
 					'upload_allowed': typ.upload_allowed_default,
@@ -398,7 +390,7 @@ export const AbgabeMitarbeiterDetail = {
 				'fixtermin': false,
 				'invertedFixtermin': true,
 				'kurzbz': '',
-				'datum': new Date().toISOString().split('T')[0],
+				'datum': getViennaTodayISO(),
 				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 				'beurteilungsnotiz': '',
 				'upload_allowed': false,
@@ -446,7 +438,7 @@ export const AbgabeMitarbeiterDetail = {
 			}
 		},
 		getMessagePtStyle() {
-			// adjust outer spacing and internal padding to appear similar to doenload button in size
+			// adjust outer spacing and internal padding to appear similar to download button in size
 			return {
 				root: {
 					style: {
@@ -561,6 +553,12 @@ export const AbgabeMitarbeiterDetail = {
 				class: "custom-tooltip"
 			}
 		},
+		getTooltipBeurteilungsnotiz() {
+			return {
+				value: this.$p.t('abgabetool/c4beurteilungsnotizBeiNegNote'),
+				class: "custom-tooltip"
+			}
+		},
 		getProjektarbeitTitel() {
 			if(this.projektarbeit?.titel) return this.$capitalize(this.$p.t('abgabetool/c4titel')) + ': ' + this.projektarbeit.titel
 			
@@ -591,7 +589,7 @@ export const AbgabeMitarbeiterDetail = {
 				'fixtermin': false,
 				'invertedFixtermin': true,
 				'kurzbz': '',
-				'datum': new Date().toISOString().split('T')[0],
+				'datum': getViennaTodayISO(),
 				'note': this.allowedNotenOptions.find(opt => opt.note == 9),
 				'beurteilungsnotiz': '',
 				'upload_allowed': typ.upload_allowed_default,
@@ -656,6 +654,7 @@ export const AbgabeMitarbeiterDetail = {
 							:enable-time-picker="false"
 							locale="de"
 							format="dd.MM.yyyy"
+							model-type="yyyy-MM-dd"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
@@ -806,6 +805,7 @@ export const AbgabeMitarbeiterDetail = {
 								:enable-time-picker="false"
 								locale="de"
 								format="dd.MM.yyyy"
+								model-type="yyyy-MM-dd"
 								:text-input="true"
 								auto-apply>
 							</VueDatePicker>
@@ -851,8 +851,10 @@ export const AbgabeMitarbeiterDetail = {
 					</div>
 					<div class="row mt-2" v-if="termin.bezeichnung?.benotbar">
 						<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4notizQualGatev2') )}}</div>
-						<div class="col-12 col-md-9">
-							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
+						<div class="col-12 col-md-9" v-tooltip.right="terminIsInvalid(termin) && getTooltipBeurteilungsnotiz">
+							<Textarea style="margin-bottom: 4px;" v-model="termin.beurteilungsnotiz" 
+							:class="{ 'p-invalid': terminIsInvalid(termin) }"
+							 rows="1" class="w-100" :disabled="!termin.allowedToSave"></Textarea>
 						</div>
 					</div>
 					
@@ -874,6 +876,7 @@ export const AbgabeMitarbeiterDetail = {
 											:disabled="true"
 											locale="de"
 											format="dd.MM.yyyy"
+											model-type="yyyy-MM-dd"
 											>
 										</VueDatePicker>
 									</div>
@@ -907,7 +910,7 @@ export const AbgabeMitarbeiterDetail = {
 						<div class="col-12 col-md-9">
 							<div class="row">
 								<div class="col-auto">
-									<button v-if="termin.allowedToSave" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
+									<button v-if="termin.allowedToSave && !terminIsInvalid(termin)" style="max-height: 40px;" class="btn btn-primary border-0" @click="saveTermin(termin)">
 										{{ $capitalize( $p.t('abgabetool/c4save') )}}
 										<i class="fa-solid fa-floppy-disk"></i>
 									</button>
@@ -3,6 +3,7 @@ import BsModal from '../../Bootstrap/Modal.js';
 import VueDatePicker from '../../vueDatepicker.js.php';
 import ApiAbgabe from '../../../api/factory/abgabe.js'
 import FhcOverlay from "../../Overlay/FhcOverlay.js";
+import { formatISODate, getViennaTodayISO } from "./dateUtils.js";

 export const AbgabeStudentDetail = {
 	name: "AbgabeStudentDetail",
@@ -20,7 +21,7 @@ export const AbgabeStudentDetail = {
 		VueDatePicker,
 		FhcOverlay
 	},
-	inject: ['notenOptions', 'isMobile', 'isViewMode', 'moodle_link'],
+	inject: ['notenOptions', 'isMobile', 'isViewMode', 'moodle_link', 'confetti_on_endupload', 'title_edit_allowed'],
 	props: {
 		projektarbeit: {
 			type: Object,
@@ -31,12 +32,14 @@ export const AbgabeStudentDetail = {
 			default: false
 		}
 	},
+	emits: ['titel-updated'],
 	data() {
 		return {
 			loading: false,
 			eidAkzeptiert: false,
 			enduploadTermin: null,
 			allActiveLanguages: FHC_JS_DATA_STORAGE_OBJECT.server_languages,
+			editingTitel: '',
 			form: Vue.reactive({
 				sprache: '',
 				abstract: '',
@@ -49,9 +52,113 @@ export const AbgabeStudentDetail = {
 		}
 	},
 	methods: {
+		confettiCannons() {
+			const container = document.getElementById('confetti-container');
+			if (!container) return;
+
+			const colors = ['#FFC107', '#FF5722', '#E91E63', '#00BCD4', '#4CAF50', '#9C27B0'];
+			const shapes = ['50%', '0%'];
+			const fragment = document.createDocumentFragment();
+
+			// Corner Cannons - Slowed Down)
+			const cannonCount = 150;
+
+			for (let i = 0; i < cannonCount; i++) {
+				const leftConfetti = document.createElement('div');
+				leftConfetti.classList.add('confetti-piece');
+				leftConfetti.style.left = '0px';
+				leftConfetti.style.top = '100%';
+
+				const rightConfetti = document.createElement('div');
+				rightConfetti.classList.add('confetti-piece');
+				rightConfetti.style.left = '100vw';
+				rightConfetti.style.top = '100%';
+
+				const colorL = colors[Math.floor(Math.random() * colors.length)];
+				const colorR = colors[Math.floor(Math.random() * colors.length)];
+				const shapeL = shapes[Math.floor(Math.random() * shapes.length)];
+				const shapeR = shapes[Math.floor(Math.random() * shapes.length)];
+
+				// Left Styles
+				leftConfetti.style.background = colorL;
+				leftConfetti.style.borderRadius = shapeL;
+				leftConfetti.style.width = `${Math.random() * 10 + 6}px`;
+				leftConfetti.style.height = `${Math.random() * 14 + 6}px`;
+				leftConfetti.style.setProperty('--blast-x', `${Math.random() * 50 + 10}vw`);
+				leftConfetti.style.setProperty('--blast-y', `-${Math.random() * 65 + 30}vh`);
+
+				// Right Styles
+				rightConfetti.style.background = colorR;
+				rightConfetti.style.borderRadius = shapeR;
+				rightConfetti.style.width = `${Math.random() * 10 + 6}px`;
+				rightConfetti.style.height = `${Math.random() * 14 + 6}px`;
+				rightConfetti.style.setProperty('--blast-x', `-${Math.random() * 50 + 10}vw`);
+				rightConfetti.style.setProperty('--blast-y', `-${Math.random() * 65 + 30}vh`);
+
+				// Increased durations to 3s - 5s for a floating gravity effect
+				const durationL = Math.random() * 2 + 3;
+				const durationR = Math.random() * 2 + 3;
+				const delayL = Math.random() * 0.2;
+				const delayR = Math.random() * 0.2;
+
+				leftConfetti.style.animation = `cannonBlast ${durationL}s linear ${delayL}s both`;
+				rightConfetti.style.animation = `cannonBlast ${durationR}s linear ${delayR}s both`;
+
+				fragment.appendChild(leftConfetti);
+				fragment.appendChild(rightConfetti);
+
+				setTimeout(() => leftConfetti.remove(), (delayL + durationL) * 1000);
+				setTimeout(() => rightConfetti.remove(), (delayR + durationR) * 1000);
+			}
+
+			container.appendChild(fragment);
+		},
+		openTitelEdit() {
+			this.editingTitel = this.projektarbeit.titel ?? '';
+			this.$refs.modalTitelEdit.show();
+		},
+		async saveTitel() {
+			const trimmed = this.editingTitel.trim();
+			if (!trimmed) {
+				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningEmptyField')));
+				return;
+			}
+
+			const confirmed = await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/c4confirmTitelSpeichern'),
+				acceptLabel: this.$capitalize(this.$p.t('ui/speichern')),
+				acceptClass: 'p-button-primary',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'p-button-secondary'
+			});
+
+			if (confirmed === false) return;
+
+			this.loading = true;
+			this.$api.call(
+				ApiAbgabe.postStudentProjektarbeitTitel(
+					this.projektarbeit.projektarbeit_id,
+					trimmed
+				)
+			).then(res => {
+				if (res.meta.status === 'success') {
+					this.projektarbeit.titel = trimmed;
+					this.$emit('titel-updated', {
+						projektarbeit_id: this.projektarbeit.projektarbeit_id,
+						titel: trimmed
+					});
+					this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4titelSavedSuccess')));
+					this.$refs.modalTitelEdit.hide();
+				} else {
+					this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4titelSaveError')));
+				}
+			}).finally(() => {
+				this.loading = false;
+			});
+		},
 		getNoteBezeichnung(termin){
 			const noteOpt = this.notenOptions.find(opt => opt.note == termin.note)
-			
+
 			if(noteOpt?.bezeichnung) {
 				return noteOpt?.positiv ? this.$capitalize(this.$p.t('abgabetool/c4positivBenotet')) + ' ✅' : this.$capitalize(this.$p.t('abgabetool/c4negativBenotet')) + ' ❌'
 			} else if(noteOpt?.benotbar === true && !termin.note) {
@@ -65,7 +172,7 @@ export const AbgabeStudentDetail = {
 				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningChooseFile')));
 				return false
 			}
-			
+
 			if(endupload) {
 				if(await this.$fhcAlert.confirm({
 					message: this.$p.t('abgabetool/confirmEnduploadSpeichern'),
@@ -77,16 +184,16 @@ export const AbgabeStudentDetail = {
 					return false
 				}
 			}
-			
+
 			return true;
 		},
 		async triggerEndupload() {
-			
+
 			if (!await this.validate(this.enduploadTermin, true))
 			{
 				return false;
 			}
-			
+
 			// post endabgabe
 			const formData = new FormData();
 			formData.append('paabgabetyp_kurzbz', this.enduploadTermin.paabgabetyp_kurzbz)
@@ -94,14 +201,14 @@ export const AbgabeStudentDetail = {
 			formData.append('paabgabe_id', this.enduploadTermin.paabgabe_id)
 			formData.append('student_uid', this.projektarbeit.student_uid)
 			formData.append('bperson_id', this.projektarbeit.bperson_id)
-			
+
 			formData.append('sprache', this.form['sprache'].sprache)
 			formData.append('abstract', this.form['abstract'])
 			formData.append('abstract_en', this.form['abstract_en'])
 			formData.append('schlagwoerter', this.form['schlagwoerter'])
 			formData.append('schlagwoerter_en', this.form['schlagwoerter_en'])
 			formData.append('seitenanzahl', this.form['seitenanzahl'])
-			
+
 			for (let i = 0; i < this.enduploadTermin.file.length; i++) {
 				formData.append('file', this.enduploadTermin.file[i]);
 			}
@@ -109,39 +216,31 @@ export const AbgabeStudentDetail = {
 			this.$api.call(ApiAbgabe.postStudentProjektarbeitEndupload(formData))
 				.then(res => {
 					this.handleUploadRes(res, this.enduploadTermin)
+						if(this.confetti_on_endupload && res.meta.status == "success") {
+							this.confettiCannons()
+						}
 				}).finally(()=> {
-					this.loading = false
+				this.loading = false
 			})
-			
+
 			this.$refs.modalContainerEnduploadZusatzdaten.hide()
 		},
 		downloadAbgabe(termin) {
 			const url = `/api/frontend/v1/Abgabe/getStudentProjektarbeitAbgabeFile?paabgabe_id=${termin.paabgabe_id}&student_uid=${this.projektarbeit.student_uid}&projektarbeit_id=${this.projektarbeit.projektarbeit_id}`;

 			window.open(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + url)
-			// this.$api.call(ApiAbgabe.getStudentProjektarbeitAbgabeFile(termin.paabgabe_id, this.projektarbeit.student_uid))
 		},
 		formatDate(dateParam) {
-			const date = new Date(dateParam)
-			// handle missing leading 0
-			const padZero = (num) => String(num).padStart(2, '0');
-
-			const month = padZero(date.getMonth() + 1); // Months are zero-based
-			const day = padZero(date.getDate());
-			const year = date.getFullYear();
-
-			return `${day}.${month}.${year}`
+			return formatISODate(dateParam)
 		},
 		async upload(termin) {

-			// only do this on endupload
 			if (! await this.validate(termin))
 			{
 				return false;
 			}
-			
+
 			if(termin.bezeichnung?.paabgabetyp_kurzbz === 'end') {
-				// open endupload form modal for further inputs
 				this.enduploadTermin = termin
 				this.$refs.modalContainerEnduploadZusatzdaten.show()
 			} else {
@@ -151,7 +250,7 @@ export const AbgabeStudentDetail = {
 				formData.append('paabgabe_id', termin.paabgabe_id)
 				formData.append('student_uid', this.projektarbeit.student_uid)
 				formData.append('bperson_id', this.projektarbeit.bperson_id)
-				
+
 				for (let i = 0; i < termin.file.length; i++) {
 					formData.append('file', termin.file[i]);
 				}
@@ -161,7 +260,7 @@ export const AbgabeStudentDetail = {
 					.then(res => {
 						this.handleUploadRes(res, termin)
 					}).finally(()=> {
-						this.loading = false
+					this.loading = false
 				})
 			}
 		},
@@ -169,21 +268,18 @@ export const AbgabeStudentDetail = {
 			if(res.meta.status == "success") {
 				this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4fileUploadSuccessv3')))

-				// update 'abgabedatum' for successful upload -> shows the pdf icon and date once set
-				termin.abgabedatum = new Date().toISOString().split('T')[0];
+				termin.abgabedatum = getViennaTodayISO();
 				if(res?.data?.signatur !== undefined) {
 					termin.signatur = res.data.signatur
 				}
-				
+
 			} else {
 				this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4fileUploadErrorv3')))
 			}
-			
+
 			if(res.meta.signaturInfo) {
 				this.$fhcAlert.alertInfo(res.meta.signaturInfo)
 			}
-			
-			
 		},
 		getOptionLabel(option) {
 			return option.sprache
@@ -195,7 +291,6 @@ export const AbgabeStudentDetail = {
 	},
 	watch: {
 		projektarbeit(newVal) {
-			// default select german if projektarbeit sprache was null
 			this.form.sprache = newVal.sprache ? this.allActiveLanguages.find(lang => lang.sprache == newVal.sprache) : this.allActiveLanguages.find(lang => lang.sprache == 'German')
 			this.form.abstract = newVal.abstract ?? ''
 			this.form.abstract_en = newVal.abstract_en ?? ''
@@ -203,15 +298,13 @@ export const AbgabeStudentDetail = {
 			this.form.schlagwoerter_en = newVal.schlagwoerter_en ?? ''
 			this.form.kontrollschlagwoerter = newVal.kontrollschlagwoerter ?? ''
 			this.form.seitenanzahl = newVal.seitenanzahl ?? 1
-			
 		}
 	},
 	computed: {
 		getMoodleLink() {
-			return this.moodle_link + this.projektarbeit.studiengang_kz	
+			return this.moodle_link + this.projektarbeit.studiengang_kz
 		},
 		getMessagePtStyle() {
-			// adjust outer spacing and internal padding to appear similar to doenload button in size
 			return {
 				root: {
 					style: {
@@ -244,85 +337,46 @@ export const AbgabeStudentDetail = {
 			})
 			return qgatefound
 		},
+		isTitelEditAllowed() {
+			return this.title_edit_allowed && !this.isViewMode && !this.projektarbeit?.note;
+		},
 		getTooltipVerspaetet() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerspaetet')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerspaetet')), class: "custom-tooltip" }
 		},
 		getTooltipVerpasst() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerpasst')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipVerpasst')), class: "custom-tooltip" }
 		},
 		getTooltipAbzugeben() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbzugeben')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbzugeben')), class: "custom-tooltip" }
 		},
 		getTooltipStandard() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandardv2')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipStandardv2')), class: "custom-tooltip" }
 		},
 		getTooltipAbgegeben() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgegeben')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgegeben')), class: "custom-tooltip" }
 		},
 		getTooltipFixtermin() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipFixtermin')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipFixtermin')), class: "custom-tooltip" }
 		},
 		getTooltipAbgabeDetected() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipAbgabeDetected')), class: "custom-tooltip" }
 		},
 		getTooltipNotAllowedToUpload() {
 			if(this.isViewMode) {
-				return {
-					value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedInViewMode')),
-					class: "custom-tooltip"
-				}
+				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedInViewMode')), class: "custom-tooltip" }
 			} else {
-				return {
-					value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegular')),
-					class: "custom-tooltip"
-				}
+				return { value: this.$capitalize(this.$p.t('abgabetool/c4studentAbgabeNotAllowedRegular')), class: "custom-tooltip" }
 			}
 		},
 		getTooltipBeurteilungerforderlich() {
-			return {
-				value: this.$capitalize(this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')),
-				class: "custom-tooltip"
-			}
+			return { value: this.$capitalize(this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')), class: "custom-tooltip" }
 		},
 		getTooltipBestanden() {
-			return {
-				value: this.$p.t('abgabetool/c4tooltipBestanden'),
-				class: "custom-tooltip"
-			}
+			return { value: this.$p.t('abgabetool/c4tooltipBestanden'), class: "custom-tooltip" }
 		},
 		getTooltipNichtBestanden() {
-			return {
-				value: this.$p.t('abgabetool/c4tooltipNichtBestanden'),
-				class: "custom-tooltip"
-			}
+			return { value: this.$p.t('abgabetool/c4tooltipNichtBestanden'), class: "custom-tooltip" }
 		},
-	},
-	created() {
-		
-	},
-	mounted() {
-
 	},
 	template: `
 		<FhcOverlay :active="loading"></FhcOverlay>
@@ -332,9 +386,24 @@ export const AbgabeStudentDetail = {
 			<h5>{{$capitalize( $p.t('abgabetool/c4abgabeStudentenbereich') )}}</h5>
 			<div class="row">
 				<div class="col-8">
-					<p> {{$capitalize( $p.t('person/student') ) }}: {{projektarbeit?.student}}</p>
-					<p> {{$capitalize( $p.t('abgabetool/c4titel') ) }}: {{projektarbeit?.titel}}</p>
-					<p> {{$capitalize( $p.t('abgabetool/c4betreuerv2') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
+					<p>{{$capitalize( $p.t('person/student') ) }}: {{projektarbeit?.student}}</p>
+
+					<p class="d-flex align-items-center gap-2 mb-2" style="min-width: 0;">
+						<span
+							:title="projektarbeit.titel"
+							style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 480px;"
+						>{{$capitalize( $p.t('abgabetool/c4titel') ) }}: {{projektarbeit?.titel}}</span>
+						<button
+							v-if="isTitelEditAllowed"
+							class="btn btn-sm btn-outline-secondary border-0 p-1"
+							v-tooltip.right="{ value: $capitalize($p.t('abgabetool/c4titelBearbeiten')), class: 'custom-tooltip' }"
+							@click="openTitelEdit"
+						>
+							<i class="fa-solid fa-pen"></i>
+						</button>
+					</p>
+
+					<p>{{$capitalize( $p.t('abgabetool/c4betreuerv2') ) }}: {{projektarbeit ? $p.t('abgabetool/c4betrart' + projektarbeit.betreuerart_kurzbz) + ' ' + projektarbeit.betreuer : ''}}</p>
 				</div>
 				<div class="col-4">
 					<p>{{ $p.t('abgabetool/c4checkoutStgMoodleInfos') }} 
@@ -357,7 +426,6 @@ export const AbgabeStudentDetail = {
 									<i v-else-if="termin.dateStyle == 'beurteilungerforderlich'" v-tooltip.right="getTooltipBeurteilungerforderlich" class="fa-solid fa-list-check"></i>
 									<i v-else-if="termin.dateStyle == 'bestanden'" v-tooltip.right="getTooltipBestanden" class="fa-solid fa-check"></i>
 									<i v-else-if="termin.dateStyle == 'nichtbestanden'" v-tooltip.right="getTooltipNichtBestanden" class="fa-solid fa-circle-exclamation"></i>
-							
 								</div>
 								<div class="text-start px-2" style="min-width: 150px; max-width: 300px; margin-left: 40px">
 									<span>{{ termin ? $p.t('abgabetool/c4paatyp' + termin.paabgabetyp_kurzbz) : '' }}</span>
@@ -408,8 +476,6 @@ export const AbgabeStudentDetail = {
 									</div>
 								</template>
 							</Inplace>
-
-						
 						</div>
 						
 						<div class="row mt-2">
@@ -430,7 +496,7 @@ export const AbgabeStudentDetail = {
 								</VueDatePicker>
 							</div>
 						</div>
-						
+												
 						<div class="row mt-2">
 							<div class="col-12 col-md-3 fw-bold align-content-center">{{$capitalize( $p.t('abgabetool/c4abgabetyp') )}}</div>
 							<div class="col-12 col-md-9">
@@ -481,9 +547,6 @@ export const AbgabeStudentDetail = {
 											<Message v-else-if="termin?.signatur == false" severity="error" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4keineSignatur') }} </Message>
 											<Message v-else-if="termin?.signatur == 'error'" severity="warn" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4signaturServerError') }} </Message>
 										</div>
-<!--										<div v-else class="col-auto">-->
-<!--											<Message severity="info" :closable="false" :pt="getMessagePtStyle"> {{ $p.t('abgabetool/c4noFileFound') }} </Message>-->
-<!--										</div>-->
 									</template>
 								</div>					
 							</template>
@@ -542,8 +605,51 @@ export const AbgabeStudentDetail = {
 				<h5>{{ $capitalize( $p.t('abgabetool/c4keineAbgabetermineGefunden') )}}</h5>
 			</div>
 			
-		 </div>
-	 	
+		</div>
+
+		<div v-if="confetti_on_endupload" id="confetti-container"></div>
+
+		<bs-modal
+			ref="modalTitelEdit"
+			class="bootstrap-prompt"
+			dialogClass="bordered-modal"
+		>
+			<template v-slot:title>
+				{{$capitalize( $p.t('abgabetool/c4titelBearbeiten') )}}
+			</template>
+			<template v-slot:default>
+				<div class="mb-2">
+					<label class="form-label fw-bold">
+						{{$capitalize( $p.t('abgabetool/c4titel') )}}
+					</label>
+					<Textarea 
+						v-model="editingTitel" 
+						rows="10" 
+						maxlength="1024" 
+						class="form-control w-100"
+						@keydown.enter.prevent="saveTitel"
+					/>
+					<div class="form-text text-end">{{ editingTitel.length }} / 1024</div>
+				</div>
+			</template>
+			<template v-slot:footer>
+				<button
+					class="btn btn-secondary"
+					@click="$refs.modalTitelEdit.hide()"
+				>
+					{{$capitalize( $p.t('abgabetool/c4Cancel') )}}
+				</button>
+				<button
+					class="btn btn-primary"
+					:disabled="!editingTitel.trim()"
+					@click="saveTitel"
+				>
+					<i class="fa-solid fa-floppy-disk me-1"></i>
+					{{$capitalize( $p.t('ui/speichern') )}}
+				</button>
+			</template>
+		</bs-modal>
+
 	 	<bs-modal 
 	 		ref="modalContainerEnduploadZusatzdaten"
 	 		class="bootstrap-prompt"
@@ -553,14 +659,10 @@ export const AbgabeStudentDetail = {
 					{{$capitalize( $p.t('abgabetool/c4enduploadZusatzdaten') )}}
 				</div>
 				<div class="row mb-3 align-items-start">
-					
 					<p class="ml-4 mr-4">Student UID: {{ projektarbeit?.student_uid}}</p>
-				
 				</div>
 				<div class="row mb-3 align-items-start">
-					
 					<p class="ml-4 mr-4">{{$capitalize( $p.t('abgabetool/c4titel') )}}: {{ projektarbeit?.titel }}</p>
-				
 				</div>
 			</template>
 			<template v-slot:default>
@@ -576,15 +678,6 @@ export const AbgabeStudentDetail = {
 					</div>
 				</div>
 				
-<!--				 lektor fills these out-->
-<!--				<div class="row mb-3 align-items-start">-->
-<!--					<div class="row">Kontrollierte Schlagwörter</div>-->
-<!--					<div class="row">-->
-<!--						<Textarea v-model="form.kontrollschlagwoerter"></Textarea>-->
-<!--					</div>-->
-<!--					-->
-<!--				-->
-<!--				</div>-->
 				<div class="row mb-3 align-items-start">
 					<div class="row">{{$capitalize( $p.t('abgabetool/c4schlagwoerterGer') )}}</div>
 					<div class="row">
@@ -631,7 +724,6 @@ export const AbgabeStudentDetail = {
 						<div class="col-9"></div>
 						<div class="col-2"><p>{{$capitalize( $p.t('abgabetool/c4gelesenUndAkzeptiert') )}}</p></div>
 						<div class="col-1">
-							
 							<Checkbox 
 								v-model="eidAkzeptiert" 
 								:binary="true" 
@@ -647,8 +739,8 @@ export const AbgabeStudentDetail = {
 				<div v-show="!allowedToSaveZusatzdaten">{{ $p.t('abgabetool/c4zusatzdatenausfuellen') }}</div>
 				<button class="btn btn-primary" :disabled="!getAllowedToSendEndupload" @click="triggerEndupload">{{$capitalize( $p.t('ui/hochladen') )}}</button>
 			</template>
+			
 		</bs-modal>
-	 	
    `,
 };

@@ -7,6 +7,7 @@ import FhcOverlay from "../../Overlay/FhcOverlay.js";
 import { getDateStyleClass } from "./getDateStyleClass.js";
 import { dateFilter } from '../../../tabulator/filters/Dates.js';
 import {splitMailsHelper} from "../../../helpers/EmailHelpers.js";
+import { formatISODate, getViennaTodayISO, toViennaDate } from "./dateUtils.js";

 export const AbgabetoolMitarbeiter = {
 	name: "AbgabetoolMitarbeiter",
@@ -43,7 +44,12 @@ export const AbgabetoolMitarbeiter = {
 	},
 	data() {
 		return {
-			tableData: null,
+			filteredRows: null,
+			count: 0,
+			filteredcount: 0,
+			selectedcount: 0,
+			qgate1FilterSelected: [],
+			qgate2FilterSelected: [],
 			abgabetypenBetreuer: null,
 			detailIsFullscreen: false,
 			phrasenPromise: null,
@@ -58,7 +64,7 @@ export const AbgabetoolMitarbeiter = {
 			allowedNotenOptions: null,
 			notenOptionsNonFinal: null,
 			serienTermin: Vue.reactive({
-				datum: new Date(),
+				datum: getViennaTodayISO(),
 				bezeichnung: {
 					paabgabetyp_kurzbz: 'zwischen',
 					bezeichnung: 'Zwischenabgabe'
@@ -80,7 +86,7 @@ export const AbgabetoolMitarbeiter = {
 			abgabeTableOptions: {
 				minHeight: 250,
 				index: 'projektarbeit_id',
-				layout: 'fitDataStretch',
+				layout: 'fitData',
 				placeholder: Vue.computed(() => this.$p.t('global/noDataAvailable')),
 				selectable: true,
 				selectableCheck: this.selectionCheck,
@@ -138,38 +144,65 @@ export const AbgabetoolMitarbeiter = {
 							handleClick: this.selectAllHandler
 						},
 						width: 50,
-						cssClass: 'sticky-col'
+						cssClass: 'sticky-col',
+						visible: true
 					},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, headerFilter: false, headerSort: false, widthGrow: 1, tooltip: false, cssClass: 'sticky-col'},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, widthGrow: 1, tooltip: false},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter,widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, maxWidth: 500, widthGrow: 8},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerartv2'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, widthGrow: 1},
-					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))), field: 'prevTermin',
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4details'))), field: 'details', formatter: this.detailFormatter, headerFilter: false, headerSort: false, minWidth: 50, visible: true, tooltip: false, cssClass: 'sticky-col'},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4personenkennzeichen'))), headerFilter: true, field: 'pkz', formatter: this.pkzTextFormatter, minWidth: 140, visible: false,tooltip: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4vorname'))), field: 'vorname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100,visible: false},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nachname'))), field: 'nachname', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100,visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4projekttyp'))), field: 'projekttyp_kurzbz', formatter: this.centeredTextFormatter, minWidth: 100,visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4stg'))), field: 'stg', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 50, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4sem'))), field: 'studiensemester_kurzbz', headerFilter: true, formatter: this.centeredTextFormatter, visible: true, minWidth: 100},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4titel'))), field: 'titel', headerFilter: true, formatter: this.centeredTextFormatter, minWidth: 100, width: 500, visible: true},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4betreuerartv2'))), field: 'betreuerart_beschreibung',formatter: this.centeredTextFormatter, visible: true, minWidth: 100, width: 200},
+					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4prevAbgabetermin'))),
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
+						tooltip: this.toolTipFuncPrevTermin,
+						field: 'prevTermin', formatter: this.abgabterminFormatter, width: 250, visible: false},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4nextAbgabetermin'))), field: 'nextTermin',
 						headerFilter: dateFilter,
 						headerFilterFunc: this.headerFilterTerminCol,
 						sorter: this.sortFuncTerminCol,
-						formatter: this.abgabterminFormatter, widthGrow: 1, width: 250, tooltip: false},
+						tooltip: this.toolTipFuncNextTermin,
+						formatter: this.abgabterminFormatter, width: 250, visible: true},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate1Status'))),
-						headerFilter: 'list',
-						headerFilterParams: { valuesLookup: this.getQGateStatusList }, 
-						field: 'qgate1Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false},
+						headerFilter: this.qgateHeaderFilterEditor,
+						headerFilterFunc: this.qgateHeaderFilterFunc,
+						headerFilterParams: {},
+						field: 'qgate1Status',
+						formatter: this.centeredTextFormatter,
+						titleFormatter: this.shortLongTitleFormatter,
+						titleFormatterParams: {
+							shortForm: 'QG1'
+						},
+						width: 50,
+						tooltip: (e, cell) => {
+							const data = cell.getData();
+							return data.qgate1Status
+						}
+					},
 					{title: Vue.computed(() => this.$capitalize(this.$p.t('abgabetool/c4qgate2Status'))),
-						headerFilter: 'list',
-						headerFilterParams: { valuesLookup: this.getQGateStatusList }, 
-						field: 'qgate2Status', formatter: this.centeredTextFormatter, widthGrow: 1, width: 220, tooltip: false}
+						headerFilter: this.qgateHeaderFilterEditor,
+						headerFilterFunc: this.qgateHeaderFilterFunc,
+						headerFilterParams: {},
+						field: 'qgate2Status',
+						formatter: this.centeredTextFormatter,
+						titleFormatter: this.shortLongTitleFormatter,
+						titleFormatterParams: {
+							shortForm: 'QG2'
+						},
+						width: 50,
+						tooltip: (e, cell) => {
+							const data = cell.getData();
+							return data.qgate2Status
+						}
+					}
 				],
 				persistence: false,
-				persistenceID: 'abgabeTableBetreuer2026-02-26'
+				persistenceID: 'abgabeTableBetreuer2026-05-26'
 			},
 			abgabeTableEventHandlers: [{
 				event: "tableBuilt",
@@ -200,11 +233,293 @@ export const AbgabetoolMitarbeiter = {
 					})
 					
 					this.selectedData = data
+					this.selectedcount = data.length;
+				}
+			},
+			{
+				event: 'dataFiltered',
+				handler: (filters, rows) => {
+					this.filteredRows = rows;
+					this.filteredcount = rows.length;
+
+					if (!this.selectedData.length) return;
+
+					const visibleData = new Set(rows.map(r => r.getData()));
+					const filteredOut = this.selectedData.filter(sd => !visibleData.has(sd));
+
+					if (!filteredOut.length) return;
+
+					const filteredOutSet = new Set(filteredOut);
+					this.$refs.abgabeTable.tabulator.getSelectedRows()
+						.filter(r => filteredOutSet.has(r.getData()))
+						.forEach(r => r.deselect());
 				}
 			}
 			]};
 	},
 	methods: {
+		getDateStyleHtml(dateStyle) {
+			const iconMap = {
+				'verspaetet':              '<i class="fa-solid fa-triangle-exclamation"></i>',
+				'verpasst':                '<i class="fa-solid fa-calendar-xmark"></i>',
+				'abzugeben':               '<i class="fa-solid fa-hourglass-half"></i>',
+				'standard':                '<i class="fa-solid fa-clock"></i>',
+				'abgegeben':               '<i class="fa-solid fa-paperclip"></i>',
+				'beurteilungerforderlich': '<i class="fa-solid fa-list-check"></i>',
+				'bestanden':               '<i class="fa-solid fa-check"></i>',
+				'nichtbestanden':          '<i class="fa-solid fa-circle-exclamation"></i>',
+			};
+			return iconMap[dateStyle] ?? '';
+		},
+		statusHeaderFilterEditor(cell, onRendered, success, cancel, editorParams) {
+			const options = [
+				{ label: this.$p.t('abgabetool/c4positivBenotet'),    value: 'bestanden',              dateStyle: 'bestanden' },
+				{ label: this.$p.t('abgabetool/c4negativBenotet'),    value: 'nichtbestanden',         dateStyle: 'nichtbestanden' },
+				{ label: this.$p.t('abgabetool/c4tooltipVerspaetet'), value: 'verspaetet',             dateStyle: 'verspaetet' },
+				{ label: this.$p.t('abgabetool/c4tooltipVerpasst'),   value: 'verpasst',               dateStyle: 'verpasst' },
+				{ label: this.$p.t('abgabetool/c4tooltipAbzugeben'),  value: 'abzugeben',              dateStyle: 'abzugeben' },
+				{ label: this.$p.t('abgabetool/c4tooltipAbgegeben'),  value: 'abgegeben',              dateStyle: 'abgegeben' },
+				{ label: this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich'), value: 'beurteilungerforderlich', dateStyle: 'beurteilungerforderlich' },
+				{ label: this.$p.t('abgabetool/c4tooltipStandardv2'), value: 'standard',               dateStyle: 'standard' },
+			];
+
+			const field = cell.getField();
+			const stateKey = field + 'FilterSelected'; // e.g. dateStyleFilterSelected
+			let selected = [...(this[stateKey] || [])];
+
+			const wrapper = document.createElement('div');
+			wrapper.style.cssText = 'position: relative; width: 100%;';
+
+			const display = document.createElement('input');
+			display.readOnly = true;
+			display.placeholder = '';
+			display.style.cssText = 'padding: 4px; width: 100%; box-sizing: border-box; cursor: default; border: 1px solid; outline: none; background: #fff; appearance: none; caret-color: transparent;';
+
+			const dropdown = document.createElement('div');
+			dropdown.style.cssText = 'display: none; position: fixed; background: #fff; border: 1px solid; z-index: 9999; min-width: 220px; box-shadow: 0 2px 6px rgba(0,0,0,0.15);';
+
+			const updateDisplay = () => {
+				display.value = options
+					.filter(o => selected.includes(o.value))
+					.map(o => o.label)
+					.join(', ');
+			};
+
+			options.forEach(opt => {
+				const row = document.createElement('label');
+				row.style.cssText = 'display: flex; align-items: center; gap: 0; cursor: pointer; white-space: nowrap; padding-right: 8px;';
+				row.addEventListener('mousedown', e => e.preventDefault());
+
+				const cb = document.createElement('input');
+				cb.type = 'checkbox';
+				cb.value = opt.value;
+				cb.checked = selected.includes(opt.value);
+				cb.style.cssText = 'margin: 0 6px;';
+				cb.addEventListener('change', () => {
+					selected = cb.checked
+						? [...selected, opt.value]
+						: selected.filter(v => v !== opt.value);
+					this[stateKey] = [...selected];
+					updateDisplay();
+					success([...selected]);
+				});
+
+				// icon badge — same look as cell
+				const badge = document.createElement('div');
+				badge.className = opt.dateStyle + '-header';
+				badge.style.cssText = `min-width: 36px; height: 36px; display: flex; align-items: center; 
+				justify-content: center; flex-shrink: 0; padding: 0px 17px 0px 17px;`;
+				badge.innerHTML = this.getDateStyleHtml(opt.dateStyle);
+
+				const labelText = document.createElement('span');
+				labelText.textContent = opt.label;
+				labelText.style.cssText = 'margin-left: 6px;';
+
+				row.appendChild(cb);
+				row.appendChild(badge);
+				row.appendChild(labelText);
+				dropdown.appendChild(row);
+			});
+
+			updateDisplay();
+
+			display.addEventListener('click', () => {
+				if (dropdown.style.display === 'none') {
+					const rect = display.getBoundingClientRect();
+					dropdown.style.top = rect.bottom + 'px';
+					dropdown.style.left = rect.left + 'px';
+					dropdown.style.display = 'block';
+				} else {
+					dropdown.style.display = 'none';
+				}
+			});
+
+			display.addEventListener('blur', () => {
+				setTimeout(() => { dropdown.style.display = 'none'; }, 150);
+			});
+
+			document.body.appendChild(dropdown);
+			wrapper.appendChild(display);
+			cell.getElement().addEventListener('remove', () => dropdown.remove());
+			onRendered(() => display.focus());
+
+			return wrapper;
+		},
+		statusHeaderFilterFunc(filterVal, rowVal, rowData, filterParams) {
+			if (!filterVal || !filterVal.length) return true;
+			// rowVal is the raw dateStyle string on the flat table
+			return filterVal.some(val => val === rowVal);
+		},
+		qgateHeaderFilterEditor(cell, onRendered, success, cancel, editorParams) {
+
+			const options = [
+				{ label: '[+] ' + this.$p.t('abgabetool/c4positivBenotet'), value: 'positive' },
+				{ label: '[-] ' + this.$p.t('abgabetool/c4negativBenotet'), value: 'negative' },
+				{ label: '[~] ' + this.$p.t('abgabetool/c4notYetGraded'), value: 'not_graded' },
+				{ label: '[?] ' + this.$p.t('abgabetool/c4notSubmitted'), value: 'not_submitted' },
+				{ label: '[o] ' + this.$p.t('abgabetool/c4notHappenedYet'), value: 'not_happened' },
+				{ label: '[--] ' + this.$p.t('abgabetool/c4keinTerminVorhanden'), value: 'no_termin' },
+			];
+
+			const field = cell.getField();
+			const stateKey = field === 'qgate1Status' ? 'qgate1FilterSelected' : 'qgate2FilterSelected';
+			let selected = [...(this[stateKey] || [])]; // restore persistence state
+
+			const wrapper = document.createElement('div');
+			wrapper.style.cssText = 'position: relative; width: 100%;';
+
+			const display = document.createElement('input');
+			display.readOnly = true;
+			display.placeholder = '';
+			display.style.cssText = 'padding: 4px; width: 100%; box-sizing: border-box; cursor: default; border: 1px solid; outline: none; background: #fff; appearance: none; caret-color: transparent;';
+
+			const dropdown = document.createElement('div');
+			dropdown.style.cssText = 'display: none; position: fixed; background: #fff; border: 1px solid; z-index: 9999; min-width: 180px; box-shadow: 0 2px 6px rgba(0,0,0,0.15);';
+
+			options.forEach(opt => {
+				const row = document.createElement('label');
+				row.style.cssText = 'display: flex; align-items: center; gap: 6px; padding: 4px 8px; cursor: pointer; white-space: nowrap;';
+				row.addEventListener('mousedown', e => e.preventDefault());
+
+				const cb = document.createElement('input');
+				cb.type = 'checkbox';
+				cb.value = opt.value;
+				cb.checked = selected.includes(opt.value); // sync with persistence
+				cb.addEventListener('change', () => {
+					if (cb.checked) {
+						selected.push(opt.value);
+					} else {
+						selected = selected.filter(v => v !== opt.value);
+					}
+					this[stateKey] = [...selected]; // sync with persistence
+					display.value = options.filter(o => selected.includes(o.value)).map(o => o.label).join(', ');
+					success([...selected]);
+				});
+
+				row.appendChild(cb);
+				row.appendChild(document.createTextNode(opt.label));
+				dropdown.appendChild(row);
+			});
+
+			display.value = options.filter(o => selected.includes(o.value)).map(o => o.label).join(', ');
+
+			display.addEventListener('click', () => {
+				if (dropdown.style.display === 'none') {
+					const rect = display.getBoundingClientRect();
+					dropdown.style.top = rect.bottom + 'px';
+					dropdown.style.left = rect.left + 'px';
+					dropdown.style.display = 'block';
+				} else {
+					dropdown.style.display = 'none';
+				}
+			});
+
+			display.addEventListener('blur', () => {
+				setTimeout(() => { dropdown.style.display = 'none'; }, 150);
+			});
+
+			document.body.appendChild(dropdown);
+			wrapper.appendChild(display);
+
+			cell.getElement().addEventListener('remove', () => dropdown.remove());
+
+			onRendered(() => display.focus());
+
+			return wrapper;
+		},
+		qgateHeaderFilterFunc(filterVal, rowVal, rowData, filterParams) {
+			if (!filterVal || !filterVal.length) return true;
+
+			const matches = (val) => {
+				switch (val) {
+					case 'positive':     return rowVal === this.$p.t('abgabetool/c4positivBenotet');
+					case 'negative':     return rowVal === this.$p.t('abgabetool/c4negativBenotet');
+					case 'not_graded':   return rowVal === this.$p.t('abgabetool/c4notYetGraded');
+					case 'not_submitted':return rowVal === this.$p.t('abgabetool/c4notSubmitted');
+					case 'not_happened': return rowVal === this.$p.t('abgabetool/c4notHappenedYet');
+					case 'no_termin':    return rowVal === this.$p.t('abgabetool/c4keinTerminVorhanden');
+					default:             return true;
+				}
+			};
+
+			// OR logic — row passes if it matches any selected filter
+			return filterVal.some(val => matches(val));
+		},
+		shortLongTitleFormatter(cell, formatterParams, onRendered) {
+			const longForm = cell.getValue()
+			const shortForm = formatterParams?.shortForm
+
+			if(longForm && shortForm) {
+				return `<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>`
+			} else {
+				return `<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>`
+			}
+
+		},
+		toolTipFuncPrevTermin(e, cell, onRendered) {
+			const data = cell.getData();
+			return this.mapDateStyleToTabulatorTooltip(data.prevTermin.dateStyle);
+		},
+		toolTipFuncNextTermin(e, cell, onRendered) {
+			const data = cell.getData();
+			return this.mapDateStyleToTabulatorTooltip(data.nextTermin.dateStyle);
+		},
+		mapDateStyleToTabulatorTooltip(dateStyleString) {
+			switch(dateStyleString) {
+				case 'bestanden':
+					return this.$p.t('abgabetool/c4tooltipBestanden')
+					break;
+				case 'nichtbestanden':
+					return this.$p.t('abgabetool/c4tooltipNichtBestanden')
+					break;
+				case 'beurteilungerforderlich':
+					return this.$p.t('abgabetool/c4tooltipBeurteilungerforderlich')
+					break;
+				case 'verspaetet':
+					return this.$p.t('abgabetool/c4tooltipVerspaetet')
+					break;
+				case 'abgegeben':
+					return this.$p.t('abgabetool/c4tooltipAbgegeben')
+					break;
+				case 'verpasst':
+					return this.$p.t('abgabetool/c4tooltipVerpasst')
+					break;
+				case 'abzugeben':
+					return this.$p.t('abgabetool/c4tooltipAbzugeben')
+					break;
+				case 'standard':
+					return this.$p.t('abgabetool/c4tooltipStandardv2')
+					break;
+				default: return ''
+			}
+		},
 		handlePaUpdated(projektarbeit) {
 			this.checkAbgabetermineProjektarbeit(projektarbeit)
 			this.$refs.abgabeTable.tabulator.redraw(true)
@@ -217,7 +532,7 @@ export const AbgabetoolMitarbeiter = {
 			})
 			const uniqueRecipients = [...new Set(recipientList)];
 			const subject = ""; // empty subject line 
-			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, this.$fhcAlert, this.$p)
+			splitMailsHelper(uniqueRecipients, param.originalEvent, subject, null, this.$fhcAlert, this.$p)
 		},
 		getQGateStatusList() {
 			return [
@@ -257,7 +572,7 @@ export const AbgabetoolMitarbeiter = {
 				if (val instanceof Date) {
 					dt = luxon.DateTime.fromJSDate(val);
 				} else if (typeof val === "string") {
-					dt = luxon.DateTime.fromISO(val);
+					dt = toViennaDate(val);
 				} else { // fallback
 					dt = luxon.DateTime.fromMillis(Number(val));
 				}
@@ -386,6 +701,9 @@ export const AbgabetoolMitarbeiter = {
 					}
 					this.stateRestored = true

+					// ensure that the filterCollapseables thingy has the correct values
+					this.$refs.abgabeTable.setSelectedFields();
+					
 				}

 			});
@@ -451,6 +769,32 @@ export const AbgabetoolMitarbeiter = {
 					projekt.qgate2StatusRank = 1
 				}
 			})
+			
+			// set shorthand statuscode once real status has been determined
+			projekt.qgate1StatusShort = this.mapRankToShortStatus(projekt.qgate1StatusRank)
+			projekt.qgate2StatusShort = this.mapRankToShortStatus(projekt.qgate2StatusRank)
+		},
+		mapRankToShortStatus(rank) {
+			switch(rank){
+				case 0: // kein termin vorhanden
+					return '--'
+					break;
+				case 1: // noch nicht stattgefunden
+					return 'o'
+					break;
+				case 2: // noch nicht abgegeben
+					return '?'
+					break;
+				case 3: // noch nicht benotet
+					return '~'
+					break;
+				case 4: // negativ benotet
+					return '-'
+					break;
+				case 5: // positiv benotet
+					return '+'
+					break;
+			}
 		},
 		checkAbgabetermineProjektarbeit(projekt) {
 			const now = luxon.DateTime.now()
@@ -460,7 +804,7 @@ export const AbgabetoolMitarbeiter = {
 				// while already looping through each termin, calculate datestyle beforehand
 				termin.dateStyle = getDateStyleClass(termin, this.notenOptions)

-				const date = luxon.DateTime.fromISO(termin.datum).endOf('day')
+				const date = toViennaDate(termin.datum).endOf('day')
 				termin.luxonDate = date
 				termin.diffMs = date.toMillis() - now.toMillis(); // positive = future, negative = past

@@ -517,11 +861,11 @@ export const AbgabetoolMitarbeiter = {
 				const bezeichnung = val.bezeichnung?.bezeichnung ?? val.bezeichnung

 				return '<div style="display: flex; height: 100%">' +
-					'<div class=' + val.dateStyle + "-header" + ' style="width:48px; height: 100%; padding: 0px; display: flex; align-items: center; justify-content: center;">' +
-					icon +
+					'<div class=' + val.dateStyle + "-header" + ' style="min-width:48px; height: 100%; padding: 0px; display: flex; align-items: center; justify-content: center;">' +
+						icon +
 					'</div>' +
 					'<div style="margin-left: 4px;">' +
-					'<p style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
+						'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">'+bezeichnung+' - '+ this.formatDate(val.datum)+'</p>' +
 					'</div>'+
 					'</div>'

@@ -545,16 +889,19 @@ export const AbgabetoolMitarbeiter = {
 		},
 		selectAllHandler(e, cell) {
 			const table = cell.getTable();
-			const rows = table.getRows();
+			const rows = this.filteredRows ?? table.getRows();

 			// custom select all logic
 			const allowed = rows.filter(r => r.getData().selectable);
+			// since betreuerpage acctually has logic behind selectable flag, it is important to go over allowed only here
 			const selected = allowed.every(r => r.isSelected());

-			if(selected) {
+			if(selected){
 				allowed.forEach(r => r.deselect());
+				e.target.checked = false;
 			} else {
 				allowed.forEach(r => r.select());
+				e.target.checked = true;
 			}

 			// stop built-in handler
@@ -568,15 +915,7 @@ export const AbgabetoolMitarbeiter = {
 			return option.bezeichnung
 		},
 		formatDate(dateParam) {
-			const date = new Date(dateParam)
-			// handle missing leading 0
-			const padZero = (num) => String(num).padStart(2, '0');
-
-			const month = padZero(date.getMonth() + 1); // Months are zero-based
-			const day = padZero(date.getDate());
-			const year = date.getFullYear();
-
-			return `${day}.${month}.${year}`;
+			return formatISODate(dateParam);
 		},
 		undoSelection(cell) {
 			// checks if cells row is selected and unselects -> imitates columns which dont trigger row selection
@@ -589,6 +928,8 @@ export const AbgabetoolMitarbeiter = {
 		},
 		selectionCheck(row) {
 			const data = row.getData()
+			
+			// zweitbetreuer cant select projektarbeiten for serientermine
 			if(data?.betreuerart_kurzbz == 'Zweitbegutachter') return false
 			return true
 		},
@@ -612,7 +953,7 @@ export const AbgabetoolMitarbeiter = {
 		addSeries() {
 			this.saving = true
 			this.$api.call(ApiAbgabe.postSerientermin(
-				this.serienTermin.datum.toISOString(),
+				this.serienTermin.datum,
 				this.serienTermin.bezeichnung.paabgabetyp_kurzbz,
 				this.serienTermin.bezeichnung.bezeichnung,
 				this.serienTermin.kurzbz,
@@ -710,7 +1051,7 @@ export const AbgabetoolMitarbeiter = {
 				termin.allowedToSave = paIsBenotet ? false : true
 				
 				// lektoren are not allowed to delete deadlines with existing submissions
-				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum
+				termin.allowedToDelete = termin.allowedToSave && !termin.abgabedatum && !termin.note
 				
 				termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)

@@ -727,28 +1068,37 @@ export const AbgabetoolMitarbeiter = {
 			
 		},
 		centeredTextFormatter(cell) {
-			const val = cell.getValue()
-			if(!val) return
-			
-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<p style="max-width: 100%; width: 100%; overflow-wrap: break-word; word-break: break-word; white-space: normal; margin: 0px; text-align: center">'+val+'</p></div>'
+			const longForm = cell.getValue()
+			if(!longForm) return
+			const data = cell.getData()
+			const entry = Object.entries(data).find(entry => entry[1] == longForm)
+
+			// shortFormKey must have same keyname as longForm but with 'Short' appended 
+			const shortForm = data[entry[0]+'Short']
+
+			if(shortForm && longForm) {
+				return `<div style="display: flex; justify-content: start; align-items: center; height: 100%; width: 100%;">
+				<span class="full-text" style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">
+					${longForm}
+				</span>
+				<span class="short-text" style="font-weight: bold; display: none;">
+					${shortForm}
+				</span>
+				</div>`;
+			} else {
+				return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+					'<p style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; margin: 0px;">'+longForm+'</p></div>'
+			}
 		},
 		detailFormatter(cell) {
-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
+			return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
 				'<a><i class="fa fa-folder-open" style="color:#00649C"></i></a></div>'
 		},
-		beurteilungFormatter(cell) {
-			const val = cell.getValue()
-			if(val) {
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-					'<a><i class="fa fa-file-pdf" style="color:#00649C"></i></a></div>'
-			} else return '-'
-		},
 		pkzTextFormatter(cell) {
 			const val = cell.getValue()

-			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%">' +
-				'<a style="max-width: 100%; word-wrap: break-word; white-space: normal;">'+val+'</a></div>'
+			return '<div style="display: flex; justify-content: start; align-items: center; height: 100%">' +
+				'<a style="max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">'+val+'</a></div>'
 		},
 		tableResolve(resolve) {
 			this.tableBuiltResolve = resolve
@@ -765,10 +1115,9 @@ export const AbgabetoolMitarbeiter = {
 		setupData(data){
 			
 			
-			this.projektarbeiten = data[0]
 			this.domain = data[1]
 			
-			this.tableData = data[0]?.retval?.map(projekt => {
+			this.projektarbeiten = data[0]?.retval?.map(projekt => {
 				this.checkAbgabetermineProjektarbeit(projekt)
 				projekt.selectable = projekt.betreuerart_kurzbz !== 'Zweitbegutachter'

@@ -787,9 +1136,10 @@ export const AbgabetoolMitarbeiter = {
 					titel: projekt.titel
 				}
 			})
+			this.count = this.projektarbeiten.length
 			
 			this.$refs.abgabeTable.tabulator.setColumns(this.abgabeTableOptions.columns)
-			this.$refs.abgabeTable.tabulator.setData(this.tableData);
+			this.$refs.abgabeTable.tabulator.setData(this.projektarbeiten);
 		},
 		loadProjektarbeiten(all = false, callback) {
 			this.$api.call(ApiAbgabe.getMitarbeiterProjektarbeiten(all))
@@ -841,6 +1191,17 @@ export const AbgabetoolMitarbeiter = {
 		},
 	},
 	computed: {
+		countsToHTML() {
+			return this.$p.t('global/ausgewaehlt')
+				+ ': <strong>' + (this.selectedcount || 0) + '</strong>'
+				+ ' | '
+				+ this.$p.t('global/gefiltert')
+				+ ': '
+				+ '<strong>' + (this.filteredcount || 0) + '</strong>'
+				+ ' | '
+				+ this.$p.t('global/gesamt')
+				+ ': <strong>' + (this.count || 0) + '</strong>';
+		},
 		emailItems() {
 			const menu = []

@@ -869,6 +1230,8 @@ export const AbgabetoolMitarbeiter = {
 		}
 	},
 	created() {
+		document.documentElement.classList.add('abgabetool');
+		
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
 		// fetch config to avoid hard coded links
@@ -910,6 +1273,9 @@ export const AbgabetoolMitarbeiter = {
 	mounted() {
 		this.setupMounted()
 	},
+	beforeUnmount() {
+		document.documentElement.classList.remove('abgabetool');
+	},
 	template: `
 	<template v-if="phrasenResolved">
 		<FhcOverlay :active="loading || saving"></FhcOverlay>
@@ -935,6 +1301,7 @@ export const AbgabetoolMitarbeiter = {
 							:enable-time-picker="false"
 							locale="de"
 							format="dd.MM.yyyy"
+							model-type="yyyy-MM-dd"
 							:text-input="true"
 							auto-apply>
 						</VueDatePicker>
@@ -1001,12 +1368,13 @@ export const AbgabetoolMitarbeiter = {
 		<!-- low max height on this vsplit wrapper to avoid padding scrolls, elements have their inherent height anyways -->
 		<div id="abgabetable" style="max-height:40vw;">
 		
-			<h2>{{$p.t('abgabetool/abgabetoolTitle')}}</h2>
+			<h2>{{$p.t('abgabetool/abgabetoolTitleBetreuer')}}</h2>
 			<hr>
 			<core-filter-cmpt
 				:title="''"  
 				@uuidDefined="handleUuidDefined"
 				ref="abgabeTable"
+				:description="countsToHTML"
 				:newBtnShow="true"
 				:newBtnLabel="$p.t('abgabetool/neueTerminserie')"
 				:newBtnDisabled="!selectedData.length"
@@ -9,6 +9,7 @@ export const AbgabetoolStudent = {
 	components: {
 		Accordion: primevue.accordion,
 		AccordionTab: primevue.accordiontab,
+		Textarea: primevue.textarea,
 		BsModal,
 		AbgabeDetail,
 		FhcOverlay
@@ -17,7 +18,9 @@ export const AbgabetoolStudent = {
 		return {
 			notenOptions: Vue.computed(() => this.notenOptions),
 			isViewMode: Vue.computed(() => this.isViewMode),
-			moodle_link: Vue.computed(() => this.moodle_link)
+			moodle_link: Vue.computed(() => this.moodle_link),
+			title_edit_allowed: Vue.computed(() => this.title_edit_allowed),
+			confetti_on_endupload: Vue.computed(() => this.confetti_on_endupload)
 		}
 	},
 	props: {
@@ -44,14 +47,69 @@ export const AbgabetoolStudent = {
 			detail: null,
 			projektarbeiten: null,
 			selectedProjektarbeit: null,
-			moodle_link: null
+			moodle_link: null,
+			title_edit_allowed: null,
+			confetti_on_endupload: null,
+			editingTitel: '',
+			editingProjektarbeit: null,
 		};
 	},
 	methods: {
+		openTitelEdit(projektarbeit, event) {
+			// stop the click from toggling the accordion tab
+			event.stopPropagation();
+			this.editingProjektarbeit = projektarbeit;
+			this.editingTitel = projektarbeit.titel ?? '';
+			this.$refs.modalTitelEdit.show();
+		},
+		async saveTitel() {
+			const trimmed = this.editingTitel.trim();
+			if (!trimmed) {
+				this.$fhcAlert.alertWarning(this.$capitalize(this.$p.t('global/warningEmptyField')));
+				return;
+			}
+
+			const confirmed = await this.$fhcAlert.confirm({
+				message: this.$p.t('abgabetool/c4confirmTitelSpeichern'),
+				acceptLabel: this.$capitalize(this.$p.t('ui/speichern')),
+				acceptClass: 'p-button-primary',
+				rejectLabel: this.$capitalize(this.$p.t('abgabetool/c4Cancel')),
+				rejectClass: 'p-button-secondary'
+			});
+
+			if (confirmed === false) return;
+
+			this.loading = true;
+			this.$api.call(
+				ApiAbgabe.postStudentProjektarbeitTitel(
+					this.editingProjektarbeit.projektarbeit_id,
+					trimmed
+				)
+			).then(res => {
+				if (res.meta.status === 'success') {
+					// update the local list entry in-place so the accordion header reflects it immediately
+					this.editingProjektarbeit.titel = trimmed;
+					// keep the open detail modal in sync if it happens to be showing this projektarbeit
+					if (this.selectedProjektarbeit?.projektarbeit_id === this.editingProjektarbeit.projektarbeit_id) {
+						this.selectedProjektarbeit.titel = trimmed;
+					}
+					this.$fhcAlert.alertSuccess(this.$capitalize(this.$p.t('abgabetool/c4titelSavedSuccess')));
+					this.$refs.modalTitelEdit.hide();
+				} else {
+					this.$fhcAlert.alertError(this.$capitalize(this.$p.t('abgabetool/c4titelSaveError')));
+				}
+			}).finally(() => {
+				this.loading = false;
+			});
+		},
+		handleTitelUpdated(projektarbeit_id, titel) {
+			const pa = this.projektarbeiten?.find(p => p.projektarbeit_id === projektarbeit_id);
+			if (pa) pa.titel = titel;
+		},
 		checkQualityGatesStrict(termine) {
 			let qgate1Passed = false
 			let qgate2Passed = false
-			
+
 			termine.forEach(t => {
 				const noteOption = this.notenOptions?.find(opt => opt.note == t.note)
 				if(noteOption && noteOption.positiv) {
@@ -68,7 +126,7 @@ export const AbgabetoolStudent = {
 		checkQualityGatesOptional(termine) {
 			const qgate1found =  termine.find(t => t.paabgabetyp_kurzbz == 'qualgate1')
 			const qgate2found =  termine.find(t => t.paabgabetyp_kurzbz == 'qualgate2')
-			
+
 			let qgate1positiv = true
 			if(qgate1found) {
 				qgate1positiv = false
@@ -109,47 +167,35 @@ export const AbgabetoolStudent = {
 			this.loadAbgaben(details).then((res)=> {
 				const pa = this.projektarbeiten?.find(projekarbeit => projekarbeit.projektarbeit_id == details.projektarbeit_id)
 				pa.abgabetermine = res.data[0].retval
-				
+
 				const paIsBenotet = pa.note !== null
-				
+
 				pa.abgabetermine.forEach(termin => {
 					termin.file = []
 					termin.allowedToUpload = false
-					
+
 					if(termin.paabgabetyp_kurzbz == 'end') {
-						// old assumed production logic when qgates are required
-						// termin.allowedToUpload = !this.isPastDate(termin.datum) && this.checkQualityGatesStrict(pa.abgabetermine)
-						
 						const inTime = termin.fixtermin ? !this.isPastDate(termin.datum) : true
 						termin.allowedToUpload = inTime && this.checkQualityGatesOptional(pa.abgabetermine)
-
-
-						// development purposes
-						// termin.allowedToUpload = this.checkQualityGatesStrict(pa.abgabetermine)
-						// termin.allowedToUpload = true
-
 					} else if(termin.fixtermin) {
 						termin.allowedToUpload = !this.isPastDate(termin.datum)
 					} else {
-						// this could confuse people since we should dont show people this flag
-						termin.allowedToUpload = termin.upload_allowed 
+						termin.allowedToUpload = termin.upload_allowed
 					}

-					// blocks client upload button if projektarbeitet is already beurteilt und thus further abgaben on any termin should be blocked
 					if(paIsBenotet) termin.allowedToUpload = false
-					
-					
+
 					termin.bezeichnung = this.abgabeTypeOptions.find(opt => opt.paabgabetyp_kurzbz === termin.paabgabetyp_kurzbz)
 					termin.dateStyle = getDateStyleClass(termin, this.notenOptions)
 				})
-				
+
 				pa.betreuer = this.buildBetreuer(pa)
 				pa.student_uid = this.student_uid
-				
+
 				this.selectedProjektarbeit = pa

 				this.$refs.modalContainerAbgabeDetail.show()
-				
+
 			}).finally(()=>{this.loading=false})
 		},
 		centeredTextFormatter(cell) {
@@ -171,8 +217,8 @@ export const AbgabetoolStudent = {
 		},
 		mailFormatter(cell) {
 			const val = cell.getValue()
-				return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
-					'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
+			return '<div style="display: flex; justify-content: center; align-items: center; height: 100%;">' +
+				'<a href='+val+'><i class="fa fa-envelope" style="color:#00649C"></i></a></div>'
 		},
 		beurteilungFormatter(cell) {
 			const val = cell.getValue()
@@ -182,19 +228,17 @@ export const AbgabetoolStudent = {
 			} else return '-'
 		},
 		buildMailToLink(projekt) {
-			// should always be "projekt.mitarbeiter_uid +'@'+ this.domain", built in backend
 			return 'mailto:' + projekt.email
 		},
 		buildBetreuer(abgabe) {
 			return (abgabe.btitelpre ? abgabe.btitelpre + ' ' : '') + abgabe.bvorname + ' ' + abgabe.bnachname + (abgabe.btitelpost ? ' ' + abgabe.btitelpost : '')
 		},
 		async setupData(data){
-			// this.projektarbeiten = data[0]
 			const projektarbeiten = data[0] ?? null
 			if(!projektarbeiten) return
 			this.projektarbeiten = projektarbeiten.map(projekt => {
 				let mode = 'detailTermine'
-				
+
 				return {
 					...projekt,
 					details: {
@@ -228,16 +272,14 @@ export const AbgabetoolStudent = {
 					.then(res => {
 						resolve(res)
 					})
-			})	
+			})
 		},
 		async setupMounted() {
 			this.loadProjektarbeiten()
 		},
 		getAccTabHeaderForProjektarbeit(projektarbeit) {
 			let title = ''
-			
 			title += projektarbeit.titel ?? this.$p.t('abgabetool/keinTitel')
-			
 			return title
 		},
 		getMailLink(projektarbeit) {
@@ -260,9 +302,7 @@ export const AbgabetoolStudent = {
 			window.open(projektarbeit.beurteilung2)
 		}
 	},
-	watch: {
-
-	},
+	watch: {},
 	computed: {
 		isViewMode() {
 			return this.student_uid !== this.viewData.uid
@@ -272,11 +312,13 @@ export const AbgabetoolStudent = {
 		}
 	},
 	async created() {
+		// make sure zoom media query doesnt spill ever to other CIS4 sites
+		document.documentElement.classList.add('abgabetool');
+		
 		this.phrasenPromise = this.$p.loadCategory(['abgabetool', 'global'])
 		this.phrasenPromise.then(()=> {this.phrasenResolved = true})
-		
+
 		this.loading = true
-		//TODO: SWITCH TO NOTEN API ONCE NOTENTOOL IS IN MASTER TO AVOID DUPLICATE API
 		await this.$api.call(ApiAbgabe.getNoten()).then(res => {
 			if(res.meta.status == 'success') {
 				this.notenOptions = res.data[0]
@@ -289,16 +331,16 @@ export const AbgabetoolStudent = {
 			this.loading = false
 		})

-		// fetch abgabetypen options
 		this.$api.call(ApiAbgabe.getPaAbgabetypen()).then(res => {
 			this.abgabeTypeOptions = res.data
 		}).catch(e => {
 			this.loading = false
 		})

-		// fetch config to avoid hard coded links
 		this.$api.call(ApiAbgabe.getConfigStudent()).then(res => {
 			this.moodle_link = res.data?.moodle_link
+			this.title_edit_allowed = res.data?.title_edit_allowed
+			this.confetti_on_endupload = res.data?.confetti_on_endupload
 		}).catch(e => {
 			this.loading = false
 		})
@@ -306,6 +348,9 @@ export const AbgabetoolStudent = {
 	mounted() {
 		this.setupMounted()
 	},
+	beforeUnmount() {
+		document.documentElement.classList.remove('abgabetool');
+	},
 	template: `
 <template v-if="phrasenResolved">
 	<FhcOverlay :active="loading"></FhcOverlay>
@@ -318,14 +363,57 @@ export const AbgabetoolStudent = {
 			</div>
 		</template>
 		<template v-slot:default>
-			<AbgabeDetail :projektarbeit="selectedProjektarbeit"></AbgabeDetail>
+			<AbgabeDetail
+				:projektarbeit="selectedProjektarbeit"
+				@titel-updated="handleTitelUpdated"
+			></AbgabeDetail>
+		</template>
+	</bs-modal>
+	<bs-modal
+		ref="modalTitelEdit"
+		class="bootstrap-prompt"
+		dialogClass="bordered-modal"
+	>
+		<template v-slot:title>
+			{{$capitalize( $p.t('abgabetool/c4titelBearbeiten') )}}
+		</template>
+		<template v-slot:default>
+			<div class="mb-2">
+				<label class="form-label fw-bold">
+					{{$capitalize( $p.t('abgabetool/c4titel') )}}
+				</label>
+				<Textarea 
+					v-model="editingTitel" 
+					rows="10" 
+					maxlength="1024" 
+					class="form-control w-100"
+					@keydown.enter.prevent="saveTitel"
+				/>
+				<div class="form-text text-end">{{ editingTitel.length }} / 1024</div>
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button
+				class="btn btn-secondary"
+				@click="$refs.modalTitelEdit.hide()"
+			>
+				{{$capitalize( $p.t('abgabetool/c4Cancel') )}}
+			</button>
+			<button
+				class="btn btn-primary"
+				:disabled="!editingTitel.trim()"
+				@click="saveTitel"
+			>
+				<i class="fa-solid fa-floppy-disk me-1"></i>
+				{{$capitalize( $p.t('ui/speichern') )}}
+			</button>
 		</template>
 	</bs-modal>
 	
 	<h2>{{$capitalize( $p.t('abgabetool/abgabetoolTitle') )}}</h2>
 	<hr>
 	
-	<div v-if="projektarbeiten === null">
+	<div v-if="projektarbeiten === null || projektarbeiten?.length == 0">
 		{{$capitalize( $p.t('abgabetool/c4abgabeStudentNoProjectsFound') )}}
 	</div>
 	
@@ -335,8 +423,12 @@ export const AbgabetoolStudent = {
 				
 				<template #header>
 					<div class="d-flex row w-100">
-						<div class="text-start" :class="projektarbeit.note != null ? 'col-6' : 'col-12'">
-							<span>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
+						<div class="text-start" :class="projektarbeit.note != null ? 'col-6' : 'col-12'"
+							style="min-width: 0;">
+							<span
+								:title="getAccTabHeaderForProjektarbeit(projektarbeit)"
+								style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 600px;"
+							>{{getAccTabHeaderForProjektarbeit(projektarbeit)}}</span>
 						</div>
 						<div class="col-6 text-end">
 							<span>{{getNoteBezeichnung(projektarbeit)}}</span>
@@ -402,10 +494,22 @@ export const AbgabetoolStudent = {
 						{{ projektarbeit.projekttypbezeichnung }}					
 					</div>
 				</div>
+
 				<div class="row mt-2">
 					<div class="col-4 col-md-3 fw-bold">{{$capitalize( $p.t('abgabetool/c4titel') )}}</div>
-					<div class="col-8 col-md-9">
-						{{ projektarbeit.titel }}	
+					<div class="col-8 col-md-9 d-flex align-items-center gap-2" style="min-width: 0;">
+						<span
+							:title="projektarbeit.titel"
+							style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"
+						>{{ projektarbeit.titel }}</span>
+						<button
+							v-if="title_edit_allowed && !isViewMode && projektarbeit.note == null"
+							class="btn btn-sm btn-outline-secondary border-0 p-1"
+							v-tooltip.right="{ value: $capitalize($p.t('abgabetool/c4titelBearbeiten')), class: 'custom-tooltip' }"
+							@click="openTitelEdit(projektarbeit, $event)"
+						>
+							<i class="fa-solid fa-pen"></i>
+						</button>
 					</div>
 				</div>
 			</AccordionTab>
@@ -415,4 +519,4 @@ export const AbgabetoolStudent = {
    `,
 };

-export default AbgabetoolStudent;
+export default AbgabetoolStudent;
@@ -0,0 +1,26 @@
+const zone = 'Europe/Vienna';
+
+export function getViennaTodayISO() {
+	return luxon.DateTime.now().setZone(zone).toISODate();
+}
+
+export function formatISODate(dateParam) {
+	if (!dateParam) return '';
+
+	const date = luxon.DateTime.fromISO(String(dateParam), { zone });
+	return date.isValid ? date.toFormat('dd.MM.yyyy') : '';
+}
+
+export function toViennaDate(dateParam) {
+	if (!dateParam) return null;
+
+	return luxon.DateTime.fromISO(String(dateParam), { zone });
+}
+
+export function compareISODateValues(a, b) {
+	if (!a && !b) return 0;
+	if (!a) return 1;
+	if (!b) return -1;
+
+	return String(a).localeCompare(String(b));
+}
@@ -1,8 +1,8 @@

 const zone = 'Europe/Vienna';
-const today = luxon.DateTime.now().setZone(zone);

 export function getDateStyleClass(termin, notenOptions) {
+	const today = luxon.DateTime.now().setZone(zone);
 	const datum = luxon.DateTime.fromISO(termin.datum, { zone }).endOf('day');
 	const abgabedatum = termin.abgabedatum ? luxon.DateTime.fromISO(termin.abgabedatum, { zone }) : null;
 	termin.diffindays = datum.diff(today, 'days').days;
@@ -28,10 +28,11 @@ export function getDateStyleClass(termin, notenOptions) {

 		// no submission yet
 		if (datum < today) return 'verpasst';
-		if (termin.diffindays <= 12) return 'abzugeben';
-		return 'standard';
+		
 	}

-	// GENERIC STATUS
-	return datum < today ? 'verpasst' : 'standard';
-}
+	// GENERIC STATUS — applies to all termine
+	if (datum < today) return 'verpasst';
+	if (termin.diffindays <= 12) return 'abzugeben';
+	return 'standard';
+}
@@ -1,109 +0,0 @@
-import IssueList from './IssueList.js';
-import DefaultIssueCheckerEndpoint from '../../api/factory/issueChecker.js';
-import DefaultIssueListEndpoint from '../../api/factory/issueList.js';
-
-export default {
-	name: 'IssueChecker',
-	expose: ['countPersonOpenIssues', 'checkPerson'],
-	//emits: ['issuesLoaded'],
-	 components: {
-		IssueList,
-		"p-skeleton": primevue.skeleton,
-		"p-overlaypanel": primevue.overlaypanel
-	 },
-	 props: {
-		person_id: Number,
-		//oe_kurzbz: String,
-		apps: [String, Array],
-		hauptzustaendig: {
-			type: Boolean,
-			default: false
-		},
-		endpoint: {
-			type: Object,
-			required: true,
-			default: DefaultIssueCheckerEndpoint
-		},
-		issueListEndpoint: {
-			type: Object,
-			required: true,
-			default: DefaultIssueListEndpoint
-		},
-		issueListStyle: {
-			type: Object
-		},
-		issueListStyleBreakpoints: {
-			type: Object
-		},
-		includeIssueList: {
-			type: Boolean,
-			default: true
-		},
-	},
-	 data() {
-		return {
-			title: "IssueChecker",
-			currentDate: null,
-			isFetching: false,
-			openissuescount: null
-		}
-	},
-	computed: {
-	},
-	watch: {
-			person_id() {
-				this.countPersonOpenIssues();
-		}
-	},
-	mounted() {
-		this.countPersonOpenIssues();
-	},
-	 methods: {
-
-		countPersonOpenIssues() {
-			this.isFetching = true;
-			this.$api.call(
-				this.endpoint.countPersonOpenIssues(this.person_id, this.hauptzustaendig)
-			)
-			.then(result => {
-				//this.$emit('issuesLoaded', this.issues);
-				this.openissuescount = result.data.openissues;
-				this.isFetching = false;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		},
-		checkPerson() {
-			this.isFetching = true;
-			this.$api.call(
-				this.endpoint.checkPerson(this.person_id, this.hauptzustaendig)
-			)
-			.then(result => {
-				//this.$emit('issuesLoaded', this.issues);
-				this.openissuescount = result.data.openissues;
-				this.isFetching = false;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		},
-		toggle(event) {
-			this.$refs.issuesOverlay.toggle(event);
-		}
-	 },
-	 template: `
-		<div>
-			<h4 class="mb-1">Issues&nbsp;<a class="refresh-issues" title="erneut prüfen" href="javascript:void(0);" @click="checkPerson"><i class="fas fa-sync"></i></a></h4>
-			<h6 v-if="!isFetching" class="text-muted" :role="includeIssueList ? 'button' : ''" @click="toggle">{{ openissuescount }}</h6>
-			<h6 v-else class="mb-2"><p-skeleton v-if="isFetching" style="width:45%"></p-skeleton></h6>
-		</div>
-
-		<p-overlaypanel ref="issuesOverlay" :style="issueListStyle" :breakpoints="issueListStyleBreakpoints" v-if="includeIssueList">
-			<issue-list
-				ref="issueListRef"
-				:person_id = "person_id"
-				:apps = "apps"
-				:hauptzustaendig = "hauptzustaendig"
-				:endpoint = "issueListEndpoint"
-			>
-			</issue-list>
-		</p-overlaypanel>
-	 `
-}
@@ -1,93 +0,0 @@
-import ApiIssueList from '../../api/factory/issueList.js';
-
-export default {
-	name: 'IssueList',
-	emits: ['issuesLoaded'],
-	expose: ['fetchIssues'],
-	 components: {
-	 },
-	 props: {
-		person_id: Number,
-		oe_kurzbz: String,
-		fehlertyp_kurzbz: String,
-		apps: [String, Array],
-		behebung_parameter: Array,
-		hauptzustaendig: {
-			type: Boolean,
-			default: false
-		},
-		date: null,
-		endpoint: {
-			type: Object,
-			default: ApiIssueList
-		}
-	},
-	 data() {
-		return {
-			title: "Issues",
-			currentDate: null,
-			isFetching: false,
-			issues: null
-		}
-	},
-	computed: {
-		// if any property changes, get issues again
-		propertiesChanged() {
-		  return `${this.person_id}|${this.oe_kurzbz}|${this.fehlertyp_kurzbz}||${this.apps}|${this.behebung_parameter}`;
-		},
-	  },
-	watch: {
-		propertiesChanged(newVal, oldVal) {
-			this.fetchIssues();
-		},
-	  },
-	mounted() {
-		this.currentDate = this.date || new Date();
-		this.fetchIssues();
-	},
-	 methods: {
-
-		 fetchIssues() {
-			this.isFetching = true;
-			this.$api.call(
-				this.endpoint.getOpenIssuesByProperties(
-					this.person_id,
-					this.oe_kurzbz,
-					this.fehlertyp_kurzbz,
-					this.apps,
-					this.behebung_parameter,
-					this.hauptzustaendig
-				)
-			)
-			.then(result => {
-				this.issues = result.data;
-				this.$emit('issuesLoaded', this.issues);
-				this.isFetching = false;
-			})
-			.catch(this.$fhcAlert.handleSystemError);
-		},
-		formatDate(ds) {
-			if (ds == undefined) return '';
-			var d = new Date(ds);
-			return d.getDate()  + "." + (d.getMonth()+1) + "." + d.getFullYear()
-		}
-	 },
-	 template: `
-		<div v-if="isFetching" class="spinner-border" role="status">
-			<span class="visually-hidden">Loading...</span>
-		</div>
-		<div v-if="!isFetching && issues!=null && issues!=[]">
-			<table class="table table-bordered">
-				<tbody>
-					<tr><th>Datum</th><th>Inhalt</th></tr>
-					<tr v-for="(item, index) in issues" :key="item.issue_id">
-						<td>{{ formatDate(item.datum) }}</td>
-						<td>{{ item.inhalt }} <br>
-							<slot name="additionalText" v-bind="item"></slot>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-	 `
-}
@@ -63,7 +63,7 @@ export default {
 			const vm = this;
 			tinymce.init({
 				target: this.$refs.editor.$refs.input, //Important: not selector: to enable multiple import of component
-				min_height: 300,
+				//height: 800,
 				//plugins: ['lists'],
 				toolbar: 'styleselect | bold italic underline | alignleft aligncenter alignright alignjustify | link',
 				plugins: 'link',
@@ -313,7 +313,7 @@ export default {

 				<div class="row">
 					<div class="col-sm-8">
-						<form-form class="row g-3 mt-2 align-content-start" ref="formMessage">
+						<form-form class="row g-3 mt-2 h-100" ref="formMessage">

 							<div class="row mb-3">

@@ -338,7 +338,7 @@ export default {
 							</div>

 							<!--Tiny MCE-->
-							<div class="row mb-3 tiny-90">
+							<div class="row mb-3 h-100 tiny-90">
 								<form-input
 									ref="editor"
 									:label="$p.t('global','nachricht')  + ' *'"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Johann Hoffmann	2eb2c36d5b	replace + in email helpers with spaces; configs for title edit, multi edit table & confetti on endupload; empty student projektarbeiten check; only show dropdown labels on large displays; new phrasen & phrasen fixes;	2026-05-26 17:06:39 +02:00
Johann Hoffmann	22eed92c86	Merge branch 'feature-75838/UXImproveProjektarbeitSTVSprint247' into feature-76657/AbgabetoolFinetuning	2026-05-26 12:58:57 +02:00
Johann Hoffmann	557e43e19c	extracted date handling with luxon into dateUtils file and only work with those functions to completely avoid anymore timezone bugs due to js Dates. formatDate was still affected by timezone issues and was showing off by one dates in rare cases.	2026-05-22 11:17:37 +02:00
Johann Hoffmann	790568e1e0	timezone save date format function in student detail view via getUTCDate() instead of getDate()	2026-05-22 09:55:25 +02:00
Johann Hoffmann	dfc3096587	rewrote findlatestTerminWithUpload sort to guarantee sorting by abgabedatum DESC	2026-05-20 13:52:32 +02:00
Johann Hoffmann	c0192e9e00	adjusted flatTable index to paabgabe_id since projektarbeit_id is not unique per row there; fixed splitMailHelpers call in Mitarbeiter page; emailHelper changes so it actually works with bcc aswell;	2026-05-18 10:23:41 +02:00
Johann Hoffmann	9b823dbaa1	scope the zoom media query to abgabetool document selector to avoid spillover to CIS4 pages unintentionally; added noten headerfilter & persistence in flat table;	2026-05-08 12:44:07 +02:00
Johann Hoffmann	398e3aa139	block deletion of benotet qulity gates; sync filter clear & semester dropdown; setSelecetedFields for flat table; WIP testing & refinement of everything;	2026-05-07 16:18:58 +02:00
Johann Hoffmann	553a33aa42	adapt Betreuer Page with changes of assistenzpage; set select all checkbox flag in selectAll handler to always be in sync with selectedData;	2026-05-06 18:54:19 +02:00
Johann Hoffmann	05e9d948ea	deselect filtered rows;	2026-05-06 17:18:35 +02:00
Johann Hoffmann	a5d343268f	fix deselect condition on filtered datasets; added new phrases for confirm & edit dialog; fixed emailSplitter phrasen & confirm; fixed modal fullscreen button alignment & color;	2026-05-06 16:49:35 +02:00
Johann Hoffmann	9e061de9bd	fix deselect condition on filtered datasets; added new phrases for confirm & edit dialog;	2026-05-06 15:26:02 +02:00
Johann Hoffmann	d0adf2dfc3	improved assistenz subqueries for zweitbetreuer infos by using common table expression instead of 8 subqueries; adapted splitMailsHelper function to take in body parameter to set default email text by parameter; dateStyles adapted so "in 12 days" also applies to termine without uploads; titleEdit modal in student & studentDetail component; send email to relevant assistenzen & projektarbeit betreuer about change from old to new title; 2nd flat table in AbgabetoolAssistenz that provides a list of all projektarbeittermine so it can be filtered & multiselected; multi delete & multi edit on these selected termine; tried to introduce a media query for zoomed in desktop users that shrinks fontsize and tabulator rows/cells; standard assistenz table column definitions have sensible minWidths & most columns are default invisible; fancy multiselect headerfilter on qualitygate 1/2 status column; actually figured out a vue watcher race codnition triggering loadProjektarbeiten twice unnecessarily; added a reload Button in case one observes a faulty reactivity somewhere in the table; fancy multiselect headerfilter on termin status column for flat table; Preselect current Semester & autoapply Filter for it; WIP refine new table & hunt for bugz; WIP working on the exact custom select handler Handling with filtered datasets; fixed root element style on legacy php view for abgabetool in old cis; WIP define more accurate allowed to delete & allowed to Edit conditions for abgabetermine -> currently benotet quality gates can be edited/deleted!!!!!	2026-05-06 13:46:26 +02:00
Johann Hoffmann	f51d0f72c6	setSelectedFields() method in filter cmpt to keep custom persistence with visible fields; distinct titles assistenz/betreuer page; fix select logic to respect the possibility of dataset being filtered; beurteilungsnotiz required if note of that termin is negative; multiselect filter on qgate status columns + persistence of those; WIP switching mode to flat table showing all abgabetermine of all projektarbeiten to multi edit/delete/whatever with them selected	2026-04-28 17:27:19 +02:00
Johann Hoffmann	c62c3c23f6	minimal column setup by default, added sensible minWidths	2026-04-27 16:37:36 +02:00
Johann Hoffmann	b22375bd21	Merge remote-tracking branch 'origin/feature-61164/AbgabetoolQualityGates' into feature-76657/AbgabetoolFinetuning # Conflicts: # public/js/components/Cis/Abgabetool/AbgabetoolAssistenz.js	2026-04-27 16:24:06 +02:00
Johann Hoffmann	f9550c99bb	remove newAbgabetermin from SpeedDial Items	2026-04-27 16:13:31 +02:00
Johann Hoffmann	df369c7149	Merge branch 'feature-75996/AbgabetoolFeedbackSprint247' into feature-76657/AbgabetoolFinetuning	2026-04-27 16:11:11 +02:00
Johann Hoffmann	6868e68145	define datepickers to use ISO strings internally with model-type="yyyy-MM-dd" to avoid construction of new js dateobjects when deleting the value via text input, which could lead to a off by one day/timezone error when saving the date	2026-04-09 15:42:05 +02:00
Johann Hoffmann	44e43d9479	phrasenkey fix 'c4fehlerAktualitaetProjektarbeit ' => 'c4fehlerAktualitaetProjektarbeit'	2026-04-08 15:47:17 +02:00
Johann Hoffmann	079a8e3ec1	added selected: x \| filtered: y \| total: z count to assistenz table	2026-03-24 15:19:36 +01:00
Johann Hoffmann	6ddb064c9e	qgateStatus tooltips	2026-03-23 10:09:46 +01:00
Johann Hoffmann	9b8b1b2532	cellFormatter & TitleFormatter breakpoints at 100px to display longform or shortform text; phrasenupdate; lefthandside formatting per default; curated tabulator tooltips for complex cells WIP	2026-03-20 12:21:47 +01:00
Johann Hoffmann	aba4bc2909	merge projektarbeit details & betreuer form and handle several UX changes regarding formData of both	2026-03-19 11:12:14 +01:00
Johann Hoffmann	f6d2b55f75	redrawTableScrollSave method instead of manual reset	2026-03-16 11:26:31 +01:00