UHSTAT Form: removed svnr phrases

statusgrund kann wieder entfernt werden

application/controllers/Studentenverwaltung.php

@@ -32,6 +32,10 @@ class Studentenverwaltung extends Auth_Controller
 				'student/keine_studstatuspruefung' => $this->permissionlib->isBerechtigt('student/keine_studstatuspruefung'),
 				'lehre/reihungstestAufsicht' => $this->permissionlib->isBerechtigt('lehre/reihungstestAufsicht'),
 				'system/change_outputformat' => $this->permissionlib->getOE_isEntitledFor('system/change_outputformat'),
+				'student/editBakkZgv' => $this->permissionlib->isBerechtigt('student/editBakkZgv'),
+				'student/editMakkZgv' => $this->permissionlib->isBerechtigt('student/editMakkZgv'),
+				'student/editDokZgv' => $this->permissionlib->isBerechtigt('student/editDokZgv'),
+				'student/editBismelden' => $this->permissionlib->isBerechtigt('student/editBismelden')
 			],
 			'variables' => [
 				'semester_aktuell' => $this->variablelib->getVar('semester_aktuell')

application/controllers/api/frontend/v1/messages/Messages.php

@@ -21,8 +21,6 @@ class Messages extends FHCAPI_Controller
 			'getReplyData' => ['admin:r', 'assistenz:r'],
 			'getPersonId' => ['admin:r', 'assistenz:r'],
 			'getUid' => ['admin:r', 'assistenz:r'],
-			'getStudiengang' => ['admin:r', 'assistenz:r'],
-
 		]);
 
 		//Load Models
@@ -86,17 +84,21 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess(array());
 	}
 
-	public function getDataVorlage($vorlage_kurzbz, $studiengang_kz)
+	public function getDataVorlage($vorlage_kurzbz)
 	{
-		if(!$studiengang_kz)
-			$this->terminateWithSuccess(null);
-
+		$studiengang_kz = 0;
 		$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
+		$this->VorlagestudiengangModel->addOrder('version', 'DESC');
 
-		$result = $this->VorlagestudiengangModel->getCurrent($vorlage_kurzbz, $studiengang_kz);
+		$result = $this->VorlagestudiengangModel->loadWhere(
+			[
+				'vorlage_kurzbz' =>$vorlage_kurzbz,
+				'studiengang_kz' => $studiengang_kz
+			]);
 
 		$data = $this->getDataOrTerminateWithError($result);
-		$this->terminateWithSuccess(current($data));
+		$vorlage = current($data);
+		$this->terminateWithSuccess($vorlage);
 	}
 
 	public function getMessageVarsPerson($id, $typeId)
@@ -141,6 +143,8 @@ class Messages extends FHCAPI_Controller
 	public function sendMessage($recipient_id)
 	{
 		//has to be uid
+		//	$this->terminateWithError("uid", $recipient_id, self::ERROR_TYPE_GENERAL);
+
 		//default setting
 		$receiversPersonId = $this->_getPersonId($recipient_id, 'uid');
 
@@ -383,21 +387,6 @@ class Messages extends FHCAPI_Controller
 		$this->terminateWithSuccess($benutzer->uid);
 	}
 
-	public function getStudiengang($id, $typeId)
-	{
-		if($typeId!= "prestudent_id" && $typeId!="uid" )
-			$this->terminateWithSuccess(null);
-
-		$prestudent_id = ($typeId == 'uid') ? $this->_getPrestudentIdFromUid($id) : $id;
-
-		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
-		$result = $this->PrestudentModel->load($prestudent_id);
-		$data = $this->getDataOrTerminateWithError($result);
-		$studiengang_kz = current($data)->studiengang_kz;
-
-		return $this->terminateWithSuccess($studiengang_kz);
-	}
-
 	private function _getPersonId($id, $typeId)
 	{
 		if ($typeId == 'uid' || $typeId == 'mitarbeiter_uid')
@@ -427,6 +416,7 @@ class Messages extends FHCAPI_Controller
 
 	private function _getPrestudentIdFromUid($uid)
 	{
+		//	$this->terminateWithError($uid, self::ERROR_TYPE_GENERAL);
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$result = $this->StudentModel->loadWhere(
 			['student_uid' => $uid]

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

@@ -331,7 +331,10 @@ class Config extends FHCAPI_Controller
 		];
 		$result['status'] = [
 			'title' => 'Status',
-			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js')
+			'component' => absoluteJsImportUrl('public/js/components/Stv/Studentenverwaltung/Details/MultiStatus.js'),
+			'config' => [
+				'showStatusVorruecken' => defined('STATUS_VORRUECKEN_ANZEIGEN') ? STATUS_VORRUECKEN_ANZEIGEN : true,
+			]
 		];
 		$result['documents'] = [
 			'title' => $this->p->t('stv', 'tab_documents'),

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

@@ -1341,6 +1341,7 @@ class Status extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => $authUID
 		];
+		$nullableFields = ['statusgrund_id', 'anmerkung', 'rt_stufe'];
 		foreach ([
 					'orgform_kurzbz',
 					'anmerkung',
@@ -1349,8 +1350,17 @@ class Status extends FHCAPI_Controller
 					'rt_stufe',
 					'statusgrund_id'
 				] as $key)
-			if ($this->input->post($key))
+		{
+			if (in_array($key, $nullableFields))
+			{
+				$updateData[$key] = ($this->input->post($key) === '') ? null : $this->input->post($key);
+			}
+			else if ($this->input->post($key))
+			{
 				$updateData[$key] = $this->input->post($key);
+			}
+		}
+
 
 		if ($this->input->post('bestaetigtam')) {
 			$updateData['bestaetigtam'] = $this->input->post('bestaetigtam');

application/views/codex/uhstat1.php

@@ -45,10 +45,7 @@ $saved = isset($saved) && $saved === true;
 			<?php echo $this->p->t('uhstat', 'rechtsbelehrung') ?>
 		</p>
 		<p>
-			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
-		</p>
-		<p>
-			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
+			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstextOhneSvnr') ?>
 		</p>
 		<br>
 		<?php if ($savePermission): ?>

config/global.config-default.inc.php

@@ -360,4 +360,8 @@ define('SANCHO_MAIL_HEADER_IMG', 'sancho_header_DEFAULT.jpg');
 
 // footer image for eigene Mails
 define('SANCHO_MAIL_FOOTER_IMG', 'sancho_footer_DEFAULT.jpg');
+
+// Gibt an, ob in der StudVW der Status vorgerueckt werden kann
+define('STATUS_VORRUECKEN_ANZEIGEN', true);
+
 ?>

public/js/api/factory/messages/messages.js

@@ -62,10 +62,10 @@ export default {
 			url: 'api/frontend/v1/messages/messages/getUid/' + userParams.id + '/' + userParams.type_id
 		};
 	},
-	getDataVorlage(vorlage_kurzbz, studiengang_kz){
+	getDataVorlage(vorlage_kurzbz){
 		return {
 			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz + '/' + studiengang_kz
+			url: 'api/frontend/v1/messages/messages/getDataVorlage/' + vorlage_kurzbz
 		};
 	},
 	getNameOfDefaultRecipient(params){
@@ -106,11 +106,5 @@ export default {
 			method: 'post',
 			url: 'api/frontend/v1/messages/messages/deleteMessage/' + messageId
 		};
-	},
-	getStudiengang(userParams){
-		return {
-			method: 'get',
-			url: 'api/frontend/v1/messages/messages/getStudiengang/' + userParams.id + '/' + userParams.type_id
-		};
-	},
+	}
 }

public/js/components/Messages/Details/NewMessage/Modal.js

@@ -57,7 +57,6 @@ export default {
 			previewBody: "",
 			replyData: null,
 			uid: null,
-			studiengang_kz: null
 		}
 	},
 	methods: {
@@ -137,9 +136,9 @@ export default {
 					}
 				);
 		},
-		getDataVorlage(vorlage_kurzbz, studiengang_kz){
+		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getDataVorlage(vorlage_kurzbz, studiengang_kz))
+				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
@@ -194,7 +193,7 @@ export default {
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
-				this.getDataVorlage(vorlage_kurzbz, this.studiengang_kz);
+				this.getDataVorlage(vorlage_kurzbz);
 			}
 		},
 		showPreview(){
@@ -214,18 +213,6 @@ export default {
 				})
 				.catch(this.$fhcAlert.handleSystemError);
 		},
-		getStudiengang(id, typeId){
-			const params = {
-				id: id,
-				type_id: typeId
-			};
-			this.$api
-				.call(this.endpoint.getStudiengang(params))
-				.then(result => {
-					this.studiengang_kz = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
 		show(){
 			this.$refs.modalNewMessage.show();
 		},
@@ -248,7 +235,7 @@ export default {
 			handler(newVal){
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal, this.studiengang_kz);
+					return this.getDataVorlage(newVal);
 				}
 			}
 		},
@@ -294,7 +281,6 @@ export default {
 		}
 
 		if(this.typeId == 'prestudent_id' || this.typeId == 'uid'){
-			this.getStudiengang(this.id, this.typeId);
 			const params = {
 				id: this.id,
 				type_id: this.typeId
@@ -304,7 +290,6 @@ export default {
 				.then(result => {
 					this.fieldsPrestudent = result.data;
 					const prestudent = this.fieldsPrestudent[0];
-					//this.studiengang_kz = prestudent.Studiengangskennzahl;
 					this.itemsPrestudent = Object.entries(prestudent).map(([key, value]) => ({
 						label: key.toLowerCase(),
 						value: '{' + key.toLowerCase() + '}'

public/js/components/Messages/Details/NewMessage/NewDiv.js

@@ -68,8 +68,7 @@ export default {
 			previewBody: "",
 			replyData: null,
 			uid: null,
-			messageSent: false,
-			studiengang_kz: null
+			messageSent: false
 		}
 	},
 	methods: {
@@ -137,9 +136,9 @@ export default {
 					}
 				);
 		},
-		getDataVorlage(vorlage_kurzbz, studiengang_kz){
+		getDataVorlage(vorlage_kurzbz){
 			return this.$api
-				.call(this.endpoint.getDataVorlage(vorlage_kurzbz, studiengang_kz))
+				.call(this.endpoint.getDataVorlage(vorlage_kurzbz))
 				.then(response => {
 					this.formData.body = response.data.text;
 					this.formData.subject = response.data.subject;
@@ -192,7 +191,7 @@ export default {
 		},
 		handleSelectedVorlage(vorlage_kurzbz) {
 			if (typeof vorlage_kurzbz === "string") {
-				this.getDataVorlage(vorlage_kurzbz, this.studiengang_kz);
+				this.getDataVorlage(vorlage_kurzbz);
 			}
 		},
 		hideTemplate(){
@@ -219,19 +218,7 @@ export default {
 					this.uid = result.data;
 				})
 				.catch(this.$fhcAlert.handleSystemError);
-		},
-		getStudiengang(id, typeId){
-			const params = {
-				id: id,
-				type_id: typeId
-			};
-			this.$api
-				.call(this.endpoint.getStudiengang(params))
-				.then(result => {
-					this.studiengang_kz = result.data;
-				})
-				.catch(this.$fhcAlert.handleSystemError);
-		},
+		}
 	},
 	watch: {
 		'formData.body': {
@@ -249,7 +236,7 @@ export default {
 
 				if (newVal && newVal != null) {
 					this.formData.subject = newVal;
-					return this.getDataVorlage(newVal, this.studiengang_kz);
+					return this.getDataVorlage(newVal);
 				}
 			}
 		},
@@ -277,7 +264,6 @@ export default {
 			}
 
 		if (['prestudent_id', 'uid'].includes(this.typeId)){
-			this.getStudiengang(this.id, this.typeId);
 				const params = {
 				id: this.id,
 				type_id: this.typeId

public/js/components/Stv/Studentenverwaltung.js

@@ -84,7 +84,12 @@ export default {
 			configShowAufnahmegruppen: this.config.showAufnahmegruppen,
 			configAllowUebernahmePunkte: this.config.allowUebernahmePunkte,
 			configUseReihungstestPunkte: this.config.useReihungstestPunkte,
-			appConfig: Vue.computed(() => this.appconfig)
+			appConfig: Vue.computed(() => this.appconfig),
+			hasZGVBakkPermission: this.permissions['student/editBakkZgv'],
+			hasZGVMasterPermission: this.permissions['student/editMakkZgv'],
+			hasZGVDoctorPermission: this.permissions['student/editDokZgv'],
+			hasBismeldenPermission: this.permissions['student/editBismelden'],
+
 		}
 	},
 	data() {

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

@@ -438,11 +438,9 @@ export default {
 
 			if (this.stgInfo.typ === 'b') {
 				this.formData.pruefungstyp_kurzbz = 'Bachelor';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
 			}
 			if (this.stgInfo.typ === 'd' || this.stgInfo === 'm') {
 				this.formData.pruefungstyp_kurzbz = 'Diplom';
-				this.formData.protokoll = this.$p.t('abschlusspruefung', 'pruefungsnotizenMaster');
 			}
 			if (this.stgInfo.typ === 'lg') {
 				this.formData.pruefungstyp_kurzbz = 'lgabschluss';

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

@@ -7,10 +7,14 @@ export default {
 	},
 	props: {
 		modelValue: Object,
+		config: {
+			type: Object,
+			default: {}
+		}
 	},
 	template: `
 	<div class="stv-details-multistatus h-100">
-		<tbl-multi-status :model-value="modelValue"></tbl-multi-status>		
+		<tbl-multi-status :model-value="modelValue" :config="config"></tbl-multi-status>
 	</div>
 	`
 }

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

@@ -30,6 +30,22 @@ export default {
 			from: 'hasAdminPermission',
 			default: false
 		},
+		hasZGVBakkPermission: {
+			from: 'hasZGVBakkPermission',
+			default: false
+		},
+		hasZGVMasterPermission: {
+			from: 'hasZGVMasterPermission',
+			default: false
+		},
+		hasZGVDoctorPermission: {
+			from: 'hasZGVDoctorPermission',
+			default: false
+		},
+		hasBismeldenPermission: {
+			from: 'hasBismeldenPermission',
+			default: false
+		},
 		currentSemester: {
 			from: 'currentSemester',
 			required: true
@@ -106,7 +122,7 @@ export default {
 	},
 
 	methods: {
-		loadPrestudent() {
+		async loadPrestudent() {
 			return this.$api
 				.call(ApiStvPrestudent.get(this.modelValue.prestudent_id, this.currentSemester))
 				.then(result => result.data)
@@ -154,8 +170,8 @@ export default {
 			)
 		},
 	},
-	created() {
-		this.loadPrestudent();
+	async created() {
+		await this.loadPrestudent();
 		this.$api
 			.call(ApiStvPrestudent.getBezeichnungZGV())
 			.then(result => result.data)
@@ -273,6 +289,7 @@ export default {
 						dropdown
 						name="zgv_code"
 						@complete="filterZgvs"
+						:disabled="!hasZGVBakkPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -291,6 +308,7 @@ export default {
 						type="text"
 						v-model="data.zgvort"
 						name="zgvort"
+						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>	
 					<form-input
@@ -307,6 +325,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVBakkPermission"
 						>
 					</form-input>
 					<form-input
@@ -316,6 +335,7 @@ export default {
 						type="select"
 						v-model="data.zgvnation"
 						name="zgvnation"
+						:disabled="!hasZGVBakkPermission"
 						>
 						<!-- 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>
@@ -336,6 +356,7 @@ export default {
 						dropdown
 						name="zgvmas_code"
 						@complete="filterMasterZgvs"
+						:disabled="!hasZGVMasterPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -354,6 +375,7 @@ export default {
 						type="text"
 						v-model="data.zgvmaort"
 						name="zgvmaort"
+						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -370,6 +392,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVMasterPermission"
 						>
 					</form-input>
 					<form-input
@@ -379,6 +402,7 @@ export default {
 						type="select"
 						v-model="data.zgvmanation"
 						name="zgvmanation"
+						:disabled="!hasZGVMasterPermission"
 						>
 						<!-- 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>
@@ -400,6 +424,7 @@ export default {
 						dropdown
 						name="zgvdoktor_code"
 						@complete="filterDoktorZgvs"
+						:disabled="!hasZGVDoctorPermission"
 						>
 							<template #option="slotProps">
 								<div
@@ -418,6 +443,7 @@ export default {
 						type="text"
 						v-model="data.zgvdoktorort"
 						name="zgvdoktorort"
+						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -434,6 +460,7 @@ export default {
 						format="dd.MM.yyyy"
 						preview-format="dd.MM.yyyy"
 						:teleport="true"
+						:disabled="!hasZGVDoctorPermission"
 						>
 					</form-input>
 					<form-input
@@ -443,6 +470,7 @@ export default {
 						type="select"
 						v-model="data.zgvdoktornation"
 						name="zgvdoktornation"
+						:disabled="!hasZGVDoctorPermission"
 						>
 						<!-- 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>
@@ -459,6 +487,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgv_erfuellt"
 							name="zgv_erfuellt"
+							:disabled="!hasZGVBakkPermission"
 							>
 						</form-input>
 					</div>
@@ -470,6 +499,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgvmas_erfuellt"
 							name="zgvmas_erfuellt"
+							:disabled="!hasZGVMasterPermission"
 							>
 						</form-input>
 					</div>
@@ -481,6 +511,7 @@ export default {
 							type="checkbox"
 							v-model="data.zgvdoktor_erfuellt"
 							name="zgvdoktor_erfuellt"
+							:disabled="!hasZGVDoctorPermission"
 							>
 						</form-input>
 					</div>
@@ -601,6 +632,7 @@ export default {
 							type="checkbox"
 							v-model="data.bismelden"
 							name="bismelden"
+							:disabled="!hasBismeldenPermission"
 							>
 						</form-input>
 					</div>

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

@@ -51,7 +51,8 @@ export default{
 		}
 	},
 	props: {
-		modelValue: Object
+		modelValue: Object,
+		config: Object,
 	},
 	data() {
 		return {
@@ -175,15 +176,18 @@ export default{
 							const data = cell.getData();
 
 							let button = document.createElement('button');
-							button.className = 'btn btn-outline-secondary btn-action';
-							button.innerHTML = '<i class="fa fa-forward"></i>';
-							button.title = this.$p.t('ui', 'btn_statusVorruecken');
-							button.addEventListener('click', () =>
-								this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
-							);
-							if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz))
-								button.disabled = true;
-							container.append(button);
+							if (this.config?.showStatusVorruecken !== false)
+							{
+								button.className = 'btn btn-outline-secondary btn-action';
+								button.innerHTML = '<i class="fa fa-forward"></i>';
+								button.title = this.$p.t('ui', 'btn_statusVorruecken');
+								button.addEventListener('click', () =>
+									this.actionAdvanceStatus(data.status_kurzbz, data.studiensemester_kurzbz, data.ausbildungssemester)
+								);
+								if (!['Student', 'Diplomand', 'Unterbrecher'].includes(data.status_kurzbz))
+									button.disabled = true;
+								container.append(button);
+							}
 
 							button = document.createElement('button');
 							button.className = 'btn btn-outline-secondary btn-action';

system/phrasesupdate.php

@@ -52330,6 +52330,26 @@ I have been informed that I am under no obligation to consent to the transmissio
 		)
 	),
 	// ### Personen zusammenlegen Phrasen END
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'uhstat1AnmeldungEinleitungstextOhneSvnr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Senden der Daten ist nur möglich, wenn alle Fragen beantwortet worden sind. Wenn Sie etwas nicht wissen, wählen Sie die Antwortmöglichkeit „unbekannt“, aber beantworten Sie bitte alle Fragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sending the data is only possible if all questions have been answered. If you don\'t know something, choose the answer option “unknown”, but please answer all questions.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );