From 3417dcd41d28a45071adef10921a6c8020fa7fd5 Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Tue, 16 Jul 2024 15:18:23 +0200
Subject: [PATCH] centers the text, displays default message and makes # links
 not clickable and removes the link styling from them

---
 .../controllers/api/frontend/v1/LvMenu.php    | 14 +++++------
 public/js/components/Cis/Mylv/LvUebersicht.js | 23 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php
index d5effafa7..3e1b2347b 100644
--- a/application/controllers/api/frontend/v1/LvMenu.php
+++ b/application/controllers/api/frontend/v1/LvMenu.php
@@ -67,6 +67,9 @@ class LvMenu extends FHCAPI_Controller
 		require_once(FHCPATH.'include/phrasen.class.php');
 		require_once(FHCPATH.'include/lvangebot.class.php');
 		require_once(FHCPATH.'include/lehre_tools.class.php');
+		// data gets not returned
+		//require_once(FHCPATH.'addons/moodle/lib/LogicCourses.php');
+		//require_once(FHCPATH.'addons/moodle/lib/Database.php');
 
 		// get the sprache
 		$sprache = getSprache();
@@ -327,14 +330,11 @@ class LvMenu extends FHCAPI_Controller
 			|| $rechte->isBerechtigtMultipleOe('lehre/lvinfo', $lehrfach_oe_kurzbz_arr)
 			)
 			{
-				$c4_linkList[$p->t('lehre/lvInfoBearbeiten')]= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['test']= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['asdf']= 'ects/index.php?lvid='.$lvid;
-				$c4_linkList['qewr']= 'ects/index.php?lvid='.$lvid;
+				$c4_linkList[]= [$p->t('lehre/lvInfoBearbeiten'), 'ects/index.php?lvid='.$lvid];
 			}
 			elseif ($is_lector)
 			{
-				$c4_linkList["Bearbeiten der LV-Infos derzeit gesperrt"]= '#';
+				$c4_linkList[]= ["Bearbeiten der LV-Infos derzeit gesperrt",'#'];
 			}
 
 			$menu[]=array
@@ -390,7 +390,7 @@ class LvMenu extends FHCAPI_Controller
 					'name'=>$p->t('lehre/gesamtnote'),
 					'c4_icon'=>'skin/images/button_endnote.png',
 					'c4_link'=>'',
-					'c4_linkList'=>[$p->t('lehre/noteneingabedeaktiviert')=>'#'],
+					'c4_linkList'=>[[$p->t('lehre/noteneingabedeaktiviert'),'#']],
 				);
 			}
 		}
@@ -428,7 +428,7 @@ class LvMenu extends FHCAPI_Controller
 			}
 
 			if($noMailLink){
-				$c4_linkList[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails)))]='#';
+				$c4_linkList[]=[$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))), '#'];
 				$link_onclick='alert(\''.$p->t('lehre/keinMailverteiler',array(implode(" ",$noMails))).'\');';
 			}else{
 				$link_onclick='';
diff --git a/public/js/components/Cis/Mylv/LvUebersicht.js b/public/js/components/Cis/Mylv/LvUebersicht.js
index ccd8abc8c..d3ded0518 100644
--- a/public/js/components/Cis/Mylv/LvUebersicht.js
+++ b/public/js/components/Cis/Mylv/LvUebersicht.js
@@ -22,19 +22,21 @@ export default  {
         BsModal,
     },
     methods:{
-        selectMenu: function(menuItem, key=null){
-            console.log(menuItem,"menuItem")
+        selectMenu: function(menuItem, index=null){
+            
+            // early return if link is #
+            if(index != null && menuItem.c4_linkList[index][1] == '#') return;
+
             switch(menuItem.id){
                 case "core_menu_mailanstudierende": window.location.href=menuItem.c4_link; break;
                 default:
                     this.selectedMenu= {...menuItem};
             }
 
-            if( this.selectedMenu && key != null && menuItem.c4_linkList[key] !='#'){
-                this.selectedMenu.c4_link = menuItem.c4_linkList[key];
-                this.selectedMenu.name += ' - ' + key;
+            if( this.selectedMenu && index != null && menuItem.c4_linkList[index][1] !='#'){
+                this.selectedMenu.c4_link = menuItem.c4_linkList[index][1];
+                this.selectedMenu.name += ' - ' + menuItem.c4_linkList[index][0];
             }
-            
         },
         hiddenModal: function(){
             this.selectedMenu = null;
@@ -43,7 +45,10 @@ export default  {
 
             this.$fhcApi.factory.addons.getLvMenu(this.event.lehrveranstaltung_id, this.event.studiensemester_kurzbz).then(res =>{
             //this.$fhcApi.factory.addons.getLvMenu(750, "WS2005").then(res =>{
+                if(res.data){
                     this.menu = res.data;
+                }
+            
             });
         },
     },
@@ -66,15 +71,15 @@ export default  {
                 </div>
                 <iframe class="h-100 w-100" :src="selectedMenu.c4_link" :title="selectedMenu.name"></iframe>
             </div>
+            <div v-else-if="!menu">No Menu available</div>
             <div v-else :style="{'display':'grid', 'row-gap':'10px', 'column-gap':'10px', 'grid-template-columns':'repeat(3,minmax(100px,1fr))', 'grid-template-rows':'repeat('+Math.ceil(menu.length / 3)+',minmax(100px,1fr))'} ">
-                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1" v-for="(menuItem, index) in menu" :key="index">
+                <div :title="menuItem.name" role="button" @click="selectMenu(menuItem)" class="lvUebersichtMenuPunkt border border-1 d-flex flex-column align-items-center justify-content-center p-1 text-center" v-for="(menuItem, index) in menu" :key="index">
                     <img :src="menuItem.c4_icon" :alt="menuItem.name" ></img>    
                     <span @click="selectMenu(menuItem)" class="underline_hover mt-2">{{menuItem.name}}</span> 
-                    <span v-for="(value,key,index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,key)" class="underline_hover mt-1" :index="index">{{key}}</span>
+                    <span v-for="([text,link],index) in menuItem.c4_linkList" @click.stop="selectMenu(menuItem,index)"  :class="{'underline_hover':menuItem.c4_linkList[index][1] != '#'}" class="mt-1" :index="index">{{text}}</span>
                         
                 </div>
             </div>
-            <div>{{JSON.stringify(event,null,2)}}</div>
         </template>
         
     </bs-modal>