From 797e52aad71f728a0b127a48a3010376a45cf10a Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Thu, 5 Dec 2024 15:22:53 +0100
Subject: [PATCH] refactor(News-StudiengangInformationen): adds the
 Studiengangs informationen next to the news View

---
 application/config/cis.php                    |  2 +-
 public/js/components/Cis/Cms/News.js          | 10 +--
 .../StudiengangInformation.js                 | 68 ++++++++-----------
 3 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/application/config/cis.php b/application/config/cis.php
index b7330ef29..82655f244 100644
--- a/application/config/cis.php
+++ b/application/config/cis.php
@@ -4,6 +4,6 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 
 // CMS Content Id for CIS4 Menu Root
-$config['cis_menu_root_content_id'] = 11066;
+$config['cis_menu_root_content_id'] = 11087;
 // send Mails for ProfilUpdate
 $config['cis_send_profil_update_mails'] = true;
diff --git a/public/js/components/Cis/Cms/News.js b/public/js/components/Cis/Cms/News.js
index fc8df69b1..f61cd3154 100644
--- a/public/js/components/Cis/Cms/News.js
+++ b/public/js/components/Cis/Cms/News.js
@@ -41,12 +41,14 @@ export default {
 	<hr/>
 	<pagination  :page_size="page_size"  @page="loadNewPageContent" :maxPageCount="maxPageCount">
 	</pagination>
-	<div class="container-xxl">
+	<div class="container-fluid">
 		<div class="row">
-			<div class="col-12 col-md-8 col-xl-9" v-html="content">
+			<div class="col" v-html="content">
 			</div>
-			<div class="col-12 col-md-4 col-xl-3">
-  				<studiengang-information></studiengang-information>
+			<div class="col-auto">
+				<div style="width:15rem">
+					<studiengang-information></studiengang-information>
+				</div>
 			</div>
 		</div>
 	</div>
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index ddc8cab93..06454736c 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -18,31 +18,34 @@ components:{
 	StudiengangPerson
 },
 template:/*html*/`
-	<template v-if="studiengang?.bezeichnung && semester">
-		<h5>Studiengang: {{studiengang.bezeichnung}}</h5>
-		<h5>Semester: {{semester}}</h5>
-	</template>
-	<template v-for="{title, collection} in collection_array">
-	<h5 v-if="Array.isArray(collection)  && collection.length !==0">{{title}}</h5>
-	<template v-for="person in studiengangs_person_data(collection)">
-		<div class="mb-3">
-			<studiengang-person :person_data="person"></studiengang-person>
-		</div>
-	</template>
-	</template>
-	<div v-if="studiengang?.zusatzinfo_html" v-html="studiengang?.zusatzinfo_html"></div>
-	<template v-if="hochschulvertr && Array.isArray(hochschulvertr) && hochschulvertr.length >0">
-		<h5>Hochschulvertretung</h5>
-		<p v-for="vertretung in hochschulvertr">{{vertretungFormatedName(vertretung)}}</p>
-	</template>
-	<template v-if="stdv && Array.isArray(stdv) && stdv.length >0">
-		<h5>Studienvertretung {{studiengang.kurzbzlang??''}}</h5>
-		<p v-for="vertretung in stdv">{{vertretungFormatedName(vertretung,false)}}</p>
-	</template>
-	<template v-if="jahrgangsvertr && Array.isArray(jahrgangsvertr) && jahrgangsvertr.length >0">
-		<h5>Jahrgangsvertretung</h5>
-		<p v-for="vertretung in jahrgangsvertr">{{vertretungFormatedName(vertretung,false)}}</p>
-	</template>
+
+		<template v-if="studiengang?.bezeichnung && semester">
+			<div class="card card-body mb-3">
+				<div class="mb-3"><b>Studiengang:</b> </h5>{{studiengang.bezeichnung}}</div>
+				<div><b>Semester: </b>{{semester}}</div>
+			</div>
+		</template>
+		<template v-for="{title, collection} in collection_array">
+		<h5 v-if="Array.isArray(collection)  && collection.length !==0">{{title}}</h5>
+		<template v-for="person in studiengangs_person_data(collection)">
+			<div class="mb-3">
+				<studiengang-person :person_data="person"></studiengang-person>
+			</div>
+		</template>
+		</template>
+		<div v-if="studiengang?.zusatzinfo_html" v-html="studiengang?.zusatzinfo_html"></div>
+		<template v-if="hochschulvertr && Array.isArray(hochschulvertr) && hochschulvertr.length >0">
+			<h5>Hochschulvertretung</h5>
+			<p v-for="vertretung in hochschulvertr">{{vertretungFormatedName(vertretung)}}</p>
+		</template>
+		<template v-if="stdv && Array.isArray(stdv) && stdv.length >0">
+			<h5>Studienvertretung {{studiengang.kurzbzlang??''}}</h5>
+			<p v-for="vertretung in stdv">{{vertretungFormatedName(vertretung,false)}}</p>
+		</template>
+		<template v-if="jahrgangsvertr && Array.isArray(jahrgangsvertr) && jahrgangsvertr.length >0">
+			<h5>Jahrgangsvertretung</h5>
+			<p v-for="vertretung in jahrgangsvertr">{{vertretungFormatedName(vertretung,false)}}</p>
+		</template>
 	
 `,
 computed:{
@@ -108,23 +111,13 @@ methods:{
 		{
 			return "tel:".concat(telefone).concat(" "+telefoneklappe);
 		}
-		else if(telefone)
-		{
-			return "tel:".concat(telefone);
-		}
 		else
 		{
-			return null;
+			return telefon ? "tel:".concat(telefone): null;
 		}
 	},
 	studiengangs_person_email: function (email) {
-		if (email) 
-		{
-			return "mailto:".concat(email);
-		}
-		else {
-			return null;
-		}
+		return email? "mailto:".concat(email): null;
 	},
 },
 mounted(){
@@ -132,7 +125,6 @@ mounted(){
 	.then(res => res.data)
 	.then(studiengangInformationen => {
 		Object.assign(this, studiengangInformationen);
-		console.log(studiengangInformationen,"das sind die Informationen")
 	});
 
 },