From abefe878dac4a8fdea2ccd85e5833e0f45fa5bd5 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 25 May 2023 11:52:33 +0200 Subject: [PATCH] Set duration default to 0, hide duration info if 0 --- .../learningPath/circlePage/CirclePage.vue | 11 ++++++++++- .../circlePage/LearningSequence.vue | 9 +++++++-- .../learnpath/tests/learning_path_factories.py | 18 +++++++++--------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/client/src/pages/learningPath/circlePage/CirclePage.vue b/client/src/pages/learningPath/circlePage/CirclePage.vue index e08883ff..00323a96 100644 --- a/client/src/pages/learningPath/circlePage/CirclePage.vue +++ b/client/src/pages/learningPath/circlePage/CirclePage.vue @@ -40,6 +40,12 @@ const duration = computed(() => { return ""; }); +const showDuration = computed(() => { + return ( + circleStore.circle && sumBy(circleStore.circle.learningSequences, "minutes") > 0 + ); +}); + onMounted(async () => { log.debug( "CirclePage mounted", @@ -136,7 +142,10 @@ onMounted(async () => { {{ circleStore.circle?.title }} -
{{ $t("circlePage.duration") }}: {{ duration }}
+
+ {{ $t("circlePage.duration") }}: + {{ duration }} +
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue index f05fb3a8..759dd527 100644 --- a/client/src/pages/learningPath/circlePage/LearningSequence.vue +++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue @@ -96,7 +96,9 @@ const learningSequenceBorderClass = computed(() => {

{{ learningSequence.title }}

-
{{ humanizeDuration(learningSequence.minutes) }}
+
+ {{ humanizeDuration(learningSequence.minutes) }} +
    @@ -108,7 +110,10 @@ const learningSequenceBorderClass = computed(() => { >
    {{ learningUnit.title }}
    -
    +
    {{ humanizeDuration(learningUnit.minutes) }}
    diff --git a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py index 5233b99b..77dc136e 100644 --- a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py +++ b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py @@ -86,7 +86,7 @@ class LearningUnitFactory(wagtail_factories.PageFactory): class LearningContentAttendanceCourseFactory(wagtail_factories.PageFactory): title = "Platzhalter Inhalt" - minutes = 15 + minutes = 0 description = RichText("Platzhalter Beschreibung") content_url = "" @@ -96,7 +96,7 @@ class LearningContentAttendanceCourseFactory(wagtail_factories.PageFactory): class LearningContentVideoFactory(wagtail_factories.PageFactory): title = "Platzhalter Video" - minutes = 15 + minutes = 0 content_url = "https://www.youtube.com/embed/qhPIfxS2hvI" description = RichText("Lorem ipsum dolor sit amet, consectetur adipiscing elit.") @@ -106,7 +106,7 @@ class LearningContentVideoFactory(wagtail_factories.PageFactory): class LearningContentPlaceholderFactory(wagtail_factories.PageFactory): title = "Platzhalter Video" - minutes = 15 + minutes = 0 content_url = "" description = RichText("Platzhalter") @@ -116,7 +116,7 @@ class LearningContentPlaceholderFactory(wagtail_factories.PageFactory): class LearningContentFeedbackFactory(wagtail_factories.PageFactory): title = "Feedback" - minutes = 15 + minutes = 0 content_url = "" description = RichText("") @@ -126,7 +126,7 @@ class LearningContentFeedbackFactory(wagtail_factories.PageFactory): class LearningContentLearningModuleFactory(wagtail_factories.PageFactory): title = "Beispiel Lernmodul" - minutes = 15 + minutes = 0 content_url = "" description = RichText("") @@ -136,7 +136,7 @@ class LearningContentLearningModuleFactory(wagtail_factories.PageFactory): class LearningContentMediaLibraryFactory(wagtail_factories.PageFactory): title = "Mediathek" - minutes = 15 + minutes = 0 content_url = "" description = RichText("") @@ -146,7 +146,7 @@ class LearningContentMediaLibraryFactory(wagtail_factories.PageFactory): class LearningContentTestFactory(wagtail_factories.PageFactory): title = "Fachcheck" - minutes = 15 + minutes = 0 content_url = "" description = RichText("") @@ -156,7 +156,7 @@ class LearningContentTestFactory(wagtail_factories.PageFactory): class LearningContentRichTextFactory(wagtail_factories.PageFactory): title = "Rich Text" - minutes = 15 + minutes = 0 content_url = "" description = RichText("") @@ -166,7 +166,7 @@ class LearningContentRichTextFactory(wagtail_factories.PageFactory): class LearningContentAssignmentFactory(wagtail_factories.PageFactory): title = "Geleitete Fallarbeit" - minutes = 15 + minutes = 0 content_url = "" description = RichText("")