From 672ee59ba527df76b853b01db05d24746fb88feb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 10:34:28 +0200
Subject: [PATCH] =?UTF-8?q?neuer=20Hinweistext=20mit=20Einspruchsfrist=20f?=
 =?UTF-8?q?=C3=BCr=20Abmeldung=20Stgl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/Fhc.css                            |  4 ++++
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 13 +++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 2c3491767..23c2379ea 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -1,3 +1,7 @@
+.text-prewrap {
+  white-space: pre-line;
+}
+
 .accordion-button-primary {
   background-color: #e7f1ff;
   color: #0c63e4;
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 8dd527a9e..48ee4f772 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -1,6 +1,8 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import Phrasen from '../../../mixins/Phrasen.js';
 
+var _uuid = 0;
+
 export default {
 	components: {
 		CoreFetchCmpt
@@ -166,13 +168,8 @@ export default {
 
 				<div v-if="data.grund" class="mb-3">
 					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
-									
-					<div class="mb-3">
-					<h5>if data grund:</h5>
-					<pre>{{data.grund}}</pre>
-				</div>
 				
-					<pre>{{data.grund}}</pre>
+					<pre class="text-prewrap">{{data.grund}}</pre>
 				</div>      
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -210,7 +207,7 @@ export default {
 				
 				<div class="col-12 text-end">
 					<button
-						v-else-if="!data.studierendenantrag_id"
+						v-if="!data.studierendenantrag_id"
 						type="button"
 						class="btn btn-primary"
 						data-bs-toggle="modal"
@@ -237,7 +234,7 @@ export default {
 									</h5>
 									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_AbmeldungStgl')">
 								</div>
 								<div class="modal-footer">
 									<button
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index facf0d2d5..65345aed1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18565,6 +18565,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'warning_AbmeldungStgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte beachten Sie die Einspruchsfrist von 2 Wochen nach Bestätigung durch die Studiengangsleitung!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please note the objection period of 2 weeks after confirmation by the head of the degree program!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',