Merge branch 'master' into feature-69542/Composer_Dependencies_Update

- kingsquare/json-schema-form has been removed
- Removed testing tools from require-dev
- netcarver/textile updated to 4.1.3

application/config/search.php

@@ -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
 ";

application/config/searchPV.php

@@ -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');

application/config/searchcis.php

@@ -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)

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

@@ -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
 	 */

application/models/organisation/Studiensemester_model.php

@@ -122,47 +122,6 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query, array($studiensemester_kurzbz, $limit));
 	}
 
-
-	/**
-	 * Returns the current study semester and the previous semesters of the same type (SS/WS).
-	 *
-	 * Example:
-	 * - SS2026, limit 3:  SS2026, SS2025, SS2024
-	 * - WS2025, limit 2: WS2025, WS2024
-	 *
-	 * @param $studiensemester_kurzbz
-	 * @param $limit
-	 */
-	public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1)
-	{
-		$qry = '
-			SELECT 
-			    studiensemester_kurzbz,
-				start,
-				ende
-			FROM 
-			    public.tbl_studiensemester
-			WHERE 
-				SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2)
-			AND start <= (
-				SELECT start
-				FROM public.tbl_studiensemester
-				WHERE studiensemester_kurzbz = ?
-			)
-			ORDER BY 
-				start DESC
-			LIMIT ?
-		';
-
-		return $this->execQuery($qry,
-			[
-				$studiensemester_kurzbz,
-				$studiensemester_kurzbz,
-				$limit
-			]
-		);
-	}
-
 	/**
 	 * getNearest
 	 */

application/models/person/Benutzerfunktion_model.php

@@ -260,6 +260,7 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
+
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -295,6 +296,7 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

composer.json

@@ -482,8 +482,6 @@
 		"brutusin/json-forms": "1.4.0",
 		"josdejong/jsoneditor": "5.5.6",
 
-		"kingsquare/json-schema-form": "*",
-
 		"ludo/jquery-treetable": "3.2.0",
 
 		"michelf/php-markdown": "1.5.0",
@@ -493,7 +491,7 @@
 		"mottie/tablesorter": "2.*",
 
 		"nategood/httpful": "0.2.*",
-		"netcarver/textile": "3.7.*",
+		"netcarver/textile": "4.1.*",
 		"nicolaskruchten/pivottable": "2.23.0",
 		"npm-asset/primevue": "3.29.1",
 		"npm-asset/primeicons": "5.0.0",
@@ -525,17 +523,12 @@
 	"config": {
 		"bin-dir": "vendor/bin"
 	},
-
 	"require-dev": {
-		"vuejs/vuejs3_dev": "3.3.8",
-		"squizlabs/php_codesniffer": "3.6.*",
-		"phpmd/phpmd": "2.*",
-		"phpmetrics/phpmetrics": "2.*",
-		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6"
+		"vuejs/vuejs3_dev": "3.3.8"
 	},
 	"scripts": {
 		"post-install-cmd": "@symlink_vendor_to_public",
 		"symlink_vendor_to_public": "ln -sfn ../vendor ./public/"
 	}
 }
+

public/js/api/factory/searchbar.js

@@ -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
-		};
 	}
 };

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

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
+			counterdate: new Date()
 		};
 	},
 	computed: {
@@ -259,7 +259,6 @@ export default {
 					<form-input
 						type="DatePicker"
 						v-model="counterdate"
-						model-type="yyyy-MM-dd"
 						input-group
 						:enable-time-picker="false"
 						text-input

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

@@ -79,7 +79,6 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
-					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

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

@@ -88,7 +88,7 @@ export default {
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				buchungsdatum: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
+				buchungsdatum: new Date(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,7 +154,6 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
-					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

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

@@ -325,7 +325,6 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
-						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -390,7 +389,6 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
-						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -456,7 +454,6 @@ export default {
 						:label="$p.t('lehre', 'zgvDoktorDatum')"
 						type="DatePicker"
 						v-model="data.zgvdoktordatum"
-						model-type="yyyy-MM-dd"
 						name="zgvdoktordatum"
 						no-today
 						auto-apply

public/js/components/filter/Filter.js

@@ -218,23 +218,15 @@ export const CoreFilterCmpt = {
 		},
 		columnsForFilter() {
 			if (!this.filteredColumns || !this.datasetMetadata) return [];
-
+			const localizedColumnTitles = this.tabulator.getLang().columns;
 			const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale;
-
-			let filterTitles;
-			if (isTabulatorLocalized) {
-				const localizedColumnTitles = this.tabulator.getLang().columns;
-				filterTitles = this.filteredColumns.reduce((a, c) => {
-					a[c.field] = localizedColumnTitles[c.field];
-					return a;
-				}, {});
-			} else {
-				filterTitles = this.filteredColumns.reduce((a, c) => {
-					a[c.field] = c.title;
-					return a;
-				}, {});
-			}
-
+			const filterTitles = this.filteredColumns.reduce((a, c) => {
+				a[c.field] =
+					isTabulatorLocalized && localizedColumnTitles[c.field]
+						? localizedColumnTitles[c.field]
+						: c.title;
+				return a;
+			}, {});
 			return this.datasetMetadata.map((el) => ({
 				...el,
 				...{ title: filterTitles[el.name] },

system/phrasesupdate.php

@@ -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',