Merge branch 'master' into feature-68737/interne_weiterbildung

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

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright (C) 2024 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Permission extends FHCAPI_Controller
+{
+	public function __construct()
+	{
+		parent::__construct([
+			'isBerechtigt' => self::PERM_LOGGED
+		]);
+
+		// Load the library SearchBarLib
+		$this->load->library('PermissionLib');
+	}
+	
+	public function isBerechtigt()
+	{
+		$payload = json_decode($this->input->raw_input_stream, TRUE);
+		if( !isset($payload['berechtigung_kurzbz']) || empty($payload['berechtigung_kurzbz']) )
+		{
+			$this->terminateWithError('Missing Parameter "berechtigung_kurzbz"');
+		}
+		$berechtigung_kurzbz = $payload['berechtigung_kurzbz'];
+		$art = isset($payload['art']) ? $payload['art'] : null;
+		$oe_kurzbz = isset($payload['oe_kurzbz']) ? $payload['oe_kurzbz'] : null;
+		$kostenstelle_id = isset($payload['kostenstelle_id']) ? $payload['kostenstelle_id'] : null;
+		$payload['isBerechtigt'] = $this->permissionlib->isBerechtigt(
+			$berechtigung_kurzbz, $art, $oe_kurzbz, $kostenstelle_id
+		);
+		
+		$this->terminateWithSuccess($payload);
+	}
+}

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

@@ -78,52 +78,32 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithError($this->p->t('ui', 'errorMissingValue', ['value' => 'Studiengang_kz']), self::ERROR_TYPE_GENERAL);
 
 		$resultPreDoc = $this->_getPrestudentDokumente($prestudent_id);
-
-		$arrayAccepted = [];
 		$person_id = $this->_getPersonId($prestudent_id);
 
-		$docNames = array_map(function ($item) {
-			return $item->dokument_kurzbz;
-		}, $resultPreDoc);
+		$mergedArray = [];
 
-		foreach($docNames as $doc)
+		foreach ($resultPreDoc as $pre)
 		{
-			$result = $this->AkteModel->getAktenFAS($person_id, $doc, $studiengang_kz, $prestudent_id, true);
+			$result = $this->AkteModel->getAktenFAS($person_id, $pre->dokument_kurzbz, $studiengang_kz, $prestudent_id, true);
 
 			if (isError($result))
-			{
 				return $this->terminateWithError($result, self::ERROR_TYPE_GENERAL);
-			}
+
 			if (hasData($result))
 			{
-				$data = getData($result);
-				foreach ($data as $value)
+				foreach (getData($result) as $doc)
 				{
-					array_push($arrayAccepted, $value);
+					$merged = clone $doc;
+					$merged->docdatum = $pre->docdatum;
+					$merged->insertvonma = $pre->insertvonma;
+					$merged->bezeichnung = $pre->bezeichnung;
+					$mergedArray[] = $merged;
 				}
 			}
-		}
-
-		//Mapping with document_kurzbz
-		$preDocMap = [];
-		foreach ($resultPreDoc as $pre) {
-			$preDocMap[$pre->dokument_kurzbz] = $pre;
-		}
-
-		$mergedArray = [];
-		foreach ($arrayAccepted as $doc) {
-			$merged = clone $doc;
-
-			if (isset($preDocMap[$doc->dokument_kurzbz])) {
-				$merged->docdatum = $preDocMap[$doc->dokument_kurzbz]->docdatum;
-				$merged->insertvonma = $preDocMap[$doc->dokument_kurzbz]->insertvonma;
-				$merged->bezeichnung = $preDocMap[$doc->dokument_kurzbz]->bezeichnung;
-			} else {
-				$merged->akzeptiertdatum = null;
-				$merged->akzeptiertvon = null;
+			else
+			{
+				$mergedArray[] = $pre;
 			}
-
-			$mergedArray[] = $merged;
 		}
 
 		$this->terminateWithSuccess($mergedArray);

application/libraries/vertragsbestandteil/AbstractBestandteil.php

@@ -40,7 +40,9 @@ abstract class AbstractBestandteil implements IValidation
 		
 		if( is_bool($new_value) && ($old_value !== $new_value) ) {
 			$this->modifiedcolumns[$columnname] = $columnname;
-		} else if($old_value != $new_value) {		
+		} else if(is_null($old_value) xor is_null($new_value)) {
+			$this->modifiedcolumns[$columnname] = $columnname;
+		} else if($old_value != $new_value) {
 			$this->modifiedcolumns[$columnname] = $columnname;
 		}
 	}

application/libraries/vertragsbestandteil/GehaltsbestandteilLib.php

@@ -15,6 +15,13 @@ class GehaltsbestandteilLib
 	protected $CI;
 	/** @var Gehaltsbestandteil_model */
 	protected $GehaltsbestandteilModel;
+	/** @var Dienstverhaeltnis_model */
+	protected $DienstverhaeltnisModel;
+
+	/**
+	 * @var PermissionLib
+	 */
+	protected $PermissionLib;
 
 	protected $loggedInUser;
 	
@@ -24,7 +31,25 @@ class GehaltsbestandteilLib
 		$this->CI = get_instance();
 		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model', 
 			'GehaltsbestandteilModel');
+		$this->CI->load->model('vertragsbestandteil/Dienstverhaeltnis_model',
+			'DienstverhaeltnisModel');
+		$this->DienstverhaeltnisModel = $this->CI->DienstverhaeltnisModel;
+		$this->CI->load->library('extensions/FHC-Core-Personalverwaltung/abrechnung/GehaltsLib');
 		$this->GehaltsbestandteilModel = $this->CI->GehaltsbestandteilModel;
+		$this->CI->load->library('PermissionLib', null, 'PermissionLib');
+		$this->PermissionLib = $this->CI->PermissionLib;
+	}
+
+	public function fetchDienstverhaeltnis($dienstverhaeltnis_id)
+	{
+		$result = $this->DienstverhaeltnisModel->load($dienstverhaeltnis_id);
+		$dv = null;
+		if(null !== ($row = getData($result)))
+		{
+			$dv = new Dienstverhaeltnis();
+			$dv->hydrateByStdClass($row[0], true);
+		}
+		return $dv;
 	}
 
 	public function fetchGehaltsbestandteileValorisiertForChart($dienstverhaeltnis_id, $stichtag=null, $includefuture=false)
@@ -120,12 +145,24 @@ class GehaltsbestandteilLib
 	{
 		$this->setUIDtoPGSQL();
 
-		$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
-		
-		if (isError($ret))
+		$dv = $this->fetchDienstverhaeltnis($gehaltsbestandteil->getDienstverhaeltnis_id());
+		if($dv && $this->PermissionLib->isberechtigt('basis/gehaelter', 'd', $dv->getOe_kurzbz())) 
 		{
-			throw new Exception('error deleting gehaltsbestandteil');
+			// delete Gehaltsabrechnung
+			$ret = $this->CI->gehaltslib->deleteAbrechnung($gehaltsbestandteil);
+
+			//
+			$ret = $this->GehaltsbestandteilModel->delete($gehaltsbestandteil->getGehaltsbestandteil_id());
+			
+			if (isError($ret))
+			{
+				throw new Exception('error deleting gehaltsbestandteil');
+			}
+
+		} else {
+			throw new Exception('permission denied for deleting gehaltsbestandteil');
 		}
+		
 	}
 	
 	public function endGehaltsbestandteil(Gehaltsbestandteil $gehaltsbestandteil, $enddate)

application/libraries/vertragsbestandteil/NoPermissionException.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace vertragsbestandteil;
+
+class NoPermissionException extends \Exception
+{
+    // Redefine the exception so message isn't optional
+    public function __construct($message, $code = 0, ?\Throwable $previous = null) {
+
+        // make sure everything is assigned properly
+        parent::__construct($message, $code, $previous);
+    }
+
+    // custom string representation of object
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message}\n";
+    }
+  
+}

application/libraries/vertragsbestandteil/VertragsbestandteilLib.php

@@ -13,10 +13,12 @@ require_once __DIR__ . '/VertragsbestandteilKarenz.php';
 require_once __DIR__ . '/VertragsbestandteilLohnguide.php';
 require_once __DIR__ . '/VertragsbestandteilFactory.php';
 require_once __DIR__ . '/OverlapChecker.php';
+require_once __DIR__ . '/NoPermissionException.php';
 
 use vertragsbestandteil\Dienstverhaeltnis;
 use vertragsbestandteil\Vertragsbestandteil;
 use vertragsbestandteil\VertragsbestandteilFactory;
+use vertragsbestandteil\NoPermissionException;
 
 /**
  * Description of VertragsbestandteilLib
@@ -35,6 +37,8 @@ class VertragsbestandteilLib
 	protected $DienstverhaeltnisModel;
 	/** @var Vertragsbestandteil_model */
 	protected $VertragsbestandteilModel;
+	/** @var GehaltsbestandeilModel */
+	protected $GehaltbestandteilModel;
 	/** @var Benutzer_model */
 	protected $BenutzerModel;
 	/**
@@ -44,6 +48,11 @@ class VertragsbestandteilLib
 
 	protected $loggedInUser;
 
+	/**
+	 * @var PermissionLib
+	 */
+	protected $PermissionLib;
+
 	public function __construct()
 	{
 		$this->loggedInUser = getAuthUID();
@@ -54,12 +63,17 @@ class VertragsbestandteilLib
 		$this->CI->load->model('vertragsbestandteil/Vertragsbestandteil_model',
 			'VertragsbestandteilModel');
 		$this->VertragsbestandteilModel = $this->CI->VertragsbestandteilModel;
+		$this->CI->load->model('vertragsbestandteil/Gehaltsbestandteil_model',
+			'GehaltbestandteilModel');
+		$this->GehaltbestandteilModel = $this->CI->GehaltbestandteilModel;
 		$this->CI->load->model('person/benutzer_model',
 			'BenutzerModel');
 		$this->BenutzerModel = $this->CI->BenutzerModel;
 		$this->CI->load->library('vertragsbestandteil/GehaltsbestandteilLib',
 			null, 'GehaltsbestandteilLib');
 		$this->GehaltsbestandteilLib = $this->CI->GehaltsbestandteilLib;
+		$this->CI->load->library('PermissionLib', null, 'PermissionLib');
+		$this->PermissionLib = $this->CI->PermissionLib;
 	}
 
 	public function handleGUIData($guidata, $employeeUID, $userUID)
@@ -99,9 +113,14 @@ class VertragsbestandteilLib
 		$vbs = $this->VertragsbestandteilModel->getVertragsbestandteile(
 			$dienstverhaeltnis_id, $stichtag, $includefuture
 		);
-		$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
-			$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
-		);
+		$dv = $this->fetchDienstverhaeltnis($dienstverhaeltnis_id);
+		$gbs = array();
+		if($dv && $this->PermissionLib->isberechtigt('basis/gehaelter', 's', $dv->getOe_kurzbz())) 
+		{
+			$gbs = $this->GehaltsbestandteilLib->fetchGehaltsbestandteile(
+				$dienstverhaeltnis_id, $stichtag, $includefuture, $withvalorisationhistory
+			);
+		}
 
 		$gbsByVBid = array();
 		foreach( $gbs as $gb )
@@ -235,8 +254,12 @@ class VertragsbestandteilLib
 				throw new Exception("Transaction failed");
 			}
 			$this->CI->db->trans_commit();
-		}
-		catch (Exception $ex)
+		} catch (NoPermissionException $e) {   
+			log_message('debug', "Transaction rolled back. " . $e->getMessage());
+			$this->CI->db->trans_rollback();
+			// rethrow and let GUIHandler catch it to display error message
+			throw $e;  
+		} catch (Exception $ex)
 		{
 			log_message('debug', "Transaction rolled back. " . $ex->getMessage());
 			$this->CI->db->trans_rollback();
@@ -314,6 +337,15 @@ class VertragsbestandteilLib
 
 	private function deleteVertragsbestandteilHelper(Vertragsbestandteil $vertragsbestandteil)
 	{
+		
+		$dv =  $this->fetchDienstverhaeltnis($vertragsbestandteil->getDienstverhaeltnis_id());
+		$hasGehaltsPermission = $this->PermissionLib->isberechtigt('basis/gehaelter', 's', $dv->getOe_kurzbz());
+		$vbHasGehaltsbestandteile = $this->GehaltbestandteilModel->existsGehaltsbestandteil($vertragsbestandteil->getVertragsbestandteil_id());
+
+		if (!$hasGehaltsPermission && $vbHasGehaltsbestandteile)
+		{
+			throw new NoPermissionException('delete Gehaltsbestandteil permission denied');
+		}
 
 		$specialisedModel = VertragsbestandteilFactory::getVertragsbestandteilDBModel(
 			$vertragsbestandteil->getVertragsbestandteiltyp_kurzbz());

application/libraries/vertragsbestandteil/VertragsbestandteilLohnguide.php

@@ -137,19 +137,25 @@ EOTXT;
 		return parent::__toString() . $txt;
 	}
 
-	/* public function validate()
+	public function validate()
 	{
-		if( !(filter_var($this->tage, FILTER_VALIDATE_INT, 
-				array(
-					'options' => array(
-						'min_range' => 1,
-						'max_range' => 50
-					)
-				)
-			)) ) {
-			$this->validationerrors[] = 'Urlaubsanspruch muss eine Tagesanzahl im Bereich 1 bis 50 sein.';
+		$value = $this->vordienstzeit;
+
+		if ($value === null || $value === '') {
+			$result = null;   // allow null value 
+		} else {
+			$result = filter_var($value, FILTER_VALIDATE_INT, [
+				'options' => [
+					'min_range' => 0,
+					'max_range' => 100
+				]
+			]);
+
+			if ($result === false) {				
+				$this->validationerrors[] = 'Vordienstjahre muss eine ganze Zahl (0 bis 100) enthalten oder leer sein.';
+			}
 		}
 		
 		return parent::validate();
-	} */
+	} 
 }

application/models/vertragsbestandteil/Gehaltsbestandteil_model.php

@@ -129,6 +129,15 @@ LEFT JOIN
 			array($dienstverhaeltnis_id),
 			$this->getEncryptedColumns());
     }
+
+	public function existsGehaltsbestandteil($vertragsbestandteil_id)
+	{
+		$qry = "select count(*) from hr.tbl_gehaltsbestandteil where vertragsbestandteil_id=?";
+		$ret = $this->execQuery($qry,
+			array($vertragsbestandteil_id));
+		$d = getData($ret);
+		return $d !== null && $d > 0;
+	}
 	
 	public function getGehaltsbestandteile($dienstverhaeltnis_id, $stichtag=null, 
 		$includefuture=false, $withvalorisationhistory=true)

application/views/templates/FHC-Footer.php

@@ -148,6 +148,9 @@
 		generateJSsInclude('vendor/npm-asset/primevue/autocomplete/autocomplete.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/overlaypanel/overlaypanel.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/datatable/datatable.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/fileupload/fileupload.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/tabview/tabview.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/tabpanel/tabpanel.min.js');
         // TODO check ob notwendig
 		generateJSsInclude('vendor/npm-asset/primevue/toast/toast.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/toastservice/toastservice.min.js');

public/css/Studentenverwaltung.css

@@ -2,7 +2,6 @@
 @import './SvgIcons.css';
 @import './components/searchbar/searchbar.css';
 @import './components/verticalsplit.css';
-@import './components/horizontalsplit.css';
 @import './components/FilterComponent.css';
 @import './components/Tabs.css';
 @import './components/Notiz.css';

public/css/components/horizontalsplit.css

@@ -1,75 +0,0 @@
-:root {
-	--fhc-horizontalsplit-hsplitter-bg-color: var(--fhc-background, #eee);
-	--fhc-horizontalsplit-hsplitter-border-color: var(--fhc-border, #eee);
-	--fhc-horizontalsplit-hsplitter-splitactions-color: var(--fhc-dark, #000);
-}
-
-.horizontalsplit-container {
-	display: flex;
-	flex-direction: row;
-	overflow: hidden;
-	max-height: 100%;
-	padding: 0px;
-}
-
-.horizontalsplitted {
-	overflow: auto;
-	flex-shrink: 0;
-}
-
-.horizontalsplitter {
-	flex-shrink: 0;
-	width: 16px;
-	cursor: col-resize;
-	user-select: none;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.horizontalsplitter.left {
-	border-left: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-right: 3px;
-}
-
-.horizontalsplitter.right {
-	border-right: solid 3px var(--fhc-horizontalsplit-hsplitter-border-color);
-	margin-left: 3px;
-}
-
-.splitactions.horizontal {
-	background-color: var(--fhc-horizontalsplit-hsplitter-bg-color);
-	color: var(--fhc-horizontalsplit-hsplitter-splitactions-color);
-	display: flex;
-	flex-direction: column;
-	padding: 5px 0 5px 0;
-}
-
-.splitactions.horizontal.left {
-	border-radius: 0 40% 40% 0;
-}
-
-.splitactions.horizontal.right {
-	border-radius: 40% 0 0 40%;
-}
-
-.splitactions.horizontal .splitaction {
-	width: 14px;
-	height: 28px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.splitactions.horizontal .splitaction.resize {
-	cursor: col-resize;
-}
-
-#content {
-	padding-top: 0 !important;
-	padding-bottom: 0 !important;
-}
-
-#content > div:first-child {
-	margin-top: 30px;
-}

public/js/api/factory/permission.js

@@ -0,0 +1,27 @@
+/**
+ * Copyright (C) 2025 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+export default {
+
+	isBerechtigt(berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/Permission/isBerechtigt',
+			params: { berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id }
+		};
+	},
+};

public/js/api/fhcapifactory.js

@@ -39,6 +39,7 @@ import studiengang from "./studiengang.js";
 import menu from "./menu.js";
 import dashboard from "./dashboard.js";
 import authinfo from "./authinfo.js";
+import permission from "./permission.js";
 import vertraege from "./vertraege.js";
 import studium from "./studium.js";
 import language from "./language.js";
@@ -65,10 +66,10 @@ export default {
     addons,
     messages,
     vorlagen,
-    addons,
 	studiengang,
 	menu,
 	authinfo,
+    permission,
 	vertraege,
 	studium,
 	language

public/js/api/permission.js

@@ -0,0 +1,17 @@
+export default {
+  isBerechtigt: function(berechtigung_kurzbz, art, oe_kurzbz, kostenstelle_id) {
+    var url = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router 
+            + '/api/frontend/v1/Permission/isBerechtigt';
+    var payload = {
+        "berechtigung_kurzbz": berechtigung_kurzbz,
+        "art": art,
+        "oe_kurzbz": oe_kurzbz,
+        "kostenstelle_id": kostenstelle_id
+    };
+    return axios.post(url, payload, {
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  }
+}

public/js/components/Stv/Studentenverwaltung.js

@@ -18,7 +18,6 @@
 import CoreSearchbar from "../searchbar/searchbar.js";
 import NavLanguage from "../navigation/Language.js";
 import VerticalSplit from "../verticalsplit/verticalsplit.js";
-import HorizontalSplit from "../horizontalsplit/horizontalsplit.js";
 import AppMenu from "../AppMenu.js";
 import AppConfig from "../AppConfig.js";
 import StvVerband from "./Studentenverwaltung/Verband.js";
@@ -38,7 +37,6 @@ export default {
 		CoreSearchbar,
 		NavLanguage,
 		VerticalSplit,
-		HorizontalSplit,
 		AppMenu,
 		AppConfig,
 		StvVerband,
@@ -237,10 +235,6 @@ export default {
 					}
 				}
 			}
-		},
-		sidebarCollapsed(newVal) {
-			if(newVal) this.$refs.hSplit.collapseLeft()
-			else this.$refs.hSplit.showBoth()
 		}
 	},
 	methods: {
@@ -638,30 +632,23 @@ export default {
 						</app-menu>
 					</div>
 				</aside>
-				<horizontal-split ref="hSplit" :defaultRatio="[15, 85]">
-					<template #left>
-						<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100  w-100">
-							<div class="offcanvas-header justify-content-end px-1 d-md-none">
-								<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
-							</div>
-							<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
-							<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
-						</nav>
-					</template>
-					<template #right>
-						<main>
-							<vertical-split :defaultRatio="[50, 50]">
-								<template #top>
-									<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
-								</template>
-								<template #bottom>
-									<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
-								</template>
-							</vertical-split>
-						</main>
-					</template>
-				</horizontal-split>
-				
+				<nav id="sidebarMenu" class="bg-light offcanvas offcanvas-start col-md p-md-0 h-100">
+					<div class="offcanvas-header justify-content-end px-1 d-md-none">
+						<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" :aria-label="$p.t('ui/schliessen')"></button>
+					</div>
+					<stv-verband :preselectedKey="studiengangKz ? '' + studiengangKz : null" :endpoint="verbandEndpoint" @select-verband="onSelectVerband" class="col" style="height:0%"></stv-verband>
+					<stv-studiensemester v-model:studiensemester-kurzbz="studiensemesterKurzbz" @update:studiensemester-kurzbz="studiensemesterChanged"></stv-studiensemester>
+				</nav>
+				<main class="col-md-8 ms-sm-auto col-lg-9 col-xl-10">
+					<vertical-split>
+						<template #top>
+							<stv-list ref="stvList" v-model:selected="selected" :studiengang-kz="studiengangKz" :studiensemester-kurzbz="studiensemesterKurzbz" @filterActive="handleCustomFilter"></stv-list>
+						</template>
+						<template #bottom>
+							<stv-details ref="details" :students="selected" @reload="reloadList"></stv-details>
+						</template>
+					</vertical-split>
+				</main>
 			</div>
 		</div>
 		<app-config ref="config" v-model="appconfig" :endpoints="configEndpoints"></app-config>

public/js/components/horizontalsplit/horizontalsplit.js

@@ -1,147 +0,0 @@
-export default {
-	name: 'HorizontalSplit',
-	props: {
-		defaultRatio: {
-			type: Array,
-			default: () => [50, 50]
-		}
-	},
-	data: function () {
-		return {
-			availWidth: 0,
-			leftwidth: 0,
-			rightwidth: 0,
-			mousePosX: 0,
-			resize: false,
-			hsplitterOffset: 0,
-			selfOffsetLeft: 0
-		};
-	},
-	template: `
-    <div ref="horizontalsplit" class="horizontalsplit-container">
-        <div ref="leftpanel" class="horizontalsplitted"
-             :style="{ width: this.leftwidthcss }">
-            <slot name="left">
-                <p>Left Panel</p>
-            </slot>
-        </div>
-        <div ref="hsplitter" class="horizontalsplitter"
-             :class="this.leftOrRightClass" @mousedown="this.dragStart">
-            <div class="splitactions horizontal" :class="this.leftOrRightClass">
-            	<span @click="this.collapseRight" class="splitaction">
-                    <i class="fas fa-angle-right text-muted"></i>
-                </span>
-                <span @dblclick="this.showBoth" class="splitaction resize">
-                    <i class="fas fa-grip-lines-vertical text-muted"></i>
-                </span>
-                <span @click="this.collapseLeft" class="splitaction">
-                    <i class="fas fa-angle-left text-muted"></i>
-                </span>
-            </div>
-        </div>
-        <div ref="rightpanel" class="horizontalsplitted"
-             :style="{ width: this.rightwidthcss }">
-            <slot name="right">
-                <p/>
-            </slot>
-        </div>
-    </div>
-    `,
-	mounted: function () {
-		this.calcWidths();
-		this.trackHorizontalSplitterOffsetLeft();
-		window.addEventListener('resize', this.calcWidths);
-	},
-	updated: function () {
-		this.trackHorizontalSplitterOffsetLeft();
-	},
-	beforeDestroy: function () {
-		window.removeEventListener('resize', this.calcWidths);
-	},
-	methods: {
-		calcWidths: function () {
-			var oldavailWidth = this.availWidth;
-			this.selfOffsetLeft = this.$refs.horizontalsplit.offsetLeft;
-			this.availWidth = this.$refs.horizontalsplit.offsetWidth - this.$refs.hsplitter.offsetWidth;
-
-			if ((this.leftwidth === 0 && this.rightwidth === 0) || oldavailWidth === 0) {
-				this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			} else {
-				this.leftwidth = Math.floor(((this.leftwidth * 100) / oldavailWidth) / 100 * this.availWidth);
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		collapseLeft: function () {
-			this.calcWidths();
-			this.leftwidth = 0;
-			this.rightwidth = this.availWidth;
-		},
-		collapseRight: function () {
-			this.calcWidths();
-			this.leftwidth = this.availWidth;
-			this.rightwidth = 0;
-		},
-		showBoth: function () {
-			this.leftwidth = Math.floor(this.availWidth * (this.defaultRatio[0] / 100));
-			this.rightwidth = this.availWidth - this.leftwidth;
-		},
-		isCollapsed: function () {
-			if (this.leftwidth === 0) {
-				return 'left';
-			} else if (this.rightwidth === 0) {
-				return 'right';
-			} else {
-				return false;
-			}
-		},
-		dragStart: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.addEventListener('mouseup', this.dragEnd);
-			window.addEventListener('mousemove', this.drag);
-			this.resize = true;
-			this.mousePosX = e.clientX;
-		},
-		drag: function (e) {
-			if (!this.resize) {
-				return;
-			}
-			e.preventDefault();
-			e.stopPropagation();
-			var offsetX = e.clientX - this.mousePosX;
-			this.leftwidth = this.leftwidth + offsetX;
-			if (this.leftwidth < 0) {
-				this.leftwidth = 0;
-			}
-			if (this.leftwidth > this.availWidth) {
-				this.leftwidth = this.availWidth;
-			}
-			this.rightwidth = this.availWidth - this.leftwidth;
-			this.mousePosX = e.clientX;
-		},
-		dragEnd: function (e) {
-			e.preventDefault();
-			e.stopPropagation();
-			window.removeEventListener('mousemove', this.drag);
-			window.removeEventListener('mouseup', this.dragEnd);
-			this.resize = false;
-			this.mousePosX = e.clientX;
-		},
-		trackHorizontalSplitterOffsetLeft: function () {
-			this.hsplitterOffset = this.$refs.hsplitter.offsetLeft;
-		}
-	},
-	computed: {
-		leftOrRightClass: function () {
-			return ((this.hsplitterOffset - this.selfOffsetLeft) <= Math.floor(this.availWidth / 2))
-				? 'left'
-				: 'right';
-		},
-		leftwidthcss: function () {
-			return this.leftwidth + 'px';
-		},
-		rightwidthcss: function () {
-			return this.rightwidth + 'px';
-		}
-	}
-};

public/js/components/verticalsplit/verticalsplit.js

@@ -1,11 +1,5 @@
 export default {
     name: 'VerticalSplit',
-    props: {
-        defaultRatio: {
-            type: Array,
-            default: () => [50, 50]
-        }
-    },
     data: function() {
       return {          
           availHeight: 0,
@@ -56,22 +50,17 @@ export default {
     updated: function() {
         this.trackVerticalSplitterOffsetTop();
     },
-    beforeDestroy: function () {
-        window.removeEventListener('resize', this.calcHeights);
-    },
     methods: {
         calcHeights: function() {
             var windowheight = window.innerHeight;
             var oldavailHeight = this.availHeight;
             this.selfOffsetTop = this.$refs.verticalsplit.offsetTop;
             this.availHeight = windowheight - this.selfOffsetTop - this.$refs.vsplitter.offsetHeight;
-           
             if( (this.topheight === 0 && this.bottomheight === 0) || oldavailHeight === 0 ) {
-                this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
+                this.topheight = Math.floor(this.availHeight/2);
             } else {
                 this.topheight = Math.floor( ((((this.topheight * 100) / oldavailHeight) / 100) * this.availHeight) );
             }
-            
             this.bottomheight = this.availHeight - this.topheight;
         },
         collapseTop: function() {
@@ -85,8 +74,8 @@ export default {
             this.bottomheight = 0;
         },
         showBoth: function() {
-            this.topheight = Math.floor(this.availHeight * (this.defaultRatio[0] / 100));
-            this.bottomheight = this.availHeight - this.topheight
+            this.topheight = Math.floor(this.availHeight/2);
+            this.bottomheight = Math.floor(this.availHeight/2);
         },
         isCollapsed: function() {
             if( this.topheight === 0 ) {

system/dbupdate_3.4/53904_dv_gehalt_permissions.php

@@ -0,0 +1,41 @@
+<?php
+/* Copyright (C) 2017 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 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.
+ *
+ * Authors: Harald Bamberger <harald.bamberger@technikum-wien.at>,
+ *
+ * Beschreibung:
+ * Permissions f. DV erstellen und bearbeiten bzw. korrigieren, Gehaelter
+ */
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Add permission: basis/gehaelter
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'basis/gehaelter';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('basis/gehaelter', 'Zugriff auf gehaelter');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission "basis/gehaelter"<br>';
+        }
+    }
+}

system/dbupdate_3.4/70376_lohnguide.php

@@ -264,8 +264,8 @@ CREATE TABLE IF NOT EXISTS hr.tbl_vertragsbestandteil_lohnguide (
     stellenbezeichnung varchar(255),
     fachrichtung_kurzbz character varying(32) NOT NULL,
     modellstelle_kurzbz character varying(32) NOT NULL,
-    kommentar_person varchar(255),
-    kommentar_modellstelle varchar(255),
+    kommentar_person text,
+    kommentar_modellstelle text,
     CONSTRAINT tbl_vertragsbestandteil_lohnguide_pk PRIMARY KEY (vertragsbestandteil_id),
 	CONSTRAINT tbl_vertragsbestandteil_fk FOREIGN KEY (vertragsbestandteil_id) REFERENCES hr.tbl_vertragsbestandteil (vertragsbestandteil_id) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,
 	CONSTRAINT tbl_vertragsbestandteil_lohnguide_fachrichtung_fk FOREIGN KEY (fachrichtung_kurzbz) REFERENCES hr.tbl_lohnguide_fachrichtung (fachrichtung_kurzbz) MATCH FULL ON DELETE RESTRICT ON UPDATE CASCADE,

system/phrasesupdate.php

@@ -27540,6 +27540,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'personalverwaltung',
+		'category' => 'person',
+		'phrase' => 'weiterbildung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Weiterbildung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Training',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'personalverwaltung',
 		'category' => 'person',