From 38a083742d9c5002b73b69f2818297e3428a727e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Fri, 24 Jan 2025 11:18:46 +0100
Subject: [PATCH] update(MyLv Noten farbe): uses db positiv column to determine
 the color of the grade in the MyLv component

---
 .../education/Lehrveranstaltung_model.php     |  6 +++-
 public/css/Cis4/Cis.css                       |  2 ++
 .../StudiengangInformation.js                 |  2 +-
 .../Cis/Mylv/Semester/Studiengang/Lv.js       | 33 ++++++++++++++-----
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php
index 3f02f5ce7..8044fa9de 100644
--- a/application/models/education/Lehrveranstaltung_model.php
+++ b/application/models/education/Lehrveranstaltung_model.php
@@ -608,7 +608,11 @@ class Lehrveranstaltung_model extends DB_Model
 		$this->addSelect($lvbezeichnung . ' AS bezeichnung');
 		$this->addSelect($sgbezeichnung . ' AS sg_bezeichnung');
 		$this->addSelect('UPPER(sg.typ::VARCHAR(1) || sg.kurzbz) AS studiengang_kuerzel');
-
+		
+		//also adds returns the index of the grade
+		//TODO: ist zeugnissnote immer gleich wie die lvgesamtnote
+		$this->addSelect('COALESCE(zn.note::numeric,gn.note::numeric) as note_index');
+		$this->addSelect('COALESCE(znn.positiv,gnn.positiv) as positiv');
 		$this->addSelect('COALESCE(gnn.' . $bezeichnung . ', gnn.bezeichnung, gn.note::text) AS lvnote');
 		$this->addSelect('COALESCE(znn.' . $bezeichnung . ', znn.bezeichnung, zn.note::text) AS znote');
 
diff --git a/public/css/Cis4/Cis.css b/public/css/Cis4/Cis.css
index 78d9215f1..74d8648e0 100644
--- a/public/css/Cis4/Cis.css
+++ b/public/css/Cis4/Cis.css
@@ -32,6 +32,8 @@ html {
   --fhc-cis-menu-lvl-5-color: #000;
   --fhc-cis-menu-lvl-5-bg-hover: #eceff1;
   --fhc-cis-menu-lvl-5-color-hover: #000;
+  --fhc-cis-grade-positive: rgb(0, 128, 0);
+  --fhc-cis-grade-negative: rgb(128, 0, 0);
 }
 @media (min-width: 992px) {
   :root {
diff --git a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
index 540f21136..06743ae5d 100644
--- a/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
+++ b/public/js/components/Cis/Cms/StudiengangInformation/StudiengangInformation.js
@@ -46,7 +46,7 @@ template:/*html*/`
 		</template>
 		<template v-for="{title, collection} in collection_array">
 			<template v-if="Array.isArray(collection)  && collection.length !==0">
-				<h2 >{{title}}</h2>
+				<h2 class="text-truncate">{{title}}</h2>
 				<template v-if="displayWidget">
 					<div class="d-flex flex-wrap flex-row mb-3 gap-2">
 						<template v-for="person in collection">
diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
index c701330c2..36d67f454 100644
--- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
+++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js
@@ -28,7 +28,8 @@ export default {
 		sprache: String,
 		ects: String,
 		incoming: Number,
-		positiv: Boolean
+		positiv: Boolean,
+		note_index: String,
 	},
 	data: () => {
 		return {
@@ -39,6 +40,19 @@ export default {
 		}
 	},
 	computed: {
+		gradeColor() {
+			// early return if value is null or undefined
+			if (this.positiv == null) return;
+			// returns a suitable color for the given grade
+			if (this.positiv)
+			{
+				return 'var(--fhc-cis-grade-positive)';
+			}
+			else
+			{
+				return 'var(--fhc-cis-grade-negative)';
+			}
+		},
 		is_organisatorische_einheit(){
 			return this.menu == "organisatorische_einheit";
 		},
@@ -59,6 +73,7 @@ export default {
 		},
 	},
 	methods: {
+		
 		fetchMenu(lehrveranstaltung_id = this.lehrveranstaltung_id, studien_semester = this.studien_semester){
 			return this.$fhcApi.factory.addons.getLvMenu(lehrveranstaltung_id, studien_semester)
 				.then(res => {
@@ -155,11 +170,11 @@ export default {
 							<div class="mx-4">
 								<i :class="[menuItem.c4_icon2 ? menuItem.c4_icon2 : 'fa-solid fa-pen-to-square', !menuItem.c4_link ? 'unavailable' : null ]"></i>
 							</div>
-							<a 
-							class="text-decoration-none text-truncate" 
-							:id="'moodle_links_'+lehrveranstaltung_id"  
-							:class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }" 
-							:target="menuItem.c4_target" 
+							<a
+							class="text-decoration-none text-truncate"
+							:id="'moodle_links_'+lehrveranstaltung_id"
+							:class="{'link-dark':menuItem.c4_link, 'unavailable':!menuItem.c4_link, 'dropdown-toggle':menuItem.c4_moodle_links?.length }"
+							:target="menuItem.c4_target"
 							:href="c4_link(menuItem) ? c4_link(menuItem) : null">
 								{{menuItem.name}}
 							</a>
@@ -178,16 +193,18 @@ export default {
 		</div>
 		<div v-if="!emptyMenu" class="card-footer">
 			<div class="row">
+				<!-- template for the LV if there are multiple pruefungen -->
 				<template v-if="LvHasPruefungenInformation">
 					<a href="#" class="col-auto text-start text-decoration-none" @click.prevent="openPruefungen">
 						<i class="fa fa-check text-success" v-if="positiv"></i>
-						{{ grade || p.t('lehre/noGrades') }}
+						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || p.t('lehre/noGrades') }}</span>
 					</a>
 				</template>
+				<!-- template for the LV with no pruefungen -->
 				<template v-else>
 					<span  class="col-auto text-start text-decoration-none" >
 						<i class="fa fa-check text-success" v-if="positiv"></i>
-						{{ grade || p.t('lehre/noGrades') }}
+						<span class="ps-1" :style="'color:'+gradeColor">{{ grade || p.t('lehre/noGrades') }}</span>
 					</span>
 				</template>
 			</div>