From a25ea04a5a8fa3f04910b32854c574fc505055f9 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 4 Apr 2024 21:49:25 +0200
Subject: [PATCH] Fix logic in status icon
---
.../documentation/DocumentationStatus.vue | 34 ++++++++-----------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/DocumentationStatus.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/DocumentationStatus.vue
index a797465e9..75a671e14 100644
--- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/DocumentationStatus.vue
+++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/DocumentationStatus.vue
@@ -51,7 +51,7 @@ export default {
{
name: "cancelled",
text: this.$t("alsijil.coursebook.status.cancelled"),
- icon: "$cancel",
+ icon: "mdi-cancel",
color: "error",
},
{
@@ -78,27 +78,21 @@ export default {
},
methods: {
updateStatus() {
- if (this.documentation.topic) {
+ if (this.documentation?.lessonEvent.cancelled) {
+ this.currentStatusName = "cancelled";
+ } else if (this.documentation.topic) {
this.currentStatusName = "available";
+ } else if (DateTime.now() > this.documentationDateTimeEnd) {
+ this.currentStatusName = "missing";
+ } else if (this.documentation?.lessonEvent.amends) {
+ this.currentStatusName = "substitution";
+ } else if (
+ DateTime.now() > this.documentationDateTimeStart &&
+ DateTime.now() < this.documentationDateTimeEnd
+ ) {
+ this.currentStatusName = "running";
} else {
- if (DateTime.now() > this.documentationDateTimeEnd) {
- this.currentStatusName = "missing";
- } else if (
- DateTime.now() > this.documentationDateTimeStart &&
- DateTime.now() < this.documentationDateTimeEnd
- ) {
- this.currentStatusName = "running";
- } else {
- if (this.documentation?.lessonEvent.amends) {
- if (this.documentation.lessonEvent.amends.cancelled) {
- this.currentStatusName = "cancelled";
- } else {
- this.currentStatusName = "substitution";
- }
- } else {
- this.currentStatusName = "pending";
- }
- }
+ this.currentStatusName = "pending";
}
},
},
--
GitLab