From 3cd2e0fa9a8a54b5b46736217c176bb62f74a0cd Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Wed, 16 Oct 2024 20:24:09 +0200
Subject: [PATCH] Reformat
---
.../substitutions/SubstitutionCard.vue | 51 +++++++++++--------
aleksis/apps/chronos/models.py | 2 +-
2 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue b/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
index 4f2d554f..618ee11a 100644
--- a/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
+++ b/aleksis/apps/chronos/frontend/components/substitutions/SubstitutionCard.vue
@@ -50,31 +50,39 @@ import deleteMixin from "aleksis.core/mixins/deleteMixin.js";
@input="roomsInput"
>
<template #prepend-inner>
- <v-chip
+ <template
v-if="roomsWithStatus.filter((t) => t.status === 'regular').length"
- v-for="room in roomsWithStatus.filter(
- (t) => t.status === 'regular',
- )"
- class="mb-1"
- small
>
- {{ room.shortName }}
- </v-chip>
- <v-chip
+ <v-chip
+ v-for="room in roomsWithStatus.filter(
+ (t) => t.status === 'regular',
+ )"
+ :key="room.id"
+ class="mb-1"
+ small
+ >
+ {{ room.shortName }}
+ </v-chip>
+ </template>
+ <template
v-if="roomsWithStatus.filter((t) => t.status === 'removed').length"
- v-for="room in roomsWithStatus.filter(
- (t) => t.status === 'removed',
- )"
- outlined
- color="error"
- class="mb-1"
- small
>
- <v-icon left small>mdi-cancel</v-icon>
- <div class="text-decoration-line-through">
- {{ room.shortName ? room.shortName : room.name }}
- </div>
- </v-chip>
+ <v-chip
+ v-for="room in roomsWithStatus.filter(
+ (t) => t.status === 'removed',
+ )"
+ :key="room.id"
+ outlined
+ color="error"
+ class="mb-1"
+ small
+ >
+ <v-icon left small>mdi-cancel</v-icon>
+ <div class="text-decoration-line-through">
+ {{ room.shortName ? room.shortName : room.name }}
+ </div>
+ </v-chip>
+ </template>
</template>
<template #selection="data">
<v-chip
@@ -116,6 +124,7 @@ import deleteMixin from "aleksis.core/mixins/deleteMixin.js";
v-for="teacher in teachersWithStatus.filter(
(t) => t.status === 'removed',
)"
+ :key="teacher.id"
outlined
color="error"
class="mb-1"
diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py
index f710b3a7..187b62e5 100644
--- a/aleksis/apps/chronos/models.py
+++ b/aleksis/apps/chronos/models.py
@@ -5,7 +5,7 @@ import itertools
from collections.abc import Iterable, Iterator
from datetime import date, datetime, time, timedelta
from itertools import chain
-from typing import Any, Optional
+from typing import Any
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied, ValidationError
--
GitLab