use model-type for interessenten anlegen, listNew

prepare field bewerbung_abgeschicktamum for showing in frontend (datestamp in database) and add also model-type to datepicker
add model-type to fields Betriebsmittel/ausgegebenam, Betriebsmittel/retouram, Funktionen/datumvon und Funktionen/datumbis
2026-07-15 05:52:18 +00:00 · 2026-07-14 15:23:06 +02:00 · 2026-07-14 15:05:54 +02:00 · 2026-07-14 14:31:13 +02:00 · 2026-07-14 14:23:37 +02:00 · 2026-07-14 14:19:25 +02:00
14 changed files with 28 additions and 101 deletions
@@ -45,7 +45,7 @@ $config['person'] = [
 			'field' => 'kontakt',
 			'join' => [
 				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy') AND tbl_kontakt.person_id = tbl_person.person_id"
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
 			],
 			"1-n" => true
 		],
@@ -360,10 +360,6 @@ $config['employee'] = [
 			'comparison' => 'equals',
 			'field' => "mitarbeiter_uid"
 		],
-		'personalnummer' => [
-			'comparison' => 'equal-int',
-			'field' => "personalnummer"
-		],
 		'vorname' => [
 			'alias' => ['firstname'],
 			'comparison' => 'similar',
@@ -419,27 +415,12 @@ $config['employee'] = [
 		'tel' => [
 			'alias' => ['phone', 'telefon'],
 			'comparison' => 'similar',
-			'field' => 'kontakt',
-			'prepare' => "employee_tel (mitarbeiter_uid, kontakt) AS (
-				SELECT m.mitarbeiter_uid,
-					   TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, ''))
-				FROM public.tbl_mitarbeiter m
-				LEFT JOIN public.tbl_kontakt k
-					ON k.standort_id = m.standort_id
-					AND k.kontakttyp = 'telefon'
-				UNION
-				SELECT m.mitarbeiter_uid, k.kontakt
-				FROM public.tbl_mitarbeiter m
-				JOIN public.tbl_benutzer b ON b.uid = m.mitarbeiter_uid
-				JOIN public.tbl_kontakt k
-					ON k.person_id = b.person_id
-					AND k.kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy')
-			)",
+			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
 			'join' => [
-				'table' => "employee_tel",
-				'using' => "mitarbeiter_uid"
+				'table' => "public.tbl_kontakt",
+				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
 			],
-			'1-n' => true
+			"1-n" => true
 		],
 		'pid' => [
 			'alias' => ['person_id'],
@@ -490,7 +471,6 @@ $config['employee'] = [
 	],
 	'resultfields' => [
 		"b.uid",
-		"m.personalnummer",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY(
@@ -532,6 +512,7 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];

+// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -543,7 +524,7 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.uid IS NULL
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 	UNION
 	SELECT tbl_mitarbeiter.*
 	FROM public.tbl_mitarbeiter
@@ -553,10 +534,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.uid IS NULL
+	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel'] = "
+$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";
@@ -1,34 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-
-$CI =& get_instance();
-
-$config['person'] = $CI->config->item('person', 'search');
-
-$config['employee'] = $CI->config->item('employee', 'search');
-$config['employee']['resultjoin'] = "
-		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
-		JOIN public.tbl_person p USING(person_id)
-		LEFT JOIN (
-			SELECT kontakt, standort_id
-			FROM public.tbl_kontakt
-			WHERE kontakttyp = 'telefon'
-		) k ON (k.standort_id = m.standort_id)";
-
-$config['unassigned_employee'] = $CI->config->item('unassigned_employee', 'search');
-$config['unassigned_employee']['resultjoin'] = "
-    JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
-    JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
-    JOIN public.tbl_person p USING(person_id)
-    LEFT JOIN (
-        SELECT kontakt, standort_id
-        FROM public.tbl_kontakt
-        WHERE kontakttyp = 'telefon'
-    ) k ON (k.standort_id = m.standort_id)";
-
-$config['room'] = $CI->config->item('room', 'search');
-
-$config['organisationunit'] = $CI->config->item('organisationunit', 'search');
@@ -7,7 +7,6 @@ $CI =& get_instance();


 $config['employee'] = $CI->config->item('employee', 'search');
-unset($config['employee']['searchfields']['tel']);
 $config['employee']['resultjoin'] = "
 		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
 		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
@@ -37,8 +37,7 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
 			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED,
-			'searchPV' => self::PERM_LOGGED
+			'searchStv' => self::PERM_LOGGED
 		]);

 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -88,15 +87,6 @@ class Searchbar extends FHCAPI_Controller
 		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
 	}

-	/**
-	 * Gets a JSON body via HTTP POST and provides the parameters
-	 */
-	public function searchPV()
-	{
-		return $this->searchAdvanced([ 'config' => 'searchPV' ]);
-	}
-
-
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */
@@ -36,12 +36,5 @@ export default {
 			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
-	},
-	searchPV(params) {
-		return {
-			method: 'post',
-			url: '/api/frontend/v1/searchbar/searchPV',
-			params
-		};
 	}
 };
@@ -433,6 +433,7 @@ export default {
 						:label="$p.t('wawi/ausgegebenam')"
 						name="ausgegebenam"
 						v-model="formData.ausgegebenam"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -449,6 +450,7 @@ export default {
 						:label="$p.t('wawi/retouram')"
 						name="retouram"
 						v-model="formData.retouram"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -551,6 +551,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_von"
+							model-type="yyyy-MM-dd"
 							name="datum_von"
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
@@ -566,6 +567,7 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_bis"
+							model-type="yyyy-MM-dd"
 							name="datum_bis"
 							:label="$p.t('global/bis')"
 							auto-apply
@@ -470,6 +470,7 @@ export default {
 							:label="$p.t('admission', 'anmeldundRtAm')"
 							type="DatePicker"
 							v-model="formData.anmeldedatum"
+							model-type="yyyy-MM-dd"
 							auto-apply
 							:enable-time-picker="false"
 							text-input
@@ -293,6 +293,7 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
+						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today
@@ -103,6 +103,7 @@ export default {
 						<form-input
 							type="DatePicker"
 							v-model="formData.nachgereicht_am"
+							model-type="yyyy-MM-dd"
 							name="nachgereicht_am"
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply
@@ -467,6 +467,7 @@ export default {
 						:label="$p.t('ui', 'von')"
 						type="DatePicker"
 						v-model="formData.von"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -501,6 +502,7 @@ export default {
 						:label="$p.t('global', 'bis')"
 						type="DatePicker"
 						v-model="formData.bis"
+						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -135,6 +135,11 @@ export default{
 					.then(result => {
 						this.statusNew = false;
 						this.formData = result.data;
+						//to show Date in correct format in the modal (is timestamp in database)
+						if (this.formData.bewerbung_abgeschicktamum) {
+							this.formData.bewerbung_abgeschicktamum =
+								this.formData.bewerbung_abgeschicktamum.substring(0, 10);
+						}
 						this.originalDatum = new Date(result.data.datum);
 						return prestudent;
 					})
@@ -276,6 +281,7 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.datum"
+				model-type="yyyy-MM-dd"
 				name="datum"
 				:label="$p.t('global/datum')"
 				auto-apply
@@ -291,6 +297,7 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bestaetigtam"
+				model-type="yyyy-MM-dd"
 				name="bestaetigtam"
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
@@ -306,6 +313,7 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bewerbung_abgeschicktamum"
+				model-type="yyyy-MM-dd"
 				name="bewerbung_abgeschicktamum"
 				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 				auto-apply
@@ -285,6 +285,7 @@ export default {
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
+								model-type="yyyy-MM-dd"
 								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input
@@ -55257,26 +55257,6 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'search',
-		'phrase' => 'type_unassigned_employee',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Mitarbeiter ohne Zuordnung',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'unassigned employee',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'search',
Author	SHA1	Message	Date
ma0068	b217681ee5	use model-type for interessenten anlegen, listNew	2026-07-14 15:23:06 +02:00
ma0068	7841a73fc0	prepare field bewerbung_abgeschicktamum for showing in frontend (datestamp in database) and add also model-type to datepicker	2026-07-14 15:05:54 +02:00
ma0068	2064008f9e	add model-type to fields Betriebsmittel/ausgegebenam, Betriebsmittel/retouram, Funktionen/datumvon und Funktionen/datumbis	2026-07-14 14:31:13 +02:00
ma0068	19b9906c86	Aufnahmetermine: use model-type isodate for field anmeldedatum	2026-07-14 14:23:37 +02:00
ma0068	2c3913a763	Mobility: use model-type isodate for fields von and bis	2026-07-14 14:19:25 +02:00
ma0068	9111edf442	Dokumente: use model-type isodate for field nachgereicht_am	2026-07-14 14:06:59 +02:00
ma0068	b1c47da3c3	use model-type isodate for fields in StatusModal datum and bestaetigtam	2026-07-14 14:01:12 +02:00
ma0068	67eb238876	use model-type isodate for field Details Gebdatum	2026-07-14 13:37:19 +02:00