Merge branch 'master' into feature-76146/SucheTelefonnummer

application/config/search.php

@@ -45,7 +45,7 @@ $config['person'] = [
 			'field' => 'kontakt',
 			'join' => [
 				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy') AND tbl_kontakt.person_id = tbl_person.person_id"
 			],
 			"1-n" => true
 		],
@@ -360,6 +360,10 @@ $config['employee'] = [
 			'comparison' => 'equals',
 			'field' => "mitarbeiter_uid"
 		],
+		'personalnummer' => [
+			'comparison' => 'equal-int',
+			'field' => "personalnummer"
+		],
 		'vorname' => [
 			'alias' => ['firstname'],
 			'comparison' => 'similar',
@@ -415,12 +419,27 @@ $config['employee'] = [
 		'tel' => [
 			'alias' => ['phone', 'telefon'],
 			'comparison' => 'similar',
-			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
+			'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')
+			)",
 			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
+				'table' => "employee_tel",
+				'using' => "mitarbeiter_uid"
 			],
-			"1-n" => true
+			'1-n' => true
 		],
 		'pid' => [
 			'alias' => ['person_id'],
@@ -471,6 +490,7 @@ $config['employee'] = [
 	],
 	'resultfields' => [
 		"b.uid",
+		"m.personalnummer",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY(
@@ -512,7 +532,6 @@ $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 (
@@ -524,7 +543,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.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 	UNION
 	SELECT tbl_mitarbeiter.*
 	FROM public.tbl_mitarbeiter
@@ -534,10 +553,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.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
+$config['unassigned_employee']['searchfields']['tel'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";

application/config/searchPV.php

@@ -0,0 +1,34 @@
+<?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');

application/config/searchcis.php

@@ -7,6 +7,7 @@ $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)

application/controllers/api/frontend/v1/Searchbar.php

@@ -37,7 +37,8 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
 			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED
+			'searchStv' => self::PERM_LOGGED,
+			'searchPV' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -87,6 +88,15 @@ 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
 	 */

application/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,10 +294,6 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

application/controllers/api/frontend/v1/stv/Abschlusspruefung.php

@@ -371,9 +371,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$datum = $formData['datum'] == '' ? null : $formData['datum'];
-		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
-
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -385,8 +382,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $datum,
-				'sponsion' => $sponsion,
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -170,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -182,7 +180,7 @@ class Dokumente extends FHCAPI_Controller
 				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
 				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
 				'titel_intern' => $this->input->post('titel_intern'),
-				'nachgereicht_am' => $nachgereicht_am,
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
 				'updatevon' => $uid,
 			]

application/controllers/api/frontend/v1/stv/Konto.php

@@ -429,12 +429,9 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
-
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
-			if($data['buchungsdatum'] == '')
-				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

application/controllers/api/frontend/v1/stv/Mobility.php

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = ($formData['von'] ?? '') ?: null;
-		$bis = ($formData['bis'] ?? '') ?: null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
 		$nation_code = $formData['nation_code'] ?? null;
 		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
 		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;

application/controllers/api/frontend/v1/stv/Prestudent.php

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
 				)
 				{
 					$val = null;

application/controllers/api/frontend/v1/stv/Pruefung.php

@@ -448,10 +448,8 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
-		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
-
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -461,7 +459,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $datum,
+					'datum' => $this->input->post('datum'),
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -474,7 +472,7 @@ class Pruefung extends FHCAPI_Controller
 				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
 				'student_uid' => $this->input->post('student_uid'),
 				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $datum,
+				'datum' => $this->input->post('datum'),
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -522,7 +520,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $datum,
+				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -557,7 +555,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $datum,
+			'benotungsdatum' => $this->input->post('datum'),
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

application/controllers/api/frontend/v1/stv/Student.php

@@ -296,10 +296,6 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
-			else if ($prop == 'gebdatum')
-			{
-				$update_person[$prop] = ($val == '') ? null : $val;
-			}
 			else
 			{
 				$update_person[$prop] = $val;

public/js/api/factory/searchbar.js

@@ -36,5 +36,12 @@ export default {
 			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
+	},
+	searchPV(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchPV',
+			params
+		};
 	}
 };

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -433,7 +433,6 @@ 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
@@ -450,7 +449,6 @@ 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

public/js/components/Funktionen/Funktionen.js

@@ -551,7 +551,6 @@ 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
@@ -567,7 +566,6 @@ 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

public/js/components/Stv/Studentenverwaltung/Details/Aufnahmetermine/Aufnahmetermine.js

@@ -470,7 +470,6 @@ 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

public/js/components/Stv/Studentenverwaltung/Details/Details.js

@@ -293,7 +293,6 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
-						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today

public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js

@@ -103,7 +103,6 @@ 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

public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js

@@ -467,7 +467,6 @@ 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
@@ -502,7 +501,6 @@ 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

public/js/components/Stv/Studentenverwaltung/Details/Status/Modal.js

@@ -276,7 +276,6 @@ 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
@@ -292,7 +291,6 @@ 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
@@ -308,14 +306,13 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bewerbung_abgeschicktamum"
-				model-type="yyyy-MM-dd HH:mm:ss"
 				name="bewerbung_abgeschicktamum"
 				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 				auto-apply
-				:enable-time-picker="true"
-				format="dd.MM.yyyy HH:mm:ss"
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
 				text-input
-				preview-format="dd.MM.yyyy HH:mm:ss"
+				preview-format="dd.MM.yyyy"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"
 				>

public/js/components/Stv/Studentenverwaltung/List/New.js

@@ -285,7 +285,6 @@ 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

system/phrasesupdate.php

@@ -55257,6 +55257,26 @@ 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',