From 0ca1ab50f7f88633b29c6e9f19f13cefa0583194 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 31 Oct 2023 08:30:06 +0100
Subject: [PATCH] chore: loading indicator, ext links

---
 client/src/components/ui/LoadingSpinner.vue   | 21 ++++++++++++++++
 client/src/pages/dashboard/DashboardPage.vue  |  9 ++++++-
 .../dashboard/statistic/AssignmentList.vue    |  3 ++-
 .../dashboard/statistic/AttendanceList.vue    |  1 +
 .../dashboard/statistic/CompetenceList.vue    |  1 +
 .../dashboard/statistic/FeedbackList.vue      |  3 ++-
 .../statistic/StatisticParentPage.vue         |  6 ++++-
 client/src/stores/dashboard.ts                | 25 ++++++++++++-------
 8 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 client/src/components/ui/LoadingSpinner.vue

diff --git a/client/src/components/ui/LoadingSpinner.vue b/client/src/components/ui/LoadingSpinner.vue
new file mode 100644
index 00000000..34c7ca21
--- /dev/null
+++ b/client/src/components/ui/LoadingSpinner.vue
@@ -0,0 +1,21 @@
+<template>
+  <div role="status">
+    <svg
+      aria-hidden="true"
+      class="mr-2 h-8 w-8 animate-spin fill-blue-900 text-gray-200 dark:text-gray-600"
+      viewBox="0 0 100 101"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+        fill="currentColor"
+      />
+      <path
+        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+        fill="currentFill"
+      />
+    </svg>
+    <span class="sr-only">Loading...</span>
+  </div>
+</template>
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index d7c51aba..9d3aa97c 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -8,6 +8,7 @@ import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useDashboardStore } from "@/stores/dashboard";
 import type { DashboardType } from "@/gql/graphql";
 import SimpleListPage from "@/pages/dashboard/SimpleListPage.vue";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const dashboardStore = useDashboardStore();
 
@@ -26,7 +27,13 @@ onMounted(dashboardStore.loadDashboardDetails);
 </script>
 
 <template>
-  <div v-if="dashboardStore.currentDashboardConfig" class="flex flex-col lg:flex-row">
+  <div v-if="dashboardStore.loading" class="m-8 flex justify-center">
+    <LoadingSpinner />
+  </div>
+  <div
+    v-else-if="dashboardStore.currentDashboardConfig"
+    class="flex flex-col lg:flex-row"
+  >
     <main class="grow bg-gray-200 lg:order-2">
       <div class="m-8">
         <div class="mb-10 flex items-center justify-between">
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 82d4fd20..47c47063 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -65,7 +65,7 @@ const total = (metrics: AssignmentCompletionMetricsType) => {
                 {{ (item as AssignmentStatisticsRecordType).assignment_title }}
               </h4>
               <div>
-                {{ $t("a.Durchführung") }} «{{
+                {{ $t("a.Durchfuehrung") }} «{{
                   courseSessionName(item.course_session_id)
                 }}» - Circle «{{ circleMeta(item.circle_id)?.name }}»
               </div>
@@ -94,6 +94,7 @@ const total = (metrics: AssignmentCompletionMetricsType) => {
               ></ItProgress>
               <router-link
                 class="underline"
+                target="_blank"
                 :to="(item as AssignmentStatisticsRecordType).details_url"
               >
                 {{ $t("a.Details anschauen") }}
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index 16d5413a..96b65839 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -75,6 +75,7 @@ const attendanceStats = (present: number, total: number) => {
               ></ItProgress>
               <router-link
                 class="underline"
+                target="_blank"
                 :to="(item as PresenceRecordStatisticsType).details_url"
               >
                 {{ $t("a.Details anschauen") }}
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index bd51d063..660d9f91 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -57,6 +57,7 @@ const { courseSessionName, circleMeta } = useCourseStatistics();
               </div>
               <router-link
                 class="whitespace-nowrap underline"
+                target="_blank"
                 :to="(item as CompetenceRecordStatisticsType).details_url"
               >
                 {{ $t("a.Details anschauen") }}
diff --git a/client/src/pages/dashboard/statistic/FeedbackList.vue b/client/src/pages/dashboard/statistic/FeedbackList.vue
index 11fa009b..e8e659d1 100644
--- a/client/src/pages/dashboard/statistic/FeedbackList.vue
+++ b/client/src/pages/dashboard/statistic/FeedbackList.vue
@@ -42,7 +42,7 @@ const { courseSessionName, circleMeta } = useCourseStatistics();
                 Feedback: Circle «{{ circleMeta(item.circle_id)?.name }}»
               </h4>
               <div>
-                {{ $t("a.Durchführung") }} «{{
+                {{ $t("a.Durchfuehrung") }} «{{
                   courseSessionName(item.course_session_id)
                 }}» - Trainer: {{ circleMeta(item.circle_id)?.experts[0] }}
               </div>
@@ -66,6 +66,7 @@ const { courseSessionName, circleMeta } = useCourseStatistics();
               </div>
               <router-link
                 class="underline"
+                target="_blank"
                 :to="(item as PresenceRecordStatisticsType).details_url"
               >
                 {{ $t("a.Details anschauen") }}
diff --git a/client/src/pages/dashboard/statistic/StatisticParentPage.vue b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
index f63446fc..db9f5724 100644
--- a/client/src/pages/dashboard/statistic/StatisticParentPage.vue
+++ b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
 import { onMounted } from "vue";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const dashboardStore = useDashboardStore();
 onMounted(dashboardStore.loadDashboardDetails);
@@ -8,7 +9,10 @@ onMounted(dashboardStore.loadDashboardDetails);
 
 <template>
   <div class="bg-gray-200">
-    <div class="container-large flex flex-col space-y-8">
+    <div v-if="dashboardStore.loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="container-large flex flex-col space-y-8">
       <router-link class="btn-text inline-flex items-center pl-0" to="/">
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index cbe4f0f4..7286eec6 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -22,6 +22,7 @@ export const useDashboardStore = defineStore("dashboard", () => {
   > = {};
   const currentDashBoardData: Ref<CourseStatisticsType | CourseProgressType | null> =
     ref(null);
+  const loading = ref(false);
 
   const loadDashboardData = async (type: DashboardType, id: string) => {
     let data;
@@ -54,16 +55,21 @@ export const useDashboardStore = defineStore("dashboard", () => {
   };
 
   const loadDashboardDetails = async () => {
-    if (!currentDashboardConfig.value) {
-      await loadDashboardConfig();
-      return;
+    loading.value = true;
+    try {
+      if (!currentDashboardConfig.value) {
+        await loadDashboardConfig();
+        return;
+      }
+      const { id, dashboard_type } = currentDashboardConfig.value;
+      if (dashBoardDataCache[id]) {
+        currentDashBoardData.value = dashBoardDataCache[id];
+        return;
+      }
+      await loadDashboardData(dashboard_type, id);
+    } finally {
+      loading.value = false;
     }
-    const { id, dashboard_type } = currentDashboardConfig.value;
-    if (dashBoardDataCache[id]) {
-      currentDashBoardData.value = dashBoardDataCache[id];
-      return;
-    }
-    await loadDashboardData(dashboard_type, id);
   };
 
   return {
@@ -73,5 +79,6 @@ export const useDashboardStore = defineStore("dashboard", () => {
     loadDashboardConfig,
     loadDashboardDetails,
     currentDashBoardData,
+    loading,
   };
 });