From 9404d3e4db627a6d8c884cd67d221e8c1a6c8e27 Mon Sep 17 00:00:00 2001
From: minie4 <minie4@gmx.de>
Date: Wed, 4 May 2022 14:37:05 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Only=20show=20changed=20value=20?=
 =?UTF-8?q?if=20it=20is=20different?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TimetableView.vue | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/TimetableView.vue b/src/views/TimetableView.vue
index 61283ba..4b7edca 100644
--- a/src/views/TimetableView.vue
+++ b/src/views/TimetableView.vue
@@ -24,12 +24,20 @@ const timetable = computed(() => {
   return newDay;
 });
 
-function isChanged(substitution, key) {
+function isChanged(lesson, key) {
+  const substitution = lesson.substitution;
   if (!substitution) return false;
   if (!substitution.change) return false;
   const changedKeys = Object.keys(substitution.change);
-  if (changedKeys.includes(key)) return true;
-  else return false;
+  if (!changedKeys.includes(key)) return false;
+  console.log(lesson, changedKeys);
+  return lesson[key] != substitution.change[key];
+}
+
+function getNotes(substitution) {
+  if (!substitution) return;
+  if (!substitution.notes) return;
+  return substitution.notes;
 }
 
 function isCancelled(substitution) {
@@ -44,10 +52,7 @@ function isCancelled(substitution) {
         <span class="hour">{{ index + 1 }}</span>
         <div class="infos">
           <!-- Subject changed -->
-          <span
-            class="subject"
-            v-if="isChanged(lesson.substitution, 'subject')"
-          >
+          <span class="subject" v-if="isChanged(lesson, 'subject')">
             <s>{{ lesson.subject }}</s> {{ lesson.substitution.change.subject }}
           </span>
           <!-- Cancellation -->
@@ -59,13 +64,13 @@ function isCancelled(substitution) {
           </span>
           <div class="info">
             <!-- Teacher changed -->
-            <span class="info" v-if="isChanged(lesson.substitution, 'teacher')">
+            <span class="info" v-if="isChanged(lesson, 'teacher')">
               <s>{{ lesson.teacher }}</s>
               {{ lesson.substitution.change.teacher }},
             </span>
             <span class="info" v-else> {{ lesson.teacher }}, </span>
             <!-- Room changed -->
-            <span class="info" v-if="isChanged(lesson.substitution, 'room')">
+            <span class="info" v-if="isChanged(lesson, 'room')">
               <s>{{ lesson.room }}</s> {{ lesson.substitution.change.room }}
             </span>
             <span class="info" v-else>{{ lesson.room }}</span>