From b7cdc0ddde4c61f3b754241cb084daefe46e192a Mon Sep 17 00:00:00 2001 From: Elia Bieri Date: Tue, 23 May 2023 15:35:19 +0200 Subject: [PATCH] Add attendance course start- and endtime --- .../attendanceCourse/AttendanceCourse.vue | 4 +++- client/src/types.ts | 6 ++---- server/vbv_lernwelt/course/models.py | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue index e3d46fc0..f8c2f4e9 100644 --- a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue +++ b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue @@ -2,7 +2,9 @@

Datum

-

{{ attendanceCourse.date }}

+

+ {{ attendanceCourse.start }} - {{ attendanceCourse.end }} +

diff --git a/client/src/types.ts b/client/src/types.ts index 4604d5ea..2241804c 100644 --- a/client/src/types.ts +++ b/client/src/types.ts @@ -390,12 +390,10 @@ export interface CircleDocument { learning_sequence: number; } -// TODO refactor, when a user can manually create these days export interface CourseSessionAttendanceCourse { learningContentId: number; - date: string; - startTime: string; - endTime: string; + start: string; + end: string; location: string; trainer: string; } diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py index 7145cec6..71a94fe3 100644 --- a/server/vbv_lernwelt/course/models.py +++ b/server/vbv_lernwelt/course/models.py @@ -200,7 +200,8 @@ class CourseSession(models.Model): "title": "ID des Lerninhalts", "required": True, }, - "date": {"type": "string"}, + "start": {"type": "string", "format": "datetime"}, + "end": {"type": "string", "format": "datetime"}, "location": {"type": "string"}, "trainer": {"type": "string"}, },