diff --git a/backend/services/diaryDateActivityService.js b/backend/services/diaryDateActivityService.js index 9e29f8b..fe70c29 100644 --- a/backend/services/diaryDateActivityService.js +++ b/backend/services/diaryDateActivityService.js @@ -118,7 +118,7 @@ class DiaryDateActivityService { include: [ { model: PredefinedActivity, - as: 'predefinedActivity', // Assuming 'predefinedActivity' is the alias used in the model association + as: 'predefinedActivity', } ] }); diff --git a/frontend/src/views/DiaryView.vue b/frontend/src/views/DiaryView.vue index 97e46ca..62bb925 100644 --- a/frontend/src/views/DiaryView.vue +++ b/frontend/src/views/DiaryView.vue @@ -54,6 +54,7 @@ Uhrzeit Aktivität Länge / Gesamtzeit (Min) + @@ -61,10 +62,8 @@ ☰ {{ calculatePlanItemTime(index) }} {{ planItem.predefinedActivity.name }} - - - - {{ planItem.duration }} - + {{ planItem.durationText }} / {{ planItem.duration }} + - @@ -89,7 +88,8 @@ - +
@@ -124,6 +124,7 @@