new Component Dropdown Nations

implemented in StudVW Tabs Details, Contact/Adress, Prestudent and Mobility

application/controllers/Cis/Compat.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Compat extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'ci' => ['basis/cis:r'],
+			'legacy' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * @access public
+	 * @return void 
+	 */
+	public function ci()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+	/**
+	 * @access public
+	 * @return void
+	 */
+	public function legacy()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+}

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

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 

application/controllers/api/frontend/v1/dropdowns/Dropdown.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Copyright (C) 2026 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');
+
+/**
+ * This controller operates between (interface) the JS (GUI) and the back-end
+ * This controller works with JSON calls on the HTTP GET or POST and the output is always JSON
+ */
+class Dropdown extends FHCAPI_Controller
+{
+	/**
+	 * Calls the parent's constructor and prepares libraries and phrases
+	 */
+	public function __construct()
+	{
+		parent::__construct([
+			'getNations' => self::PERM_LOGGED
+		]);
+
+		// Load Libraries
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+	}
+
+	public function getNations($searchString=null)
+	{
+		$this->load->model('codex/nation_model', 'NationModel');
+
+		$result = $this->NationModel->searchNations($searchString);
+		if (isError($result)) {
+			$this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
+		}
+		$this->terminateWithSuccess($result ?: []);
+	}
+}

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

@@ -42,11 +42,15 @@ class Address extends FHCAPI_Controller
 	{
 		$this->load->model('codex/Nation_model', 'NationModel');
 
-		$this->NationModel->addOrder('kurztext');
+		//show at first entries staatenlos and Stbg. ungeklaert
+		$this->db->order_by("kontinent IS NULL DESC, kurztext ASC", '', FALSE);
+		$this->NationModel->addSelect("langtext as label");
+		$this->NationModel->addSelect('kurztext');
+		$this->NationModel->addSelect('nation_code');
 
 		$result = $this->NationModel->load();
 		$data = $this->getDataOrTerminateWithError($result);
-		
+
 		$this->terminateWithSuccess($data);
 	}
 

application/models/codex/Nation_model.php

@@ -11,4 +11,39 @@ class Nation_model extends DB_Model
 		$this->dbTable = 'bis.tbl_nation';
 		$this->pk = 'nation_code';
 	}
+
+	public function searchNations($filter=null)
+	{
+		$params = [];
+
+		if ($filter)
+		{
+			if (preg_match('/%[0-9A-Fa-f]{2}/', $filter)) {
+				$filter = urldecode($filter);
+			}
+			$filter = mb_strtolower($filter, 'UTF-8'); //for umlaute
+		}
+
+		$qry = "
+			SELECT
+				n.nation_code, n.langtext as label, n.kurztext, n.sperre
+			FROM
+				bis.tbl_nation n";
+
+		if ($filter)
+		{
+			$escapedFilter = $this->db->escape('%' . $filter . '%');
+
+			$qry .= "
+				WHERE
+					n.kurztext ILIKE $escapedFilter
+					OR n.engltext ILIKE $escapedFilter
+					OR n.nation_code ILIKE $escapedFilter
+			";
+		}
+
+		$qry .= " ORDER BY n.kontinent IS NULL DESC, n.kurztext ASC";
+
+		return $this->execQuery($qry, $params);
+	}
 }

application/views/Studentenverwaltung.php

@@ -21,7 +21,8 @@
 			'public/css/components/primevue.css',
 			'public/css/Studentenverwaltung.css',
 			'public/css/components/function.css',
-			'public/css/components/Detailheader.css'
+			'public/css/components/Detailheader.css',
+			'public/css/components/dropdown.css'
 		],
 		'customJSs' => [
 			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',

cis/testtool/login.php

@@ -632,6 +632,7 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
+				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,6 +29,7 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
+require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -198,8 +199,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT DISTINCT ON
-			(gebiet_id, semester, reihung)
+		SELECT * FROM (SELECT DISTINCT ON
+			(gebiet_id)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -226,13 +227,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(
-						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-						OR
-						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
-						OR
-						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-					)
+					tbl_ablauf.semester <= prestudent_data.semester
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -259,9 +254,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-				OR
-					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					tbl_ablauf.semester <= prestudent_data.semester
 				)
 			) temp
 		) temp2
@@ -270,7 +263,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." 
+			". $bezeichnung_mehrsprachig_sel ." ) temp3
 
 		ORDER BY
 			semester,
@@ -283,6 +276,8 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
+	$gebiet_pruefling = new gebiet_pruefling();
+	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -294,8 +289,25 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
+			if ($row->semester == '1')
+			{
+				// Basisgebiete anzeigen
+				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
+			}
+			else
+			{
+				if (!$quereinsteiger_menu)
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
+					$quereinsteiger_menu = true;
+				}
+				else
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				}
+			}
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -394,6 +406,12 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
+			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
+			{
+				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
+				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
+				$gebiet_pruefling->saveGebietForPruefling();
+			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

include/gebiet_pruefling.class.php

@@ -0,0 +1,97 @@
+<?php
+/* Copyright (C) 2024 Technikum-Wien
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class gebiet_pruefling extends basis_db
+{
+	//Tabellenspalten
+	public $prueflinggebiet_id;
+	public $pruefling_id;
+	public $gebiet_id;
+	public $insertamum;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function loadByPruefling($pruefling_id)
+	{
+		$qry = "SELECT *
+     			FROM testtool.tbl_pruefling_gebiet
+     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
+				$this->pruefling_id = $row->pruefling_id;
+				$this->gebiet_id = $row->gebiet_id;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = "Pruefling nicht gefunden";
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
+			return false;
+		}
+	}
+
+	public function checkIfExists($pruefling_id, $gebiet_id)
+	{
+		$qry = "SELECT 1 
+				FROM testtool.tbl_pruefling_gebiet 
+				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+	}
+
+	public function saveGebietForPruefling()
+	{
+		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
+    					(pruefling_id, gebiet_id)
+				VALUES(".
+			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
+			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
+
+		if ($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return true;
+		}
+	}
+
+}
+?>

public/css/components/dropdown.css

@@ -0,0 +1,3 @@
+.item-sperre {
+    text-decoration: line-through;
+}

public/js/api/dropdowns/dropdown.js

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2026 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/>.
+ */
+
+export default {
+	getNations(searchString) {
+		return {
+			method: 'get',
+			url: 'api/frontend/v1/dropdowns/dropdown/getNations/' + searchString
+		};
+	}
+};

public/js/apps/Cis/Cis.js

@@ -19,6 +19,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
+import Compat from "../../components/Cis/Compat.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
@@ -29,6 +30,18 @@ const isMobile = window.matchMedia("(max-width: 767px)").matches;
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Compat/:mode(ci|legacy)/:path(.*)`,
+			name: 'Compat',
+			component: Compat,
+			props: (route) => {
+				return {
+					mode: route.params.mode,
+					path: route.params.path,
+					query_string: VueRouter.stringifyQuery(route.query)
+				};
+			}
+		},
 		{
 			path: `/Cis/Studium`,
 			name: 'Studium',
@@ -277,7 +290,7 @@ const app = Vue.createApp({
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				
-				const path = url.pathname
+				const path = url.pathname + url.search;
 				const base = this.$router.options.history.base
 				const route = path.replace(base, '') || '/'
 

public/js/components/Cis/Compat.js

@@ -0,0 +1,93 @@
+export default {
+	name: "Compat",
+	props: {
+		mode: { type: String, required: true },
+		path: { type: String, required: true },
+		query_string: { type: String, required: true, default: ''}
+	},
+	data: function() {
+		return {
+			lastLoadediFrameURL: '',
+			srcUrl: ''
+		};
+	},
+	computed: {
+		propsWatchHelper: function() {
+			return this.mode + '#' + this.path + '#' + this.query_string;
+		}
+	},
+	mounted: function() {
+		this.srcUrl = this.buildSrcUrl();
+	},
+	watch: {
+		propsWatchHelper: function() {
+			if(this.lastLoadediFrameURL === '') {
+				return;
+			}
+
+			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
+
+			let url = this.buildSrcUrl();
+			if(this.lastLoadediFrameURL !== url) {
+				this.srcUrl = url;
+				if(this.srcUrl === url) {
+					this.$refs.compatiframe.contentWindow.location.href = url;
+				}
+			}
+		}
+	},
+	methods: {
+		buildSrcUrl: function() {
+			let url = false;
+			switch(this.mode) {
+				case 'ci':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
+					break;
+				case 'legacy':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
+					break;
+				default:
+					url = false;
+			}
+			if(this.query_string !== '' && url) {
+				url += '?' + this.query_string;
+			}
+
+			return url;
+		},
+		loadHandler: function() {
+			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
+			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
+			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
+			let routerpath = null;
+
+			this.lastLoadediFrameURL = iframe_href;
+
+			if(iframe_href.startsWith(ci_urlstart)) {
+				routerpath = iframe_href.replace(
+					ci_urlstart, '/Cis/Compat/ci/');
+			} else if(iframe_href.startsWith(legacy_urlstart)) {
+				routerpath = iframe_href.replace(
+					legacy_urlstart, '/Cis/Compat/legacy/');
+			} else {
+				return;
+			}
+
+			if(this.$route.fullPath !== routerpath) {
+				this.$router.push(routerpath);
+			}
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				ref="compatiframe"
+				v-if="srcUrl"
+				:src="srcUrl"
+				@load="loadHandler"
+				style="width:100%; height:90vh; border:0; display:block;"
+			></iframe>
+		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
+		</div>
+	`
+};

public/js/components/DetailHeader/DetailHeader.js

@@ -542,10 +542,10 @@ export default {
 
 		<template v-if="typeHeader==='mitarbeiter'">
 
-				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+				<div class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block">
 					<img
-					  class="d-block w-100 h-100 rounded"
-					  style="height: 84px; object-fit: contain;"
+					  class="d-block rounded"
+					  style="height: 96px;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
 					/>
@@ -558,15 +558,13 @@ export default {
 					<template v-if="fotoEditable">
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
 							@click="showDeleteModal(person_id)">
 							<i class="fa fa-xmark"></i>
 						</button>
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
 							@click="showModal(person_id)">
 							<i class="fa fa-pen"></i>
 						</button>

public/js/components/Dropdowns/NationsDropdown.js

@@ -0,0 +1,109 @@
+import CoreForm from '../Form/Form.js';
+import FormInput from '../Form/Input.js';
+import ApiDropdowns from '../../api/dropdowns/dropdown.js';
+
+export default {
+	name: "NationsDropdown",
+	components: {
+		CoreForm,
+		FormInput
+	},
+	inject: {
+		lists: {
+			from: 'lists'
+		},
+	},
+	props: {
+		nation: {
+			type: String,
+			required: true
+		},
+		containerClass: {
+			type: String,
+			required: false
+		},
+		labelDropdown: {
+			type: String,
+			required: false
+		},
+		nullLabel: {
+			type: String,
+			required: false,
+			default: ''
+		},
+	},
+	data(){
+		return {
+			filteredNations: [],
+			selectedNation: null,
+			abortController: {
+				nations: null
+			},
+		};
+	},
+	watch: {
+		nation: {
+			immediate: true,
+			handler(newVal) {
+				if (newVal) {
+					this.updateNation(newVal);
+				}
+			}
+		},
+		selectedNation(newVal) {
+			//emit
+			this.$emit('updateNation', {
+				nation_code: newVal?.nation_code
+			});
+		}
+	},
+	methods: {
+		filterNations(event){
+			//use search function instead of filteringList to get also params of engltext and nation_code
+			if (this.abortController.nations) {
+				this.abortController.nations.abort();
+			}
+			this.abortController.nations = new AbortController();
+
+			return this.$api
+				.call(ApiDropdowns.getNations(event.query))
+				.then(result => {
+					this.filteredNations = result.data.retval;
+				});
+		},
+		updateNation(nation) {
+			const detailsNation = this.lists.nations.find(
+				item => item.nation_code == nation
+			);
+
+			//create new object to avoid erros because of same instance if included more than once
+			this.selectedNation = detailsNation
+				? { ...detailsNation }
+				: { nation_code: nation, label: this.nullLabel };
+		},
+	},
+	template: `
+	<div class="stv-nations-dropdown">
+		<form-input
+			:container-class="containerClass"
+			:label="labelDropdown"
+			type="autocomplete"
+			v-model="selectedNation"
+			forceSelection
+			optionLabel="label"
+			:suggestions="filteredNations"
+			dropdown
+			@complete="filterNations"
+			>
+				<template #option="slotProps">
+					<div
+						:class="slotProps.option.sperre
+						? 'item-sperre'
+						: ''"
+						>
+							{{slotProps.option.label}}
+					</div>
+				</template>
+		</form-input>
+	</div>	`
+};

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

@@ -3,17 +3,18 @@ import FormInput from '../../../Form/Input.js';
 import FormUploadImage from '../../../Form/Upload/Image.js';
 
 import CoreUdf from '../../../Udf/Udf.js';
+import NationsDropdown from '../../../Dropdowns/NationsDropdown.js';
 
 import ApiStvDetails from '../../../../api/factory/stv/details.js';
 
-
 export default {
 	name: "TabDetails",
 	components: {
 		CoreForm,
 		FormInput,
 		FormUploadImage,
-		CoreUdf
+		CoreUdf,
+		NationsDropdown
 	},
 	inject: {
 		showBpk: {
@@ -54,11 +55,14 @@ export default {
 			default: {}
 		}
 	},
+	emits: [
+		'updateNation'
+	],
 	data() {
 		return {
 			original: null,
 			data: null,
-			changed: {}
+			changed: {},
 		}
 	},
 	computed: {
@@ -79,7 +83,7 @@ export default {
 				"v": this.$p.t('person', 'verheiratet'),
 				"w": this.$p.t('person', 'verwitwet'),
 			};
-		}
+		},
 	},
 	watch: {
 		modelValue(n) {
@@ -100,7 +104,7 @@ export default {
 				this.changed = res;
 			},
 			deep: true
-		}
+		},
 	},
 	methods: {
 		updateStudent(n) {
@@ -168,6 +172,12 @@ export default {
 			const bodyEncoded = encodeURIComponent(bodyWithNewLines);
 
 			window.location.href = "mailto:" + this.modelValue.mail_intern + "?subject=" + subjectEncoded + "&body=" + bodyEncoded;
+		},
+		handleChangeNation({nation_code}){
+			this.data.geburtsnation = nation_code;
+		},
+		handleChangeStbg({nation_code}){
+			this.data.staatsbuergerschaft = nation_code;
 		}
 	},
 	created() {
@@ -325,28 +335,26 @@ export default {
 						maxlength="128"
  						>
 					</form-input>
-					<form-input
+					<nations-dropdown
 						v-if="!config.hiddenFields.includes('geburtsnation')"
 						container-class="col stv-details-details-geburtsnation"
-						:label="$p.t('person', 'geburtsnation')"
-						type="select"
-						v-model="data.geburtsnation"
+						:label-dropdown="$p.t('person', 'geburtsnation')"
+						:nation="data.geburtsnation"
+						:nullLabel="' -- ' + $p.t('fehlermonitoring', 'keineAuswahl') + ' -- '"
 						name="geburtsnation"
- 						>
-						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-					</form-input>
-					<form-input
+						@updateNation="handleChangeNation"
+						>
+					</nations-dropdown>
+					<nations-dropdown
 						v-if="!config.hiddenFields.includes('staatsbuergerschaft')"
 						container-class="col stv-details-details-staatsbuergerschaft"
-						:label="$p.t('person', 'staatsbuergerschaft')"
-						type="select"
-						v-model="data.staatsbuergerschaft"
+						:label-dropdown="$p.t('person', 'staatsbuergerschaft')"
+						:nation="data.staatsbuergerschaft"
+						:nullLabel="' -- ' + $p.t('fehlermonitoring', 'keineAuswahl') + ' -- '"
+						@updateNation="handleChangeStbg"
 						name="staatsbuergerschaft"
- 						>
-						<option value="">-- {{$p.t('fehlermonitoring', 'keineAuswahl')}} --</option>
-						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-					</form-input>
+						>
+					</nations-dropdown>
 				</div>
 				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 

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

@@ -4,6 +4,7 @@ import FhcFormValidation from '../../../../Form/Validation.js';
 import BsModal from "../../../../Bootstrap/Modal.js";
 import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
+import NationsDropdown from '../../../../Dropdowns/NationsDropdown.js';
 
 import ApiStvAddress from '../../../../../api/factory/stv/kontakt/address.js';
 
@@ -15,11 +16,15 @@ export default{
 		FhcFormValidation,
 		BsModal,
 		FormForm,
-		FormInput
+		FormInput,
+		NationsDropdown
 	},
 	props: {
 		uid: Number
 	},
+	emits: [
+		'updateNation'
+	],
 	data() {
 		return {
 			addressData: {
@@ -231,7 +236,6 @@ export default{
 					//	delete this.addressData.plz;
 					this.loadPlaces(this.addressData.address.plz);
 					this.$refs.adressModal.show();
-
 				}
 			});
 		},
@@ -338,6 +342,9 @@ export default{
 
 			this.statusNew = true;
 		},
+		handleChangeNation({nation_code}){
+			this.addressData.nation = nation_code;
+		},
 	},
 	created() {
 		this.$api
@@ -397,182 +404,174 @@ export default{
 							v-model="addressData.strasse"
 						>
 						</form-input>					
-				</div>
+					</div>
 
-				<div class="row mb-3">
-					<form-input
-						type="select"
-						name="nation"
-						:label="$p.t('person/nation')"
-						v-model="addressData.nation"
-						>
-						<option 
-							v-for="nation in nations" 
-							:key="nation.nation_code" 
-							:value="nation.nation_code" 
-							:disabled="nation.sperre"
-							>
-							{{nation.kurztext}}
-						</option>
-						</form-input>
-				</div>
-							
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="address[plz]"
-						:label="$p.t('person/plz') + ' *'"
-						v-model="addressData.address.plz"
-						required
-						@input="loadPlaces"
-					>
-					</form-input>					
-				</div>
+					<div class="row mb-3">
+							<nations-dropdown
+								container-class="col-12"
+								:label-dropdown="$p.t('person', 'nation')"
+								:nation="addressData.nation"
+								name="nation"
+								@updateNation="handleChangeNation"
+								>
+							</nations-dropdown>
+					</div>
 
-				<div class="row mb-3">
-					<form-input
-						v-if="addressData.nation == 'A'"
-						type="select"
-						name="gemeinde"
-						:label="$p.t('person/gemeinde')"
-						v-model="addressData.gemeinde"
-						>
-						<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
-						<option 
-							v-for="gemeinde in gemeinden" 
-							:key="gemeinde.name" 
-							:value="gemeinde.name"
-							>
-							{{gemeinde.name}}
-						</option>
-					</form-input>
-					<form-input
-							v-else
+					<div class="row mb-3">
+						<form-input
 							type="text"
+							name="address[plz]"
+							:label="$p.t('person/plz') + ' *'"
+							v-model="addressData.address.plz"
+							required
+							@input="loadPlaces"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							v-if="addressData.nation == 'A'"
+							type="select"
+							name="gemeinde"
 							:label="$p.t('person/gemeinde')"
-							name="addressData.gemeinde"
 							v-model="addressData.gemeinde"
-						>	
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						v-if="addressData.nation == 'A'" 
-						type="select"
-						name="ort"
-						:label="$p.t('person/ort')"
-						v-model="addressData.ort"
-						>
-						<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
-						<option 
-							v-for="ort in orte" 
-							:key="ort.ortschaftsname" 
-							:value="ort.ortschaftsname"
 							>
-							{{ort.ortschaftsname}}
-						</option>
-					</form-input>
-					<form-input
-							v-else
-							type="text"
-							:label="$p.t('person/ort')"
+							<option v-if="!gemeinden.length" disabled>{{$p.t('ui', 'bittePlzWaehlen')}}</option>
+							<option
+								v-for="gemeinde in gemeinden"
+								:key="gemeinde.name"
+								:value="gemeinde.name"
+								>
+								{{gemeinde.name}}
+							</option>
+						</form-input>
+						<form-input
+								v-else
+								type="text"
+								:label="$p.t('person/gemeinde')"
+								name="addressData.gemeinde"
+								v-model="addressData.gemeinde"
+							>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							v-if="addressData.nation == 'A'"
+							type="select"
 							name="ort"
+							:label="$p.t('person/ort')"
 							v-model="addressData.ort"
-						>	
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<div class="col-sm-4">
+							>
+							<option v-if="!orte.length" disabled>{{$p.t('ui', 'bitteGemeindeWaehlen')}}</option>
+							<option
+								v-for="ort in orte"
+								:key="ort.ortschaftsname"
+								:value="ort.ortschaftsname"
+								>
+								{{ort.ortschaftsname}}
+							</option>
+						</form-input>
 						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="heimatadresse"
-							:label="$p.t('person/heimatadresse')"
-							v-model="addressData.heimatadresse"
-						>
+								v-else
+								type="text"
+								:label="$p.t('person/ort')"
+								name="ort"
+								v-model="addressData.ort"
+							>
 						</form-input>
 					</div>
-				</div>
 
-				<div class="row mb-3">
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="zustelladresse"
-							:label="$p.t('person/zustelladresse')"
-							v-model="addressData.zustelladresse"
-						>
-						</form-input>
+					<div class="row mb-3">
+						<div class="col-sm-4">
+							<form-input
+								container-class="form-check"
+								type="checkbox"
+								name="heimatadresse"
+								:label="$p.t('person/heimatadresse')"
+								v-model="addressData.heimatadresse"
+							>
+							</form-input>
+						</div>
 					</div>
-				</div>
 
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="co_name"
-						:label="$p.t('person/co_name')"
-						v-model="addressData.co_name"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<div class="col-sm-4">
-						<form-input
-							container-class="form-check"
-							type="checkbox"
-							name="rechnungsadresse"
-							:label="$p.t('person/rechnungsadresse')"
-							v-model="addressData.rechnungsadresse"
-						>
-						</form-input>
+					<div class="row mb-3">
+						<div class="col-sm-4">
+							<form-input
+								container-class="form-check"
+								type="checkbox"
+								name="zustelladresse"
+								:label="$p.t('person/zustelladresse')"
+								v-model="addressData.zustelladresse"
+							>
+							</form-input>
+						</div>
 					</div>
-				</div>
 
-				<div class="row mb-3">
-					<form-input
-						type="autocomplete"
-						:label="$p.t('person/firma')"
-						name="firma_name"
-						v-model="selectedFirma"
-						optionLabel="label"
-						optionValue="firma_id"
-						dropdown
-						forceSelection
-						:suggestions="filteredFirmen" 
-						@complete="filterFirmen"
-						:min-length="3"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
-				</div>
-
-				<div class="row mb-3">
-					<form-input
-						type="text"
-						name="firma_zusatz"
-						:label="$p.t('global/name')"
-						v-model="addressData.name"
-					>
-					</form-input>
-				</div>
-
-				<div class="row mb-3">
-					<form-input
+					<div class="row mb-3">
+						<form-input
 							type="text"
-							name="anmerkung"
-							:label="$p.t('global/anmerkung')"
-							v-model="addressData.anmerkung"
+							name="co_name"
+							:label="$p.t('person/co_name')"
+							v-model="addressData.co_name"
 						>
-					</form-input>
-				</div>
+						</form-input>
+					</div>
 
+					<div class="row mb-3">
+						<div class="col-sm-4">
+							<form-input
+								container-class="form-check"
+								type="checkbox"
+								name="rechnungsadresse"
+								:label="$p.t('person/rechnungsadresse')"
+								v-model="addressData.rechnungsadresse"
+							>
+							</form-input>
+						</div>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="autocomplete"
+							:label="$p.t('person/firma')"
+							name="firma_name"
+							v-model="selectedFirma"
+							optionLabel="label"
+							optionValue="firma_id"
+							dropdown
+							forceSelection
+							:suggestions="filteredFirmen"
+							@complete="filterFirmen"
+							:min-length="3"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<input type="hidden" class="form-control" id="firma_id" v-model="addressData.firma_id">
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+							type="text"
+							name="firma_zusatz"
+							:label="$p.t('global/name')"
+							v-model="addressData.name"
+						>
+						</form-input>
+					</div>
+
+					<div class="row mb-3">
+						<form-input
+								type="text"
+								name="anmerkung"
+								:label="$p.t('global/anmerkung')"
+								v-model="addressData.anmerkung"
+							>
+						</form-input>
+					</div>
 			</form-form>
 
 			<template #footer>

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

@@ -4,6 +4,7 @@ import FormForm from '../../../../Form/Form.js';
 import FormInput from '../../../../Form/Input.js';
 import MobilityPurpose from './List/Purpose.js';
 import MobilitySupport from './List/Support.js';
+import NationsDropdown from '../../../../Dropdowns/NationsDropdown.js';
 
 import ApiStvMobility from '../../../../../api/factory/stv/mobility.js';
 
@@ -14,7 +15,8 @@ export default {
 		FormForm,
 		FormInput,
 		MobilityPurpose,
-		MobilitySupport
+		MobilitySupport,
+		NationsDropdown
 	},
 	inject: {
 		$reloadList: {
@@ -35,6 +37,15 @@ export default {
 	props: {
 		student: Object
 	},
+	emits: [
+		'updateNation',
+		'deleteMobilityPurpose',
+		'setMobilityPurpose',
+		'setMobilityPurposeToNewMobility',
+		'deleteMobilitySupport',
+		'setMobilitySupport',
+		'setMobilitySupportToNewMobility'
+	],
 	data() {
 		return {
 			formData: {
@@ -392,6 +403,14 @@ export default {
 		addSupportToMobility({aufenthaltfoerderung_code}){
 			this.formData.localSupports.push(aufenthaltfoerderung_code);
 		},
+		handleChangeGastnation({nation_code}){
+			console.log("update Gastnation with" + nation_code);
+			this.formData.nation_code = nation_code;
+		},
+		handleChangeHerkunftsland({nation_code}){
+			console.log("update erkunftsland with" + nation_code);
+			this.formData.herkunftsland_code = nation_code;
+		}
 	},
 	created() {
 		this.$api
@@ -429,6 +448,24 @@ export default {
 			})
 			.catch(this.$fhcAlert.handleSystemError);
 	},
+	/*
+	* 					<form-input
+						container-class="col-6 stv-details-mobility-herkunftsland"
+						:label="$p.t('mobility', 'herkunftsland')"
+						type="select"
+						v-model="formData.herkunftsland_code"
+						name="herkunftsland_code"
+						>
+						<option
+						v-for="nation in lists.nations"
+						:key="nation.nation_code"
+						:value="nation.nation_code"
+						:disabled="nation.sperre"
+						>
+						{{nation.kurztext}}
+						</option>
+					</form-input>
+	* */
 	template: `
 	<div class="stv-details-mobility h-100 pb-3">
 		<h4>In / Out</h4>
@@ -559,66 +596,59 @@ export default {
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-mobility-gastnation"
-						:label="$p.t('mobility', 'gastnation')"
-						type="select"
-						v-model="formData.nation_code"
-						name="nation_code"
-						>
-						<option 
-						v-for="nation in lists.nations" 
-						:key="nation.nation_code" 
-						:value="nation.nation_code" 
-						:disabled="nation.sperre"
-						>
-						{{nation.kurztext}}
-						</option>
-					</form-input>
-					<form-input
-						container-class="col-6 stv-details-mobility-universitaet"
-						:label="$p.t('mobility', 'universitaet')"
-						type="text"
-						v-model="formData.universitaet"
-						name="universitaet"
-						>
-
-					</form-input>
+					<div class="col-6">
+						<nations-dropdown
+							container-class="col-12 stv-details-mobility-gastnation"
+							:label-dropdown="$p.t('mobility', 'gastnation')"
+							:nation="formData.nation_code"
+							name="nation_code"
+							@updateNation="handleChangeGastnation"
+							>
+						</nations-dropdown>
+					</div>
+					<div class="col-6">
+						<form-input
+							container-class="stv-details-mobility-universitaet"
+							:label="$p.t('mobility', 'universitaet')"
+							type="text"
+							v-model="formData.universitaet"
+							name="universitaet"
+							>
+						</form-input>
+					</div>
 				</div>
 				
 				<div class="row mb-3">
-					<form-input
-						container-class="col-6 stv-details-mobility-herkunftsland"
-						:label="$p.t('mobility', 'herkunftsland')"
-						type="select"
-						v-model="formData.herkunftsland_code"
-						name="herkunftsland_code"
-						>
-						<option 
-						v-for="nation in lists.nations" 
-						:key="nation.nation_code" 
-						:value="nation.nation_code" 
-						:disabled="nation.sperre"
-						>
-						{{nation.kurztext}}
-						</option>
-					</form-input>
-					<form-input
-						container-class="col-3 stv-details-mobility-ects_erworben"
-						:label="$p.t('mobility', 'ects_erworben')"
-						type="text"
-						v-model="formData.ects_erworben"
-						name="ects_erworben"
-						>
-					</form-input>				
-					<form-input
-						container-class="col-3 stv-details-mobility-ects_angerechnet"
-						:label="$p.t('mobility', 'ects_angerechnet')"
-						type="text"
-						v-model="formData.ects_angerechnet"
-						name="ects_angerechnet"
-						>
-					</form-input>
+					<div class="col-6">
+						<nations-dropdown
+							container-class="col-12 stv-details-mobility-herkunftsland"
+							:label-dropdown="$p.t('mobility', 'herkunftsland')"
+							:nation="formData.herkunftsland_code"
+							name="herkunftsland_code"
+							@updateNation="handleChangeHerkunftsland"
+							>
+						</nations-dropdown>
+					</div>
+					<div class="col-6">
+						<div class="row">
+							<form-input
+								container-class="col-6 stv-details-mobility-ects_erworben"
+								:label="$p.t('mobility', 'ects_erworben')"
+								type="text"
+								v-model="formData.ects_erworben"
+								name="ects_erworben"
+								>
+							</form-input>
+							<form-input
+								container-class="col-6 stv-details-mobility-ects_angerechnet"
+								:label="$p.t('mobility', 'ects_angerechnet')"
+								type="text"
+								v-model="formData.ects_angerechnet"
+								name="ects_angerechnet"
+								>
+							</form-input>
+						</div>
+					</div>
 				</div>
 				
 				<div class="row mb-3">

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

@@ -3,6 +3,7 @@ import FormInput from '../../../Form/Input.js';
 import TblHistory from "./Prestudent/History.js";
 
 import CoreUdf from '../../../Udf/Udf.js';
+import NationsDropdown from '../../../Dropdowns/NationsDropdown.js';
 
 import ApiStvPrestudent from '../../../../api/factory/stv/prestudent.js';
 
@@ -12,7 +13,8 @@ export default {
 		FormForm,
 		FormInput,
 		TblHistory,
-		CoreUdf
+		CoreUdf,
+		NationsDropdown
 	},
 	inject: {
 		lists: {
@@ -58,6 +60,9 @@ export default {
 			default: {}
 		}
 	},
+	emits: [
+		'updateNation'
+	],
 	data() {
 		return {
 			data: [],
@@ -178,6 +183,15 @@ export default {
 				item.label.toLowerCase().includes(query)
 			)
 		},
+		handleChangeZGVNation({nation_code}){
+			this.data.zgvnation = nation_code;
+		},
+		handleChangeZGVMaNation({nation_code}){
+			this.data.zgvmanation = nation_code;
+		},
+		handleChangeZGVDrNation({nation_code}){
+			this.data.zgvdoktornation = nation_code;
+		},
 	},
 	async created() {
 		await this.loadPrestudent();
@@ -336,18 +350,15 @@ export default {
 						:teleport="true"
 						>
 					</form-input>
-					<form-input
-						v-if="!config.hiddenFields.includes('zgvNation')"
-						container-class="col stv-details-prestudent-zgvNation"
-						:label="$p.t('infocenter', 'zgvNation')"
-						type="select"
-						v-model="data.zgvnation"
+					<nations-dropdown
+						v-if="!config.hiddenFields.includes('zgvnation')"
+						container-class="col stv-details-prestudent-zgvnation"
+						:label-dropdown="$p.t('infocenter', 'zgvNation')"
+						:nation="data.zgvnation"
 						name="zgvnation"
+						@updateNation="handleChangeZGVNation"
 						>
-						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-						<option value="">&nbsp;</option>
-						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-					</form-input>
+					</nations-dropdown>
 				</div>
 				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
 					<form-input
@@ -401,18 +412,15 @@ export default {
 						:teleport="true"
 						>
 					</form-input>
-					<form-input
+					<nations-dropdown
 						v-if="!config.hiddenFields.includes('zgvmanation')"
 						container-class="col stv-details-prestudent-zgvmanation"
-						:label="$p.t('lehre', 'zgvMasterNation')"
-						type="select"
-						v-model="data.zgvmanation"
+						:label-dropdown="$p.t('lehre', 'zgvMasterNation')"
+						:nation="data.zgvmanation"
 						name="zgvmanation"
+						@updateNation="handleChangeZGVMaNation"
 						>
-						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-						<option value="">&nbsp;</option>
-						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-					</form-input>
+					</nations-dropdown>
 				</div>
 				<!--ZGV Doktor-->
 				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">
@@ -467,18 +475,15 @@ export default {
 						:teleport="true"
 						>
 					</form-input>
-					<form-input
+					<nations-dropdown
 						v-if="!config.hiddenFields.includes('zgvdoktornation')"
 						container-class="col stv-details-prestudent-zgvdoktornation"
-						:label="$p.t('lehre', 'zgvDoktorNation')"
-						type="select"
-						v-model="data.zgvdoktornation"
+						:label-dropdown="$p.t('lehre', 'zgvDoktorNation')"
+						:nation="data.zgvdoktornation"
 						name="zgvdoktornation"
+						@updateNation="handleChangeZGVDrNation"
 						>
-						<!-- TODO(chris): gesperrte nationen können nicht ausgewählt werden! Um das zu realisieren müsste man ein pseudo select machen -->
-						<option value="">&nbsp;</option>
-						<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
-					</form-input>
+					</nations-dropdown>
 				</div>
 
 				<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 row-cols-xl-4 gx-3 gy-1 mb-1">

system/dbupdate_3.4.php

@@ -102,6 +102,8 @@ require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
+require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
+
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -253,7 +255,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
@@ -421,6 +423,7 @@ $tabellen=array(
 	"testtool.tbl_pruefling_frage"  => array("prueflingfrage_id","pruefling_id","frage_id","nummer","begintime","endtime"),
 	"testtool.tbl_frage_sprache"  => array("frage_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
 	"testtool.tbl_vorschlag_sprache"  => array("vorschlag_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
+	"testtool.tbl_pruefling_gebiet"  => array("prueflinggebiet_id","pruefling_id","gebiet_id","insertamum"),
 	"system.tbl_app" => array("app"),
 	"system.tbl_appdaten" => array("appdaten_id","uid","app","appversion","version","bezeichnung","daten","freigabe","insertamum","insertvon","updateamum","updatevon"),
 	"system.tbl_cronjob"  => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),

system/dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php

@@ -0,0 +1,41 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM testtool.tbl_pruefling_gebiet LIMIT 1'))
+{
+	$qry = 'CREATE TABLE testtool.tbl_pruefling_gebiet
+			(
+				prueflinggebiet_id integer NOT NULL,
+				pruefling_id integer NOT NULL,
+				gebiet_id integer NOT NULL,
+				insertamum timestamp DEFAULT now()
+			);
+			
+			ALTER TABLE testtool.tbl_pruefling_gebiet OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT pk_tbl_pruefling_gebiet PRIMARY KEY (prueflinggebiet_id);
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_pruefling_id FOREIGN KEY (pruefling_id) REFERENCES testtool.tbl_pruefling(pruefling_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_gebiet_id FOREIGN KEY (gebiet_id) REFERENCES testtool.tbl_gebiet(gebiet_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+			CREATE SEQUENCE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq
+				START WITH 1
+				INCREMENT BY 1
+				NO MINVALUE
+				NO MAXVALUE
+				CACHE 1;
+
+			ALTER TABLE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ALTER COLUMN prueflinggebiet_id SET DEFAULT nextval(\'testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq\');
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO web;
+			';
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_pruefling_gebiet: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_pruefling_gebiet table created';
+}
+

system/phrasesupdate.php

@@ -19829,6 +19829,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'massnahmeneinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme ist nur einmalig planbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure may only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20609,6 +20629,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'personenMassnahmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle Maßnahmen der Personen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => ' all measures of the people',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20689,6 +20729,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'einmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur einmal planbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'One-time only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'erroreinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme kann nur einmal geplant werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure can only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',

vilesci/stammdaten/auswertung_fhtw.php

@@ -251,6 +251,31 @@ if ($deleteSingleResult)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id, insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND
 				frage_id IN (SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ");
@@ -258,7 +283,9 @@ if ($deleteSingleResult)
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ";";
 
 		if ($result = $db->db_query($qry))
 		{
@@ -388,9 +415,35 @@ if ($deleteAllResults)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . ";
+				";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id,insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "	DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+					DELETE FROM testtool.tbl_antwort where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+					DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if ($result = $db->db_query($qry))
 		{

vilesci/stammdaten/reihungstest_administration.php

@@ -402,7 +402,10 @@ if(isset($_POST['deleteteilgebiet']))
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND gebiet_id=".$db->db_add_param($_POST['gebiet']).";";
 
 		if($result = $db->db_query($qry))
 		{
@@ -497,7 +500,8 @@ if(isset($_POST['delete_all']))
 		}
 		//Gebiet loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+				DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if($result = $db->db_query($qry))
 		{