From 33267de4beb4752a15548dd7e4bf53b1cba1ea08 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 14 May 2024 09:25:21 +0200
Subject: [PATCH] Refactor Status, Adaptions Prestudent

---
 .../api/frontend/v1/stv/Config.php            |  4 +-
 .../api/frontend/v1/stv/Prestudent.php        | 18 +++---
 .../Studentenverwaltung/Details/Prestudent.js |  7 +--
 .../Details/Prestudent/MultiStatus.js         | 61 +++++++++++--------
 system/phrasesupdate.php                      | 21 +++++++
 5 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/frontend/v1/stv/Config.php b/application/controllers/api/frontend/v1/stv/Config.php
index d97c1a86b..87abe4ef4 100644
--- a/application/controllers/api/frontend/v1/stv/Config.php
+++ b/application/controllers/api/frontend/v1/stv/Config.php
@@ -67,7 +67,7 @@ class Config extends FHCAPI_Controller
 			'title' => $this->p->t('stv', 'tab_prestudent'),
 			'component' => './Stv/Studentenverwaltung/Details/Prestudent.js'
 		];
-		$result['multistatus'] = [
+		$result['status'] = [
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js'
 		];
@@ -114,7 +114,7 @@ class Config extends FHCAPI_Controller
 				'additionalCols' => []
 			]
 		];
-		$result['multistatus'] = [
+		$result['status'] = [
 			'title' => 'Status',
 			'component' => './Stv/Studentenverwaltung/Details/MultiStatus.js',
 			'config' => [
diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php
index d0606a5bb..e29736288 100644
--- a/application/controllers/api/frontend/v1/stv/Prestudent.php
+++ b/application/controllers/api/frontend/v1/stv/Prestudent.php
@@ -12,15 +12,15 @@ class Prestudent extends FHCAPI_Controller
 			'get' => ['admin:r', 'assistenz:r'],
 			'updatePrestudent' =>  ['admin:w', 'assistenz:w'],
 			'getHistoryPrestudents' => ['admin:r', 'assistenz:r'],
-			'getBezeichnungZGV' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungDZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBezeichnungMZgv' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getAusbildung' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getAufmerksamdurch' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getBerufstaetigkeit' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getTypenStg' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getStudiensemester' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
-			'getStudienplaene' => 'assistenz:r', // TODO(manu): self::PERM_LOGGED
+			'getBezeichnungZGV' => self::PERM_LOGGED,
+			'getBezeichnungDZgv' => self::PERM_LOGGED,
+			'getBezeichnungMZgv' => self::PERM_LOGGED,
+			'getAusbildung' => self::PERM_LOGGED,
+			'getAufmerksamdurch' => self::PERM_LOGGED,
+			'getBerufstaetigkeit' => self::PERM_LOGGED,
+			'getTypenStg' => self::PERM_LOGGED,
+			'getStudiensemester' => self::PERM_LOGGED,
+			'getStudienplaene' => self::PERM_LOGGED
 		]);
 
 		// Load Libraries
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
index ad402b5ed..149556508 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js
@@ -139,7 +139,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 		this.$fhcApi
 			.get('api/frontend/v1/stv/lists/getStgs')
-			.then(result => CoreRESTClient.getData(result.data) || [])
+			.then(result => result.data)
 			.then(result => {
 				this.listStgs = result;
 			})
@@ -174,8 +174,7 @@ export default {
 			.catch(this.$fhcAlert.handleSystemError);
 	},
 	template: `
-	<div class="stv-details-details h-100 pb-3">
-<!--	TEST: {{modelValue}} -->
+	<div class="stv-details-details h-100 pb-3">	
 		<form-form ref="form" class="stv-details-prestudent" @submit.prevent="updatePrestudent">
 		<div class="position-sticky top-0 z-1">
 			<button type="submit" class="btn btn-primary position-absolute top-0 end-0" :disabled="!deltaLength">Speichern</button>
@@ -289,7 +288,7 @@ export default {
 								<option v-for="nation in lists.nations" :key="nation.nation_code" :value="nation.nation_code" :disabled="nation.sperre">{{nation.kurztext}}</option>
 							</form-input>
 						</div>
-						<!--ZGV Doktor Todo(manu) Config -->
+						<!--ZGV Doktor-->
 						<div v-if="showZgvDoktor" class="row mb-3">
 							<form-input
 								container-class="col-3"
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
index 3d0f101cf..eb6322f82 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js
@@ -351,7 +351,7 @@ export default{
 			});
 		},
 		actionConfirmDialogue(data, statusgrund, statusText){
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.actionButton = statusgrund;
 			this.actionStatusText = statusText;
 
@@ -375,6 +375,8 @@ export default{
 			console.log(this.newArray);
 
 			console.log("in changeStatusToAbbrecher" + prestudentIds);
+			console.log("count: " + prestudentIds.length);
+
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbbrecherStud(prestudentIds){
@@ -447,7 +449,7 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
 			console.log("in changeStatusToDiplomand" + prestudentIds);
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.addNewStatus(prestudentIds);
 		},
 		changeStatusToAbsolvent(prestudentIds){
@@ -462,45 +464,53 @@ export default{
 			this.newArray = this.updateData.map(objekt => ({ ...objekt, ...deltaData}));
 
 			console.log("in changeStatusToAbsolvent" + prestudentIds);
-			this.hideModal('addMultiStatus2');
+			this.hideModal('addMultiStatus');
 			this.addNewStatus(prestudentIds);
 		},
 		addNewStatus(prestudentIds){
 			//Array.isArray(prestudentIds) ? this.modelValue.prestudent_id : [prestudentIds];
 			let changeData = {};
 
+			//for Feedback Sucess, Error
+			let countSuccess = 0;
+			let countError = 0;
+
 			if(!prestudentIds)
 				prestudentIds = [this.modelValue.prestudent_id];
 
 			const promises = prestudentIds.map(prestudentId => {
 				//TODO(manu) besserer check
-				//if(!this.newArray)
-				if(this.statusData.status_kurzbz)
-				{
-					changeData = this.statusData; //this.statusData = this.updateData.find(item => item.prestudent_id === prestudentId);
-				}
-				else
-				{
-					changeData = this.newArray.find(item => item.prestudent_id === prestudentId);
-				}
+				changeData = this.statusData.status_kurzbz ? this.statusData : this.newArray.find(item => item.prestudent_id === prestudentId);
 
 				return this.$fhcApi.post('api/frontend/v1/stv/status/addNewStatus/' + prestudentId,
-					//this.statusData
-					//this.updateData.find(item => item.prestudent_id == prestudentId)
 					changeData
 				).then(response => {
-						this.$fhcAlert.alertSuccess(this.$p.t('ui', 'successSave'));
-						console.log(response);
+						countSuccess++;
 						return response;
-						}).catch(this.$fhcAlert.handleSystemError)
-					/*.finally(() => {
-					window.scrollTo(0, 0);
-				})*/;
+						})
+					//.catch(this.$fhcAlert.handleSystemError)
+					.catch(error => {
+						countError++;
+						//For each Prestudent show Error in Alert
+						this.$fhcAlert.handleSystemError(error);
+					});
 			});
 
 			Promise
 				.allSettled(promises)
 				.then(values => {
+					let newStatus = this.newArray[0].status_kurzbz;
+					console.log(`Successful: ${countSuccess}, Errors: ${countError}`);
+
+					//Feedback Success als infoalert
+					 if (countSuccess > 0) {
+						 this.$fhcAlert.alertInfo(this.$p.t('ui', 'successNewStatus', {
+							 'countSuccess': countSuccess,
+							 'status': newStatus,
+							 'countError': countError
+						 }));
+					 }
+
 					if (this.modelValue.prestudent_id) {
 						this.reload();
 						//TODO(manu) reload Detailtab after Abbrecher to see current status activ, verband and gruppe
@@ -511,7 +521,6 @@ export default{
 					this.hideModal('newStatusModal');
 					this.resetModal();
 				});
-
 		},
 		advanceStatus(statusId){
 			return this.$fhcApi.post('api/frontend/v1/stv/status/advanceStatus/' +
@@ -653,7 +662,7 @@ export default{
 	mounted(){},
 	template: `
 		<div class="stv-list h-100 pt-3">
-				
+					
 			<!--Modal: Add New Status-->
 			<BsModal ref="newStatusModal">
 				<template #title>{{$p.t('lehre', 'status_new')}}</template>
@@ -844,7 +853,7 @@ export default{
 									<option  value="Bewerber">BewerberIn</option>
 									<option  value="Aufgenommener">Aufgenommene/r</option>
 									<option  value="Student">StudentIn</option>
-<!--									TODO(Manu) handle Unterbrecher from here
+<!--									TODO(Manu) check: is handle Unterbrecher from here necessary?
 									<option  value="Unterbrecher">UnterbrecherIn</option>-->
 									<option  value="Diplomand">DiplomandIn</option>
 									<option  value="Incoming">Incoming</option>
@@ -1030,7 +1039,7 @@ export default{
 				</template>
 			</BsModal>
 			
-			<BsModal ref="addMultiStatus2" id="addMultiStatus2">
+			<BsModal ref="addMultiStatus" id="addMultiStatus">
 				<template #title>Status ändern zu</template>
 				<template #default>
 					<button type="button" class="btn btn-primary d-block mb-2" data-bs-toggle="collapse" data-bs-target="#submenu1">
@@ -1124,7 +1133,7 @@ export default{
 				>
 				
 				<template #actions="{updateData2}">
-					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus2">
+					<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 						Status Ändern
 					</button>
 				</template>
@@ -1134,7 +1143,7 @@ export default{
 				v-if="this.modelValue.length"
 				ref="buttonsStatusMulti"
 			>	
-			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus2">
+			<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addMultiStatus">
 				Status Ändern
 			</button>
 			</div>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index ba4dcfa01..94834e54f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27761,6 +27761,7 @@ array(
 			)
 		)
 	),
+	//****************************	 FHC-Core-Status
 	array(
 		'app' => 'core',
 		'category' => 'lehre',
@@ -27781,6 +27782,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'successNewStatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '{countSuccess} erfolgreiche Statusänderung(en) auf {status}, {countError} Fehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '{countSuccess} successful status changes to {status}, {countError} errors',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );