From 6bbd509faf8eff784666d471d04268d6f65e4c0c Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 17 Jan 2023 15:16:00 +0100
Subject: [PATCH] Add feedback icon, add feedback to default path

---
 client/src/components/FeedbackForm.vue                |  4 ++--
 .../components/learningPath/FeedbackCompletition.vue  |  2 +-
 client/src/components/learningPath/SelfEvaluation.vue |  9 ++++++++-
 client/src/utils/typeMaps.ts                          |  2 ++
 .../vbv_lernwelt/learnpath/create_vv_learning_path.py | 11 +++++++++++
 .../learnpath/tests/learning_path_factories.py        |  8 ++++++++
 server/vbv_lernwelt/static/icons/icon-lc-feedback.svg |  8 ++++++++
 7 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 server/vbv_lernwelt/static/icons/icon-lc-feedback.svg

diff --git a/client/src/components/FeedbackForm.vue b/client/src/components/FeedbackForm.vue
index db983244..9d7fb918 100644
--- a/client/src/components/FeedbackForm.vue
+++ b/client/src/components/FeedbackForm.vue
@@ -105,7 +105,7 @@
       @back="previousStep"
       @continue="nextStep"
     ></LearningContentNavigation>
-    <hr class="mb-10 mt-10" />
+    <!-- <hr class="mb-10 mt-10" />
     <pre>
      satisfaction {{ satisfaction }}
      goalAttainment {{ goalAttainment }}
@@ -119,7 +119,7 @@
      coursePositiveFeedback {{ coursePositiveFeedback }}
      courseNegativeFeedback {{ courseNegativeFeedback }}
      mutationResult: {{ mutationResult }}
-    </pre>
+    </pre> -->
   </div>
 </template>
 
diff --git a/client/src/components/learningPath/FeedbackCompletition.vue b/client/src/components/learningPath/FeedbackCompletition.vue
index ee27de0d..deefc0e9 100644
--- a/client/src/components/learningPath/FeedbackCompletition.vue
+++ b/client/src/components/learningPath/FeedbackCompletition.vue
@@ -2,7 +2,7 @@
   <div>
     <h1 class="hidden lg:block lg:mb-12">{{ title }}</h1>
     <div
-      class="b-0 lg:border lg:border-gray-400 p-8 flex flex-col lg:items-center lg:flex-row"
+      class="b-0 lg:border lg:border-gray-400 lg:p-8 flex flex-col lg:items-center lg:flex-row"
     >
       <img :src="avatarUrl" class="w-16 h-16 rounded-full mb-6 lg:mr-12" />
       <h1 class="block lg:hidden mb-8">{{ title }}</h1>
diff --git a/client/src/components/learningPath/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue
index bf0f0df6..f070eac9 100644
--- a/client/src/components/learningPath/SelfEvaluation.vue
+++ b/client/src/components/learningPath/SelfEvaluation.vue
@@ -5,12 +5,14 @@ import * as log from "loglevel";
 
 import LearningContentContainer from "@/components/learningPath/LearningContentContainer.vue";
 import { COMPLETION_FAILURE, COMPLETION_SUCCESS } from "@/constants";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { computed, reactive } from "vue";
 import LearningContentNavigation from "./LearningContentNavigation.vue";
 
 log.debug("LearningContent.vue setup");
 
 const circleStore = useCircleStore();
+const courseSession = useCourseSessionsStore();
 
 const state = reactive({
   questionIndex: 0,
@@ -90,7 +92,12 @@ function handleBack() {
 
           <div class="mt-6 lg:mt-12">
             {{ $t("selfEvaluation.progressText") }}
-            {{ $t("selfEvaluation.progressLink") }}
+            <router-link
+              :to="courseSession.courseSessionForRoute?.competence_url || '/'"
+              class="text-primary-500 underline"
+            >
+              {{ $t("selfEvaluation.progressLink") }}
+            </router-link>
           </div>
         </div>
         <LearningContentNavigation
diff --git a/client/src/utils/typeMaps.ts b/client/src/utils/typeMaps.ts
index 85b73c7f..ac666119 100644
--- a/client/src/utils/typeMaps.ts
+++ b/client/src/utils/typeMaps.ts
@@ -26,6 +26,8 @@ export function learningContentTypeData(t: LearningContentType): {
       return { title: "Test", icon: "it-icon-lc-test" };
     case "resource":
       return { title: "Reflexion", icon: "it-icon-lc-resource" };
+    case "feedback":
+      return { title: "Feedback", icon: "it-icon-lc-feedback" };
     case "placeholder":
       return { title: "In Umsetzung", icon: "it-icon-lc-document" };
   }
diff --git a/server/vbv_lernwelt/learnpath/create_vv_learning_path.py b/server/vbv_lernwelt/learnpath/create_vv_learning_path.py
index d3f2a48a..e5ab5f14 100644
--- a/server/vbv_lernwelt/learnpath/create_vv_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_vv_learning_path.py
@@ -12,6 +12,7 @@ from vbv_lernwelt.course.models import CourseCategory, CoursePage
 from vbv_lernwelt.learnpath.tests.learning_path_factories import (
     AssignmentBlockFactory,
     CircleFactory,
+    FeedbackBlockFactory,
     LearningContentFactory,
     LearningModuleBlockFactory,
     LearningPathFactory,
@@ -931,6 +932,16 @@ def create_learning_content_beenden(parent):
             )
         ],
     )
+    LearningContentFactory(
+        title="Feedback",
+        parent=parent,
+        contents=[
+            (
+                "feedback",
+                FeedbackBlockFactory(),
+            )
+        ],
+    )
 
 
 def create_learning_content_transferauftrag(title, parent):
diff --git a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
index a6297068..c9fba17b 100644
--- a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
+++ b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
@@ -13,6 +13,7 @@ from vbv_lernwelt.learnpath.models_learning_unit_content import (
     BookBlock,
     DocumentBlock,
     ExerciseBlock,
+    FeedbackBlock,
     LearningModuleBlock,
     MediaLibraryBlock,
     OnlineTrainingBlock,
@@ -110,6 +111,13 @@ class TestBlockFactory(wagtail_factories.StructBlockFactory):
         model = TestBlock
 
 
+class FeedbackBlockFactory(wagtail_factories.StructBlockFactory):
+    description = "Beispiel Feedback"
+
+    class Meta:
+        model = FeedbackBlock
+
+
 class MediaLibraryBlockFactory(wagtail_factories.StructBlockFactory):
     description = "Sie erreichen die Mediathek mit einem Klick auf den unteren Link"
 
diff --git a/server/vbv_lernwelt/static/icons/icon-lc-feedback.svg b/server/vbv_lernwelt/static/icons/icon-lc-feedback.svg
new file mode 100644
index 00000000..f8424594
--- /dev/null
+++ b/server/vbv_lernwelt/static/icons/icon-lc-feedback.svg
@@ -0,0 +1,8 @@
+<svg viewBox="0 0 61 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M39.6694 37.824L37.2574 35.412L35.9854 36.684L39.0334 39.732C39.2134 39.912 39.4414 39.996 39.6694 39.996C39.8974 39.996 40.1254 39.912 40.3054 39.732L47.3493 32.688L46.0773 31.416L39.6694 37.824Z"
+          fill="black"/>
+    <path d="M55.0896 22.2839H28.2336C26.0136 22.2839 24.2136 24.0839 24.2136 26.3039V31.9319H14.4096C14.2536 31.9319 14.0976 31.9679 13.9536 32.0519L8.39762 35.2559V32.8319C8.39762 32.3399 7.98962 31.9319 7.49762 31.9319H5.56562C4.34162 31.9319 3.34562 30.9359 3.34562 29.7119V11.1839C3.34562 9.95994 4.34162 8.96394 5.56562 8.96394H32.4336C33.6576 8.96394 34.6536 9.95994 34.6536 11.1839V19.3679H36.4536V11.1839C36.4536 8.96394 34.6536 7.16394 32.4336 7.16394H5.57762C3.35762 7.16394 1.55762 8.96394 1.55762 11.1839V29.7119C1.55762 31.9319 3.35762 33.7319 5.57762 33.7319H6.60962V36.8159C6.60962 37.1399 6.77762 37.4399 7.06562 37.5959C7.20962 37.6799 7.36562 37.7159 7.52162 37.7159C7.67762 37.7159 7.83362 37.6799 7.97762 37.5959L14.6736 33.7319H24.2376V44.8319C24.2376 47.0519 26.0376 48.8519 28.2576 48.8519H46.0296L52.7256 52.7159C52.8696 52.7999 53.0256 52.8359 53.1816 52.8359C53.3376 52.8359 53.4936 52.7999 53.6376 52.7159C53.9136 52.5599 54.0936 52.2599 54.0936 51.9359V48.8519H55.1256C57.3456 48.8519 59.1456 47.0519 59.1456 44.8319V26.3039C59.1456 24.0839 57.3456 22.2839 55.1256 22.2839H55.0896ZM57.3096 44.8319C57.3096 46.0559 56.3136 47.0519 55.0896 47.0519H53.1576C52.6656 47.0519 52.2576 47.4599 52.2576 47.9519V50.3759L46.7016 47.1719C46.5696 47.0879 46.4136 47.0519 46.2456 47.0519H28.2216C26.9976 47.0519 26.0016 46.0559 26.0016 44.8319V26.3039C26.0016 25.0799 26.9976 24.0839 28.2216 24.0839H55.0776C56.3016 24.0839 57.2976 25.0799 57.2976 26.3039V44.8319H57.3096Z"
+          fill="black"/>
+    <path d="M29.4455 15.828H8.5415V17.628H29.4455V15.828Z" fill="black"/>
+    <path d="M18.9455 24.156H8.5415V25.956H18.9455V24.156Z" fill="black"/>
+</svg>