minie4/Timetable-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Only show changed value if it is different

Browse Source
This commit is contained in:
minie4
2022-05-04 14:37:05 +02:00
parent b358796c04
commit 9404d3e4db
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/TimetableView.vue
View File

@ -24,12 +24,20 @@ const timetable = computed(() => {
return newDay; return newDay;
}); });
function isChanged(substitution, key) { function isChanged(lesson, key) {
const substitution = lesson.substitution;
if (!substitution) return false; if (!substitution) return false;
if (!substitution.change) return false; if (!substitution.change) return false;
const changedKeys = Object.keys(substitution.change); const changedKeys = Object.keys(substitution.change);
if (changedKeys.includes(key)) return true; if (!changedKeys.includes(key)) return false;
else 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) { function isCancelled(substitution) {
@ -44,10 +52,7 @@ function isCancelled(substitution) {
<span class="hour">{{ index + 1 }}</span> <span class="hour">{{ index + 1 }}</span>
<div class="infos"> <div class="infos">
<!-- Subject changed --> <!-- Subject changed -->
<span <span class="subject" v-if="isChanged(lesson, 'subject')">
class="subject"
v-if="isChanged(lesson.substitution, 'subject')"
>
<s>{{ lesson.subject }}</s> {{ lesson.substitution.change.subject }} <s>{{ lesson.subject }}</s> {{ lesson.substitution.change.subject }}
</span> </span>
<!-- Cancellation --> <!-- Cancellation -->
@ -59,13 +64,13 @@ function isCancelled(substitution) {
</span> </span>
<div class="info"> <div class="info">
<!-- Teacher changed --> <!-- Teacher changed -->
<span class="info" v-if="isChanged(lesson.substitution, 'teacher')"> <span class="info" v-if="isChanged(lesson, 'teacher')">
<s>{{ lesson.teacher }}</s> <s>{{ lesson.teacher }}</s>
{{ lesson.substitution.change.teacher }}, {{ lesson.substitution.change.teacher }},
</span> </span>
<span class="info" v-else> {{ lesson.teacher }}, </span> <span class="info" v-else> {{ lesson.teacher }}, </span>
<!-- Room changed --> <!-- 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 }} <s>{{ lesson.room }}</s> {{ lesson.substitution.change.room }}
</span> </span>
<span class="info" v-else>{{ lesson.room }}</span> <span class="info" v-else>{{ lesson.room }}</span>