From 47896444a6a5f71bf726e481675fe9f66eda88bd Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 4 Jul 2024 17:38:28 +0200
Subject: [PATCH 01/42] Make `ItDatePicker` component

---
 .../components/onboarding/PersonalAddress.vue | 38 +-----------
 .../personalProfile/ProfileEdit.vue           |  4 ++
 client/src/components/ui/ItDatePicker.vue     | 59 +++++++++++++++++++
 3 files changed, 65 insertions(+), 36 deletions(-)
 create mode 100644 client/src/components/ui/ItDatePicker.vue

diff --git a/client/src/components/onboarding/PersonalAddress.vue b/client/src/components/onboarding/PersonalAddress.vue
index e40dd405..c4fcbeea 100644
--- a/client/src/components/onboarding/PersonalAddress.vue
+++ b/client/src/components/onboarding/PersonalAddress.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useEntities } from "@/services/entities";
-import VueDatePicker from "@vuepic/vue-datepicker";
 import "@vuepic/vue-datepicker/dist/main.css";
 import { t } from "i18next";
-import { useUserStore } from "@/stores/user";
+import ItDatePicker from "@/components/ui/ItDatePicker.vue";
 
 const props = defineProps<{
   modelValue: {
@@ -25,7 +24,6 @@ const props = defineProps<{
 const emit = defineEmits(["update:modelValue"]);
 
 const { countries } = useEntities();
-const userStore = useUserStore();
 
 const paymentMethods = [
   { value: "credit_card", label: t("a.Debit-/Kreditkarte/Twint") },
@@ -234,40 +232,8 @@ const address = computed({
         {{ $t("a.Geburtsdatum") }}
       </label>
       <div class="mt-2">
-        <VueDatePicker
-          v-model="address.birth_date"
-          format="dd.MM.yyyy"
-          no-today
-          model-type="yyyy-MM-dd"
-          name="birth-date"
-          max-date="2007-01-01"
-          prevent-min-max-navigation
-          required
-          :enable-time-picker="false"
-          text-input
-          placeholder="15.06.1982"
-          start-date="1982-01-01"
-          :locale="userStore.language"
-          :cancel-text="$t('a.Abbrechen')"
-          :select-text="$t('a.Auswählen')"
-        ></VueDatePicker>
+        <ItDatePicker v-model="address.birth_date"></ItDatePicker>
       </div>
     </div>
   </div>
 </template>
-
-<style>
-/* Theming for date picker */
-.dp__theme_light {
-  --dp-text-color: #585f63;
-  --dp-primary-color: #41b5fa;
-  --dp-border-color-focus: #3d6dcc;
-}
-
-:root {
-  --dp-font-family: "Buenos Aires" sans-serif;
-  --dp-border-radius: none;
-  --dp-font-size: 0.875rem;
-  --dp-cell-border-radius: none;
-}
-</style>
diff --git a/client/src/components/personalProfile/ProfileEdit.vue b/client/src/components/personalProfile/ProfileEdit.vue
index 77d0da8d..6a928e1b 100644
--- a/client/src/components/personalProfile/ProfileEdit.vue
+++ b/client/src/components/personalProfile/ProfileEdit.vue
@@ -21,6 +21,10 @@ const formData = ref({
   postal_code: user.postal_code,
   city: user.city,
   country_code: user.country?.country_code,
+
+  phone_number: user.phone_number,
+  birth_date: user.birth_date,
+
   organisation: user.organisation,
   organisation_street: user.organisation_street,
   organisation_street_number: user.organisation_street_number,
diff --git a/client/src/components/ui/ItDatePicker.vue b/client/src/components/ui/ItDatePicker.vue
new file mode 100644
index 00000000..4ded7f00
--- /dev/null
+++ b/client/src/components/ui/ItDatePicker.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import { useUserStore } from "@/stores/user";
+import VueDatePicker from "@vuepic/vue-datepicker";
+import { defineProps, withDefaults, defineModel } from "vue";
+
+const model = defineModel<string>();
+
+export interface Props {
+  noToday?: boolean;
+  required?: boolean;
+  placeholder?: string;
+  startDate?: string;
+  maxDate?: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  required: false,
+  placeholder: "15.06.1982",
+  startDate: "1982-01-01",
+  maxDate: "2007-01-01",
+});
+
+const userStore = useUserStore();
+</script>
+
+<template>
+  <VueDatePicker
+    v-model="model"
+    format="dd.MM.yyyy"
+    model-type="yyyy-MM-dd"
+    name="date"
+    prevent-min-max-navigation
+    :required="props.required"
+    :enable-time-picker="false"
+    text-input
+    :no-today="props.noToday"
+    :max-date="props.maxDate"
+    :placeholder="props.placeholder"
+    :start-date="props.startDate"
+    :locale="userStore.language"
+    :cancel-text="$t('a.Abbrechen')"
+    :select-text="$t('a.Auswählen')"
+  ></VueDatePicker>
+</template>
+
+<style>
+.dp__theme_light {
+  --dp-text-color: #585f63;
+  --dp-primary-color: #41b5fa;
+  --dp-border-color-focus: #3d6dcc;
+}
+
+:root {
+  --dp-font-family: "Buenos Aires" sans-serif;
+  --dp-border-radius: none;
+  --dp-font-size: 0.875rem;
+  --dp-cell-border-radius: none;
+}
+</style>

From d56c346512fb33f889496f6c5df9b678a6de8381 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 16 Jul 2024 10:58:58 +0200
Subject: [PATCH 02/42] Add more editable profile fields

---
 .../personalProfile/ProfileEdit.vue           | 48 +++++++++-
 .../personalProfile/ProfileView.vue           | 95 ++++++++++++-------
 client/src/components/ui/ItDatePicker.vue     |  1 +
 client/src/pages/StyleGuidePage.vue           |  9 ++
 server/vbv_lernwelt/core/models.py            |  3 +-
 5 files changed, 121 insertions(+), 35 deletions(-)

diff --git a/client/src/components/personalProfile/ProfileEdit.vue b/client/src/components/personalProfile/ProfileEdit.vue
index 6a928e1b..e668857a 100644
--- a/client/src/components/personalProfile/ProfileEdit.vue
+++ b/client/src/components/personalProfile/ProfileEdit.vue
@@ -3,6 +3,8 @@ import { useEntities } from "@/services/entities";
 import AvatarImage from "@/components/ui/AvatarImage.vue";
 import { ref } from "vue";
 import { type User, useUserStore } from "@/stores/user";
+import ItDatePicker from "@/components/ui/ItDatePicker.vue";
+import { normalizeSwissPhoneNumber } from "@/utils/phone";
 
 const emit = defineEmits(["cancel", "save"]);
 
@@ -26,6 +28,7 @@ const formData = ref({
   birth_date: user.birth_date,
 
   organisation: user.organisation,
+  organisation_detail_name: user.organisation_detail_name,
   organisation_street: user.organisation_street,
   organisation_street_number: user.organisation_street_number,
   organisation_postal_code: user.organisation_postal_code,
@@ -35,7 +38,8 @@ const formData = ref({
 });
 
 async function save() {
-  const { country_code, organisation_country_code, ...profileData } = formData.value;
+  const { country_code, organisation_country_code, phone_number, ...profileData } =
+    formData.value;
   const typedProfileData: Partial<User> = { ...profileData };
 
   typedProfileData.country = countries.value.find(
@@ -45,6 +49,10 @@ async function save() {
     (c) => c.country_code === organisation_country_code
   );
 
+  if (phone_number) {
+    typedProfileData.phone_number = normalizeSwissPhoneNumber(phone_number);
+  }
+
   await user.updateUserProfile(typedProfileData);
   emit("save");
 }
@@ -130,6 +138,28 @@ async function avatarUpload(e: Event) {
         disabled
         class="disabled:bg-gray-50 mb-4 block w-full border-0 py-1.5 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 disabled:cursor-not-allowed disabled:text-gray-500 disabled:ring-gray-200 sm:max-w-sm sm:text-sm sm:leading-6"
       />
+
+      <label for="phone" class="block pb-1.5 leading-6">
+        {{ $t("a.Telefonnummer") }}
+      </label>
+      <div>
+        <input
+          id="phone"
+          v-model="formData.phone_number"
+          type="text"
+          name="phone"
+          autocomplete="phone-number"
+          class="disabled:bg-gray-50 mb-4 block w-full border-0 py-1.5 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 disabled:cursor-not-allowed disabled:text-gray-500 disabled:ring-gray-200 sm:max-w-sm sm:text-sm sm:leading-6"
+        />
+      </div>
+
+      <label for="birth-date" class="block pb-1.5 leading-6">
+        {{ $t("a.Geburtsdatum") }}
+      </label>
+      <div class="mb-4 block w-full py-1.5 sm:max-w-sm sm:text-sm sm:leading-6">
+        <ItDatePicker v-model="formData.birth_date"></ItDatePicker>
+      </div>
+
       <label class="block pb-1.5 leading-6">
         {{ $t("a.Profilbild") }}
       </label>
@@ -268,6 +298,22 @@ async function avatarUpload(e: Event) {
         {{ $t("a.Firmenanschrift") }}
       </h4>
 
+      <div class="flex flex-col justify-start md:flex-row md:space-x-4">
+        <div class="w-full md:max-w-lg">
+          <label for="org-street-address" class="block pb-1.5 leading-6">
+            {{ $t("a.Name") }}
+          </label>
+
+          <input
+            id="org-detail-name"
+            v-model="formData.organisation_detail_name"
+            type="text"
+            name="org-detail-name"
+            class="disabled:bg-gray-50 mb-4 block w-full border-0 py-1.5 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 disabled:cursor-not-allowed disabled:text-gray-500 disabled:ring-gray-200 sm:text-sm sm:leading-6"
+          />
+        </div>
+      </div>
+
       <div class="flex flex-col justify-start md:flex-row md:space-x-4">
         <div class="w-full md:max-w-sm">
           <label for="org-street-address" class="block pb-1.5 leading-6">
diff --git a/client/src/components/personalProfile/ProfileView.vue b/client/src/components/personalProfile/ProfileView.vue
index b5d2d06e..b41779c7 100644
--- a/client/src/components/personalProfile/ProfileView.vue
+++ b/client/src/components/personalProfile/ProfileView.vue
@@ -3,6 +3,8 @@ import { useUserStore } from "@/stores/user";
 import { computed } from "vue";
 import { useEntities } from "@/services/entities";
 import { useTranslation } from "i18next-vue";
+import dayjs from "dayjs";
+import { displaySwissPhoneNumber } from "@/utils/phone";
 
 const { t } = useTranslation();
 
@@ -10,21 +12,20 @@ const user = useUserStore();
 const { organisations } = useEntities();
 
 const privateAddress = computed(() => {
-  let addressText = `${user.street} ${user.street_number}`.trim();
-  if (user.postal_code || user.city) {
-    if (addressText.length) {
-      addressText += ", ";
-    }
-    addressText += `${user.postal_code} ${user.city}`;
-  }
-  if (user.country) {
-    if (addressText.length) {
-      addressText += ", ";
-    }
-    addressText += user.country.name;
+  const textParts = [];
+
+  if (user.street || user.street_number) {
+    textParts.push(`${user.street} ${user.street_number}`.trim());
   }
 
-  return addressText.trim();
+  if (user.postal_code || user.city) {
+    textParts.push(`${user.postal_code} ${user.city}`);
+  }
+  if (textParts.length && user.country) {
+    textParts.push(user.country.name);
+  }
+
+  return textParts;
 });
 
 const organisationName = computed(() => {
@@ -36,22 +37,25 @@ const organisationName = computed(() => {
 });
 
 const orgAddress = computed(() => {
-  let addressText =
-    `${user.organisation_street} ${user.organisation_street_number}`.trim();
-  if (user.organisation_postal_code || user.organisation_city) {
-    if (addressText.length) {
-      addressText += ", ";
-    }
-    addressText += `${user.organisation_postal_code} ${user.organisation_city}`;
-  }
-  if (user.organisation_country) {
-    if (addressText.length) {
-      addressText += ", ";
-    }
-    addressText += user.organisation_country.name;
+  const textParts = [];
+
+  if (user.organisation_detail_name) {
+    textParts.push(user.organisation_detail_name);
   }
 
-  return addressText.trim();
+  if (user.organisation_street || user.organisation_street_number) {
+    textParts.push(
+      `${user.organisation_street} ${user.organisation_street_number}`.trim()
+    );
+  }
+  if (user.organisation_postal_code || user.organisation_city) {
+    textParts.push(`${user.organisation_postal_code} ${user.organisation_city}`);
+  }
+  if (textParts.length && user.organisation_country) {
+    textParts.push(user.organisation_country.name);
+  }
+
+  return textParts;
 });
 
 const invoiceAddress = computed(() => {
@@ -74,13 +78,34 @@ const invoiceAddress = computed(() => {
         {{ $t("a.E-Mail Adresse") }}
       </label>
       <div class="mb-3 sm:col-span-2 sm:mb-0">{{ user.email }}</div>
+      <label class="block font-semibold leading-6">
+        {{ $t("a.Telefonnummer") }}
+      </label>
+      <div class="mb-3 sm:col-span-2 sm:mb-0">
+        <span v-if="user.phone_number">
+          {{ displaySwissPhoneNumber(user.phone_number) }}
+        </span>
+        <span v-else class="text-gray-800">{{ $t("a.Keine Angabe") }}</span>
+      </div>
+      <label class="block font-semibold leading-6">
+        {{ $t("a.Geburtsdatum") }}
+      </label>
+      <div class="mb-3 sm:col-span-2 sm:mb-0">
+        <span v-if="user.birth_date">
+          {{ dayjs(user.birth_date).format("DD.MM.YYYY") }}
+        </span>
+        <span v-else class="text-gray-800">{{ $t("a.Keine Angabe") }}</span>
+      </div>
       <label class="block font-semibold leading-6">
         {{ $t("a.Privatadresse") }}
       </label>
       <div class="mb-3 sm:col-span-2 sm:mb-0">
-        <template v-if="privateAddress">
-          {{ privateAddress }}
-        </template>
+        <div v-if="privateAddress.length">
+          <span v-for="(line, index) in privateAddress" :key="index">
+            {{ line }}
+            <br />
+          </span>
+        </div>
         <span v-else class="text-gray-800">{{ $t("a.Keine Angabe") }}</span>
       </div>
     </div>
@@ -94,9 +119,13 @@ const invoiceAddress = computed(() => {
         {{ $t("a.Firmenanschrift") }}
       </label>
       <div class="sm:col-span-2">
-        <template v-if="orgAddress">
-          {{ orgAddress }}
-        </template>
+        <!-- eslint-disable vue/no-v-html -->
+        <div v-if="orgAddress">
+          <span v-for="(line, index) in orgAddress" :key="index">
+            {{ line }}
+            <br />
+          </span>
+        </div>
         <span v-else class="text-gray-800">{{ $t("a.Keine Angabe") }}</span>
       </div>
     </div>
diff --git a/client/src/components/ui/ItDatePicker.vue b/client/src/components/ui/ItDatePicker.vue
index 4ded7f00..4c44f46d 100644
--- a/client/src/components/ui/ItDatePicker.vue
+++ b/client/src/components/ui/ItDatePicker.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { useUserStore } from "@/stores/user";
 import VueDatePicker from "@vuepic/vue-datepicker";
+import "@vuepic/vue-datepicker/dist/main.css";
 import { defineProps, withDefaults, defineModel } from "vue";
 
 const model = defineModel<string>();
diff --git a/client/src/pages/StyleGuidePage.vue b/client/src/pages/StyleGuidePage.vue
index 1cb4a1e3..26f791bb 100644
--- a/client/src/pages/StyleGuidePage.vue
+++ b/client/src/pages/StyleGuidePage.vue
@@ -13,6 +13,8 @@ import VerticalBarChart from "@/components/ui/VerticalBarChart.vue";
 import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPathCircle.vue";
 import logger from "loglevel";
 import { reactive, ref } from "vue";
+import VueDatePicker from "@vuepic/vue-datepicker";
+import "@vuepic/vue-datepicker/dist/main.css";
 
 const state = reactive({
   checkboxValue: true,
@@ -34,6 +36,8 @@ const state = reactive({
   },
 });
 
+const birtDate = ref("1982-06-15");
+
 const dropdownData = [
   {
     title: "Option 1",
@@ -411,6 +415,11 @@ function log(data: any) {
     ></ItDropdownSelect>
     {{ state.dropdownSelected }}
 
+    <h2 class="mb-8 mt-8">Date Picker</h2>
+    <div class="mt-2">
+      <VueDatePicker v-model="birthDate"></VueDatePicker>
+    </div>
+
     <h2 class="mb-8 mt-8">Checkbox</h2>
 
     <ItCheckbox
diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py
index a1b09008..9d0ca936 100644
--- a/server/vbv_lernwelt/core/models.py
+++ b/server/vbv_lernwelt/core/models.py
@@ -114,8 +114,9 @@ class User(AbstractUser):
         blank=True,
     )
 
-    # fields gathered from cembra pay form
     birth_date = models.DateField(null=True, blank=True)
+
+    # phone number should be stored in the format +41792018586 (not validated)
     phone_number = models.CharField(max_length=255, blank=True, default="")
 
     # is only set by abacus invoice export code

From f0acdaf2549ecd30bdbe3d3ed212cbcc03e668cc Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 16 Jul 2024 14:51:44 +0200
Subject: [PATCH 03/42] Add custom organisation name

---
 .../onboarding/OrganisationAddress.vue        |  2 +-
 client/src/consts.ts                          | 19 ++++++
 .../src/pages/onboarding/AccountProfile.vue   | 60 +++++++++++++------
 .../pages/onboarding/vv/CheckoutAddress.vue   | 19 ++++--
 client/src/services/onboarding.ts             | 13 ++++
 server/vbv_lernwelt/course/consts.py          |  7 +++
 6 files changed, 96 insertions(+), 24 deletions(-)
 create mode 100644 client/src/consts.ts

diff --git a/client/src/components/onboarding/OrganisationAddress.vue b/client/src/components/onboarding/OrganisationAddress.vue
index b8b59889..e56e33cd 100644
--- a/client/src/components/onboarding/OrganisationAddress.vue
+++ b/client/src/components/onboarding/OrganisationAddress.vue
@@ -34,7 +34,7 @@ const orgAddress = computed({
         for="company-name"
         class="block text-sm font-medium leading-6 text-gray-900"
       >
-        {{ $t("a.Name") }}
+        {{ $t("a.Firmenname") }}
       </label>
       <div class="mt-2">
         <input
diff --git a/client/src/consts.ts b/client/src/consts.ts
new file mode 100644
index 00000000..25801247
--- /dev/null
+++ b/client/src/consts.ts
@@ -0,0 +1,19 @@
+// Course IDs
+export const COURSE_TEST_ID = -1;
+export const COURSE_UK = -3;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_ID = -4;
+export const COURSE_UK_FR = -5;
+export const COURSE_UK_TRAINING = -6;
+export const COURSE_UK_TRAINING_FR = -7;
+export const COURSE_UK_IT = -8;
+export const COURSE_UK_TRAINING_IT = -9;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID = -10;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID = -11;
+export const COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID = -12;
+export const COURSE_MOTORFAHRZEUG_PRUEFUNG_ID = -13;
+
+// Organization IDs
+export const ORGANISATION_OTHER_BROKER_ID = 1;
+export const ORGANISATION_OTHER_HEALTH_INSURANCE_ID = 2;
+export const ORGANISATION_OTHER_PRIVATE_INSURANCE_ID = 3;
+export const ORGANISATION_NO_COMPANY_ID = 31;
\ No newline at end of file
diff --git a/client/src/pages/onboarding/AccountProfile.vue b/client/src/pages/onboarding/AccountProfile.vue
index 4a0d780b..2982a9a3 100644
--- a/client/src/pages/onboarding/AccountProfile.vue
+++ b/client/src/pages/onboarding/AccountProfile.vue
@@ -3,9 +3,9 @@ import WizardPage from "@/components/onboarding/WizardPage.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useUserStore } from "@/stores/user";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useTranslation } from "i18next-vue";
-import { profileNextRoute } from "@/services/onboarding";
+import { isOtherOrganisation, profileNextRoute } from "@/services/onboarding";
 import { useEntities } from "@/services/entities";
 import AvatarImage from "@/components/ui/AvatarImage.vue";
 
@@ -13,9 +13,12 @@ const { t } = useTranslation();
 
 const user = useUserStore();
 const route = useRoute();
+const router = useRouter();
 
 const { organisations } = useEntities();
 
+const organisationDetailName = ref<string>("");
+
 const selectedOrganisation = ref({
   id: 0,
   name: t("a.Auswählen"),
@@ -35,7 +38,11 @@ watch(
 );
 
 const validOrganisation = computed(() => {
-  return selectedOrganisation.value.id !== 0;
+  const organisationSelected = selectedOrganisation.value.id !== 0;
+  const organisationNameSet =
+    !isOtherOrganisation(selectedOrganisation.value.id) ||
+    !!organisationDetailName.value.trim();
+  return organisationSelected && organisationNameSet;
 });
 
 const avatarError = ref(false);
@@ -56,15 +63,21 @@ async function avatarUpload(e: Event) {
   }
 }
 
-watch(selectedOrganisation, async (organisation) => {
+async function updateUserProfile() {
   await user.updateUserProfile({
-    organisation: organisation.id,
+    organisation: selectedOrganisation.value.id,
+    organisation_detail_name: organisationDetailName.value.trim(),
   });
-});
+}
 
 const nextRoute = computed(() => {
   return profileNextRoute(route.params.courseType);
 });
+
+async function navigateNextRoute() {
+  await updateUserProfile();
+  await router.push({ name: nextRoute.value });
+}
 </script>
 
 <template>
@@ -86,6 +99,19 @@ const nextRoute = computed(() => {
 
       <ItDropdownSelect v-model="selectedOrganisation" :items="organisations" />
 
+      <div v-if="isOtherOrganisation(selectedOrganisation.id)" class="my-8">
+        <label for="organisationDetailName" class="block pb-1.5 heading-3">
+          {{ $t("a.Firmenname") }}
+        </label>
+        <input
+          id="organisationDetailName"
+          v-model="organisationDetailName"
+          type="text"
+          name="phone"
+          class="block w-full border-0 py-1.5 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-blue-600 disabled:cursor-not-allowed disabled:text-gray-500 disabled:ring-gray-200 sm:max-w-sm sm:text-sm sm:leading-6"
+        />
+      </div>
+
       <div class="mt-16 flex flex-col justify-between gap-12 lg:flex-row lg:gap-24">
         <div>
           <h3 class="mb-3">{{ $t("a.Profilbild") }}</h3>
@@ -117,18 +143,16 @@ const nextRoute = computed(() => {
     </template>
 
     <template #footer>
-      <router-link v-slot="{ navigate }" :to="{ name: nextRoute }" custom>
-        <button
-          :disabled="!validOrganisation"
-          class="btn-blue flex items-center"
-          role="link"
-          data-cy="continue-button"
-          @click="navigate"
-        >
-          {{ $t("general.next") }}
-          <it-icon-arrow-right class="it-icon ml-2 h-6 w-6" />
-        </button>
-      </router-link>
+      <button
+        :disabled="!validOrganisation"
+        class="btn-blue flex items-center"
+        role="link"
+        data-cy="continue-button"
+        @click="navigateNextRoute"
+      >
+        {{ $t("general.next") }}
+        <it-icon-arrow-right class="it-icon ml-2 h-6 w-6" />
+      </button>
     </template>
   </WizardPage>
 </template>
diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index f8ff17ef..76e5a6ed 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -13,6 +13,12 @@ import DatatransCembraDeviceFingerprint from "@/components/onboarding/DatatransC
 import { getLocalSessionKey } from "@/statistics";
 import log from "loglevel";
 import { normalizeSwissPhoneNumber, validatePhoneNumber } from "@/utils/phone";
+import {
+  ORGANISATION_NO_COMPANY_ID,
+  ORGANISATION_OTHER_BROKER_ID,
+  ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+  ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+} from "@/consts";
 
 const props = defineProps({
   courseType: {
@@ -31,11 +37,14 @@ const userOrganisationName = computed(() => {
   }
 
   // Those IDs do not represent a company
-  // 1: Other broker
-  // 2: Other insurance
-  // 3: Other private insurance
-  // 31: No company relation
-  if ([1, 2, 3, 31].includes(user.organisation)) {
+  if (
+    [
+      ORGANISATION_OTHER_BROKER_ID,
+      ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+      ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+      ORGANISATION_NO_COMPANY_ID,
+    ].includes(user.organisation)
+  ) {
     return null;
   }
 
diff --git a/client/src/services/onboarding.ts b/client/src/services/onboarding.ts
index 24b59a48..9c59ef48 100644
--- a/client/src/services/onboarding.ts
+++ b/client/src/services/onboarding.ts
@@ -1,4 +1,9 @@
 import { isString, startsWith } from "lodash";
+import {
+  ORGANISATION_OTHER_BROKER_ID,
+  ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+  ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+} from "@/consts";
 
 export function profileNextRoute(courseType: string | string[]) {
   if (courseType === "uk") {
@@ -10,3 +15,11 @@ export function profileNextRoute(courseType: string | string[]) {
   }
   return "";
 }
+
+export function isOtherOrganisation(orgId: number) {
+  return [
+    ORGANISATION_OTHER_BROKER_ID,
+    ORGANISATION_OTHER_HEALTH_INSURANCE_ID,
+    ORGANISATION_OTHER_PRIVATE_INSURANCE_ID,
+  ].includes(orgId);
+}
diff --git a/server/vbv_lernwelt/course/consts.py b/server/vbv_lernwelt/course/consts.py
index a0dd7b27..a9949458 100644
--- a/server/vbv_lernwelt/course/consts.py
+++ b/server/vbv_lernwelt/course/consts.py
@@ -28,3 +28,10 @@ UK_COURSE_IDS = [
     COURSE_UK_TRAINING_FR,
     COURSE_UK_TRAINING_IT,
 ]
+
+
+# Organization IDs
+ORGANISATION_OTHER_BROKER_ID = 1
+ORGANISATION_OTHER_HEALTH_INSURANCE_ID = 2
+ORGANISATION_OTHER_PRIVATE_INSURANCE_ID = 3
+ORGANISATION_NO_COMPANY_ID = 31

From aa30dadfd788f78acb1d866030eb3b922ddf59ef Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 16 Jul 2024 15:20:25 +0200
Subject: [PATCH 04/42] Update cypress tests

---
 .../personalProfile/ProfileEdit.vue           |   4 +-
 .../personalProfile/ProfileView.vue           |  23 ++--
 client/src/consts.ts                          |   2 +-
 client/src/pages/StyleGuidePage.vue           |   8 --
 .../src/pages/onboarding/AccountProfile.vue   |   2 +-
 .../personalProfile/PersonalProfilePage.vue   |   6 +-
 cypress/e2e/checkout-vv/checkout.cy.js        | 121 +++++++++++++-----
 cypress/e2e/profile/profile.cy.js             |  85 ++++++++++++
 cypress/support/commands.js                   |  11 ++
 server/vbv_lernwelt/core/serializers.py       |   6 +
 10 files changed, 212 insertions(+), 56 deletions(-)
 create mode 100644 cypress/e2e/profile/profile.cy.js

diff --git a/client/src/components/personalProfile/ProfileEdit.vue b/client/src/components/personalProfile/ProfileEdit.vue
index e668857a..398e363a 100644
--- a/client/src/components/personalProfile/ProfileEdit.vue
+++ b/client/src/components/personalProfile/ProfileEdit.vue
@@ -301,7 +301,7 @@ async function avatarUpload(e: Event) {
       <div class="flex flex-col justify-start md:flex-row md:space-x-4">
         <div class="w-full md:max-w-lg">
           <label for="org-street-address" class="block pb-1.5 leading-6">
-            {{ $t("a.Name") }}
+            {{ $t("a.Firmenname") }}
           </label>
 
           <input
@@ -439,7 +439,7 @@ async function avatarUpload(e: Event) {
     <button class="btn btn-secondary" @click="emit('cancel')">
       {{ $t("general.cancel") }}
     </button>
-    <button class="btn btn-primary" @click="save">
+    <button class="btn btn-primary" data-cy="saveButton" @click="save">
       {{ $t("general.save") }}
     </button>
   </div>
diff --git a/client/src/components/personalProfile/ProfileView.vue b/client/src/components/personalProfile/ProfileView.vue
index b41779c7..ac2e494c 100644
--- a/client/src/components/personalProfile/ProfileView.vue
+++ b/client/src/components/personalProfile/ProfileView.vue
@@ -71,17 +71,21 @@ const invoiceAddress = computed(() => {
     <h3 class="mb-2">{{ $t("a.Persönliche Informationen") }}</h3>
     <div class="sm:grid sm:grid-cols-3 sm:items-start sm:gap-8 sm:py-6">
       <label class="block font-semibold leading-6">{{ $t("a.Vorname") }}</label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">{{ user.first_name }}</div>
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="firstName">
+        {{ user.first_name }}
+      </div>
       <label class="block font-semibold leading-6">{{ $t("a.Name") }}</label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">{{ user.last_name }}</div>
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="lastName">
+        {{ user.last_name }}
+      </div>
       <label class="block font-semibold leading-6">
         {{ $t("a.E-Mail Adresse") }}
       </label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">{{ user.email }}</div>
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="email">{{ user.email }}</div>
       <label class="block font-semibold leading-6">
         {{ $t("a.Telefonnummer") }}
       </label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="phone">
         <span v-if="user.phone_number">
           {{ displaySwissPhoneNumber(user.phone_number) }}
         </span>
@@ -90,7 +94,7 @@ const invoiceAddress = computed(() => {
       <label class="block font-semibold leading-6">
         {{ $t("a.Geburtsdatum") }}
       </label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="birthDate">
         <span v-if="user.birth_date">
           {{ dayjs(user.birth_date).format("DD.MM.YYYY") }}
         </span>
@@ -99,7 +103,7 @@ const invoiceAddress = computed(() => {
       <label class="block font-semibold leading-6">
         {{ $t("a.Privatadresse") }}
       </label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="privateAddress">
         <div v-if="privateAddress.length">
           <span v-for="(line, index) in privateAddress" :key="index">
             {{ line }}
@@ -114,13 +118,14 @@ const invoiceAddress = computed(() => {
     <h3 class="my-2">{{ $t("a.Geschäftsdaten") }}</h3>
     <div class="sm:grid sm:grid-cols-3 sm:items-start sm:gap-8 sm:py-6">
       <label class="block font-semibold leading-6">{{ $t("a.Unternehmen") }}</label>
-      <div class="mb-3 sm:col-span-2 sm:mb-0">{{ organisationName }}</div>
+      <div class="mb-3 sm:col-span-2 sm:mb-0" data-cy="organisationDetailName">
+        {{ organisationName }}
+      </div>
       <label class="block font-semibold leading-6">
         {{ $t("a.Firmenanschrift") }}
       </label>
       <div class="sm:col-span-2">
-        <!-- eslint-disable vue/no-v-html -->
-        <div v-if="orgAddress">
+        <div v-if="orgAddress" data-cy="organisationAddress">
           <span v-for="(line, index) in orgAddress" :key="index">
             {{ line }}
             <br />
diff --git a/client/src/consts.ts b/client/src/consts.ts
index 25801247..656714c7 100644
--- a/client/src/consts.ts
+++ b/client/src/consts.ts
@@ -16,4 +16,4 @@ export const COURSE_MOTORFAHRZEUG_PRUEFUNG_ID = -13;
 export const ORGANISATION_OTHER_BROKER_ID = 1;
 export const ORGANISATION_OTHER_HEALTH_INSURANCE_ID = 2;
 export const ORGANISATION_OTHER_PRIVATE_INSURANCE_ID = 3;
-export const ORGANISATION_NO_COMPANY_ID = 31;
\ No newline at end of file
+export const ORGANISATION_NO_COMPANY_ID = 31;
diff --git a/client/src/pages/StyleGuidePage.vue b/client/src/pages/StyleGuidePage.vue
index 26f791bb..25ff5db5 100644
--- a/client/src/pages/StyleGuidePage.vue
+++ b/client/src/pages/StyleGuidePage.vue
@@ -13,7 +13,6 @@ import VerticalBarChart from "@/components/ui/VerticalBarChart.vue";
 import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPathCircle.vue";
 import logger from "loglevel";
 import { reactive, ref } from "vue";
-import VueDatePicker from "@vuepic/vue-datepicker";
 import "@vuepic/vue-datepicker/dist/main.css";
 
 const state = reactive({
@@ -36,8 +35,6 @@ const state = reactive({
   },
 });
 
-const birtDate = ref("1982-06-15");
-
 const dropdownData = [
   {
     title: "Option 1",
@@ -415,11 +412,6 @@ function log(data: any) {
     ></ItDropdownSelect>
     {{ state.dropdownSelected }}
 
-    <h2 class="mb-8 mt-8">Date Picker</h2>
-    <div class="mt-2">
-      <VueDatePicker v-model="birthDate"></VueDatePicker>
-    </div>
-
     <h2 class="mb-8 mt-8">Checkbox</h2>
 
     <ItCheckbox
diff --git a/client/src/pages/onboarding/AccountProfile.vue b/client/src/pages/onboarding/AccountProfile.vue
index 2982a9a3..727dd96e 100644
--- a/client/src/pages/onboarding/AccountProfile.vue
+++ b/client/src/pages/onboarding/AccountProfile.vue
@@ -100,7 +100,7 @@ async function navigateNextRoute() {
       <ItDropdownSelect v-model="selectedOrganisation" :items="organisations" />
 
       <div v-if="isOtherOrganisation(selectedOrganisation.id)" class="my-8">
-        <label for="organisationDetailName" class="block pb-1.5 heading-3">
+        <label for="organisationDetailName" class="heading-3 block pb-1.5">
           {{ $t("a.Firmenname") }}
         </label>
         <input
diff --git a/client/src/pages/personalProfile/PersonalProfilePage.vue b/client/src/pages/personalProfile/PersonalProfilePage.vue
index 01903add..99312b07 100644
--- a/client/src/pages/personalProfile/PersonalProfilePage.vue
+++ b/client/src/pages/personalProfile/PersonalProfilePage.vue
@@ -45,7 +45,11 @@ function startEditMode() {
 
     <div class="flex flex-grow flex-col space-y-4 px-8 py-8 md:px-16">
       <div v-if="!editMode" class="flex justify-end space-x-4">
-        <button class="btn btn-secondary" @click="startEditMode">
+        <button
+          class="btn btn-secondary"
+          data-cy="editProfileButton"
+          @click="startEditMode"
+        >
           {{ $t("a.Profil bearbeiten") }}
         </button>
       </div>
diff --git a/cypress/e2e/checkout-vv/checkout.cy.js b/cypress/e2e/checkout-vv/checkout.cy.js
index 00f39ac7..e6007b44 100644
--- a/cypress/e2e/checkout-vv/checkout.cy.js
+++ b/cypress/e2e/checkout-vv/checkout.cy.js
@@ -17,22 +17,31 @@ describe("checkout.cy.js", () => {
 
     cy.get('[data-cy="account-confirm-title"]').should(
       "contain",
-      "Konto erstellen"
+      "Konto erstellen",
     );
     cy.get('[data-cy="continue-button"]').click();
 
     cy.get('[data-cy="account-profile-title"]').should(
       "contain",
-      "Profil ergänzen"
+      "Profil ergänzen",
     );
     cy.get('[data-cy="dropdown-select"]').click();
-    cy.get('[data-cy="dropdown-select-option-Baloise"]').click();
+    cy.get(
+      '[data-cy="dropdown-select-option-andere Krankenversicherer"]',
+    ).click();
+    cy.get("#organisationDetailName").type("FdH GmbH");
     cy.get('[data-cy="continue-button"]').click();
 
+    cy.loadUser("id", TEST_USER_EMPTY_ID).then((u) => {
+      expect(u.organisation_detail_name).to.equal("FdH GmbH");
+      // 2 -> andere Krankenversicherer
+      expect(u.organisation).to.equal(2);
+    });
+
     // Adressdaten ausfüllen
     cy.get('[data-cy="account-checkout-title"]').should(
       "contain",
-      "Lehrgang kaufen"
+      "Lehrgang kaufen",
     );
     cy.get("#street-address").type("Eggersmatt");
     cy.get("#street-number").type("32");
@@ -40,7 +49,7 @@ describe("checkout.cy.js", () => {
     cy.get("#city").type("Zumholz");
     cy.get('[data-cy="add-company-address"]').click();
 
-    cy.get("#company-name").type("Iterativ GmbH");
+    // cy.get("#company-name").clear().type("Iterativ GmbH");
     cy.get("#company-street-address").type("Brückfeldstrasse");
     cy.get("#company-street-number").type("16");
     cy.get("#company-postal-code").type("3012");
@@ -60,7 +69,7 @@ describe("checkout.cy.js", () => {
       expect(ci.country).to.equal("CH");
 
       expect(ci.invoice_address).to.equal("org");
-      expect(ci.organisation_detail_name).to.equal("Iterativ GmbH");
+      expect(ci.organisation_detail_name).to.equal("FdH GmbH");
       expect(ci.organisation_street).to.equal("Brückfeldstrasse");
       expect(ci.organisation_street_number).to.equal("16");
       expect(ci.organisation_postal_code).to.equal("3012");
@@ -72,12 +81,32 @@ describe("checkout.cy.js", () => {
       expect(ci.state).to.equal("ongoing");
     });
 
+    cy.loadUser("id", TEST_USER_EMPTY_ID).then((u) => {
+      expect(u.first_name).to.equal("Flasche");
+      expect(u.last_name).to.equal("Leer");
+
+      expect(u.street).to.equal("Eggersmatt");
+      expect(u.street_number).to.equal("32");
+      expect(u.postal_code).to.equal("1719");
+      expect(u.city).to.equal("Zumholz");
+      expect(u.country).to.equal("CH");
+
+      expect(u.invoice_address).to.equal("org");
+      expect(u.organisation_detail_name).to.equal("FdH GmbH");
+      expect(u.organisation_street).to.equal("Brückfeldstrasse");
+      expect(u.organisation_street_number).to.equal("16");
+      expect(u.organisation_postal_code).to.equal("3012");
+      expect(u.organisation_city).to.equal("Bern");
+      // 2 -> andere Krankenversicherer
+      expect(u.organisation).to.equal(2);
+    });
+
     // pay
     cy.get('[data-cy="pay-button"]').click();
 
     cy.get('[data-cy="checkout-success-title"]').should(
       "contain",
-      "Gratuliere"
+      "Gratuliere",
     );
     // wait for payment callback
     cy.wait(3000);
@@ -86,7 +115,7 @@ describe("checkout.cy.js", () => {
     // back on dashboard page
     cy.get('[data-cy="db-course-title"]').should(
       "contain",
-      "Versicherungsvermittler"
+      "Versicherungsvermittler",
     );
 
     cy.loadCheckoutInformation("user_id", TEST_USER_EMPTY_ID).then((ci) => {
@@ -102,13 +131,13 @@ describe("checkout.cy.js", () => {
 
     cy.get('[data-cy="account-confirm-title"]').should(
       "contain",
-      "Konto erstellen"
+      "Konto erstellen",
     );
     cy.get('[data-cy="continue-button"]').click();
 
     cy.get('[data-cy="account-profile-title"]').should(
       "contain",
-      "Profil ergänzen"
+      "Profil ergänzen",
     );
     cy.get('[data-cy="dropdown-select"]').click();
     cy.get('[data-cy="dropdown-select-option-Baloise"]').click();
@@ -117,10 +146,10 @@ describe("checkout.cy.js", () => {
     // Adressdaten ausfüllen
     cy.get('[data-cy="account-checkout-title"]').should(
       "contain",
-      "Lehrgang kaufen"
+      "Lehrgang kaufen",
     );
 
-    cy.get('#paymentMethod').select('cembra_byjuno');
+    cy.get("#paymentMethod").select("cembra_byjuno");
 
     cy.get("#street-address").type("Eggersmatt");
     cy.get("#street-number").type("32");
@@ -132,32 +161,38 @@ describe("checkout.cy.js", () => {
 
     cy.get('[data-cy="continue-pay"]').click();
 
-    cy.loadExternalApiRequestLog("request_username", "empty@example.com").then((entry) => {
-      // ends with "/v1/transactions""
-      expect(entry.api_url).to.contain("/v1/transactions");
-      expect(entry.request_username).to.contain("empty@example.com");
+    cy.loadExternalApiRequestLog("request_username", "empty@example.com").then(
+      (entry) => {
+        // ends with "/v1/transactions""
+        expect(entry.api_url).to.contain("/v1/transactions");
+        expect(entry.request_username).to.contain("empty@example.com");
 
-      expect(entry.api_request_data.amount).to.equal(32400);
-      expect(entry.api_request_data.currency).to.equal("CHF");
-      expect(entry.api_request_data.autoSettle).to.equal(true);
+        expect(entry.api_request_data.amount).to.equal(32400);
+        expect(entry.api_request_data.currency).to.equal("CHF");
+        expect(entry.api_request_data.autoSettle).to.equal(true);
 
-      expect(entry.api_request_data.customer.firstName).to.equal("Flasche");
-      expect(entry.api_request_data.customer.lastName).to.equal("Leer");
-      expect(entry.api_request_data.customer.street).to.equal("Eggersmatt 32");
-      expect(entry.api_request_data.customer.zipCode).to.equal("1719");
-      expect(entry.api_request_data.customer.city).to.equal("Zumholz");
-      expect(entry.api_request_data.customer.country).to.equal("CH");
-      expect(entry.api_request_data.customer.type).to.equal("P");
-      expect(entry.api_request_data.customer.phone).to.equal("+41792018586");
-      expect(entry.api_request_data.customer.birthDate).to.equal("1982-06-09");
+        expect(entry.api_request_data.customer.firstName).to.equal("Flasche");
+        expect(entry.api_request_data.customer.lastName).to.equal("Leer");
+        expect(entry.api_request_data.customer.street).to.equal(
+          "Eggersmatt 32",
+        );
+        expect(entry.api_request_data.customer.zipCode).to.equal("1719");
+        expect(entry.api_request_data.customer.city).to.equal("Zumholz");
+        expect(entry.api_request_data.customer.country).to.equal("CH");
+        expect(entry.api_request_data.customer.type).to.equal("P");
+        expect(entry.api_request_data.customer.phone).to.equal("+41792018586");
+        expect(entry.api_request_data.customer.birthDate).to.equal(
+          "1982-06-09",
+        );
 
-      expect(entry.api_request_data.INT.repaymentType).to.equal(3);
-      expect(entry.api_request_data.INT.riskOwner).to.equal("IJ");
-      expect(entry.api_request_data.INT.subtype).to.equal("INVOICE");
-      expect(entry.api_request_data.INT.deviceFingerprintId).to.not.be.empty;
+        expect(entry.api_request_data.INT.repaymentType).to.equal(3);
+        expect(entry.api_request_data.INT.riskOwner).to.equal("IJ");
+        expect(entry.api_request_data.INT.subtype).to.equal("INVOICE");
+        expect(entry.api_request_data.INT.deviceFingerprintId).to.not.be.empty;
 
-      expect(true).to.be.true;
-    });
+        expect(true).to.be.true;
+      },
+    );
 
     // check that results are stored on server
     cy.loadCheckoutInformation("user_id", TEST_USER_EMPTY_ID).then((ci) => {
@@ -183,5 +218,23 @@ describe("checkout.cy.js", () => {
       expect(ci.ip_address).to.not.be.empty;
       expect(ci.device_fingerprint_session_key).to.not.be.empty;
     });
+
+    cy.loadUser("id", TEST_USER_EMPTY_ID).then((u) => {
+      expect(u.first_name).to.equal("Flasche");
+      expect(u.last_name).to.equal("Leer");
+
+      expect(u.street).to.equal("Eggersmatt");
+      expect(u.street_number).to.equal("32");
+      expect(u.postal_code).to.equal("1719");
+      expect(u.city).to.equal("Zumholz");
+      expect(u.country).to.equal("CH");
+      expect(u.phone_number).to.equal("+41792018586");
+      expect(u.birth_date).to.equal("1982-06-09");
+
+      expect(u.invoice_address).to.equal("prv");
+
+      // 7 -> Baloise
+      expect(u.organisation).to.equal(7);
+    });
   });
 });
diff --git a/cypress/e2e/profile/profile.cy.js b/cypress/e2e/profile/profile.cy.js
new file mode 100644
index 00000000..627e8088
--- /dev/null
+++ b/cypress/e2e/profile/profile.cy.js
@@ -0,0 +1,85 @@
+import { TEST_USER_EMPTY_ID } from "../../consts";
+import { login } from "../helpers";
+
+describe("profile.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset");
+
+    login("empty@example.com", "test");
+    cy.visit("/profile");
+  });
+
+  it("can edit all profile fields", () => {
+    cy.get('[data-cy="editProfileButton"]').click();
+
+    cy.get("#phone").type("079 201 85 86");
+    cy.get('[data-test="dp-input"]').type("09.06.1982{enter}");
+
+    cy.get("#street-address").type("Hafen");
+    cy.get("#street-number").type("123");
+    cy.get("#postal-code").type("DE-20095");
+    cy.get("#city").type("Hamburg");
+    cy.get("#country").select("DE");
+
+    // andere broker
+    cy.get("#organisation").select("1");
+
+    cy.get("#org-detail-name").type("Judihui GmbH");
+    cy.get("#org-street-address").type("Auf der Alm");
+    cy.get("#org-street-number").type("17");
+    cy.get("#org-postal-code").type("AT-6020");
+    cy.get("#org-city").type("Innsbruck");
+    cy.get("#org-country").select("AT");
+
+    cy.get("#invoice-address-organisation").click();
+
+    cy.get('[data-cy="saveButton"]').click();
+
+    // check displayed data
+    cy.get('[data-cy="firstName"]').should("contain", "Flasche");
+    cy.get('[data-cy="lastName"]').should("contain", "Leer");
+    cy.get('[data-cy="email"]').should("contain", "empty@example.com");
+    cy.get('[data-cy="phone"]').should("contain", "079 201 85 86");
+    cy.get('[data-cy="birthDate"]').should("contain", "09.06.1982");
+
+    cy.get('[data-cy="privateAddress"]').should("contain", "Hafen 123");
+    cy.get('[data-cy="privateAddress"]').should("contain", "DE-20095 Hamburg");
+    cy.get('[data-cy="privateAddress"]').should("contain", "Deutschland");
+
+    cy.get('[data-cy="organisationDetailName"]').should(
+      "contain",
+      "andere Broker",
+    );
+    cy.get('[data-cy="organisationAddress"]').should("contain", "Judihui GmbH");
+    cy.get('[data-cy="organisationAddress"]').should(
+      "contain",
+      "Auf der Alm 17",
+    );
+    cy.get('[data-cy="organisationAddress"]').should(
+      "contain",
+      "AT-6020 Innsbruck",
+    );
+    cy.get('[data-cy="organisationAddress"]').should("contain", "Österreich");
+
+    // check stored data
+    cy.loadUser("id", TEST_USER_EMPTY_ID).then((u) => {
+      expect(u.first_name).to.equal("Flasche");
+      expect(u.last_name).to.equal("Leer");
+
+      expect(u.street).to.equal("Hafen");
+      expect(u.street_number).to.equal("123");
+      expect(u.postal_code).to.equal("DE-20095");
+      expect(u.city).to.equal("Hamburg");
+      expect(u.country).to.equal("DE");
+
+      expect(u.invoice_address).to.equal("org");
+      expect(u.organisation_detail_name).to.equal("Judihui GmbH");
+      expect(u.organisation_street).to.equal("Auf der Alm");
+      expect(u.organisation_street_number).to.equal("17");
+      expect(u.organisation_postal_code).to.equal("AT-6020");
+      expect(u.organisation_city).to.equal("Innsbruck");
+      // 1 -> andere Broker
+      expect(u.organisation).to.equal(1);
+    });
+  });
+});
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 50dfdf30..3564a74c 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -178,6 +178,17 @@ Cypress.Commands.add("loadCheckoutInformation", (key, value) => {
   );
 });
 
+Cypress.Commands.add("loadUser", (key, value) => {
+  return loadObjectJson(
+    key,
+    value,
+    "vbv_lernwelt.core.models.User",
+    "vbv_lernwelt.core.serializers.CypressUserSerializer",
+    true
+  );
+});
+
+
 Cypress.Commands.add("makeSelfEvaluation", (answers) => {
   for (let i = 0; i < answers.length; i++) {
     const answer = answers[i];
diff --git a/server/vbv_lernwelt/core/serializers.py b/server/vbv_lernwelt/core/serializers.py
index 3a656c71..31965017 100644
--- a/server/vbv_lernwelt/core/serializers.py
+++ b/server/vbv_lernwelt/core/serializers.py
@@ -131,6 +131,12 @@ class UserSerializer(serializers.ModelSerializer):
         return instance
 
 
+class CypressUserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = "__all__"
+
+
 class OrganisationSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(source="organisation_id", read_only=True)
     name = serializers.SerializerMethodField()

From 8882e04049e17bd9e36e9cd8f3f3de7a5aef52f7 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 16 Jul 2024 16:43:20 +0200
Subject: [PATCH 05/42] Rename cypress test to `personaProfile`

---
 .../profile.cy.js => personalProfile/personalProfile.cy.js}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename cypress/e2e/{profile/profile.cy.js => personalProfile/personalProfile.cy.js} (98%)

diff --git a/cypress/e2e/profile/profile.cy.js b/cypress/e2e/personalProfile/personalProfile.cy.js
similarity index 98%
rename from cypress/e2e/profile/profile.cy.js
rename to cypress/e2e/personalProfile/personalProfile.cy.js
index 627e8088..2608f53b 100644
--- a/cypress/e2e/profile/profile.cy.js
+++ b/cypress/e2e/personalProfile/personalProfile.cy.js
@@ -1,7 +1,7 @@
 import { TEST_USER_EMPTY_ID } from "../../consts";
 import { login } from "../helpers";
 
-describe("profile.cy.js", () => {
+describe("personalProfile.cy.js", () => {
   beforeEach(() => {
     cy.manageCommand("cypress_reset");
 

From 96e9ef63574c2fd530015468649dc8e92cb0b8f8 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 16 Jul 2024 16:47:19 +0200
Subject: [PATCH 06/42] Add third cypress/currents step

---
 bitbucket-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 909e9bdb..0dcb4cc1 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -97,6 +97,7 @@ js-linting: &js-linting
 
 default-steps: &default-steps
   - parallel:
+      - step: *e2e
       - step: *e2e
       - step: *e2e
       - step: *python-tests

From 128c8da2e6fac99f2013f9817145d8b9b41fe85f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jul 2024 11:49:55 +0200
Subject: [PATCH 07/42] Optimize competences queries

---
 .../dashboard/graphql/types/competence.py     | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/types/competence.py b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
index 28dbae75..bc682ca2 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/competence.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
@@ -1,10 +1,13 @@
 from typing import List, Tuple
 
 import graphene
+import structlog
 from wagtail.models import Page
 
 from vbv_lernwelt.course.models import CourseCompletion, CourseCompletionStatus
 
+logger = structlog.get_logger(__name__)
+
 
 class CompetencePerformanceStatisticsSummaryType(graphene.ObjectType):
     _id = graphene.ID(required=True)
@@ -41,25 +44,23 @@ def competences(
     completions = CourseCompletion.objects.filter(
         course_session_id__in=course_session_selection_ids,
         page_type="competence.PerformanceCriteria",
-    ).prefetch_related("course_session", "page")
+    ).select_related("course_session", "page")
 
     if user_selection_ids is not None:
         completions = completions.filter(user_id__in=user_selection_ids)
 
-    competence_records = {}
+    page_ids = completions.values_list("page_id", flat=True).distinct()
+    pages = Page.objects.filter(id__in=page_ids)
+    learning_units = {page.id: page.specific.learning_unit for page in pages}
 
-    unique_page_ids = {completion.page.id for completion in completions}
-    learning_units = {
-        page_id: Page.objects.get(id=page_id).specific.learning_unit
-        for page_id in unique_page_ids
-    }
     circles = {
         lu.id: c
         for lu in learning_units.values()
-        if (lu is not None and (c := lu.get_circle()) is not None)
-        and (circle_ids is None or c.id in circle_ids)
+        if lu and (c := lu.get_circle()) and (circle_ids is None or c.id in circle_ids)
     }
 
+    competence_records = {}
+
     for completion in completions:
         learning_unit = learning_units.get(completion.page.id)
 
@@ -73,20 +74,23 @@ def competences(
 
         combined_id = f"{circle.id}-{completion.course_session.id}@{urql_id_postfix}"
 
-        competence_records.setdefault(combined_id, {}).setdefault(
-            learning_unit,
-            CompetenceRecordStatisticsType(
-                _id=combined_id,  # noqa
-                title=learning_unit.title,  # noqa
-                course_session_id=completion.course_session.id,  # noqa
-                generation=completion.course_session.generation,  # noqa
-                circle_id=circle.id,  # noqa
-                success_count=0,  # noqa
-                fail_count=0,  # noqa
+        if combined_id not in competence_records:
+            competence_records[combined_id] = {}
+
+        if learning_unit not in competence_records[combined_id]:
+            competence_records[combined_id][
+                learning_unit
+            ] = CompetenceRecordStatisticsType(
+                _id=combined_id,
+                title=learning_unit.title,
+                course_session_id=completion.course_session.id,
+                generation=completion.course_session.generation,
+                circle_id=circle.id,
+                success_count=0,
+                fail_count=0,
                 details_url=f"/course/{course_slug}/cockpit?courseSessionId={completion.course_session.id}",
                 # noqa
-            ),
-        )
+            )
 
         if completion.completion_status == CourseCompletionStatus.SUCCESS.value:
             competence_records[combined_id][learning_unit].success_count += 1
@@ -99,7 +103,7 @@ def competences(
         for record in circle_records.values()
     ]
 
-    success_count = sum([c.success_count for c in values])
-    fail_count = sum([c.fail_count for c in values])
+    success_count = sum(c.success_count for c in values)
+    fail_count = sum(c.fail_count for c in values)
 
     return values, success_count, fail_count

From 69ea3c8c17620460051afb9a4a97264159005b07 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jul 2024 14:41:53 +0200
Subject: [PATCH 08/42] Use specific

---
 server/vbv_lernwelt/dashboard/graphql/types/competence.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/types/competence.py b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
index bc682ca2..dc00f167 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/competence.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
@@ -50,7 +50,7 @@ def competences(
         completions = completions.filter(user_id__in=user_selection_ids)
 
     page_ids = completions.values_list("page_id", flat=True).distinct()
-    pages = Page.objects.filter(id__in=page_ids)
+    pages = Page.objects.filter(id__in=page_ids).specific()
     learning_units = {page.id: page.specific.learning_unit for page in pages}
 
     circles = {

From 9424979bef1d3220fc4c82f275619343d17f8675 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jul 2024 14:59:53 +0200
Subject: [PATCH 09/42] Select related data

---
 server/vbv_lernwelt/competence/services.py    |  4 +--
 .../dashboard/graphql/types/assignment.py     | 33 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/server/vbv_lernwelt/competence/services.py b/server/vbv_lernwelt/competence/services.py
index 0ef4d306..977ea2dc 100644
--- a/server/vbv_lernwelt/competence/services.py
+++ b/server/vbv_lernwelt/competence/services.py
@@ -17,7 +17,7 @@ def query_competence_course_session_assignments(course_session_ids, circle_ids=N
             AssignmentType.CASEWORK.value,
         ],
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ):
+    ).select_related("submission_deadline", "learning_content"):
         if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(csa)
@@ -34,7 +34,7 @@ def query_competence_course_session_edoniq_tests(course_session_ids, circle_ids=
     for cset in CourseSessionEdoniqTest.objects.filter(
         course_session_id__in=course_session_ids,
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ):
+    ).select_related("deadline", "learning_content"):
         if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(cset)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 8199bc72..d09d5d36 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -2,12 +2,12 @@ import math
 from typing import List
 
 import graphene
+from django.db import connection, reset_queries
 
 import vbv_lernwelt.assignment.models
 from vbv_lernwelt.assignment.models import (
     AssignmentCompletion,
     AssignmentCompletionStatus,
-    AssignmentType,
 )
 from vbv_lernwelt.competence.services import (
     query_competence_course_session_assignments,
@@ -176,6 +176,9 @@ def assignments(
     circle_ids: List[graphene.ID] | None = None,
     urql_id: str = None,
 ) -> AssignmentsStatisticsType:
+    import structlog
+
+    logger = structlog.get_logger()
     if urql_id is None:
         urql_id = str(course_id)
 
@@ -184,22 +187,20 @@ def assignments(
     )
     records: List[AssignmentStatisticsRecordType] = []
 
-    for course_session in course_sessions:
-        for csa in query_competence_course_session_assignments(
-            [course_session.id], circle_ids
-        ):
-            record = create_record(csa, user_selection_ids, urql_id_postfix=urql_id)
-            records.append(record)
+    reset_queries()
+    csas = query_competence_course_session_assignments(course_sessions, circle_ids)
+    csets = query_competence_course_session_edoniq_tests(course_sessions, circle_ids)
 
-        for cset in query_competence_course_session_edoniq_tests(
-            [course_session.id], circle_ids
-        ):
-            record = create_record(
-                course_session_assignment=cset,
-                user_selection_ids=user_selection_ids,
-                urql_id_postfix=urql_id,
-            )
-            records.append(record)
+    for csa in csas:
+        record = create_record(csa, user_selection_ids, urql_id_postfix=urql_id)
+        records.append(record)
+
+    for cset in csets:
+        record = create_record(cset, user_selection_ids, urql_id_postfix=urql_id)
+        records.append(record)
+
+    num_queries = len(connection.queries)
+    logger.info(f"cset number of queries executed: {num_queries}")
 
     return AssignmentsStatisticsType(
         _id=urql_id,  # noqa

From 8e7f805067eb85f19d17b3cbf8fb680cc90cd370 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jul 2024 15:28:28 +0200
Subject: [PATCH 10/42] Add context

---
 server/vbv_lernwelt/competence/services.py    |  5 +-
 .../dashboard/graphql/types/assignment.py     | 46 +++++++++++--------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/server/vbv_lernwelt/competence/services.py b/server/vbv_lernwelt/competence/services.py
index 977ea2dc..168e938f 100644
--- a/server/vbv_lernwelt/competence/services.py
+++ b/server/vbv_lernwelt/competence/services.py
@@ -17,7 +17,8 @@ def query_competence_course_session_assignments(course_session_ids, circle_ids=N
             AssignmentType.CASEWORK.value,
         ],
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ).select_related("submission_deadline", "learning_content"):
+    ).select_related("submission_deadline", "learning_content", "course_session",
+                     "learning_content__content_assignment"):
         if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(csa)
@@ -34,7 +35,7 @@ def query_competence_course_session_edoniq_tests(course_session_ids, circle_ids=
     for cset in CourseSessionEdoniqTest.objects.filter(
         course_session_id__in=course_session_ids,
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ).select_related("deadline", "learning_content"):
+    ).select_related("deadline", "learning_content", "course_session", "learning_content__content_assignment"):
         if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(cset)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index d09d5d36..766fb8af 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -1,8 +1,9 @@
 import math
-from typing import List
+from typing import List, Dict, Tuple
 
 import graphene
-from django.db import connection, reset_queries
+import structlog
+from django.db import connections, reset_queries
 
 import vbv_lernwelt.assignment.models
 from vbv_lernwelt.assignment.models import (
@@ -19,6 +20,8 @@ from vbv_lernwelt.course_session.models import (
     CourseSessionEdoniqTest,
 )
 
+logger = structlog.get_logger()
+
 
 class AssignmentCompletionMetricsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
@@ -139,11 +142,21 @@ def create_record(
     course_session_assignment: CourseSessionAssignment | CourseSessionEdoniqTest,
     user_selection_ids: List[str] | None,
     urql_id_postfix: str = "",
-) -> AssignmentStatisticsRecordType:
-    if isinstance(course_session_assignment, CourseSessionAssignment):
-        due_date = course_session_assignment.submission_deadline
-    else:
-        due_date = course_session_assignment.deadline
+    context=None,
+) -> Tuple[AssignmentStatisticsRecordType, Dict]:
+    if not context:
+        context = {}
+
+    assignment_type = "CourseSessionAssignment" if isinstance(course_session_assignment,
+                                                              CourseSessionAssignment) else "CourseSessionEdoniqTest"
+    due_date = course_session_assignment.submission_deadline if assignment_type == "CourseSessionAssignment" else course_session_assignment.deadline
+
+    key = f"{assignment_type}_{course_session_assignment.learning_content.id}"
+
+    if not key in context:
+        context[key] = course_session_assignment.learning_content.get_circle().id
+
+    circle_id = context[key]
 
     learning_content = course_session_assignment.learning_content
 
@@ -152,7 +165,7 @@ def create_record(
         _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",
         # noqa
         course_session_id=str(course_session_assignment.course_session.id),  # noqa
-        circle_id=learning_content.get_circle().id,  # noqa
+        circle_id=circle_id,  # noqa
         course_session_assignment_id=str(course_session_assignment.id),  # noqa
         generation=course_session_assignment.course_session.generation,  # noqa
         assignment_type_translation_key=due_date.assignment_type_translation_key,
@@ -166,7 +179,7 @@ def create_record(
         ),
         details_url=due_date.url_expert,  # noqa
         deadline=due_date.start,  # noqa
-    )
+    ), context
 
 
 def assignments(
@@ -176,9 +189,6 @@ def assignments(
     circle_ids: List[graphene.ID] | None = None,
     urql_id: str = None,
 ) -> AssignmentsStatisticsType:
-    import structlog
-
-    logger = structlog.get_logger()
     if urql_id is None:
         urql_id = str(course_id)
 
@@ -186,22 +196,20 @@ def assignments(
         id__in=course_session_selection_ids,
     )
     records: List[AssignmentStatisticsRecordType] = []
-
+    context = {}
     reset_queries()
     csas = query_competence_course_session_assignments(course_sessions, circle_ids)
     csets = query_competence_course_session_edoniq_tests(course_sessions, circle_ids)
 
     for csa in csas:
-        record = create_record(csa, user_selection_ids, urql_id_postfix=urql_id)
+        record, context = create_record(csa, user_selection_ids, urql_id_postfix=urql_id, context=context)
         records.append(record)
 
     for cset in csets:
-        record = create_record(cset, user_selection_ids, urql_id_postfix=urql_id)
+        record, context = create_record(cset, user_selection_ids, urql_id_postfix=urql_id, context=context)
         records.append(record)
-
-    num_queries = len(connection.queries)
-    logger.info(f"cset number of queries executed: {num_queries}")
-
+    num_queries = len(connections["default"].queries)
+    logger.info(num_queries)
     return AssignmentsStatisticsType(
         _id=urql_id,  # noqa
         records=sorted(records, key=lambda r: r.deadline),  # noqa

From dbcae57091b94d18c20ae9ba58b899b63b72c55a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jul 2024 16:12:59 +0200
Subject: [PATCH 11/42] Add CourseSessionUsers to context

---
 server/vbv_lernwelt/competence/services.py    | 15 ++++--
 .../dashboard/graphql/types/assignment.py     | 54 ++++++++++++-------
 2 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/server/vbv_lernwelt/competence/services.py b/server/vbv_lernwelt/competence/services.py
index 168e938f..6905ef91 100644
--- a/server/vbv_lernwelt/competence/services.py
+++ b/server/vbv_lernwelt/competence/services.py
@@ -17,8 +17,12 @@ def query_competence_course_session_assignments(course_session_ids, circle_ids=N
             AssignmentType.CASEWORK.value,
         ],
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ).select_related("submission_deadline", "learning_content", "course_session",
-                     "learning_content__content_assignment"):
+    ).select_related(
+        "submission_deadline",
+        "learning_content",
+        "course_session",
+        "learning_content__content_assignment",
+    ):
         if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(csa)
@@ -35,7 +39,12 @@ def query_competence_course_session_edoniq_tests(course_session_ids, circle_ids=
     for cset in CourseSessionEdoniqTest.objects.filter(
         course_session_id__in=course_session_ids,
         learning_content__content_assignment__competence_certificate__isnull=False,
-    ).select_related("deadline", "learning_content", "course_session", "learning_content__content_assignment"):
+    ).select_related(
+        "deadline",
+        "learning_content",
+        "course_session",
+        "learning_content__content_assignment",
+    ):
         if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
             continue
         result.append(cset)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 766fb8af..ba26e3c6 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -1,9 +1,7 @@
 import math
-from typing import List, Dict, Tuple
+from typing import List
 
 import graphene
-import structlog
-from django.db import connections, reset_queries
 
 import vbv_lernwelt.assignment.models
 from vbv_lernwelt.assignment.models import (
@@ -20,8 +18,6 @@ from vbv_lernwelt.course_session.models import (
     CourseSessionEdoniqTest,
 )
 
-logger = structlog.get_logger()
-
 
 class AssignmentCompletionMetricsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
@@ -101,14 +97,23 @@ def get_assignment_completion_metrics(
     assignment: vbv_lernwelt.assignment.models.Assignment,
     user_selection_ids: List[str] | None,
     urql_id_postfix: str = "",
+    context=None,
 ) -> AssignmentCompletionMetricsType:
+    if not context:
+        context = {}
+
     if user_selection_ids:
         course_session_users = user_selection_ids
     else:
-        course_session_users = CourseSessionUser.objects.filter(
-            course_session=course_session,
-            role=CourseSessionUser.Role.MEMBER,
-        ).values_list("user", flat=True)
+        key = f"CourseSessionUser_{course_session.id}"
+        if not key in context:
+            course_session_users = CourseSessionUser.objects.filter(
+                course_session=course_session,
+                role=CourseSessionUser.Role.MEMBER,
+            ).values_list("user", flat=True)
+            context[key] = course_session_users
+        else:
+            course_session_users = context[key]
 
     evaluation_results = AssignmentCompletion.objects.filter(
         completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
@@ -143,13 +148,20 @@ def create_record(
     user_selection_ids: List[str] | None,
     urql_id_postfix: str = "",
     context=None,
-) -> Tuple[AssignmentStatisticsRecordType, Dict]:
+) -> AssignmentStatisticsRecordType:
     if not context:
         context = {}
 
-    assignment_type = "CourseSessionAssignment" if isinstance(course_session_assignment,
-                                                              CourseSessionAssignment) else "CourseSessionEdoniqTest"
-    due_date = course_session_assignment.submission_deadline if assignment_type == "CourseSessionAssignment" else course_session_assignment.deadline
+    assignment_type = (
+        "CourseSessionAssignment"
+        if isinstance(course_session_assignment, CourseSessionAssignment)
+        else "CourseSessionEdoniqTest"
+    )
+    due_date = (
+        course_session_assignment.submission_deadline
+        if assignment_type == "CourseSessionAssignment"
+        else course_session_assignment.deadline
+    )
 
     key = f"{assignment_type}_{course_session_assignment.learning_content.id}"
 
@@ -176,10 +188,11 @@ def create_record(
             assignment=learning_content.content_assignment,  # noqa
             user_selection_ids=user_selection_ids,  # noqa
             urql_id_postfix=urql_id_postfix,  # noqa
+            context=context,  # noqa
         ),
         details_url=due_date.url_expert,  # noqa
         deadline=due_date.start,  # noqa
-    ), context
+    )
 
 
 def assignments(
@@ -197,19 +210,22 @@ def assignments(
     )
     records: List[AssignmentStatisticsRecordType] = []
     context = {}
-    reset_queries()
+
     csas = query_competence_course_session_assignments(course_sessions, circle_ids)
     csets = query_competence_course_session_edoniq_tests(course_sessions, circle_ids)
 
     for csa in csas:
-        record, context = create_record(csa, user_selection_ids, urql_id_postfix=urql_id, context=context)
+        record = create_record(
+            csa, user_selection_ids, urql_id_postfix=urql_id, context=context
+        )
         records.append(record)
 
     for cset in csets:
-        record, context = create_record(cset, user_selection_ids, urql_id_postfix=urql_id, context=context)
+        record = create_record(
+            cset, user_selection_ids, urql_id_postfix=urql_id, context=context
+        )
         records.append(record)
-    num_queries = len(connections["default"].queries)
-    logger.info(num_queries)
+
     return AssignmentsStatisticsType(
         _id=urql_id,  # noqa
         records=sorted(records, key=lambda r: r.deadline),  # noqa

From 0fef8ec9b693b410102940e1fb0acaa40f7b5382 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 23 Jul 2024 13:55:16 +0200
Subject: [PATCH 12/42] Extend evaluation period

---
 server/vbv_lernwelt/importer/services.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py
index f4594a24..20de544f 100644
--- a/server/vbv_lernwelt/importer/services.py
+++ b/server/vbv_lernwelt/importer/services.py
@@ -765,7 +765,7 @@ def create_or_update_course_session_assignment(
             csa.submission_deadline.save()
             csa.evaluation_deadline.start = timezone.make_aware(
                 start
-            ) + timezone.timedelta(days=45)
+            ) + timezone.timedelta(days=60)
             csa.evaluation_deadline.end = None
             csa.evaluation_deadline.save()
     else:

From 46daea051153112fcb2b1290004e42fd5849c10a Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Jul 2024 14:19:34 +0200
Subject: [PATCH 13/42] Enable cembra/byjuno payment

---
 env_secrets/caprover_vbv-develop.env          | Bin 1410 -> 1410 bytes
 server/vbv_lernwelt/core/constants.py         |   1 +
 .../vbv_lernwelt/core/create_default_users.py |  19 ++++++++++++++++++
 server/vbv_lernwelt/shop/services.py          |   6 ++----
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/env_secrets/caprover_vbv-develop.env b/env_secrets/caprover_vbv-develop.env
index c633f417bff7fbf9e1da651afdf0215ac04467d3..5432d3c8d0f3325116f2c115d5b3e00b05d3e2f7 100644
GIT binary patch
literal 1410
zcmV-|1%3JeM@dveQdv+`0R5m0PB9m#27BrtQzTx)WmcPXSslete|WanHJO_H|4~_O
zP^cLG*XtL4O<!-W+xD2=#uhe|e1V<mhp%nf?u?wUD_cxP)i(Irj&{N%Q*tRMD)8w;
zZ=>C<rX6cOlJ7-?>~z@$5m_&IGL&h_JQJ|gH+5hQSp4{>H?-RSNu(A%LMc|^)u)D&
zqoMe<u77mXu6p2oq9q(ZJYwI}AL#j!M!KJK&gMsmEf$}d#To%CozsdWhd(C6E!#*t
z(g18RFC-UJ0}q)#l%qzS+2*&qmTKo({?g>#h&R6`nYgW1niNZQJRV!nlGJJM71d4a
zXb5fj0W&mrii<m~CrMWp${t3*W0OVqo=ZBOM`nnh-YA71P8%0jdZD`tOia4t{Fl*G
zC@2Tfv+#;*OnsTg3|)%A={t{ys%{}#OhApxPZ5KP<~+T-m2%Z%oSm!-JT&Fa>@$Dr
zb6~$Ch`Cn`pm{iLtmmv{cu9*`reNXYG0EPEm>5}eK2Jx!xd-5<WGv@zo#$hBHlEpV
z93Y`gp&_R~xcWo&nEYqfjfMJL$Y^!wBCU6Ej|YG%3h_CJFAD>2RUe}Z{XQJ;rN>r~
zQTuqp<1^BI105)RWpaFZn1K(pE4kPlby`GZL5+BR5HnnU8lO_ok{Hz>+V||0fO%&>
zUTzCfno(qE>jU{9E`Lqi4WZjF-*@p<N}(<>gQQlH2*r>PZRedmIMZ09JE%OVhuP`f
z9(|?;L{^b-XRf`qCIYFZze%{^2W&(Mp#mub)onH8O#d{_r-3NY+RWFWVHCV2fbg3B
z)v$P*s2Bz3EaT`je|}Py(UWG)=0tl=$KTk}n~-5=lr(V3!gFD|T@OLQoY#?+@5px+
zcV2^PdKzL=TJ#>u{aaMN2S&|{kdKeyJ7M~ufHh8^AnKB|jS*DCDPLi<&FsYaRh@S~
zzbM3%GT4NC7#wuTUf+nuWoFAO%iOBfPou;>b_tOj>nBsX6}Q}PN%-*<=T!5Fez2>A
zw|xDViOuevU9QfXWEV0qcOKn2R?;&S-|3^2tv&0H#uBTB@bM)R<WTeV(+}&z|6uC~
zn+%^n2Y#+wlDW>i=A8FMH(+HRE6*f?OQWX8su^Ien`@qnd_dom`|@eKUW(Q$#e&BT
z#De4lBb$-MEwE)<Sk|L-54OP&AIO6Y2dml=iF-K$l`rh%n{4@bT@VsU#mvFz3s;A0
zy<Yz1DjiL|M^+r=Wv#Yv%0LKv%yE@{<6?#^aObhTk-}xDu{ISgWYfKFeYhFSG|P<+
zuWR+AwINJ{HAiN<w!mdzR>l9U!rIU0>zkK$LoZUulYSL!ZT8*JM##eJNbm;78K|~f
zbB>Z`XP`R`>Sry?a1a*IAEugrmH`9IZIS&zP}DXhzGNu67xQ>!Do?$tiz^ICk-nh}
z2Oo<H=sb=5d^m_!)sz%|e5ArpFGXH+3ga<U@eq1dXpZF^KEEx53d%5ic7mi}(X13%
zm1SPgABIhK-wdv0+=~2a-3r+(THah2Bfp*l0nuN=ht^1clx2<P!Zwsx*zBL4e4!84
z8qc+}Ysq_qnXcNh8&o2t{Oew6=@=mvmF&1hcaL;7y7cLyxC?2{NWZvDew(EhnRtc1
zJozgL<&iU=n6mPh=@^r_hsOS?6WJG;G2gL3ysr|WO)0y*`(_=S%n~jEUP2;G-sW~Z
zk>(KyVR(yT*ysaU>N#&P^6;*_#1ww}``u5gjWb7s%&EwLsry38dxw5(Wo2x?h4oy3
z&M+{+21EE%bNplpX5mto&aIU&7gB2cEC5LNl)jY^=~4hooIYAOM;UY&L3$bkOxgx&
QEL5k|q77$mx!byyB&9#T9{>OV

literal 1410
zcmV-|1%3JeM@dveQdv+`0H6*;YgY}<6t)6kQ+BGQ30$%8=Z<g;h43(^^9+i;bm1yK
zXqsCdGk+VrAtg(<)2?~&1~PHGC#jShY)!{nP5kwfQoU1Ym5BF(`!vuD{cRy^v@N!c
zSU!!v1G~2X)NWBI<<=dMem!%J3<)ihe~`q9=GlIW>&H;LwH8|#dM(Qy-L0^4mFL{A
z{NOuVz~v=y&_o7Y2`$$o!*}E<`7vnJ!af<$q!0r!FoM@Q#HAMc7Y&puEGvnhUK!Di
z&>2kCU#QHjSZ*)RWr}W_-ndPAs6A9{B-bqRRv1_d$1ci^n2h{)voEKLu@-BPHHgj=
zIcR*n@Gc5NE4JXOuR{(7cA#3$7&WCYHL|4UuzX<%h`hCe2C#wII#_HxS`rIm{T59>
zQIqlroBTHL_d;@R67in5rPfhH=hP||Vx0)R2jyK6QaJis6y(d`{|zqSK?^wz$tQpk
z*Ln%bPVBy0MRsqd^E^AV;>Ck45A054(u2={U!U*eAim-{{i!8P^4r$k9zGo;=txaC
zbk8H+VA`T(h%-(QoxunK%<5euAlxhd*RHby45xd8Na&=o8V&bp6Ie=13`(wG--U3U
z%6uo>T?8;FCcrtkuL_SoNb<!rO&h@i@xGNkIhK83dit+pV0Qx4pP!`8wZBBvMzDCg
z!ORQA1i;>^C`C11abt?$R$rxb5)Z%Rx0~jI)abor+2+mP?$a0$`>QlwukUn(cQ5@4
zxGGGP^*jr0%RhNrwF3ULY8pz?Q3q1)+YjQav-_RqC<DYGpn*U};We>|zkG_*1ZK0!
z%8dr2?!i9*Zra&A(nkG8Ab&+uW>B>f)4;am&HjfY%OFi;A@(`zq*q>dDN#sP<U<mN
zWwH|yp&ra2hQ%B_TFGc~bPt*GJ=laJlHMW11!5lu2d^DZ3uKW+@><(&CR`F@$$&20
z3@e~YOhE1In9IS{w8!hest|~(A;56ZAbq9}ujdpnJ6S~TH=OS(d=FmzF;6B`ls!I#
z87_xkLl;Ui7k4~2DddBU2}V}r2i#fO@-L56NJ;dWt>3`M1?zebcvO@Uj1a(k2ygSC
zIVrx#$;S>X`*z9m+}Xei1Igz|#i!eA`<l0!or1W%w=6$4sbc79iK<FeQK9HJdj=I^
z?{S=;pXwgi_X~Td4MYUt7q4+oFYy;8{ClmvPkos8hD2P^JaUa_%(u#v*?)%Y)f=H)
z|9K<*WLUmdx?l+<=h()Yq$1K1dYQ{Cq(zZ^s!We%C+KA2hB55^&l?{BbDGxh=H%J1
z&koOM7rxrrLV0-ak3KIG#CiV*lz;bhPyU@;T}&wyvhKEu+{DD5HTMTfbg<TECHmu=
zcISXLF4Q!}5KeG15Jf+tVcm^332Qm4Yel1OM3uA>!`r6|8)RF2YG?nE)HXHvZT+b>
zk6{cxE^)~X#Al4Ih%`RZf3P=8sEjg+Xu+1po@o8eSVb)V)I<Gh{d}}lE4%s2ZiHGG
zgHxTFV3NSLO*oQyp<K3+@hOdKPPsEz>6n$9O2`_ZG5ED;ZXFH)nK+YnTHlca;&1`%
z0jx<iI30WU?N%Nm(3sb*vF?})h&N4coV)8@aMRzTr6dkp)*l1)9()=o)U>g<@ZXhY
zUpx6u^|SdDbcl|L(}T!Zq|99VcAqN4frV+d6ES4u3j7*nR)2AN1ohg<!hlV`j-pYd
zHMN}L1G5lcNN0km%hrb6J+xz_<5H*u)bD6A4A`%4h)|6UEUAgzvmW#te?5@Pjp89`
zG|D;pIy1Qv8=80H7N2;V*A)17&<cRN_&cCSHmnew{+j>j>um4M;K-H0d!IS0W+DTr
QcJP3A1@w{)_wTYYEKec0#Q*>R

diff --git a/server/vbv_lernwelt/core/constants.py b/server/vbv_lernwelt/core/constants.py
index 75f24848..e36702b8 100644
--- a/server/vbv_lernwelt/core/constants.py
+++ b/server/vbv_lernwelt/core/constants.py
@@ -28,6 +28,7 @@ TEST_MENTOR1_USER_ID = "d1f5f5a9-5b0a-4e1a-9e1a-9e9b5b5e1b1b"
 TEST_STUDENT1_VV_USER_ID = "5ff59857-8de5-415e-a387-4449f9a0337a"
 TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID = "7e8ebf0b-e6e2-4022-88f4-6e663ba0a9db"
 TEST_USER_EMPTY_ID = "daecbabe-4ab9-4edf-a71f-4119042ccb02"
+TEST_USER_DATATRANS_HANNA_ID = "6bec1a0d-f852-47aa-a4de-072df6e07ad1"
 
 TEST_COURSE_SESSION_BERN_ID = -1
 TEST_COURSE_SESSION_ZURICH_ID = -2
diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py
index 17acd036..a384c13e 100644
--- a/server/vbv_lernwelt/core/create_default_users.py
+++ b/server/vbv_lernwelt/core/create_default_users.py
@@ -20,6 +20,7 @@ from vbv_lernwelt.core.constants import (
     TEST_SUPERVISOR1_USER_ID,
     TEST_TRAINER1_USER_ID,
     TEST_TRAINER2_USER_ID,
+    TEST_USER_DATATRANS_HANNA_ID,
     TEST_USER_EMPTY_ID,
 )
 from vbv_lernwelt.core.models import User
@@ -202,6 +203,24 @@ def create_default_users(default_password="test", set_avatar=False):
         language="de",
     )
 
+    hanna, _ = User.objects.get_or_create(
+        id=TEST_USER_DATATRANS_HANNA_ID,
+    )
+    hanna.username = "datatrans.hanna.vbv@example.com"
+    hanna.email = "datatrans.hanna.vbv@example.com"
+    hanna.language = "de"
+    hanna.first_name = "Hanna"
+    hanna.last_name = "Vbv"
+    hanna.street = "Bahnstrasse"
+    hanna.street_number = "2"
+    hanna.postal_code = "8603"
+    hanna.city = "Schwerzenbach"
+    hanna.country_id = "CH"
+    hanna.birth_date = "1970-01-01"
+    hanna.phone_number = "+41792018586"
+    hanna.password = make_password("test")
+    hanna.save()
+
     for user_data in default_users:
         _create_student_user(**user_data)
 
diff --git a/server/vbv_lernwelt/shop/services.py b/server/vbv_lernwelt/shop/services.py
index f5998d38..a9561d0e 100644
--- a/server/vbv_lernwelt/shop/services.py
+++ b/server/vbv_lernwelt/shop/services.py
@@ -7,7 +7,6 @@ import structlog
 from django.conf import settings
 
 from vbv_lernwelt.core.admin import User
-from vbv_lernwelt.shop.const import VV_PRODUCT_NUMBER
 from vbv_lernwelt.shop.datatrans.datatrans_api_client import DatatransApiClient
 from vbv_lernwelt.shop.models import CheckoutState
 
@@ -101,9 +100,8 @@ def init_datatrans_transaction(
         },
     }
 
-    # FIXME: test with working cembra byjuno invoice customer?
-    # if with_cembra_byjuno_invoice:
-    #     payload["paymentMethods"] = ["INT"]
+    if with_cembra_byjuno_invoice:
+        payload["paymentMethods"] = ["INT"]
     if datatrans_customer_data:
         payload["customer"] = datatrans_customer_data
     if datatrans_int_data:

From e803e5308fc6bc948932901c92667b28c81ef513 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Jul 2024 14:35:41 +0200
Subject: [PATCH 14/42] Fix unit tests

---
 .../vbv_lernwelt/core/create_default_users.py | 42 +++++++++++--------
 .../core/management/commands/cypress_reset.py |  5 +++
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py
index a384c13e..beeaca53 100644
--- a/server/vbv_lernwelt/core/create_default_users.py
+++ b/server/vbv_lernwelt/core/create_default_users.py
@@ -4,6 +4,7 @@ from django.contrib.auth.models import Group, Permission
 from django.core.files import File
 from environs import Env
 
+from vbv_lernwelt.core.model_utils import add_countries
 from vbv_lernwelt.media_files.models import UserImage
 
 env = Env()
@@ -79,7 +80,30 @@ default_users = [
 AVATAR_DIR = settings.APPS_DIR / "static" / "avatars"
 
 
+def create_datatrans_hanna_user():
+    hanna, _ = User.objects.get_or_create(
+        id=TEST_USER_DATATRANS_HANNA_ID,
+    )
+    hanna.username = "datatrans.hanna.vbv@example.com"
+    hanna.email = "datatrans.hanna.vbv@example.com"
+    hanna.language = "de"
+    hanna.first_name = "Hanna"
+    hanna.last_name = "Vbv"
+    hanna.street = "Bahnstrasse"
+    hanna.street_number = "2"
+    hanna.postal_code = "8603"
+    hanna.city = "Schwerzenbach"
+    hanna.country_id = "CH"
+    hanna.birth_date = "1970-01-01"
+    hanna.phone_number = "+41792018586"
+    hanna.password = make_password("test")
+    hanna.save()
+    return hanna
+
+
 def create_default_users(default_password="test", set_avatar=False):
+    add_countries(small_set=True)
+
     admin_group, created = Group.objects.get_or_create(name="admin_group")
     _content_creator_group, _created = Group.objects.get_or_create(
         name="content_creator_grop"
@@ -203,23 +227,7 @@ def create_default_users(default_password="test", set_avatar=False):
         language="de",
     )
 
-    hanna, _ = User.objects.get_or_create(
-        id=TEST_USER_DATATRANS_HANNA_ID,
-    )
-    hanna.username = "datatrans.hanna.vbv@example.com"
-    hanna.email = "datatrans.hanna.vbv@example.com"
-    hanna.language = "de"
-    hanna.first_name = "Hanna"
-    hanna.last_name = "Vbv"
-    hanna.street = "Bahnstrasse"
-    hanna.street_number = "2"
-    hanna.postal_code = "8603"
-    hanna.city = "Schwerzenbach"
-    hanna.country_id = "CH"
-    hanna.birth_date = "1970-01-01"
-    hanna.phone_number = "+41792018586"
-    hanna.password = make_password("test")
-    hanna.save()
+    hanna = create_datatrans_hanna_user()
 
     for user_data in default_users:
         _create_student_user(**user_data)
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index abfae404..1a02a343 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -17,8 +17,10 @@ from vbv_lernwelt.core.constants import (
     TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
     TEST_STUDENT3_USER_ID,
     TEST_TRAINER1_USER_ID,
+    TEST_USER_DATATRANS_HANNA_ID,
     TEST_USER_EMPTY_ID,
 )
+from vbv_lernwelt.core.create_default_users import create_datatrans_hanna_user
 from vbv_lernwelt.core.models import Organisation, User
 from vbv_lernwelt.course.consts import (
     COURSE_TEST_ID,
@@ -159,6 +161,9 @@ def command(
         password=make_password("test"),
     )
 
+    User.objects.filter(id=TEST_USER_DATATRANS_HANNA_ID).delete()
+    create_datatrans_hanna_user()
+
     cursor = connection.cursor()
     cursor.execute("truncate core_securityrequestresponselog;")
     cursor.execute("truncate core_externalapirequestlog;")

From 74c4099b8b3dd25bc494c26ba7ead13b1722f996 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Jul 2024 15:29:12 +0200
Subject: [PATCH 15/42] Test-Deployment improvements

---
 caprover_create_app.py         |   8 ++++++--
 env_secrets/local_daniel.env   | Bin 1281 -> 1512 bytes
 server/config/settings/base.py |   6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/caprover_create_app.py b/caprover_create_app.py
index 24dba123..e137bcf1 100644
--- a/caprover_create_app.py
+++ b/caprover_create_app.py
@@ -93,8 +93,12 @@ def main(app_name, image_name, environment_file):
             "AWS_S3_SECRET_ACCESS_KEY": env.str("AWS_S3_SECRET_ACCESS_KEY", ""),
             "AWS_S3_REGION_NAME": "eu-central-1",
             "AWS_STORAGE_BUCKET_NAME": "myvbv-dev.iterativ.ch",
-            "DATATRANS_HMAC_KEY": env.str("DATATRANS_HMAC_KEY", ""),
-            "DATATRANS_BASIC_AUTH_KEY": env.str("DATATRANS_BASIC_AUTH_KEY", ""),
+            "DATATRANS_HMAC_KEY": env.str("PIPELINES_DATATRANS_HMAC_KEY", ""),
+            "DATATRANS_BASIC_AUTH_KEY": env.str(
+                "PIPELINES_DATATRANS_BASIC_AUTH_KEY", ""
+            ),
+            "DATATRANS_API_ENDPOINT": "https://api.sandbox.datatrans.com",
+            "DATATRANS_PAY_URL": "https://pay.sandbox.datatrans.com",
             "FILE_UPLOAD_STORAGE": "s3",
             "IT_DJANGO_DEBUG": "false",
             "IT_SERVE_VUE": "false",
diff --git a/env_secrets/local_daniel.env b/env_secrets/local_daniel.env
index 7ae4f656c72a7fda433d8e81db09bbca0a48052d..703bd5e90348bdc749c714a4a40b8b13b4a5f3fb 100644
GIT binary patch
literal 1512
zcmV<E1sD1NM@dveQdv+`05m|e=o>C-quY~NB@>Kjv9hwx!L<9@4IcztOcYMjf4dlr
zN{=(4ZmZ=LJHWAVZg_dR8SFER-T^A(E;wTNd_Ffaoqjxx6dA~Bk<FQLncRa9U+7yw
zV8?Hn@Bc1dd761g{$uVn{(W5uu9t;#non!4xB1+wO`h309Dxd_K&XSCsl)X8#9&7j
zD-kKv(yg;Sk?m}iA&Fl&!hjrDV!DqwzLCUm%Mwi~ww$}uI{1AXRCoTK5gi59fzi<m
z$zmo_l))9X)h54lg0ajzmHaAO2~f07)MQNkZu}O`8_mdBIaZ`upJ57It!y|G980LR
zg`{2O1)BZucCE2o@C{Y`OeAov=RV)xFD)-(XhqP0cm!&#c+~S{%EIDLbnXQK6F}=+
zXh2Prpjq0(U!w;+fdoTLiOgD^_QPrbe|Iz<CDoNe=O_*)g-1P}hm*=L4yb}b>VTKf
zlDptT5_GKrzV^HV*6xpqTef^(SKk1azu@5Y=)vc$qN7^Qfhr2&q|tt)f8;+-*kRnZ
zCi#e@ID~vZZq{ZtYbjuRPa};}^4{Nu2h<Shx><y*%*yZeOp|QNtUw>dJl#GK+Rk29
zmXQUTC#j&e=T)}L+&hx-O^+1%oNDlhsa#ZzmfkV^rDKxArU`3r#3(qgL!Nef?>PU(
zz;EOB8BsWUX9ioh(kY1{3ZTWjWJ!5)U5p7PunF431sD?PnCB2rrg<?%fUyg+(p7M$
z(p-d3qRn7v+xFf0JI=dItC;s$jR!U#nN2vF6|{~!An1Z95*hExVWJ2gPQ*g|?895j
zl*-9T)kh$B@u9f30*aOx?ZS@|Nyd)4VAVJbUJ0O~1TSjkam3hwBqD~MPv=6<d#Efa
zWzi_&?7h^S9NCa+d9^B@c}`aQ?#A{TI?|h(G!Ey2s;P~D&^4tE@YQp8bi`+v$JSz!
z)tN(u=Z49ZBhMUvXLR}rPq3XeMkDl<GW&Hbv0?VUr!3tLXHnS?hMqeC8%ebpR@KhM
z0=~w!7LWw{dRJQ;UYEuBKewjNx--q|9Gfu4h^_ij%8sc>eCkGMCNN^$;u@3WS?GSE
zWPjq5k=b?&LI7L_9D>x~woW(*o47LD_5fH!WAkthP0hh6-L$PXy8fLU4W+;g2JO<I
zB(CgsS0-sRG`b2fTkUc;uU8~a6nvVZGP61YcTKz%__H4dRyyutknV-0uAp=&O-_x-
zZctQn4Jyc*wTq7n3ydDn>5aTvX$W&n@l!KbzgjdqI0skZC~XHbFz&!>OA1D{nRWDH
z=*?R+sETm?u)6H!xf?>X*z6-eT6jy~W(hVO9NU_<)f*^p%<CJt(yhF#3rwW{0L-oT
ztWvL_-qNJrf57(AvqN{MR>^{(aCXWZgCMGFeBYur-DF#>Z|#fVPZzSze8e<^AOz7h
zDhue^YZ>bCt8K*ywu;II74)@HlX8G>>$?S%Qsd`n?dkh+N{jfgB6jw!Q*T>WH1jdN
zM7?Dd*%d4Gp+jx|vYw69X64f}<MjxMWYIZ8MF)22@gJzhccu5<H^`-)C+u8PK-<Iq
ztOc6CZ-%a#L4?rcrWA~v4;R}VMp|E90?2LnR$$^EfrJD(fynpZXJqCrAx+z6Z}K1c
zX3^G+)5l2Qv>CKbx#qp{WTL-CD1ttmkP2rEI|K!5SyR3tpKuc-qW#&(Adey5U&$9^
zRw)ZhN``&1dSqd9n4s9=i;Eb0<2qK3Q#U4dfG6=0!Tqh@=9X#w)CiUDTDABYoPZOH
zq27Nv=l=sOWe5~s<XULKaX=448`@&R#5!LufbuIxVyppKz*Jg1m4u)>nBc(n5^PAO
zBF>DO`i))}nopj_CGh-b@b{}#Hkj77l(Ljr14+SP5qsnUfD5^EJ4w^DD!G>4A+a2=
zY+^R0N)P>FMjOrsLihd7Pwl_)le$doDXh%}J}a|Jcahl6fO8Nfq3{}Mj;UFAt7!OU
O%0;Y)orw|(_Ix()nD*WP

literal 1281
zcmV+c1^)T~M@dveQdv+`0K~zt1aShaqph1>SC&gOXbPlOPt<_H_XF=zFMrBbRB&HK
z>zIo@$>_iMEgH;_Jj`zfn7Q}W)m%2RD@&QnOlSeUhGQ^Ie&karq-#%x2ArcCTcMye
zacXtbU;>n5<LHE087#GoYw=3r<C$A+XesalkLztTzY)0SL8no7+C3&ANTO`{HB4kZ
zc;}UA`K2-DoZA9noyU+Do%LzSc*PK*kHg`kHs{z(KLidl^k|VJl~2(k{EaNuJ8q|!
zQuz&{%QjGoG88E`lm%Sl!J##^Sn>v|($s-;&(Jfw)#UCp0<qWez__?D&*s8_z8xRI
zysRtff^W{XQ6C|A1uPA?u|ORB+fXH_1;FZmg15K89uqv^^BQZg#awtof<=46Vi^C~
zxKQtZN|izUX@f>(*k!b2*IepL9U)KT4ok{a(-lNo^<zBvbMj7{g%(!!_KxRSOQ1!N
zt_&>u>?9P{CBUfv{I0GWg3vdtjSuJWUSy!9g6La*G)ut$7C8A-A-jfV@Sh<32q9E^
z^aSA0{3U^xSj4G$P$J}d-j0dX+895O2$b(tW^u@#rM+SPG;nnMI7;lfZZn)&S+7*$
zhPCb4wn**kjS>3mN-m3g+K=Y4HX8I&Yb#sAtB<yIZ6tp5{G0C;Z^<|$5}u15rWAY|
z3uu3$em*CoMC6lpAK8|)LeqD&OTB{Hv{WF8_LDNGjzF&vnP+~DJdAwbi%_t<DE&cR
z%{V=<8r#MxoQ!8XeIG4xi~wMd&cjb{#akC6{~;U6v+a9RPFi%EyeKzHWP_mxFsopi
zE==Ytz|s<*D13Xwt9uSE*)P!N88YN!b+ts7xqMo68{M6$bF{{1*S~Lx3goQdI};Xy
zPKx~`?33&-qp38^+FRs#QT8I^A$9@BiD>l=8Izg%+s;X(L(g(7+wI7Spvf#p8(@E+
zA^+tv>NM|Nx2-8=)l0f?;3OwesAAcBR&M5NhEE$jS&MZNw3-7=Kg<G;Da(PBVlH!&
zZI%9!s$k$odfQ|OJw&dS*eaVgp5G(a9-=EI)2!>RZ4WwVD5C%ws150Btv7VWX<v6A
zVuF||roNdG8*3)dIv=-VTfW7TVFn4&-E$*5Vom>E)*qrxAX<49+iiA!d({XH8<HAp
zph3;RG!nFRkYnC)%H~7oE{4TnS9`7|c%)i{M#GoDn{~F<RRvW7gs9HtB|fmT;@$=4
zz4yr>mVo?|Ib^C*o!H}|w06GKhmDtLW5>3|`;~w?0$$=`uz4%K6&;U=kqC`g$@^@=
zH0>%!Pnty${^#e6aEIEaqkb;!`I9bXJVpqp;7v+Ft@e|5rI#mUb7mBd#6n*L`8y5e
z&622!O$B@CMGSQ!7+`IWiEHW+hkM-9&dyJ(s3^HMc&Yc5^_dcvNUtJl5QNW3s&6vO
z0s!Al4hPApLt597{9c|>j^z}Y7EWtTiNeie8J^pi+M`>ew=U&|<{e-O3J@p%irfD{
z?kVNTGtlLFC|}U~P^dL#O%L?PQ6P}loH~0Jn<rbKw2QjyB~Hr~#KqgU>fB~~OspUf
zhQVS^tE<wpQ5g@l&!s|I(G>$t32l`>PytLxr&zUh*+V-hME-e=(KHmw&Xkvj*xkvA
rA0#!9aELc67R}V0cnQxU;m+5b$i>2A4)aHay0f|KeTBvxI>C);#ZG?e

diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index a4fda6fd..6533d160 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -682,10 +682,12 @@ if APP_ENVIRONMENT.startswith("prod"):
     DATATRANS_PAY_URL = "https://pay.datatrans.com"
 else:
     DATATRANS_API_ENDPOINT = env(
-        "DATATRANS_API_ENDPOINT", default="https://api.sandbox.datatrans.com"
+        "DATATRANS_API_ENDPOINT",
+        default="http://localhost:8000/server/fakeapi/datatrans/api",
     )
     DATATRANS_PAY_URL = env(
-        "DATATRANS_PAY_URL", default="https://pay.sandbox.datatrans.com"
+        "DATATRANS_PAY_URL",
+        default="http://localhost:8000/server/fakeapi/datatrans/pay",
     )
 
 # default settings for python sftpserver test-server

From ab60eebd25fbdb3d1a96a0120988ee3a6078d94f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 23 Jul 2024 14:02:23 +0200
Subject: [PATCH 16/42] Use order_id as refno

---
 server/vbv_lernwelt/shop/services.py          |  6 +-
 .../shop/tests/test_checkout_api.py           | 24 +++---
 .../shop/tests/test_datatrans_service.py      | 19 ++---
 server/vbv_lernwelt/shop/views.py             | 73 ++++++++++---------
 4 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/server/vbv_lernwelt/shop/services.py b/server/vbv_lernwelt/shop/services.py
index a9561d0e..0e7bd7b3 100644
--- a/server/vbv_lernwelt/shop/services.py
+++ b/server/vbv_lernwelt/shop/services.py
@@ -1,6 +1,5 @@
 import hashlib
 import hmac
-import uuid
 
 import requests
 import structlog
@@ -72,6 +71,7 @@ def is_signature_valid(
 
 def init_datatrans_transaction(
     user: User,
+    refno: str,
     amount_chf_centimes: int,
     redirect_url_success: str,
     redirect_url_error: str,
@@ -90,8 +90,8 @@ def init_datatrans_transaction(
         "amount": amount_chf_centimes,
         "currency": "CHF",
         "language": user.language,
-        "refno": str(uuid.uuid4()),
-        "refno2": refno2,
+        "refno": str(refno),
+        "refno2": str(refno2),
         "webhook": {"url": webhook_url},
         "redirect": {
             "successUrl": redirect_url_success,
diff --git a/server/vbv_lernwelt/shop/tests/test_checkout_api.py b/server/vbv_lernwelt/shop/tests/test_checkout_api.py
index efbee5da..f5f46b37 100644
--- a/server/vbv_lernwelt/shop/tests/test_checkout_api.py
+++ b/server/vbv_lernwelt/shop/tests/test_checkout_api.py
@@ -71,9 +71,8 @@ class CheckoutAPITestCase(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            f"https://pay.sandbox.datatrans.com/v1/start/1234567890",
-            response.json()["next_step_url"],
+        self.assertTrue(
+            response.json()["next_step_url"].endswith("v1/start/1234567890")
         )
 
         ci = CheckoutInformation.objects.first()
@@ -154,9 +153,11 @@ class CheckoutAPITestCase(APITestCase):
         )
 
         self.assertEqual(
-            0,
+            1,
             CheckoutInformation.objects.count(),
         )
+        ci = CheckoutInformation.objects.first()
+        self.assertEqual(ci.state, CheckoutState.FAILED)
 
     def test_checkout_already_paid(self):
         # GIVEN
@@ -217,9 +218,8 @@ class CheckoutAPITestCase(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            f"https://pay.sandbox.datatrans.com/v1/start/{transaction_id_next}",
-            response.json()["next_step_url"],
+        self.assertTrue(
+            response.json()["next_step_url"].endswith(f"v1/start/{transaction_id_next}")
         )
 
         # check that we have two checkouts
@@ -277,9 +277,8 @@ class CheckoutAPITestCase(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            f"https://pay.sandbox.datatrans.com/v1/start/{transaction_id}",
-            response.json()["next_step_url"],
+        self.assertTrue(
+            response.json()["next_step_url"].endswith(f"v1/start/{transaction_id}")
         )
 
     @patch("vbv_lernwelt.shop.views.init_datatrans_transaction")
@@ -310,7 +309,6 @@ class CheckoutAPITestCase(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            f"https://pay.sandbox.datatrans.com/v1/start/{transaction_id}",
-            response.json()["next_step_url"],
+        self.assertTrue(
+            response.json()["next_step_url"].endswith(f"v1/start/{transaction_id}")
         )
diff --git a/server/vbv_lernwelt/shop/tests/test_datatrans_service.py b/server/vbv_lernwelt/shop/tests/test_datatrans_service.py
index 6dc907fe..7f22c8ee 100644
--- a/server/vbv_lernwelt/shop/tests/test_datatrans_service.py
+++ b/server/vbv_lernwelt/shop/tests/test_datatrans_service.py
@@ -24,10 +24,8 @@ class DatatransServiceTest(TestCase):
 
     @override_settings(DATATRANS_BASIC_AUTH_KEY="BASIC_AUTH_KEY")
     @patch("vbv_lernwelt.shop.services.requests.post")
-    @patch("vbv_lernwelt.shop.services.uuid.uuid4")
-    def test_init_transaction_201(self, mock_uuid, mock_post):
+    def test_init_transaction_201(self, mock_post):
         # GIVEN
-        mock_uuid.return_value = uuid.uuid4()
         mock_post.return_value.status_code = 201
         mock_post.return_value.json.return_value = {
             "transactionId": 1234567890,
@@ -38,6 +36,7 @@ class DatatransServiceTest(TestCase):
         # WHEN
         transaction_id = init_datatrans_transaction(
             user=self.user,
+            refno="123321",
             amount_chf_centimes=324_30,
             redirect_url_success=f"{REDIRECT_URL}/success",
             redirect_url_error=f"{REDIRECT_URL}/error",
@@ -64,11 +63,12 @@ class DatatransServiceTest(TestCase):
         with self.assertRaises(InitTransactionException):
             init_datatrans_transaction(
                 user=self.user,
+                refno="123321",
                 amount_chf_centimes=324_30,
-                redirect_url_success=f"/success",
-                redirect_url_error=f"/error",
-                redirect_url_cancel=f"/cancel",
-                webhook_url=f"/webhook",
+                redirect_url_success="/success",
+                redirect_url_error="/error",
+                redirect_url_cancel="/cancel",
+                webhook_url="/webhook",
                 refno2="",
             )
 
@@ -80,7 +80,4 @@ class DatatransServiceTest(TestCase):
         url = get_payment_url(transaction_id)
 
         # THEN
-        self.assertEqual(
-            url,
-            f"https://pay.sandbox.datatrans.com/v1/start/{transaction_id}",
-        )
+        self.assertTrue(url.endswith(f"v1/start/{transaction_id}"))
diff --git a/server/vbv_lernwelt/shop/views.py b/server/vbv_lernwelt/shop/views.py
index 1ce904a3..a245520a 100644
--- a/server/vbv_lernwelt/shop/views.py
+++ b/server/vbv_lernwelt/shop/views.py
@@ -93,7 +93,7 @@ def checkout_vv(request):
     sku = request.data["product"]
     base_redirect_url = request.data["redirect_url"]
 
-    log.info(f"Checkout requested: sku", user_id=request.user.id, sku=sku)
+    log.info("Checkout requested: sku", user_id=request.user.id, sku=sku)
 
     try:
         product = Product.objects.get(sku=sku)
@@ -124,6 +124,38 @@ def checkout_vv(request):
         disable_save="fakeapi" in settings.DATATRANS_API_ENDPOINT
     )
 
+    address_data = request.data["address"]
+    country_code = address_data.pop("country_code")
+    address_data["country_id"] = country_code
+
+    organisation_country_code = "CH"
+    if "organisation_country_code" in address_data:
+        organisation_country_code = address_data.pop("organisation_country_code")
+    address_data["organisation_country_id"] = organisation_country_code
+
+    if "birth_date" in address_data and address_data["birth_date"]:
+        address_data["birth_date"] = date.fromisoformat(address_data["birth_date"])
+
+    checkout_info = CheckoutInformation.objects.create(
+        user=request.user,
+        state=CheckoutState.ONGOING,
+        # product
+        product_sku=sku,
+        product_price=product.price,
+        product_name=product.name,
+        product_description=product.description,
+        email=email,
+        ip_address=ip_address,
+        cembra_byjuno_invoice=with_cembra_byjuno_invoice,
+        device_fingerprint_session_key=request.data.get(
+            "device_fingerprint_session_key", ""
+        ),
+        # address
+        **request.data["address"],
+    )
+
+    checkout_info.set_increment_abacus_order_id()
+
     refno2 = f"{request.user.abacus_debitor_number}_{VV_PRODUCT_NUMBER}"
 
     try:
@@ -138,10 +170,10 @@ def checkout_vv(request):
                 "street": f'{request.data["address"]["street"]} {request.data["address"]["street_number"]}',
                 "city": request.data["address"]["city"],
                 "zipCode": request.data["address"]["postal_code"],
-                "country": request.data["address"]["country_code"],
+                "country": request.data["address"]["country_id"],
                 "phone": request.data["address"]["phone_number"],
                 "email": email,
-                "birthDate": request.data["address"]["birth_date"],
+                "birthDate": str(request.data["address"]["birth_date"]),
                 "language": request.user.language,
                 "ipAddress": ip_address,
                 "type": "P",
@@ -154,6 +186,7 @@ def checkout_vv(request):
             }
         transaction_id = init_datatrans_transaction(
             user=request.user,
+            refno=str(checkout_info.abacus_order_id),
             amount_chf_centimes=product.price,
             redirect_url_success=checkout_success_url(
                 base_url=base_redirect_url, product_sku=sku
@@ -170,6 +203,8 @@ def checkout_vv(request):
             with_cembra_byjuno_invoice=with_cembra_byjuno_invoice,
         )
     except InitTransactionException as e:
+        checkout_info.state = CheckoutState.FAILED.value
+        checkout_info.save()
         if not settings.DEBUG:
             log.error("Transaction initiation failed", exc_info=True, error=str(e))
             capture_exception(e)
@@ -180,36 +215,8 @@ def checkout_vv(request):
             ),
         )
 
-    address_data = request.data["address"]
-    country_code = address_data.pop("country_code")
-    address_data["country_id"] = country_code
-
-    organisation_country_code = "CH"
-    if "organisation_country_code" in address_data:
-        organisation_country_code = address_data.pop("organisation_country_code")
-    address_data["organisation_country_id"] = organisation_country_code
-
-    if "birth_date" in address_data and address_data["birth_date"]:
-        address_data["birth_date"] = date.fromisoformat(address_data["birth_date"])
-
-    checkout_info = CheckoutInformation.objects.create(
-        user=request.user,
-        state=CheckoutState.ONGOING,
-        transaction_id=transaction_id,
-        # product
-        product_sku=sku,
-        product_price=product.price,
-        product_name=product.name,
-        product_description=product.description,
-        email=email,
-        ip_address=ip_address,
-        cembra_byjuno_invoice=with_cembra_byjuno_invoice,
-        device_fingerprint_session_key=request.data.get(
-            "device_fingerprint_session_key", ""
-        ),
-        # address
-        **request.data["address"],
-    )
+    checkout_info.transaction_id = transaction_id
+    checkout_info.save()
 
     return next_step_response(url=get_payment_url(transaction_id))
 

From 08b65f00d743fd8cc2a785280df51abc47c4339a Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 23 Jul 2024 14:39:49 +0200
Subject: [PATCH 17/42] Enable cembra/byjuno payment for PROD env

---
 client/src/components/onboarding/PersonalAddress.vue       | 7 -------
 .../learningContentPage/assignment/AssignmentView.vue      | 4 ----
 server/config/settings/base.py                             | 1 -
 3 files changed, 12 deletions(-)

diff --git a/client/src/components/onboarding/PersonalAddress.vue b/client/src/components/onboarding/PersonalAddress.vue
index e40dd405..0430d18a 100644
--- a/client/src/components/onboarding/PersonalAddress.vue
+++ b/client/src/components/onboarding/PersonalAddress.vue
@@ -32,13 +32,6 @@ const paymentMethods = [
   { value: "cembra_byjuno", label: t("a.Rechnung") },
 ];
 
-// TODO: remove after cembra is ready for production
-const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
-if (appEnv.startsWith("prod")) {
-  paymentMethods.splice(1, 1);
-}
-// END TODO
-
 const address = computed({
   get() {
     return props.modelValue;
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index d6d79516..48ae62a3 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -51,10 +51,6 @@ const submissionDeadline = computed(() => {
     ?.submission_deadline;
 });
 
-// FIXME daniel: `useRouteQuery` from usevue is currently the reason that we have to
-// fix the version of @vueuse/router and @vueuse/core to 10.1.0
-// it fails with version 10.2.0. I have a reminder to check out the situation
-// at the end of July 2023
 // 0 = introduction, 1 - n = tasks, n+1 = submission
 const stepIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index 6533d160..031cb063 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -332,7 +332,6 @@ X_FRAME_OPTIONS = "DENY"
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
-# FIXME how to send emails?
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
 )

From bd59f24ea95e41c6686a3c49d002a142724749f1 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jul 2024 09:20:28 +0200
Subject: [PATCH 18/42] Add loading spinner to widget

---
 .../src/components/dashboard/UkStatistics.vue |  4 ++
 .../learningPath/LearningPathDiagram.vue      | 37 ++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
index 7d70d930..720ce3e2 100644
--- a/client/src/components/dashboard/UkStatistics.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -6,6 +6,7 @@ import type { CourseStatisticsType } from "@/gql/graphql";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 import FeedbackSummaryBox from "@/components/dashboard/FeedbackSummaryBox.vue";
 import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const props = defineProps<{
   courseId: string;
@@ -95,4 +96,7 @@ onMounted(async () => {
       />
     </div>
   </div>
+  <div v-else class="flex w-full flex-row justify-center">
+    <LoadingSpinner />
+  </div>
 </template>
diff --git a/client/src/components/learningPath/LearningPathDiagram.vue b/client/src/components/learningPath/LearningPathDiagram.vue
index ce0c098e..e91aae0c 100644
--- a/client/src/components/learningPath/LearningPathDiagram.vue
+++ b/client/src/components/learningPath/LearningPathDiagram.vue
@@ -3,6 +3,7 @@ import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPa
 import { calculateCircleSectorData } from "@/pages/learningPath/learningPathPage/utils";
 import { computed } from "vue";
 import { useCourseCircleProgress, useCourseDataWithCompletion } from "@/composables";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 export type DiagramType = "horizontal" | "horizontalSmall" | "singleSmall";
 
@@ -54,23 +55,25 @@ const { inProgressCirclesCount, circlesCount } = useCourseCircleProgress(
 
 <template>
   <div>
-    <h4
-      v-if="diagramType === 'horizontal' && circles.length > 0"
-      class="mb-4 font-bold"
-    >
-      {{
-        $t("learningPathPage.progressText", {
-          inProgressCount: inProgressCirclesCount,
-          allCount: circlesCount,
-        })
-      }}
-    </h4>
-    <div :class="wrapperClasses">
-      <LearningPathCircle
-        v-for="circle in circles"
-        :key="circle.id"
-        :sectors="calculateCircleSectorData(circle)"
-      ></LearningPathCircle>
+    <div v-if="circlesCount > 0">
+      <h4 v-if="diagramType === 'horizontal'" class="mb-4 font-bold">
+        {{
+          $t("learningPathPage.progressText", {
+            inProgressCount: inProgressCirclesCount,
+            allCount: circlesCount,
+          })
+        }}
+      </h4>
+      <div :class="wrapperClasses">
+        <LearningPathCircle
+          v-for="circle in circles"
+          :key="circle.id"
+          :sectors="calculateCircleSectorData(circle)"
+        ></LearningPathCircle>
+      </div>
+    </div>
+    <div v-else class="flex justify-center">
+      <LoadingSpinner />
     </div>
   </div>
 </template>

From 4d4e202a241c0184fb1ac45f65e275f578b2989a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jul 2024 09:45:02 +0200
Subject: [PATCH 19/42] Preselect user

---
 server/vbv_lernwelt/dashboard/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 1cdf533a..e8266145 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -183,7 +183,7 @@ def _create_person_list_with_roles(user):
         if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
             course_session_users = CourseSessionUser.objects.filter(
                 course_session=cs.id
-            )
+            ).select_related("user")
             my_role = user_role(cs.roles)
             for csu in course_session_users:
                 person_data = result_persons.get(
@@ -239,7 +239,6 @@ def _create_person_list_with_roles(user):
             result_persons[mentor_relation.mentor.id]["course_sessions"].append(
                 course_session_entry
             )
-
     return result_persons.values()
 
 

From c1e1f38a274cd2eea07ebcfde955847733363383 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jul 2024 11:18:19 +0200
Subject: [PATCH 20/42] Optimize duedates in dashboards

---
 server/vbv_lernwelt/dashboard/views.py | 41 ++++++++------------------
 1 file changed, 12 insertions(+), 29 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index e8266145..9d20bab7 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -306,45 +306,28 @@ def get_dashboard_due_dates(request):
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
         course_session_ids = [cs.id for cs in course_sessions]
 
-        all_due_dates = DueDate.objects.filter(
-            course_session__id__in=course_session_ids
-        )
-
-        # filter only future due dates
-        due_dates = []
         today = date.today()
-        for due_date in all_due_dates:
-            # due_dates.append(due_date)
-            if due_date.end:
-                if due_date.end.date() >= today:
-                    due_dates.append(due_date)
-            elif due_date.start:
-                if due_date.start.date() >= today:
-                    due_dates.append(due_date)
 
-        due_dates.sort(key=lambda x: x.start)
-
-        # find course session by id in `course_sessions`
+        # Fetch future due dates in a single query using Q objects for complex filtering
+        future_due_dates = DueDate.objects.filter(
+            Q(course_session_id__in=course_session_ids),
+            Q(end__gte=today) | Q(start__gte=today)
+        ).select_related('course_session')
 
         result_due_dates = []
-        for due_date in due_dates:
-            data = DueDateSerializer(due_date).data
+        course_session_map = {cs.id: cs for cs in course_sessions}
+
+        for due_date in sorted(future_due_dates, key=lambda x: x.start):
+            data = DueDateSerializer(due_date).data
+            cs = course_session_map.get(due_date.course_session_id)
 
-            cs = next(
-                course_session
-                for course_session in course_sessions
-                if course_session.id == due_date.course_session.id
-            )
             if cs:
                 data["course_session"] = _create_course_session_dict(
                     cs, my_role=user_role(cs.roles), user_role=""
                 )
             result_due_dates.append(data)
 
-        return Response(
-            status=200,
-            data=result_due_dates,
-        )
+        return Response(status=200, data=result_due_dates)
 
     except PermissionDenied as e:
         raise e
@@ -625,7 +608,7 @@ def _get_course_sessions_with_roles_for_user(
         csr
         for csr in get_course_sessions_with_roles_for_user(user)
         if any(role in allowed_roles for role in csr.roles)
-        and csr.id in requested_cs_ids
+           and csr.id in requested_cs_ids
     ]  # noqa
 
     return all_cs_roles_for_user

From 58908bc5c687c60a900813cfee8ff794cba768dc Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jul 2024 11:37:03 +0200
Subject: [PATCH 21/42] Fix context

---
 .../dashboard/graphql/types/assignment.py     | 50 ++++++++++---------
 .../dashboard/graphql/types/competence.py     |  3 --
 server/vbv_lernwelt/dashboard/views.py        |  6 +--
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index ba26e3c6..32b91849 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -1,5 +1,5 @@
 import math
-from typing import List
+from typing import List, Tuple
 
 import graphene
 
@@ -148,7 +148,7 @@ def create_record(
     user_selection_ids: List[str] | None,
     urql_id_postfix: str = "",
     context=None,
-) -> AssignmentStatisticsRecordType:
+) -> Tuple[AssignmentStatisticsRecordType, dict]:
     if not context:
         context = {}
 
@@ -172,26 +172,29 @@ def create_record(
 
     learning_content = course_session_assignment.learning_content
 
-    return AssignmentStatisticsRecordType(
-        # make sure it's unique, across all types of assignments!
-        _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",
-        # noqa
-        course_session_id=str(course_session_assignment.course_session.id),  # noqa
-        circle_id=circle_id,  # noqa
-        course_session_assignment_id=str(course_session_assignment.id),  # noqa
-        generation=course_session_assignment.course_session.generation,  # noqa
-        assignment_type_translation_key=due_date.assignment_type_translation_key,
-        # noqa
-        assignment_title=learning_content.content_assignment.title,  # noqa
-        metrics=get_assignment_completion_metrics(  # noqa
-            course_session=course_session_assignment.course_session,  # noqa
-            assignment=learning_content.content_assignment,  # noqa
-            user_selection_ids=user_selection_ids,  # noqa
-            urql_id_postfix=urql_id_postfix,  # noqa
-            context=context,  # noqa
+    return (
+        AssignmentStatisticsRecordType(
+            # make sure it's unique, across all types of assignments!
+            _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",
+            # noqa
+            course_session_id=str(course_session_assignment.course_session.id),  # noqa
+            circle_id=circle_id,  # noqa
+            course_session_assignment_id=str(course_session_assignment.id),  # noqa
+            generation=course_session_assignment.course_session.generation,  # noqa
+            assignment_type_translation_key=due_date.assignment_type_translation_key,
+            # noqa
+            assignment_title=learning_content.content_assignment.title,  # noqa
+            metrics=get_assignment_completion_metrics(  # noqa
+                course_session=course_session_assignment.course_session,  # noqa
+                assignment=learning_content.content_assignment,  # noqa
+                user_selection_ids=user_selection_ids,  # noqa
+                urql_id_postfix=urql_id_postfix,  # noqa
+                context=context,  # noqa
+            ),
+            details_url=due_date.url_expert,  # noqa
+            deadline=due_date.start,  # noqa
         ),
-        details_url=due_date.url_expert,  # noqa
-        deadline=due_date.start,  # noqa
+        context,
     )
 
 
@@ -204,7 +207,6 @@ def assignments(
 ) -> AssignmentsStatisticsType:
     if urql_id is None:
         urql_id = str(course_id)
-
     course_sessions = CourseSession.objects.filter(
         id__in=course_session_selection_ids,
     )
@@ -215,13 +217,13 @@ def assignments(
     csets = query_competence_course_session_edoniq_tests(course_sessions, circle_ids)
 
     for csa in csas:
-        record = create_record(
+        record, context = create_record(
             csa, user_selection_ids, urql_id_postfix=urql_id, context=context
         )
         records.append(record)
 
     for cset in csets:
-        record = create_record(
+        record, context = create_record(
             cset, user_selection_ids, urql_id_postfix=urql_id, context=context
         )
         records.append(record)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/competence.py b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
index dc00f167..2cf5d96f 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/competence.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
@@ -1,13 +1,10 @@
 from typing import List, Tuple
 
 import graphene
-import structlog
 from wagtail.models import Page
 
 from vbv_lernwelt.course.models import CourseCompletion, CourseCompletionStatus
 
-logger = structlog.get_logger(__name__)
-
 
 class CompetencePerformanceStatisticsSummaryType(graphene.ObjectType):
     _id = graphene.ID(required=True)
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 9d20bab7..2e64c804 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -311,8 +311,8 @@ def get_dashboard_due_dates(request):
         # Fetch future due dates in a single query using Q objects for complex filtering
         future_due_dates = DueDate.objects.filter(
             Q(course_session_id__in=course_session_ids),
-            Q(end__gte=today) | Q(start__gte=today)
-        ).select_related('course_session')
+            Q(end__gte=today) | Q(start__gte=today),
+        ).select_related("course_session")
 
         result_due_dates = []
         course_session_map = {cs.id: cs for cs in course_sessions}
@@ -608,7 +608,7 @@ def _get_course_sessions_with_roles_for_user(
         csr
         for csr in get_course_sessions_with_roles_for_user(user)
         if any(role in allowed_roles for role in csr.roles)
-           and csr.id in requested_cs_ids
+        and csr.id in requested_cs_ids
     ]  # noqa
 
     return all_cs_roles_for_user

From fe2b91e619be268095ea9d42edb0fc196b63fc30 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jul 2024 14:00:29 +0200
Subject: [PATCH 22/42] Add debug middleware

---
 server/config/settings/base.py               |  1 +
 server/vbv_lernwelt/debugtools/middleware.py | 38 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 server/vbv_lernwelt/debugtools/middleware.py

diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index a4fda6fd..8251e138 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -201,6 +201,7 @@ MIDDLEWARE = [
     "vbv_lernwelt.core.middleware.security.SecurityRequestResponseLoggingMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
     "vbv_lernwelt.core.middleware.auth.UserLoggedInCookieMiddleWare",
+    # "vbv_lernwelt.debugtools.middleware.QueryCountDebugMiddleware",
 ]
 
 # STATIC
diff --git a/server/vbv_lernwelt/debugtools/middleware.py b/server/vbv_lernwelt/debugtools/middleware.py
new file mode 100644
index 00000000..fea26453
--- /dev/null
+++ b/server/vbv_lernwelt/debugtools/middleware.py
@@ -0,0 +1,38 @@
+import time
+
+import structlog
+from django.db import connection, reset_queries
+
+logger = structlog.get_logger(__name__)
+
+
+class QueryCountDebugMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if not request.path.startswith("/api/") and not request.path.startswith(
+            "/server/"
+        ):
+            return self.get_response(request)
+
+        reset_queries()
+        start_queries = len(connection.queries)
+        start_time = time.time()
+
+        response = self.get_response(request)
+
+        end_queries = len(connection.queries)
+        end_time = time.time()
+
+        total_queries = end_queries - start_queries
+        duration = end_time - start_time
+
+        logger.debug(
+            "query_count_middleware",
+            request_path=request.path,
+            queries=total_queries,
+            duration=duration,
+        )
+
+        return response

From d750a19d24308159e19db58645a09c07f036e0c3 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Jul 2024 08:44:10 +0200
Subject: [PATCH 23/42] Add migration and admin field

---
 server/vbv_lernwelt/course/admin.py           |  4 ++-
 ...essionuser_required_attendance_and_more.py | 32 +++++++++++++++++++
 server/vbv_lernwelt/course/models.py          |  1 +
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 server/vbv_lernwelt/course/migrations/0009_coursesessionuser_required_attendance_and_more.py

diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py
index 4a4741f3..8ec26bb9 100644
--- a/server/vbv_lernwelt/course/admin.py
+++ b/server/vbv_lernwelt/course/admin.py
@@ -64,6 +64,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
         "course_session",
         "role",
         "circles",
+        "optional_attendance",
         # "created_at",
         # "updated_at",
     ]
@@ -76,6 +77,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
     list_filter = [
         "role",
         "course_session",
+        "optional_attendance",
     ]
     raw_id_fields = [
         "user",
@@ -97,7 +99,7 @@ class CourseSessionUserAdmin(admin.ModelAdmin):
         return ", ".join([c.title for c in obj.expert.all()])
 
     fieldsets = [
-        (None, {"fields": ("user", "course_session", "role")}),
+        (None, {"fields": ("user", "course_session", "role", "optional_attendance")}),
         (
             "Expert/Trainer",
             {
diff --git a/server/vbv_lernwelt/course/migrations/0009_coursesessionuser_required_attendance_and_more.py b/server/vbv_lernwelt/course/migrations/0009_coursesessionuser_required_attendance_and_more.py
new file mode 100644
index 00000000..3c7fe2f8
--- /dev/null
+++ b/server/vbv_lernwelt/course/migrations/0009_coursesessionuser_required_attendance_and_more.py
@@ -0,0 +1,32 @@
+# Generated by Django 4.2.13 on 2024-07-25 05:47
+
+from django.db import migrations, models
+
+import vbv_lernwelt.course.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0008_auto_20240403_1132"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="coursesessionuser",
+            name="optional_attendance",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AlterField(
+            model_name="coursecompletion",
+            name="completion_status",
+            field=models.CharField(
+                choices=[
+                    ("SUCCESS", "Success"),
+                    ("FAIL", "Fail"),
+                    ("UNKNOWN", "Unknown"),
+                ],
+                default=vbv_lernwelt.course.models.CourseCompletionStatus["UNKNOWN"],
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index d8b6997a..d85c6a9a 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -283,6 +283,7 @@ class CourseSessionUser(models.Model):
     expert = models.ManyToManyField(
         "learnpath.Circle", related_name="expert", blank=True
     )
+    optional_attendance = models.BooleanField(default=False)
 
     class Meta:
         constraints = [

From dec5691d8f7143e83784b44065dc7e39d3394f13 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Jul 2024 09:52:15 +0200
Subject: [PATCH 24/42] Add info to attendance page

---
 client/src/components/ui/ItPersonRow.vue         | 16 ++++++++++++----
 client/src/gql/gql.ts                            |  4 ++--
 client/src/gql/graphql.ts                        |  5 +++--
 client/src/gql/schema.graphql                    |  1 +
 client/src/graphql/queries.ts                    |  1 +
 .../attendanceCheckPage/AttendanceCheckPage.vue  |  3 +++
 server/vbv_lernwelt/course/graphql/types.py      |  2 ++
 7 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/client/src/components/ui/ItPersonRow.vue b/client/src/components/ui/ItPersonRow.vue
index 98f2792b..addb6356 100644
--- a/client/src/components/ui/ItPersonRow.vue
+++ b/client/src/components/ui/ItPersonRow.vue
@@ -1,18 +1,26 @@
 <script setup lang="ts">
 import ItRow from "@/components/ui/ItRow.vue";
 
-defineProps<{
+export interface Props {
   avatarUrl: string;
   name: string;
-}>();
+  extraInfo?: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  extraInfo: "",
+});
 </script>
 
 <template>
   <ItRow>
     <template #firstRow>
       <slot name="leading"></slot>
-      <img class="mr-2 h-11 w-11 rounded-full" :src="avatarUrl" />
-      <p class="text-bold lg:leading-[45px]">{{ name }}</p>
+      <img class="mr-2 h-11 w-11 rounded-full" :src="props.avatarUrl" />
+      <p class="text-bold lg:leading-[45px]">
+        {{ props.name }}
+        <span v-if="props.extraInfo" class="font-normal">{{ props.extraInfo }}</span>
+      </p>
     </template>
     <template #center>
       <slot name="center"></slot>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index a159d573..37055776 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -20,7 +20,7 @@ const documents = {
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      needs_expert_evaluation\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      solution_sample {\n        id\n        url\n      }\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_points_deducted\n      evaluation_points_deducted_reason\n      evaluation_points_final\n\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
     "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userId: UUID!\n  ) {\n    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateForUserQueryDocument,
-    "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n": types.CourseSessionDetailDocument,
+    "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n        optional_attendance\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n": types.CourseSessionDetailDocument,
     "\n  query courseQuery($slug: String!) {\n    course(slug: $slug) {\n      id\n      title\n      slug\n      category_name\n      configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n      action_competences {\n        competence_id\n        ...CoursePageFields\n        performance_criteria {\n          competence_id\n          learning_unit {\n            id\n            slug\n            evaluate_url\n          }\n          ...CoursePageFields\n        }\n      }\n      learning_path {\n        ...CoursePageFields\n        topics {\n          is_visible\n          ...CoursePageFields\n          circles {\n            description\n            goals\n            ...CoursePageFields\n            learning_sequences {\n              icon\n              ...CoursePageFields\n              learning_units {\n                evaluate_url\n                ...CoursePageFields\n                performance_criteria {\n                  ...CoursePageFields\n                }\n                learning_contents {\n                  can_user_self_toggle_course_completion\n                  content_url\n                  minutes\n                  description\n                  ...CoursePageFields\n                  ... on LearningContentAssignmentObjectType {\n                    assignment_type\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentEdoniqTestObjectType {\n                    checkbox_text\n                    has_extended_time_test\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentRichTextObjectType {\n                    text\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CourseQueryDocument,
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
@@ -75,7 +75,7 @@ export function graphql(source: "\n  query competenceCertificateForUserQuery(\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n        optional_attendance\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n        optional_attendance\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index beb6b10f..732491b5 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -455,6 +455,7 @@ export type CourseSessionUserObjectsType = {
   first_name: Scalars['String']['output'];
   id: Scalars['ID']['output'];
   last_name: Scalars['String']['output'];
+  optional_attendance?: Maybe<Scalars['Boolean']['output']>;
   role: Scalars['String']['output'];
   user_id: Scalars['UUID']['output'];
 };
@@ -1285,7 +1286,7 @@ export type CourseSessionDetailQueryVariables = Exact<{
 }>;
 
 
-export type CourseSessionDetailQuery = { __typename?: 'Query', course_session?: { __typename?: 'CourseSessionObjectType', id: string, title: string, course: { __typename?: 'CourseObjectType', id: string, title: string, slug: string, configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean } }, users: Array<{ __typename?: 'CourseSessionUserObjectsType', id: string, user_id: string, first_name: string, last_name: string, email: string, avatar_url: string, role: string, circles: Array<{ __typename?: 'CourseSessionUserExpertCircleType', id: string, title: string, slug: string }> }>, attendance_courses: Array<{ __typename?: 'CourseSessionAttendanceCourseObjectType', id: string, location: string, trainer: string, learning_content_id?: string | null, due_date?: { __typename?: 'DueDateObjectType', id: string, start?: string | null, end?: string | null } | null, learning_content: { __typename?: 'LearningContentAttendanceCourseObjectType', id: string, title: string, circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null } }>, assignments: Array<{ __typename?: 'CourseSessionAssignmentObjectType', id: string, submission_deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null } | null, evaluation_deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null } | null, learning_content: { __typename?: 'LearningContentAssignmentObjectType', id: string, title: string, content_assignment: { __typename?: 'AssignmentObjectType', id: string, title: string, assignment_type: AssignmentAssignmentAssignmentTypeChoices } } }>, edoniq_tests: Array<{ __typename?: 'CourseSessionEdoniqTestObjectType', id: string, deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null, end?: string | null } | null, learning_content: { __typename?: 'LearningContentEdoniqTestObjectType', id: string, title: string, content_assignment: { __typename?: 'AssignmentObjectType', id: string, title: string, assignment_type: AssignmentAssignmentAssignmentTypeChoices } } }> } | null };
+export type CourseSessionDetailQuery = { __typename?: 'Query', course_session?: { __typename?: 'CourseSessionObjectType', id: string, title: string, course: { __typename?: 'CourseObjectType', id: string, title: string, slug: string, configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean } }, users: Array<{ __typename?: 'CourseSessionUserObjectsType', id: string, user_id: string, first_name: string, last_name: string, email: string, avatar_url: string, role: string, optional_attendance?: boolean | null, circles: Array<{ __typename?: 'CourseSessionUserExpertCircleType', id: string, title: string, slug: string }> }>, attendance_courses: Array<{ __typename?: 'CourseSessionAttendanceCourseObjectType', id: string, location: string, trainer: string, learning_content_id?: string | null, due_date?: { __typename?: 'DueDateObjectType', id: string, start?: string | null, end?: string | null } | null, learning_content: { __typename?: 'LearningContentAttendanceCourseObjectType', id: string, title: string, circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null } }>, assignments: Array<{ __typename?: 'CourseSessionAssignmentObjectType', id: string, submission_deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null } | null, evaluation_deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null } | null, learning_content: { __typename?: 'LearningContentAssignmentObjectType', id: string, title: string, content_assignment: { __typename?: 'AssignmentObjectType', id: string, title: string, assignment_type: AssignmentAssignmentAssignmentTypeChoices } } }>, edoniq_tests: Array<{ __typename?: 'CourseSessionEdoniqTestObjectType', id: string, deadline?: { __typename?: 'DueDateObjectType', id: string, start?: string | null, end?: string | null } | null, learning_content: { __typename?: 'LearningContentEdoniqTestObjectType', id: string, title: string, content_assignment: { __typename?: 'AssignmentObjectType', id: string, title: string, assignment_type: AssignmentAssignmentAssignmentTypeChoices } } }> } | null };
 
 export type CourseQueryQueryVariables = Exact<{
   slug: Scalars['String']['input'];
@@ -1411,7 +1412,7 @@ export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"needs_expert_evaluation"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted_reason"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_completion_data"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
 export const CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list_for_user"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
-export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseSessionDetail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_courses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"location"}},{"kind":"Field","name":{"kind":"Name","value":"trainer"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"submission_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_tests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseSessionDetailQuery, CourseSessionDetailQueryVariables>;
+export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseSessionDetail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}},{"kind":"Field","name":{"kind":"Name","value":"optional_attendance"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_courses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"location"}},{"kind":"Field","name":{"kind":"Name","value":"trainer"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"submission_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_tests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseSessionDetailQuery, CourseSessionDetailQueryVariables>;
 export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}},{"kind":"Field","name":{"kind":"Name","value":"action_competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_unit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"topics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"is_visible"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"goals"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_sequences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_units"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_contents"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"can_user_self_toggle_course_completion"}},{"kind":"Field","name":{"kind":"Name","value":"content_url"}},{"kind":"Field","name":{"kind":"Name","value":"minutes"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentAssignmentObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentEdoniqTestObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"checkbox_text"}},{"kind":"Field","name":{"kind":"Name","value":"has_extended_time_test"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentRichTextObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index af9a73ac..14d5f4ed 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -713,6 +713,7 @@ type CourseSessionUserObjectsType {
   avatar_url: String!
   role: String!
   circles: [CourseSessionUserExpertCircleType!]!
+  optional_attendance: Boolean
 }
 
 type CourseSessionUserExpertCircleType {
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index c1ef08ac..65d46547 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -192,6 +192,7 @@ export const COURSE_SESSION_DETAIL_QUERY = graphql(`
           title
           slug
         }
+        optional_attendance
       }
       attendance_courses {
         id
diff --git a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
index b079551d..198a2d30 100644
--- a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
+++ b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
@@ -224,6 +224,9 @@ watch(
               :name="`${csu.first_name} ${csu.last_name}`"
               :avatar-url="csu.avatar_url"
               :class="0 === index ? 'border-none' : ''"
+              :extra-info="
+                csu.optional_attendance ? `(${$t('a.Optionale Anwesenheit')})` : ''
+              "
             >
               <template #leading>
                 <ItCheckbox
diff --git a/server/vbv_lernwelt/course/graphql/types.py b/server/vbv_lernwelt/course/graphql/types.py
index fb6ec987..32665319 100644
--- a/server/vbv_lernwelt/course/graphql/types.py
+++ b/server/vbv_lernwelt/course/graphql/types.py
@@ -151,6 +151,7 @@ class CourseSessionUserObjectsType(ObjectType):
     circles = graphene.List(
         graphene.NonNull(CourseSessionUserExpertCircleType), required=True
     )
+    optional_attendance = graphene.Boolean(required=False)
 
 
 class CircleDocumentObjectType(DjangoObjectType):
@@ -233,6 +234,7 @@ class CourseSessionObjectType(DjangoObjectType):
                         )
                         for circle in course_session_user.expert.all()  # noqa
                     ],
+                    optional_attendance=course_session_user.optional_attendance,  # noqa
                 )
             )
 

From fd3effc67394d9b43b28c0ae33269bb8f8fe2a93 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Jul 2024 11:07:46 +0200
Subject: [PATCH 25/42] Add optional attendance information to profile

---
 client/src/pages/userProfile/UserProfilePage.vue | 7 ++++++-
 server/vbv_lernwelt/core/serializers.py          | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index 7bd87afe..d21cfd0f 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -53,7 +53,12 @@ onMounted(() => {
           <div class="flex flex-col">
             <h2 class="mb-2">{{ user.first_name }} {{ user.last_name }}</h2>
             <p class="mb-2">{{ user.email }}</p>
-            <p class="text-gray-800">{{ $t("a.Teilnehmer") }}</p>
+            <p class="text-gray-800">
+              {{ $t("a.Teilnehmer") }}
+              <span v-if="user.optional_attendance">
+                ({{ $t("a.Optionale Anwesenheit") }})
+              </span>
+            </p>
           </div>
         </div>
       </div>
diff --git a/server/vbv_lernwelt/core/serializers.py b/server/vbv_lernwelt/core/serializers.py
index 31965017..d099c6ee 100644
--- a/server/vbv_lernwelt/core/serializers.py
+++ b/server/vbv_lernwelt/core/serializers.py
@@ -55,6 +55,7 @@ class UserSerializer(serializers.ModelSerializer):
     course_session_experts = serializers.SerializerMethodField()
     country = CountrySerializer()
     organisation_country = CountrySerializer()
+    optional_attendance = serializers.SerializerMethodField()
 
     class Meta:
         model = User
@@ -83,6 +84,7 @@ class UserSerializer(serializers.ModelSerializer):
             "organisation_postal_code",
             "organisation_city",
             "organisation_country",
+            "optional_attendance",
         ]
         read_only_fields = [
             "id",
@@ -108,6 +110,11 @@ class UserSerializer(serializers.ModelSerializer):
 
         return [str(_id) for _id in (supervisor_in_session_ids | expert_in_session_ids)]
 
+    def get_optional_attendance(self, obj: User) -> bool:
+        return CourseSessionUser.objects.filter(
+            user=obj, optional_attendance=True
+        ).values_list("course_session__id", flat=True)
+
     def update(self, instance, validated_data):
         country_data = validated_data.pop("country", None)
         organisation_country_data = validated_data.pop("organisation_country", None)

From 848647fb97b2e3327d629d4694b814817e95b7f4 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Jul 2024 13:57:06 +0200
Subject: [PATCH 26/42] Add cypress tests

---
 client/src/components/ui/ItPersonRow.vue      | 12 ++++++++----
 .../AttendanceCheckPage.vue                   |  2 +-
 .../src/pages/userProfile/UserProfilePage.vue |  4 ++--
 .../e2e/cockpit/cockpitAttendaceCheck.cy.js   | 11 +++++++++++
 .../publicProfileAttendance.cy.js             | 17 +++++++++++++++++
 server/vbv_lernwelt/api/tests/test_profile.py |  1 +
 .../core/management/commands/cypress_reset.py | 19 +++++++++++++++++++
 7 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 cypress/e2e/cockpit/cockpitAttendaceCheck.cy.js
 create mode 100644 cypress/e2e/publicProfile/publicProfileAttendance.cy.js

diff --git a/client/src/components/ui/ItPersonRow.vue b/client/src/components/ui/ItPersonRow.vue
index addb6356..c7383606 100644
--- a/client/src/components/ui/ItPersonRow.vue
+++ b/client/src/components/ui/ItPersonRow.vue
@@ -17,10 +17,14 @@ const props = withDefaults(defineProps<Props>(), {
     <template #firstRow>
       <slot name="leading"></slot>
       <img class="mr-2 h-11 w-11 rounded-full" :src="props.avatarUrl" />
-      <p class="text-bold lg:leading-[45px]">
-        {{ props.name }}
-        <span v-if="props.extraInfo" class="font-normal">{{ props.extraInfo }}</span>
-      </p>
+      <div :class="props.extraInfo ? 'leading-5' : ''">
+        <p class="text-bold" :class="props.extraInfo ? '' : 'lg:leading-[45px]'">
+          {{ props.name }}
+        </p>
+        <p v-if="props.extraInfo" class="font-normal" data-cy="extra-info">
+          {{ props.extraInfo }}
+        </p>
+      </div>
     </template>
     <template #center>
       <slot name="center"></slot>
diff --git a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
index 198a2d30..9f6d6e94 100644
--- a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
+++ b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
@@ -225,7 +225,7 @@ watch(
               :avatar-url="csu.avatar_url"
               :class="0 === index ? 'border-none' : ''"
               :extra-info="
-                csu.optional_attendance ? `(${$t('a.Optionale Anwesenheit')})` : ''
+                csu.optional_attendance ? `${$t('a.Optionale Anwesenheit')}` : ''
               "
             >
               <template #leading>
diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index d21cfd0f..cf27137e 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -55,8 +55,8 @@ onMounted(() => {
             <p class="mb-2">{{ user.email }}</p>
             <p class="text-gray-800">
               {{ $t("a.Teilnehmer") }}
-              <span v-if="user.optional_attendance">
-                ({{ $t("a.Optionale Anwesenheit") }})
+              <span v-if="user.optional_attendance" data-cy="optional-attendance">
+                {{ $t("a.Optionale Anwesenheit") }}
               </span>
             </p>
           </div>
diff --git a/cypress/e2e/cockpit/cockpitAttendaceCheck.cy.js b/cypress/e2e/cockpit/cockpitAttendaceCheck.cy.js
new file mode 100644
index 00000000..81f0eed9
--- /dev/null
+++ b/cypress/e2e/cockpit/cockpitAttendaceCheck.cy.js
@@ -0,0 +1,11 @@
+import { login } from "../helpers";
+
+describe("cockpitAttendaceCheck.cy.js", () => {
+  it("will display optional participants", () => {
+    cy.manageCommand("cypress_reset --set-optional-attendance-flag");
+    login("test-trainer1@example.com", "test");
+    cy.visit("/course/test-lehrgang/cockpit/attendance");
+
+    cy.get('[data-cy="extra-info"]').should("contain", "Optionale Anwesenheit");
+  });
+});
diff --git a/cypress/e2e/publicProfile/publicProfileAttendance.cy.js b/cypress/e2e/publicProfile/publicProfileAttendance.cy.js
new file mode 100644
index 00000000..2abd72e1
--- /dev/null
+++ b/cypress/e2e/publicProfile/publicProfileAttendance.cy.js
@@ -0,0 +1,17 @@
+import { login } from "../helpers";
+import { TEST_STUDENT1_USER_ID } from "../../consts";
+
+describe("publicProfileAttendance.cy.js", () => {
+  it("will display optional attendance", () => {
+    cy.manageCommand("cypress_reset --set-optional-attendance-flag");
+    login("test-trainer1@example.com", "test");
+    cy.visit(
+      `course/test-lehrgang/profile/${TEST_STUDENT1_USER_ID}/learning-path`,
+    );
+
+    cy.get('[data-cy="optional-attendance"]').should(
+      "contain",
+      "Optionale Anwesenheit",
+    );
+  });
+});
diff --git a/server/vbv_lernwelt/api/tests/test_profile.py b/server/vbv_lernwelt/api/tests/test_profile.py
index bb8c3206..b5b68f70 100644
--- a/server/vbv_lernwelt/api/tests/test_profile.py
+++ b/server/vbv_lernwelt/api/tests/test_profile.py
@@ -71,5 +71,6 @@ class ProfileViewTest(APITestCase):
                 "organisation_postal_code": "",
                 "organisation_city": "",
                 "organisation_country": None,
+                "optional_attendance": False,
             },
         )
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index 1a02a343..38c38c9c 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -120,6 +120,11 @@ from vbv_lernwelt.shop.models import CheckoutInformation
     default=False,
     help="Will set only the is_vv flag for the test course and enable learning mentors for the course",
 )
+@click.option(
+    "--set-optional-attendance-flag/--no-optional-attendance-flag",
+    default=False,
+    help="Will set the optional attendance flag for the test-student1@example.com",
+)
 def command(
     create_assignment_completion,
     create_assignment_evaluation,
@@ -133,6 +138,7 @@ def command(
     create_learning_mentor,
     set_only_is_uk_flag,
     set_only_is_vv_flag,
+    set_optional_attendance_flag,
 ):
     print("cypress reset data")
     CourseCompletion.objects.all().delete()
@@ -478,4 +484,17 @@ def command(
             course.configuration.is_uk = False
             course.configuration.enable_learning_mentor = False
 
+    if set_optional_attendance_flag:
+        course_session_user = CourseSessionUser.objects.get(
+            user__id=TEST_STUDENT1_USER_ID
+        )
+        course_session_user.optional_attendance = True
+        course_session_user.save()
+    else:
+        course_session_user = CourseSessionUser.objects.get(
+            user_id=TEST_STUDENT1_USER_ID
+        )
+        course_session_user.optional_attendance = False
+        course_session_user.save()
+
     course.configuration.save()

From b52781fe22928ebd037c7da29ab7636fb29c932c Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Jul 2024 15:56:40 +0200
Subject: [PATCH 27/42] Add optional attendance flag to export

---
 .../course_session/services/export_attendance.py      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/server/vbv_lernwelt/course_session/services/export_attendance.py b/server/vbv_lernwelt/course_session/services/export_attendance.py
index 71587217..214d9b77 100644
--- a/server/vbv_lernwelt/course_session/services/export_attendance.py
+++ b/server/vbv_lernwelt/course_session/services/export_attendance.py
@@ -82,6 +82,10 @@ def _create_sheet(
     # headers
     # common user headers..., <attendance_course> <date>, status <attendance_course>, ..
     col_idx = add_user_headers(sheet)
+
+    sheet.cell(row=1, column=col_idx, value=str(_("Optionale Anwesenheit")))
+    col_idx += 1
+
     attendance_data = {}
 
     for course in attendance_courses:
@@ -110,6 +114,13 @@ def _create_sheet(
 def _add_rows(sheet, users: list[CourseSessionUser], attendance_data):
     for row_idx, user in enumerate(users, start=2):
         col_idx = add_user_export_data(sheet, user, row_idx)
+
+        optional_attendance_text = (
+            str(_("Ja")) if user.optional_attendance else str(_("Nein"))
+        )
+        sheet.cell(row=row_idx, column=col_idx, value=optional_attendance_text)
+        col_idx += 1
+
         for key, user_dict_map in attendance_data.items():
             user_dict = user_dict_map.get(str(user.user.id), {})
             status = user_dict.get("status", "") if user_dict else ""

From fabb759daa23cf9bb38e62561db306f81c3c9cca Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Sat, 27 Jul 2024 21:21:34 +0200
Subject: [PATCH 28/42] Update tests, add translations

---
 server/locale/de/LC_MESSAGES/django.po        |  58 +++++++++++-------
 server/locale/fr/LC_MESSAGES/django.mo        | Bin 2619 -> 2743 bytes
 server/locale/fr/LC_MESSAGES/django.po        |  39 ++++++++----
 server/locale/it/LC_MESSAGES/django.mo        | Bin 2526 -> 2646 bytes
 server/locale/it/LC_MESSAGES/django.po        |  39 ++++++++----
 .../tests/test_attendance_export.py           |  30 +++++++--
 6 files changed, 111 insertions(+), 55 deletions(-)

diff --git a/server/locale/de/LC_MESSAGES/django.po b/server/locale/de/LC_MESSAGES/django.po
index 826c9f35..d377dfff 100644
--- a/server/locale/de/LC_MESSAGES/django.po
+++ b/server/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-18 15:24+0200\n"
+"POT-Creation-Date: 2024-07-27 20:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,32 +38,32 @@ msgstr ""
 msgid "Nicht bestanden"
 msgstr ""
 
-#: vbv_lernwelt/assignment/export.py:203 vbv_lernwelt/assignment/export.py:206
-#: vbv_lernwelt/assignment/export.py:207
+#: vbv_lernwelt/assignment/export.py:204 vbv_lernwelt/assignment/export.py:208
+#: vbv_lernwelt/assignment/export.py:209
 msgid "Keine Daten"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:32
+#: vbv_lernwelt/core/admin.py:38 vbv_lernwelt/sso/admin.py:83
 msgid "Personal info"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:34
+#: vbv_lernwelt/core/admin.py:40
 msgid "Permissions"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:45
+#: vbv_lernwelt/core/admin.py:51
 msgid "Important dates"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:47
+#: vbv_lernwelt/core/admin.py:53
 msgid "Profile"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:62
+#: vbv_lernwelt/core/admin.py:70
 msgid "Organisation"
 msgstr ""
 
-#: vbv_lernwelt/core/admin.py:75
+#: vbv_lernwelt/core/admin.py:83 vbv_lernwelt/sso/admin.py:86
 msgid "Additional data"
 msgstr ""
 
@@ -87,31 +87,31 @@ msgstr ""
 msgid "Lehrgang-Seite"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:272
+#: vbv_lernwelt/course/models.py:278
 msgid "Teilnehmer"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:273
+#: vbv_lernwelt/course/models.py:279
 msgid "Experte/Trainer"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:332
+#: vbv_lernwelt/course/models.py:339
 msgid "Dokumente im Circle ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:336
+#: vbv_lernwelt/course/models.py:343
 msgid "Lernmentor-Funktion ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:340
+#: vbv_lernwelt/course/models.py:347
 msgid "Kompetenzweise ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:343
+#: vbv_lernwelt/course/models.py:350
 msgid "Versicherungsvermittler-Lehrgang"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:344
+#: vbv_lernwelt/course/models.py:351
 msgid "ÜK-Lehrgang"
 msgstr ""
 
@@ -119,31 +119,43 @@ msgstr ""
 msgid "export_anwesenheit"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:92
+#: vbv_lernwelt/course_session/services/export_attendance.py:86
+msgid "Optionale Anwesenheit"
+msgstr ""
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:96
 msgid "Anwesenheit"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:116
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Ja"
+msgstr ""
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Nein"
+msgstr ""
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Anwesend"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:116
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Nicht anwesend"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:123
+#: vbv_lernwelt/course_session/services/export_attendance.py:135
 msgid "Vorname"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:124
+#: vbv_lernwelt/course_session/services/export_attendance.py:136
 msgid "Nachname"
 msgstr ""
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:125
+#: vbv_lernwelt/course_session/services/export_attendance.py:137
 msgid "Email"
 msgstr "Email"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:126
+#: vbv_lernwelt/course_session/services/export_attendance.py:138
 msgid "Lehrvertragsnummer"
 msgstr ""
 
diff --git a/server/locale/fr/LC_MESSAGES/django.mo b/server/locale/fr/LC_MESSAGES/django.mo
index ce61e8a72769e42ae28aef9a3d86d6a038be81e4..57810233a1dc8e67621a4022cb8761f6c74a6e9b 100644
GIT binary patch
delta 802
zcmXxiKS&!<9Ki8k?_x~TSZkWpYOOu%A5ajnIMl&Gv4bLwRw$)Z@CYY4&`U6vItT{3
zi9^9qT5%H`vWVhPT5*t+4o-II;LypTR0LPIet&0t+<TvQmzUqY-|yW);%l<_Cm#AF
zv?ufydg7KyH^vMG+Ac<L5AWc2yp2Dx22ZdKe^>9%kW2nC==uwc;}vS0m?;v%B;FM%
zN;8vs9&}?82T>QMuomCobDYI?+`th$#4*%pZ($rea2u!b7(20*T|UH7Y{VJV1PU1E
z{ZeG28(7CS+`?h1@B?)tVRoT^s7KvU69ciO4K>3q4C6CoPcn#PCPVlXC#v_^>hCKU
z<M{`S@P7HoL^J<_QQSc;`NlAcN7##DcJmqs@ExvU2LIv<oMM+b{EQtKA(+~W7QRA_
zn@3G}8H+kuWAX?$k;J8$u8p`sYhu(h*2a<`dku8cGzP~Td_Q{Dn!U!;_V}9M`_d$}
zLKHSQihC3-D21-kQtCO~r#H~G<TowBL`&RCe^6R5hKzB$R5p4{$Ms6T3@e$+`EJ&;
z=N)U<TXOP_mvLNw|I#=&%~ZiHorXvHUS>U+wDVSOu~KG%FO}7FCR?bKW%Bw-+Og*B
RbYb4NefPby-(MRw{{v?!RY3p%

delta 674
zcmY+?ze@sP7{KvI&$_J4GJjM`W!c~mK{N#6aG^v~L(mXGOGbl;(Gau<4Gqx{9Q6l8
zLo@^;RNxY{)Ed=N1T76xLsJleeILD{UhaKA_nf}(`@GNHMW_-iz63l6LW?>52S@17
zE(Th`Ez*MP*oIr^#T{(Iee~g>6Cb1g?-T=gjynGqJMa$u_}X}0luvF<9(>~@x($(G
zoWf~b##ubVMSRBu&Ui%TF^8J)753m8MzDsOXoM^^kvQtc6Bx%dTCSqVDmR+pNpoXD
z2{oY#vW8rvp6CX-<eouK@`OWJbz&cr+KFSR>m{)j$B|1?3~9{ZDDL6{`^zOaOXz3T
z8s;#A4_Lq`$4KCwV+jX|ACal@g?h4@qn}-)!~>{rQIiVODcrwC!KK*Cz`T0NG+SLz
z%cZ4c|N6puYHj+BbkTzv(E8{hx>n<F)6KPV6jnN&AGCt{opft#<u|h%+5C!FcEvqr
af4Gx&)aWnI8CAnhnU=k6hRbKB*Z2iO?L2J&

diff --git a/server/locale/fr/LC_MESSAGES/django.po b/server/locale/fr/LC_MESSAGES/django.po
index 949dc188..f18ecf09 100644
--- a/server/locale/fr/LC_MESSAGES/django.po
+++ b/server/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-12 09:37+0200\n"
+"POT-Creation-Date: 2024-07-27 20:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,23 +95,23 @@ msgstr ""
 msgid "Experte/Trainer"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:338
+#: vbv_lernwelt/course/models.py:339
 msgid "Dokumente im Circle ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:342
+#: vbv_lernwelt/course/models.py:343
 msgid "Lernmentor-Funktion ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:346
+#: vbv_lernwelt/course/models.py:347
 msgid "Kompetenzweise ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:349
+#: vbv_lernwelt/course/models.py:350
 msgid "Versicherungsvermittler-Lehrgang"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:350
+#: vbv_lernwelt/course/models.py:351
 msgid "ÜK-Lehrgang"
 msgstr ""
 
@@ -119,31 +119,44 @@ msgstr ""
 msgid "export_anwesenheit"
 msgstr "export_presence"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:92
+#: vbv_lernwelt/course_session/services/export_attendance.py:86
+#| msgid "Anwesenheit"
+msgid "Optionale Anwesenheit"
+msgstr "Présence facultative"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:96
 msgid "Anwesenheit"
 msgstr "Présence"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:117
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Ja"
+msgstr "Oui"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Nein"
+msgstr "Non"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Anwesend"
 msgstr "Présent"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:117
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Nicht anwesend"
 msgstr "Pas présent"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:124
+#: vbv_lernwelt/course_session/services/export_attendance.py:135
 msgid "Vorname"
 msgstr "Prénom"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:125
+#: vbv_lernwelt/course_session/services/export_attendance.py:136
 msgid "Nachname"
 msgstr "Nom de famille"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:126
+#: vbv_lernwelt/course_session/services/export_attendance.py:137
 msgid "Email"
 msgstr "E-mail"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:127
+#: vbv_lernwelt/course_session/services/export_attendance.py:138
 msgid "Lehrvertragsnummer"
 msgstr "Numéro de contrat d'apprentissage"
 
diff --git a/server/locale/it/LC_MESSAGES/django.mo b/server/locale/it/LC_MESSAGES/django.mo
index 9cd960ba104f8242c39253523e57dd8031e5d563..a046bd9415926ec35a412e4d2314c0f5562689d1 100644
GIT binary patch
delta 777
zcmX}qKS*0q6vy$?7fsq4|MZ!p{!LSjlsMW&u^Ad1)Ww2BMG(yJpebz(X@cMqaCG$H
zprC_Lir~<ar35-v9Gu$4!NElbQ3|dOLchNxczNf2?t8hp_uO;edG~3ga_+Wl8SMoz
zKtvvyr7-MpqkYH6_ygOphEMPqTk#LJ<7xBx61nV}o5ue`7w=H>gac+R7{v~=iuKXy
z<V6ajIDr~Chap_Raa_h>+{O(4!Wq<Ti!h5x{EG8<f+H9w%O0G<=eUI0Kp9=uw+bC4
zu!%2mA2U?p2$e{PEM!;HUSw_?LhbMsGSprpIoU+>eHs%y&mfn5<VF#!h+!=2J?q;#
z9hGPUmDw(8fp0j8hd6>)IE@`-qYAvoRouZ8y8JndZ?G5la1?(wpD&Q1c8{ub@F|;D
zXMm1MJBDoB`Uo`*R?}oUV>O1<lOvahrs`>D`hK(#&ei$}wZR7U?@Mc`LaLUIqKhT#
zrJ!FgrOv6Fct()qLyOQ05^*Bte|FN&Y}P+;Mgv|h@BeiY(YZn?x026(@)B?JtKJtc
p|G~?Zs<+NfATa;?&_4@~`<<bf`>v?p*0PC}!dhc|H5sZo{{hq_N^t-H

delta 689
zcmY+?JxD@P6u|N0)6%}pEGsKCGq9yaD3Bl}`j{HpT0+Pm60;8oTAXT(KyrwtaH%n&
zL6-&>*PxcdXeo#qS|h0c(KpnEdw=&lulJsN-n(~KyE0Xm?L=q;X8*<@{n5feOB*5%
z+`<;z$0j_)20X?#%$ac>b=@Vp@EZ016>P^_?7-*x^Nf5lvGd>yC(*Eq1TcazT)_oA
z$7OuS5uCG$EMXEg;T!D57xdr{YN8&p)I|KK2Zzy*GZ?dEMAn#Sh8K->uS`qG9#TfV
zQ3Y8lcV_&6KH^u@3pf~B(TN%lGH3!p)P2S=f?*6|8s|A*a!mB5Pq>G}WD~+ujAI%5
zaFpG~a2hq<Ku!DryYa|0j{)K$>RZ&Ldgv7HU!&lX(T!MFD_Jv=L#<p|O5I#b#szCl
zzmZP5yB<nE>cRS6|28jy-dL;UG=I<v>UYwmaWu7;*h!>TC7LZ6<Jk`*l=WJN3X9e^
cYj(;$;Y#_^+qz&kA+zyha(#ERaAq$Wzm@($`v3p{

diff --git a/server/locale/it/LC_MESSAGES/django.po b/server/locale/it/LC_MESSAGES/django.po
index bd228f25..13e9a24a 100644
--- a/server/locale/it/LC_MESSAGES/django.po
+++ b/server/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-12 09:36+0200\n"
+"POT-Creation-Date: 2024-07-27 20:59+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,23 +95,23 @@ msgstr ""
 msgid "Experte/Trainer"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:338
+#: vbv_lernwelt/course/models.py:339
 msgid "Dokumente im Circle ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:342
+#: vbv_lernwelt/course/models.py:343
 msgid "Lernmentor-Funktion ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:346
+#: vbv_lernwelt/course/models.py:347
 msgid "Kompetenzweise ein/aus"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:349
+#: vbv_lernwelt/course/models.py:350
 msgid "Versicherungsvermittler-Lehrgang"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:350
+#: vbv_lernwelt/course/models.py:351
 msgid "ÜK-Lehrgang"
 msgstr ""
 
@@ -119,31 +119,44 @@ msgstr ""
 msgid "export_anwesenheit"
 msgstr "esportazione_presenza"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:92
+#: vbv_lernwelt/course_session/services/export_attendance.py:86
+#| msgid "Anwesenheit"
+msgid "Optionale Anwesenheit"
+msgstr "Presenza opzionale"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:96
 msgid "Anwesenheit"
 msgstr "Presenza"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:117
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Ja"
+msgstr "Sì"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:119
+msgid "Nein"
+msgstr "No"
+
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Anwesend"
 msgstr "Presente"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:117
+#: vbv_lernwelt/course_session/services/export_attendance.py:128
 msgid "Nicht anwesend"
 msgstr "Non presente"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:124
+#: vbv_lernwelt/course_session/services/export_attendance.py:135
 msgid "Vorname"
 msgstr "Nome"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:125
+#: vbv_lernwelt/course_session/services/export_attendance.py:136
 msgid "Nachname"
 msgstr "Cognome"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:126
+#: vbv_lernwelt/course_session/services/export_attendance.py:137
 msgid "Email"
 msgstr "Email"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:127
+#: vbv_lernwelt/course_session/services/export_attendance.py:138
 msgid "Lehrvertragsnummer"
 msgstr "Numero di contratto di tirocinio"
 
diff --git a/server/vbv_lernwelt/course_session/tests/test_attendance_export.py b/server/vbv_lernwelt/course_session/tests/test_attendance_export.py
index 350ffaa4..eb217f4b 100644
--- a/server/vbv_lernwelt/course_session/tests/test_attendance_export.py
+++ b/server/vbv_lernwelt/course_session/tests/test_attendance_export.py
@@ -8,7 +8,7 @@ from vbv_lernwelt.core.constants import TEST_STUDENT1_USER_ID, TEST_STUDENT2_USE
 from vbv_lernwelt.core.create_default_users import create_default_users
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.creators.test_course import create_test_course
-from vbv_lernwelt.course.models import CourseSession
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
 from vbv_lernwelt.course_session.services.export_attendance import export_attendance
 
 
@@ -42,6 +42,11 @@ class AttendanceExportTestCase(ExportBaseTestCase):
         self.test_student1 = User.objects.get(id=TEST_STUDENT1_USER_ID)
         self.test_student1.additional_json_data = {"Lehrvertragsnummer": 1234567890}
         self.test_student1.save()
+        csu1 = CourseSessionUser.objects.get(
+            user=self.test_student1, course_session=self.course_session_be
+        )
+        csu1.optional_attendance = True
+        csu1.save()
         self.test_student2 = User.objects.get(id=TEST_STUDENT2_USER_ID)
         self.test_student2.additional_json_data = {"Lehrvertragsnummer": 1987654321}
         self.test_student2.save()
@@ -64,6 +69,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student1.last_name,
                 self.test_student1.email,
                 self.test_student1.additional_json_data["Lehrvertragsnummer"],
+                "Ja",
                 "Anwesend",
             ],
             [
@@ -71,6 +77,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student2.last_name,
                 self.test_student2.email,
                 self.test_student2.additional_json_data["Lehrvertragsnummer"],
+                "Nein",
                 "Nicht anwesend",
             ],
             [
@@ -78,6 +85,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student3.last_name,
                 self.test_student3.email,
                 None,
+                "Nein",
                 "Nicht anwesend",
             ],
         ]
@@ -95,6 +103,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
             "Nachname",
             "Email",
             "Lehrvertragsnummer",
+            "Optionale Anwesenheit",
             f"Anwesenheit {csac.get_circle().title} {csac.due_date.start.strftime('%d.%m.%Y')}",
         ]
 
@@ -103,7 +112,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
         self.assertEqual(len(wb.sheetnames), 1)
         self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
 
-        self._check_export(wb, self.expected_data_be, 4, 5)
+        self._check_export(wb, self.expected_data_be, 4, 6)
 
     def test_attendance_export_multiple_cs(self):
         self.attendance_course_zh.attendance_user_list = [
@@ -123,6 +132,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student2.last_name,
                 self.test_student2.email,
                 self.test_student2.additional_json_data["Lehrvertragsnummer"],
+                "Nein",
                 "Anwesend",
             ],
         ]
@@ -136,10 +146,10 @@ class AttendanceExportTestCase(ExportBaseTestCase):
         self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
         self.assertEqual(wb.sheetnames[1], "Test Zürich 2022 a")
 
-        self._check_export(wb, self.expected_data_be, 4, 5)
+        self._check_export(wb, self.expected_data_be, 4, 6)
 
         wb.active = wb["Test Zürich 2022 a"]
-        self._check_export(wb, expected_data_zh, 2, 5)
+        self._check_export(wb, expected_data_zh, 2, 6)
 
     def test_french_export(self):
         activate("fr")
@@ -150,6 +160,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
             "Nom de famille",
             "E-mail",
             "Numéro de contrat d'apprentissage",
+            "Présence facultative",
             f"Présence {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}",
         ]
 
@@ -160,6 +171,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student1.last_name,
                 self.test_student1.email,
                 self.test_student1.additional_json_data["Lehrvertragsnummer"],
+                "Oui",
                 "Présent",
             ],
             [
@@ -167,6 +179,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student2.last_name,
                 self.test_student2.email,
                 self.test_student2.additional_json_data["Lehrvertragsnummer"],
+                "Non",
                 "Pas présent",
             ],
             [
@@ -174,10 +187,11 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student3.last_name,
                 self.test_student3.email,
                 None,
+                "Non",
                 "Pas présent",
             ],
         ]
-        self._check_export(wb, expected_data_be, 4, 5)
+        self._check_export(wb, expected_data_be, 4, 6)
 
     def test_italian_export(self):
         activate("it")
@@ -188,6 +202,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
             "Cognome",
             "Email",
             "Numero di contratto di tirocinio",
+            "Presenza opzionale",
             f"Presenza {self.attendance_course_be.get_circle().title} {self.attendance_course_be.due_date.start.strftime('%d.%m.%Y')}",
         ]
 
@@ -198,6 +213,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student1.last_name,
                 self.test_student1.email,
                 self.test_student1.additional_json_data["Lehrvertragsnummer"],
+                "Sì",
                 "Presente",
             ],
             [
@@ -205,6 +221,7 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student2.last_name,
                 self.test_student2.email,
                 self.test_student2.additional_json_data["Lehrvertragsnummer"],
+                "No",
                 "Non presente",
             ],
             [
@@ -212,7 +229,8 @@ class AttendanceExportTestCase(ExportBaseTestCase):
                 self.test_student3.last_name,
                 self.test_student3.email,
                 None,
+                "No",
                 "Non presente",
             ],
         ]
-        self._check_export(wb, expected_data_be, 4, 5)
+        self._check_export(wb, expected_data_be, 4, 6)

From a552ff75fe832792e52b64a66de5dd790a0cf6cf Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 29 Jul 2024 08:09:46 +0200
Subject: [PATCH 29/42] Change payment message

---
 client/src/pages/onboarding/vv/CheckoutAddress.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index 76e5a6ed..ba309415 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -265,11 +265,10 @@ const executePayment = async () => {
 
       <p v-if="paymentError" class="text-bold mt-12 text-lg text-red-700">
         {{
-          $t("a.Fehler bei der Zahlung. Bitte versuche es erneut oder kontaktiere uns")
-        }}:
-        <a href="mailto:vermittler@vbv-afa.ch" class="underline">
-          vermittler@vbv-afa.ch
-        </a>
+          $t(
+            "a.Fehler bei der Zahlung. Bitte versuche es erneut oder wähle eine andere Zahlungsmethode."
+          )
+        }}
       </p>
 
       <h3 class="mb-4 mt-10">{{ $t("a.Adresse") }}</h3>

From 9e46e844c66ad9957bdd2ce26d9327713aa71854 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 29 Jul 2024 09:49:14 +0200
Subject: [PATCH 30/42] Fix userprofile data

---
 client/src/pages/userProfile/UserProfilePage.vue | 7 ++++++-
 server/vbv_lernwelt/api/tests/test_profile.py    | 2 +-
 server/vbv_lernwelt/core/serializers.py          | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index cf27137e..b2d49465 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -55,7 +55,12 @@ onMounted(() => {
             <p class="mb-2">{{ user.email }}</p>
             <p class="text-gray-800">
               {{ $t("a.Teilnehmer") }}
-              <span v-if="user.optional_attendance" data-cy="optional-attendance">
+              <span
+                v-if="
+                  user.optional_attendance.some((id: string) => id === courseSession.id)
+                "
+                data-cy="optional-attendance"
+              >
                 {{ $t("a.Optionale Anwesenheit") }}
               </span>
             </p>
diff --git a/server/vbv_lernwelt/api/tests/test_profile.py b/server/vbv_lernwelt/api/tests/test_profile.py
index b5b68f70..453e479f 100644
--- a/server/vbv_lernwelt/api/tests/test_profile.py
+++ b/server/vbv_lernwelt/api/tests/test_profile.py
@@ -71,6 +71,6 @@ class ProfileViewTest(APITestCase):
                 "organisation_postal_code": "",
                 "organisation_city": "",
                 "organisation_country": None,
-                "optional_attendance": False,
+                "optional_attendance": [],
             },
         )
diff --git a/server/vbv_lernwelt/core/serializers.py b/server/vbv_lernwelt/core/serializers.py
index d099c6ee..ba43e949 100644
--- a/server/vbv_lernwelt/core/serializers.py
+++ b/server/vbv_lernwelt/core/serializers.py
@@ -111,9 +111,10 @@ class UserSerializer(serializers.ModelSerializer):
         return [str(_id) for _id in (supervisor_in_session_ids | expert_in_session_ids)]
 
     def get_optional_attendance(self, obj: User) -> bool:
-        return CourseSessionUser.objects.filter(
+        optional_attendance_ids = CourseSessionUser.objects.filter(
             user=obj, optional_attendance=True
         ).values_list("course_session__id", flat=True)
+        return [str(id) for id in optional_attendance_ids]
 
     def update(self, instance, validated_data):
         country_data = validated_data.pop("country", None)

From 0313abb010611075ff678231b8790fb853c2f862 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 29 Jul 2024 11:49:27 +0200
Subject: [PATCH 31/42] Allow other billing address for cembra

---
 .../pages/onboarding/vv/CheckoutAddress.vue   |  2 +-
 server/vbv_lernwelt/shop/invoice/abacus.py    | 12 ++---
 server/vbv_lernwelt/shop/models.py            | 12 +++++
 .../shop/tests/test_abacus_invoice.py         | 47 +++++++++++++++++++
 4 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index ba309415..3bcfa0d3 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -293,7 +293,7 @@ const executePayment = async () => {
         {{ formErrors.personal.join(", ") }}
       </p>
 
-      <section v-if="address.payment_method !== 'cembra_byjuno'">
+      <section>
         <div class="mt-4">
           <button
             v-if="!withCompanyAddress"
diff --git a/server/vbv_lernwelt/shop/invoice/abacus.py b/server/vbv_lernwelt/shop/invoice/abacus.py
index 1af1a09a..2e7f9491 100644
--- a/server/vbv_lernwelt/shop/invoice/abacus.py
+++ b/server/vbv_lernwelt/shop/invoice/abacus.py
@@ -78,32 +78,32 @@ def create_customer_xml(checkout_information: CheckoutInformation):
         first_name=checkout_information.first_name,
         company_name=(
             checkout_information.organisation_detail_name
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else ""
         ),
         street=(
             checkout_information.organisation_street
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else checkout_information.street
         ),
         house_number=(
             checkout_information.organisation_street_number
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else checkout_information.street_number
         ),
         zip_code=(
             checkout_information.organisation_postal_code
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else checkout_information.postal_code
         ),
         city=(
             checkout_information.organisation_city
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else checkout_information.city
         ),
         country=(
             checkout_information.organisation_country_id
-            if checkout_information.invoice_address == "org"
+            if checkout_information.abacus_use_organisation_data()
             else checkout_information.country_id
         ),
         language=customer.language,
diff --git a/server/vbv_lernwelt/shop/models.py b/server/vbv_lernwelt/shop/models.py
index 8373bc4d..04694fc6 100644
--- a/server/vbv_lernwelt/shop/models.py
+++ b/server/vbv_lernwelt/shop/models.py
@@ -128,3 +128,15 @@ class CheckoutInformation(models.Model):
         self.abacus_order_id = new_abacus_order_id
         self.save()
         return self
+
+    def abacus_address_type(self) -> str:
+        # always use priv for abacus and CembraPay
+        return (
+            self.INVOICE_ADDRESS_ORGANISATION
+            if self.invoice_address == self.INVOICE_ADDRESS_ORGANISATION
+            and not self.cembra_byjuno_invoice
+            else self.INVOICE_ADDRESS_PRIVATE
+        )
+
+    def abacus_use_organisation_data(self) -> bool:
+        return self.abacus_address_type() == self.INVOICE_ADDRESS_ORGANISATION
diff --git a/server/vbv_lernwelt/shop/tests/test_abacus_invoice.py b/server/vbv_lernwelt/shop/tests/test_abacus_invoice.py
index e7171ba0..025d0239 100644
--- a/server/vbv_lernwelt/shop/tests/test_abacus_invoice.py
+++ b/server/vbv_lernwelt/shop/tests/test_abacus_invoice.py
@@ -163,6 +163,53 @@ class AbacusInvoiceTestCase(TestCase):
         assert "<Street>Laupenstrasse</Street>" in customer_xml_content
         assert "<Country>CH</Country>" in customer_xml_content
 
+    def test_create_customer_xml_byjuno_cembra_with_company_address(self):
+        _pat = User.objects.get(username="patrizia.huggel@eiger-versicherungen.ch")
+        _pat.abacus_debitor_number = 60000011
+        _pat.save()
+        _ignore_checkout_information = CheckoutInformationFactory(
+            user=_pat, abacus_order_id=6_000_000_123
+        )
+
+        feuz = User.objects.get(username="andreas.feuz@eiger-versicherungen.ch")
+        feuz_checkout_info = CheckoutInformationFactory(
+            user=feuz,
+            transaction_id="24021508331287484",
+            first_name="Andreas",
+            last_name="Feuz",
+            street="Eggersmatt",
+            street_number="32",
+            postal_code="1719",
+            city="Zumholz",
+            country_id="CH",
+            invoice_address="org",
+            organisation_detail_name="VBV",
+            organisation_street="Laupenstrasse",
+            organisation_street_number="10",
+            organisation_postal_code="3000",
+            organisation_city="Bern",
+            organisation_country_id="CH",
+            cembra_byjuno_invoice=True,
+        )
+        feuz_checkout_info.created_at = datetime(2024, 2, 15, 8, 33, 12, 0)
+
+        customer_xml_filename, customer_xml_content = create_customer_xml(
+            checkout_information=feuz_checkout_info
+        )
+        print(customer_xml_content)
+        print(customer_xml_filename)
+
+        self.assertEqual("myVBV_debi_60000012.xml", customer_xml_filename)
+        assert "<CustomerNumber>60000012</CustomerNumber>" in customer_xml_content
+        assert (
+            "<Email>andreas.feuz@eiger-versicherungen.ch</Email>"
+            in customer_xml_content
+        )
+        assert "<AddressNumber>60000012</AddressNumber>" in customer_xml_content
+        assert "<Name>Feuz</Name>" in customer_xml_content
+        assert "<Text>VBV</Text>" not in customer_xml_content
+        assert "<Street>Eggersmatt</Street>" in customer_xml_content
+
     def test_render_customer_xml(self):
         customer_xml = render_customer_xml(
             abacus_debitor_number=60000012,

From fd2cbb96bcb5057f82ba478d8829f25c6d12e4c9 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 15 Jul 2024 15:10:33 +0200
Subject: [PATCH 32/42] wip: Add functions for person export [skip ci]

---
 .../vbv_lernwelt/dashboard/person_export.py   | 101 +++++++++
 server/vbv_lernwelt/dashboard/utils.py        | 170 +++++++++++++++
 server/vbv_lernwelt/dashboard/views.py        | 204 ++----------------
 3 files changed, 288 insertions(+), 187 deletions(-)
 create mode 100644 server/vbv_lernwelt/dashboard/person_export.py
 create mode 100644 server/vbv_lernwelt/dashboard/utils.py

diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
new file mode 100644
index 00000000..e2167ca9
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -0,0 +1,101 @@
+from io import BytesIO
+
+import structlog
+from django.utils.translation import gettext_lazy as _
+from openpyxl import Workbook
+
+from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.models import CourseSession
+from vbv_lernwelt.course_session.services.export_attendance import (
+    add_user_export_data,
+    add_user_headers,
+    make_export_filename,
+    sanitize_sheet_name,
+)
+from vbv_lernwelt.dashboard.utils import create_person_list_with_roles
+
+PERSONS_EXPORT_FILENAME = _("export_personen")
+
+logger = structlog.get_logger(__name__)
+
+
+def export_persons(
+    user: User,
+    course_session_ids: list[str],
+    save_as_file: bool = False,
+):
+    if len(course_session_ids) == 0:
+        return
+
+    wb = Workbook()
+    # remove the first sheet is just easier than keeping track of the active sheet
+    wb.remove(wb.active)
+
+    user_with_roles = create_person_list_with_roles(user, course_session_ids)
+    course_sessions = CourseSession.objects.filter(id__in=course_session_ids)
+
+    for cs in course_sessions:
+        _create_sheet(
+            wb,
+            cs.title,
+            cs.id,
+            user_with_roles,
+        )
+
+    if save_as_file:
+        wb.save(make_export_filename(PERSONS_EXPORT_FILENAME))
+    else:
+        output = BytesIO()
+        wb.save(output)
+
+        output.seek(0)
+        return output.getvalue()
+
+
+def _create_sheet(
+    wb: Workbook,
+    title: str,
+    cs_id: int,
+    user_with_roles,
+):
+    sheet = wb.create_sheet(title=sanitize_sheet_name(title))
+
+    if len(user_with_roles) == 0:
+        return sheet
+
+    # headers
+    # common user headers, Circle <title> <learningcontenttitle> bestanden,  Circle <title> <learningcontenttitle> Resultat, ...
+    col_idx = add_user_headers(sheet)
+    sheet.cell(row=1, column=col_idx, value=str(_("Telefon")))
+    sheet.cell(row=1, column=col_idx + 1, value=str(_("Rolle")))
+
+    _add_rows(sheet, user_with_roles, cs_id)
+
+    return sheet
+
+
+def _add_rows(
+    sheet,
+    users,
+    course_session_id,
+):
+    for row_idx, user in enumerate(users, start=2):
+
+        def get_user_cs_by_id(user_cs, cs_id):
+            return next((cs for cs in user_cs if cs.get("course_id") == cs_id), None)
+
+        col_idx = add_user_export_data(sheet, user, row_idx)
+        sheet.cell(
+            row=row_idx,
+            column=col_idx,
+            value=user.user.additional_json_data.get("phone", ""),
+        )
+        sheet.cell(
+            row=row_idx,
+            column=col_idx + 1,
+            value=get_user_cs_by_id(user.course_sessions, course_session_id).get(
+                "user_role"
+            ),
+        )
+
+        col_idx += 2
diff --git a/server/vbv_lernwelt/dashboard/utils.py b/server/vbv_lernwelt/dashboard/utils.py
new file mode 100644
index 00000000..0002004c
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/utils.py
@@ -0,0 +1,170 @@
+from dataclasses import dataclass
+from typing import List, Set
+
+from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
+from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.learning_mentor.models import LearningMentor
+
+
+@dataclass(frozen=True)
+class CourseSessionWithRoles:
+    _original: CourseSession
+    roles: Set[str]
+
+    def __getattr__(self, name: str):
+        # Delegate attribute access to the _original CourseSession object
+        return getattr(self._original, name)
+
+    def save(self, *args, **kwargs):
+        raise NotImplementedError("This proxy object cannot be saved.")
+
+
+def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWithRoles]:
+    result_course_sessions = {}
+
+    # participant/member/expert course sessions
+    csu_qs = CourseSessionUser.objects.filter(user=user).prefetch_related(
+        "course_session", "course_session__course"
+    )
+    for csu in csu_qs:
+        cs = csu.course_session
+        # member/expert is mutually exclusive...
+        cs.roles = {csu.role}
+        result_course_sessions[cs.id] = cs
+
+    # enrich with supervisor course sessions
+    csg_qs = CourseSessionGroup.objects.filter(supervisor=user).prefetch_related(
+        "course_session", "course_session__course"
+    )
+    for csg in csg_qs:
+        for cs in csg.course_session.all():
+            cs.roles = set()
+            cs = result_course_sessions.get(cs.id, cs)
+
+            cs.roles.add("SUPERVISOR")
+            result_course_sessions[cs.id] = cs
+
+    # enrich with mentor course sessions
+    lm_qs = LearningMentor.objects.filter(mentor=user).prefetch_related(
+        "course_session", "course_session__course"
+    )
+    for lm in lm_qs:
+        cs = lm.course_session
+        cs.roles = set()
+        cs = result_course_sessions.get(cs.id, cs)
+
+        cs.roles.add("LEARNING_MENTOR")
+        result_course_sessions[cs.id] = cs
+
+    return [
+        CourseSessionWithRoles(cs, cs.roles) for cs in result_course_sessions.values()
+    ]
+
+
+def has_cs_role(roles: Set[str]) -> bool:
+    return bool(roles & {"SUPERVISOR", "EXPERT", "MEMBER"})
+
+
+def user_role(roles: Set[str]) -> str:
+    if "SUPERVISOR" in roles:
+        return "SUPERVISOR"
+    if "EXPERT" in roles:
+        return "EXPERT"
+    if "MEMBER" in roles:
+        return "MEMBER"
+    return "LEARNING_MENTOR"
+
+
+def create_course_session_dict(course_session_object, my_role, user_role):
+    return {
+        "id": str(course_session_object.id),
+        "session_title": course_session_object.title,
+        "course_id": str(course_session_object.course.id),
+        "course_title": course_session_object.course.title,
+        "course_slug": course_session_object.course.slug,
+        "region": course_session_object.region,
+        "generation": course_session_object.generation,
+        "my_role": my_role,
+        "user_role": user_role,
+        "is_uk": course_session_object.course.configuration.is_uk,
+        "is_vv": course_session_object.course.configuration.is_vv,
+    }
+
+
+def create_person_list_with_roles(user, course_session_ids=None):
+    def create_user_dict(user_object):
+        return {
+            "user_id": user_object.id,
+            "first_name": user_object.first_name,
+            "last_name": user_object.last_name,
+            "email": user_object.email,
+            "avatar_url_small": user_object.avatar_url_small,
+            "avatar_url": user_object.avatar_url,
+            "course_sessions": [],
+        }
+
+    course_sessions = get_course_sessions_with_roles_for_user(user)
+
+    result_persons = {}
+    for cs in course_sessions:
+        if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
+            course_session_users = CourseSessionUser.objects.filter(
+                course_session=cs.id
+            ).select_related("user")
+            my_role = user_role(cs.roles)
+            for csu in course_session_users:
+                person_data = result_persons.get(
+                    csu.user.id, create_user_dict(csu.user)
+                )
+                person_data["course_sessions"].append(
+                    create_course_session_dict(cs, my_role, csu.role)
+                )
+                result_persons[csu.user.id] = person_data
+
+    # add persons where request.user is mentor
+    for cs in course_sessions:
+        if "LEARNING_MENTOR" in cs.roles:
+            lm = LearningMentor.objects.filter(
+                mentor=user, course_session=cs.id
+            ).first()
+
+            for participant in lm.participants.all():
+                course_session_entry = create_course_session_dict(
+                    cs,
+                    "LEARNING_MENTOR",
+                    "LEARNING_MENTEE",
+                )
+
+                if participant.user.id not in result_persons:
+                    person_data = create_user_dict(participant.user)
+                    person_data["course_sessions"] = [course_session_entry]
+                    result_persons[participant.user.id] = person_data
+                else:
+                    # user is already in result_persons
+                    result_persons[participant.user.id]["course_sessions"].append(
+                        course_session_entry
+                    )
+
+    # add persons where request.user is mentee
+    mentor_relation_qs = LearningMentor.objects.filter(
+        participants__user=user
+    ).prefetch_related("mentor", "course_session")
+    for mentor_relation in mentor_relation_qs:
+        cs = mentor_relation.course_session
+        course_session_entry = create_course_session_dict(
+            cs,
+            "LEARNING_MENTEE",
+            "LEARNING_MENTOR",
+        )
+
+        if mentor_relation.mentor.id not in result_persons:
+            person_data = create_user_dict(mentor_relation.mentor)
+            person_data["course_sessions"] = [course_session_entry]
+            result_persons[mentor_relation.mentor.id] = person_data
+        else:
+            # user is already in result_persons
+            result_persons[mentor_relation.mentor.id]["course_sessions"].append(
+                course_session_entry
+            )
+    return result_persons.values()
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 2e64c804..8616a2bf 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -2,7 +2,7 @@ import base64
 from dataclasses import asdict, dataclass
 from datetime import date
 from enum import Enum
-from typing import List, Set, Tuple
+from typing import List, Tuple
 
 from django.db.models import Q
 from django.http import HttpResponse
@@ -24,25 +24,23 @@ from vbv_lernwelt.competence.services import (
     query_competence_course_session_edoniq_tests,
 )
 from vbv_lernwelt.core.models import User
-from vbv_lernwelt.course.models import (
-    CourseConfiguration,
-    CourseSession,
-    CourseSessionUser,
-)
+from vbv_lernwelt.course.models import CourseConfiguration, CourseSessionUser
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session.services.export_attendance import (
     ATTENDANCE_EXPORT_FILENAME,
     export_attendance,
     make_export_filename,
 )
-from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.dashboard.person_export import export_persons
+from vbv_lernwelt.dashboard.utils import (
+    CourseSessionWithRoles,
+    create_course_session_dict,
+    create_person_list_with_roles,
+    get_course_sessions_with_roles_for_user,
+    user_role,
+)
 from vbv_lernwelt.duedate.models import DueDate
 from vbv_lernwelt.duedate.serializers import DueDateSerializer
-from vbv_lernwelt.feedback.export import (
-    export_feedback_with_circle_restriction,
-    FEEDBACK_EXPORT_FILE_NAME,
-)
-from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
@@ -65,19 +63,6 @@ class RoleKeyType(Enum):
     TRAINER = "Trainer"
 
 
-@dataclass(frozen=True)
-class CourseSessionWithRoles:
-    _original: CourseSession
-    roles: Set[str]
-
-    def __getattr__(self, name: str):
-        # Delegate attribute access to the _original CourseSession object
-        return getattr(self._original, name)
-
-    def save(self, *args, **kwargs):
-        raise NotImplementedError("This proxy object cannot be saved.")
-
-
 @dataclass(frozen=True)
 class CourseConfig:
     course_id: str
@@ -92,156 +77,6 @@ class CourseConfig:
     session_to_continue_id: str | None
 
 
-def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWithRoles]:
-    result_course_sessions = {}
-
-    # participant/member/expert course sessions
-    csu_qs = CourseSessionUser.objects.filter(user=user).prefetch_related(
-        "course_session", "course_session__course"
-    )
-    for csu in csu_qs:
-        cs = csu.course_session
-        # member/expert is mutually exclusive...
-        cs.roles = {csu.role}
-        result_course_sessions[cs.id] = cs
-
-    # enrich with supervisor course sessions
-    csg_qs = CourseSessionGroup.objects.filter(supervisor=user).prefetch_related(
-        "course_session", "course_session__course"
-    )
-    for csg in csg_qs:
-        for cs in csg.course_session.all():
-            cs.roles = set()
-            cs = result_course_sessions.get(cs.id, cs)
-
-            cs.roles.add("SUPERVISOR")
-            result_course_sessions[cs.id] = cs
-
-    # enrich with mentor course sessions
-    lm_qs = LearningMentor.objects.filter(mentor=user).prefetch_related(
-        "course_session", "course_session__course"
-    )
-    for lm in lm_qs:
-        cs = lm.course_session
-        cs.roles = set()
-        cs = result_course_sessions.get(cs.id, cs)
-
-        cs.roles.add("LEARNING_MENTOR")
-        result_course_sessions[cs.id] = cs
-
-    return [
-        CourseSessionWithRoles(cs, cs.roles) for cs in result_course_sessions.values()
-    ]
-
-
-def has_cs_role(roles: Set[str]) -> bool:
-    return bool(roles & {"SUPERVISOR", "EXPERT", "MEMBER"})
-
-
-def user_role(roles: Set[str]) -> str:
-    if "SUPERVISOR" in roles:
-        return "SUPERVISOR"
-    if "EXPERT" in roles:
-        return "EXPERT"
-    if "MEMBER" in roles:
-        return "MEMBER"
-    return "LEARNING_MENTOR"
-
-
-def _create_course_session_dict(course_session_object, my_role, user_role):
-    return {
-        "id": str(course_session_object.id),
-        "session_title": course_session_object.title,
-        "course_id": str(course_session_object.course.id),
-        "course_title": course_session_object.course.title,
-        "course_slug": course_session_object.course.slug,
-        "region": course_session_object.region,
-        "generation": course_session_object.generation,
-        "my_role": my_role,
-        "user_role": user_role,
-        "is_uk": course_session_object.course.configuration.is_uk,
-        "is_vv": course_session_object.course.configuration.is_vv,
-    }
-
-
-def _create_person_list_with_roles(user):
-    def create_user_dict(user_object):
-        return {
-            "user_id": user_object.id,
-            "first_name": user_object.first_name,
-            "last_name": user_object.last_name,
-            "email": user_object.email,
-            "avatar_url_small": user_object.avatar_url_small,
-            "avatar_url": user_object.avatar_url,
-            "course_sessions": [],
-        }
-
-    course_sessions = get_course_sessions_with_roles_for_user(user)
-
-    result_persons = {}
-    for cs in course_sessions:
-        if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
-            course_session_users = CourseSessionUser.objects.filter(
-                course_session=cs.id
-            ).select_related("user")
-            my_role = user_role(cs.roles)
-            for csu in course_session_users:
-                person_data = result_persons.get(
-                    csu.user.id, create_user_dict(csu.user)
-                )
-                person_data["course_sessions"].append(
-                    _create_course_session_dict(cs, my_role, csu.role)
-                )
-                result_persons[csu.user.id] = person_data
-
-    # add persons where request.user is mentor
-    for cs in course_sessions:
-        if "LEARNING_MENTOR" in cs.roles:
-            lm = LearningMentor.objects.filter(
-                mentor=user, course_session=cs.id
-            ).first()
-
-            for participant in lm.participants.all():
-                course_session_entry = _create_course_session_dict(
-                    cs,
-                    "LEARNING_MENTOR",
-                    "LEARNING_MENTEE",
-                )
-
-                if participant.user.id not in result_persons:
-                    person_data = create_user_dict(participant.user)
-                    person_data["course_sessions"] = [course_session_entry]
-                    result_persons[participant.user.id] = person_data
-                else:
-                    # user is already in result_persons
-                    result_persons[participant.user.id]["course_sessions"].append(
-                        course_session_entry
-                    )
-
-    # add persons where request.user is mentee
-    mentor_relation_qs = LearningMentor.objects.filter(
-        participants__user=user
-    ).prefetch_related("mentor", "course_session")
-    for mentor_relation in mentor_relation_qs:
-        cs = mentor_relation.course_session
-        course_session_entry = _create_course_session_dict(
-            cs,
-            "LEARNING_MENTEE",
-            "LEARNING_MENTOR",
-        )
-
-        if mentor_relation.mentor.id not in result_persons:
-            person_data = create_user_dict(mentor_relation.mentor)
-            person_data["course_sessions"] = [course_session_entry]
-            result_persons[mentor_relation.mentor.id] = person_data
-        else:
-            # user is already in result_persons
-            result_persons[mentor_relation.mentor.id]["course_sessions"].append(
-                course_session_entry
-            )
-    return result_persons.values()
-
-
 def _persons_list_add_competence_metrics(persons):
     course_session_ids = {cs["id"] for p in persons for cs in p["course_sessions"]}
     competence_assignments = query_competence_course_session_assignments(
@@ -284,7 +119,7 @@ def _persons_list_add_competence_metrics(persons):
 @api_view(["GET"])
 def get_dashboard_persons(request):
     try:
-        persons = list(_create_person_list_with_roles(request.user))
+        persons = list(create_person_list_with_roles(request.user))
 
         if request.GET.get("with_competence_metrics", "") == "true":
             persons = _persons_list_add_competence_metrics(persons)
@@ -322,7 +157,7 @@ def get_dashboard_due_dates(request):
             cs = course_session_map.get(due_date.course_session_id)
 
             if cs:
-                data["course_session"] = _create_course_session_dict(
+                data["course_session"] = create_course_session_dict(
                     cs, my_role=user_role(cs.roles), user_role=""
                 )
             result_due_dates.append(data)
@@ -561,20 +396,15 @@ def export_competence_elements_as_xsl(request):
 
 @api_view(["POST"])
 def export_feedback_as_xsl(request):
-    circle_ids = request.data.get("circleIds", None)
     requested_course_session_ids = request.data.get("courseSessionIds", [])
     course_sessions_with_roles = _get_permitted_courses_sessions_for_user(
         request.user, requested_course_session_ids
     )  # noqa
 
-    allowed_circles = _get_permitted_circles_ids_for_user_and_course_session(
-        request.user,
-        course_sessions_with_roles,
-        circle_ids,
-    )  # noqa
-
-    data = export_feedback_with_circle_restriction(allowed_circles, False)
-    return _make_excel_response(data, FEEDBACK_EXPORT_FILE_NAME)
+    data = export_persons(
+        [cswr.id for cswr in course_sessions_with_roles],
+    )
+    return _make_excel_response(data, COMPETENCE_ELEMENT_EXPORT_FILE_NAME)
 
 
 def _get_permitted_courses_sessions_for_user(
@@ -608,7 +438,7 @@ def _get_course_sessions_with_roles_for_user(
         csr
         for csr in get_course_sessions_with_roles_for_user(user)
         if any(role in allowed_roles for role in csr.roles)
-        and csr.id in requested_cs_ids
+           and csr.id in requested_cs_ids
     ]  # noqa
 
     return all_cs_roles_for_user

From 9f880baffd47f676de05e390b845642c25f217ae Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 09:56:19 +0200
Subject: [PATCH 33/42] wip: Fix export, add test

---
 .../vbv_lernwelt/dashboard/person_export.py   |  34 +--
 .../dashboard/tests/test_export.py            | 225 ++++++++++++++++++
 server/vbv_lernwelt/dashboard/utils.py        |  13 +-
 3 files changed, 256 insertions(+), 16 deletions(-)
 create mode 100644 server/vbv_lernwelt/dashboard/tests/test_export.py

diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
index e2167ca9..0c7e5eae 100644
--- a/server/vbv_lernwelt/dashboard/person_export.py
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -7,7 +7,6 @@ from openpyxl import Workbook
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import CourseSession
 from vbv_lernwelt.course_session.services.export_attendance import (
-    add_user_export_data,
     add_user_headers,
     make_export_filename,
     sanitize_sheet_name,
@@ -82,20 +81,27 @@ def _add_rows(
     for row_idx, user in enumerate(users, start=2):
 
         def get_user_cs_by_id(user_cs, cs_id):
-            return next((cs for cs in user_cs if cs.get("course_id") == cs_id), None)
+            return next((cs for cs in user_cs if int(cs.get("id")) == cs_id), None)
 
-        col_idx = add_user_export_data(sheet, user, row_idx)
+        user_cs = get_user_cs_by_id(user["course_sessions"], course_session_id)
+
+        if not user_cs:
+            logger.warning(
+                "User not found in course session",
+                user_id=user["user_id"],
+                course_session_id=course_session_id,
+            )
+            continue
+
+        user_role = (user_cs.get("user_role"),)
+
+        sheet.cell(row=row_idx, column=1, value=user["first_name"])
+        sheet.cell(row=row_idx, column=2, value=user["last_name"])
+        sheet.cell(row=row_idx, column=3, value=user["email"])
+        sheet.cell(row=row_idx, column=4, value=user.get("Lehrvertragsnummer", ""))
         sheet.cell(
             row=row_idx,
-            column=col_idx,
-            value=user.user.additional_json_data.get("phone", ""),
+            column=5,
+            value=user.get("phone", ""),
         )
-        sheet.cell(
-            row=row_idx,
-            column=col_idx + 1,
-            value=get_user_cs_by_id(user.course_sessions, course_session_id).get(
-                "user_role"
-            ),
-        )
-
-        col_idx += 2
+        sheet.cell(row=row_idx, column=6, value=user_role[0])
diff --git a/server/vbv_lernwelt/dashboard/tests/test_export.py b/server/vbv_lernwelt/dashboard/tests/test_export.py
new file mode 100644
index 00000000..083e7f60
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/tests/test_export.py
@@ -0,0 +1,225 @@
+import io
+
+from openpyxl import load_workbook
+
+from vbv_lernwelt.core.constants import (
+    TEST_STUDENT1_USER_ID,
+    TEST_STUDENT2_USER_ID,
+    TEST_STUDENT3_USER_ID,
+    TEST_TRAINER1_USER_ID,
+    TEST_TRAINER2_USER_ID,
+)
+from vbv_lernwelt.core.create_default_users import create_default_users
+from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.creators.test_course import create_test_course
+from vbv_lernwelt.course.models import CourseSession
+from vbv_lernwelt.course_session.tests.test_attendance_export import ExportBaseTestCase
+from vbv_lernwelt.dashboard.person_export import export_persons
+from vbv_lernwelt.learnpath.models import Circle
+
+
+class PersonsExportTestCase(ExportBaseTestCase):
+    def setUp(self):
+        super().setUp()
+
+        create_default_users()
+        create_test_course(include_vv=False, with_sessions=True)
+
+        self.course_session_be = CourseSession.objects.get(title="Test Bern 2022 a")
+        self.course_session_zh = CourseSession.objects.get(title="Test Zürich 2022 a")
+
+        self.circle_fahrzeug = Circle.objects.get(
+            slug="test-lehrgang-lp-circle-fahrzeug"
+        )
+        self.circle_reisen = Circle.objects.get(slug="test-lehrgang-lp-circle-fahrzeug")
+
+        self.test_trainer1 = User.objects.get(id=TEST_TRAINER1_USER_ID)
+        self.test_trainer2 = User.objects.get(id=TEST_TRAINER2_USER_ID)
+        self.test_student1 = User.objects.get(id=TEST_STUDENT1_USER_ID)
+        self.test_student2 = User.objects.get(id=TEST_STUDENT2_USER_ID)
+        self.test_student3 = User.objects.get(id=TEST_STUDENT3_USER_ID)
+
+        self.test_student1_row = [
+            self.test_student1.first_name,
+            self.test_student1.last_name,
+            self.test_student1.email,
+            None,
+            None,
+            "MEMBER",
+        ]
+        self.test_student2_row = [
+            self.test_student2.first_name,
+            self.test_student2.last_name,
+            self.test_student2.email,
+            None,
+            None,
+            "MEMBER",
+        ]
+        self.test_student3_row = [
+            self.test_student3.first_name,
+            self.test_student3.last_name,
+            self.test_student3.email,
+            None,
+            None,
+            "MEMBER",
+        ]
+        self.test_trainer1_row = [
+            self.test_trainer1.first_name,
+            self.test_trainer1.last_name,
+            self.test_trainer1.email,
+            None,
+            None,
+            "EXPERT",
+        ]
+        self.test_trainer2_row = [
+            self.test_trainer2.first_name,
+            self.test_trainer2.last_name,
+            self.test_trainer2.email,
+            None,
+            None,
+            "EXPERT",
+        ]
+
+    def _generate_expected_data(self, rows):
+        expected_data = [
+            self._make_header(),
+        ]
+        for r in rows:
+            expected_data.append(r)
+
+        return expected_data
+
+    def _generate_workbook(self, user, course_session_ids):
+        export_data = io.BytesIO(
+            export_persons(user, course_session_ids, save_as_file=False)
+        )
+        return load_workbook(export_data)
+
+    def _make_header(self):
+        return [
+            "Vorname",
+            "Nachname",
+            "Email",
+            "Lehrvertragsnummer",
+            "Telefon",
+            "Rolle",
+        ]
+
+    def test_export_persons(self):
+        wb = self._generate_workbook(self.test_trainer1, [self.course_session_be.id])
+        self.assertEqual(len(wb.sheetnames), 1)
+        self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
+        wb.active = wb["Test Bern 2022 a"]
+
+        data = self._generate_expected_data(
+            [
+                self.test_student1_row,
+                self.test_student2_row,
+                self.test_student3_row,
+                self.test_trainer1_row,
+            ]
+        )
+
+        self._check_export(wb, data, 4, 6)
+
+        wb = self._generate_workbook(self.test_trainer2, [self.course_session_zh.id])
+        self.assertEqual(len(wb.sheetnames), 1)
+        self.assertEqual(wb.sheetnames[0], "Test Zürich 2022 a")
+        wb.active = wb["Test Zürich 2022 a"]
+
+        data = self._generate_expected_data(
+            [self.test_student2_row, self.test_trainer2_row]
+        )
+        self._check_export(wb, data, 3, 6)
+
+    # def test_export_feedback_with_cs_circle_pairs(self):
+    #     cs_circle_pairs = [
+    #         (
+    #             self.course_session_be.id,
+    #             [self.circle_fahrzeug.id, self.circle_reisen.id],
+    #         ),
+    #         (
+    #             self.course_session_zh.id,
+    #             [self.circle_reisen.id, self.circle_fahrzeug.id],
+    #         ),
+    #     ]
+    #     export_data = io.BytesIO(
+    #         export_feedback_with_circle_restriction(cs_circle_pairs, save_as_file=False)
+    #     )
+    #     wb = load_workbook(export_data)
+    #     self.assertEqual(len(wb.sheetnames), 2)
+    #     self.assertEqual(wb.sheetnames[0], "Fahrzeug")
+    #     self.assertEqual(wb.sheetnames[1], "Reisen")
+    #
+    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
+    #
+    #     wb.active = wb["Reisen"]
+    #     self._check_export(wb, self.expected_data_reisen, 2, 12)
+
+    # def test_does_not_include_unsubmitted_feedback(self):
+    #     feedback = FeedbackResponse.objects.get(
+    #         circle=self.circle_reisen,
+    #         course_session=self.course_session_zh,
+    #         feedback_user=self.test_student2,
+    #     )
+    #
+    #     feedback.submitted = False
+    #     feedback.save()
+    #
+    #     wb = self._generate_workbook(
+    #         [self.course_session_be.id, self.course_session_zh.id]
+    #     )
+    #     self.assertEqual(len(wb.sheetnames), 1)
+    #     self.assertEqual(wb.sheetnames[0], "Fahrzeug")
+    #
+    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
+    #
+    # def test_french_export(self):
+    #     activate("fr")
+    #     wb = self._generate_workbook(
+    #         [self.course_session_be.id, self.course_session_zh.id]
+    #     )
+    #
+    #     header = [
+    #         "Opérations",
+    #         "Date",
+    #         "Degré de satisfaction au global",
+    #         "Degré de réalisation des objectifs",
+    #         "As-tu l’impression de bien maîtriser les sujets qui ont été abordés pendant le cours ?",
+    #         "Les travaux préparatoires étaient-ils clairs et compréhensibles ?",
+    #         "Que penses-tu des compétences techniques de la personne chargée du cours et de sa maîtrise du sujet ?",
+    #         "Les questions et les suggestions des participants ont-elles été prises au sérieux et traitées correctement ?",
+    #         "Souhaites-tu ajouter quelque chose à l’intention de la personne chargée du cours ?",
+    #         "Est-ce que tu recommandes ce cours ?",
+    #         "Qu’est-ce qui t’a particulièrement plu ?",
+    #         "À ton avis, quels sont les points qui pourraient être améliorés ?",
+    #     ]
+    #
+    #     self.expected_data_fahrzeug[0] = header
+    #
+    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
+    #
+    # def test_italian_export(self):
+    #     activate("it")
+    #     wb = self._generate_workbook(
+    #         [self.course_session_be.id, self.course_session_zh.id]
+    #     )
+    #
+    #     header = [
+    #         "Svolgimenti",
+    #         "Data",
+    #         "Soddisfazione complessiva",
+    #         "Raggiungimento complessivo degli obiettivi",
+    #         "Come valuti il tuo livello di preparazione sui temi dopo il corso?",
+    #         "Gli incarichi di preparazione erano chiari e comprensibili?",
+    #         "Come valuti il livello di preparazione sui temi e le competenze specialistiche dell’istruttore/istruttrice del corso?",
+    #         "Le domande e i suggerimenti dei/delle partecipanti al corso sono stati accolti e presi sul serio?",
+    #         "Cos’altro vorresti ancora dire all’istruttore/istruttrice del corso?",
+    #         "Raccomanderesti il corso?",
+    #         "Cos’hai apprezzato particolarmente?",
+    #         "Dove vedi un potenziale di miglioramento?",
+    #     ]
+    #
+    #     self.expected_data_fahrzeug[0] = header
+    #
+    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
diff --git a/server/vbv_lernwelt/dashboard/utils.py b/server/vbv_lernwelt/dashboard/utils.py
index 0002004c..8967eb90 100644
--- a/server/vbv_lernwelt/dashboard/utils.py
+++ b/server/vbv_lernwelt/dashboard/utils.py
@@ -92,9 +92,11 @@ def create_course_session_dict(course_session_object, my_role, user_role):
     }
 
 
-def create_person_list_with_roles(user, course_session_ids=None):
+def create_person_list_with_roles(
+    user, course_session_ids=None, include_private_data=False
+):
     def create_user_dict(user_object):
-        return {
+        user_data = {
             "user_id": user_object.id,
             "first_name": user_object.first_name,
             "last_name": user_object.last_name,
@@ -103,6 +105,13 @@ def create_person_list_with_roles(user, course_session_ids=None):
             "avatar_url": user_object.avatar_url,
             "course_sessions": [],
         }
+        if include_private_data:
+            user_data["phone"] = user_object.additional_json_data.get("phone", "")
+            user_data["Lehrvertragsnummer"] = user_object.additional_json_data.get(
+                "Lehrvertragsnummer", ""
+            )
+
+        return user_data
 
     course_sessions = get_course_sessions_with_roles_for_user(user)
 

From b8c4125b37a9605b1eea3ae57ec821be895a74ef Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 10:57:37 +0200
Subject: [PATCH 34/42] Add tests

---
 .../dashboard/tests/test_export.py            | 96 ++-----------------
 server/vbv_lernwelt/dashboard/views.py        | 26 ++++-
 2 files changed, 30 insertions(+), 92 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/tests/test_export.py b/server/vbv_lernwelt/dashboard/tests/test_export.py
index 083e7f60..ed48761e 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_export.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_export.py
@@ -132,94 +132,10 @@ class PersonsExportTestCase(ExportBaseTestCase):
         )
         self._check_export(wb, data, 3, 6)
 
-    # def test_export_feedback_with_cs_circle_pairs(self):
-    #     cs_circle_pairs = [
-    #         (
-    #             self.course_session_be.id,
-    #             [self.circle_fahrzeug.id, self.circle_reisen.id],
-    #         ),
-    #         (
-    #             self.course_session_zh.id,
-    #             [self.circle_reisen.id, self.circle_fahrzeug.id],
-    #         ),
-    #     ]
-    #     export_data = io.BytesIO(
-    #         export_feedback_with_circle_restriction(cs_circle_pairs, save_as_file=False)
-    #     )
-    #     wb = load_workbook(export_data)
-    #     self.assertEqual(len(wb.sheetnames), 2)
-    #     self.assertEqual(wb.sheetnames[0], "Fahrzeug")
-    #     self.assertEqual(wb.sheetnames[1], "Reisen")
-    #
-    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
-    #
-    #     wb.active = wb["Reisen"]
-    #     self._check_export(wb, self.expected_data_reisen, 2, 12)
+    def test_cannot_export_other_session(self):
+        wb = self._generate_workbook(self.test_trainer1, [self.course_session_zh.id])
+        self.assertEqual(len(wb.sheetnames), 1)
+        self.assertEqual(wb.sheetnames[0], "Test Zürich 2022 a")
+        wb.active = wb["Test Zürich 2022 a"]
 
-    # def test_does_not_include_unsubmitted_feedback(self):
-    #     feedback = FeedbackResponse.objects.get(
-    #         circle=self.circle_reisen,
-    #         course_session=self.course_session_zh,
-    #         feedback_user=self.test_student2,
-    #     )
-    #
-    #     feedback.submitted = False
-    #     feedback.save()
-    #
-    #     wb = self._generate_workbook(
-    #         [self.course_session_be.id, self.course_session_zh.id]
-    #     )
-    #     self.assertEqual(len(wb.sheetnames), 1)
-    #     self.assertEqual(wb.sheetnames[0], "Fahrzeug")
-    #
-    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
-    #
-    # def test_french_export(self):
-    #     activate("fr")
-    #     wb = self._generate_workbook(
-    #         [self.course_session_be.id, self.course_session_zh.id]
-    #     )
-    #
-    #     header = [
-    #         "Opérations",
-    #         "Date",
-    #         "Degré de satisfaction au global",
-    #         "Degré de réalisation des objectifs",
-    #         "As-tu l’impression de bien maîtriser les sujets qui ont été abordés pendant le cours ?",
-    #         "Les travaux préparatoires étaient-ils clairs et compréhensibles ?",
-    #         "Que penses-tu des compétences techniques de la personne chargée du cours et de sa maîtrise du sujet ?",
-    #         "Les questions et les suggestions des participants ont-elles été prises au sérieux et traitées correctement ?",
-    #         "Souhaites-tu ajouter quelque chose à l’intention de la personne chargée du cours ?",
-    #         "Est-ce que tu recommandes ce cours ?",
-    #         "Qu’est-ce qui t’a particulièrement plu ?",
-    #         "À ton avis, quels sont les points qui pourraient être améliorés ?",
-    #     ]
-    #
-    #     self.expected_data_fahrzeug[0] = header
-    #
-    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
-    #
-    # def test_italian_export(self):
-    #     activate("it")
-    #     wb = self._generate_workbook(
-    #         [self.course_session_be.id, self.course_session_zh.id]
-    #     )
-    #
-    #     header = [
-    #         "Svolgimenti",
-    #         "Data",
-    #         "Soddisfazione complessiva",
-    #         "Raggiungimento complessivo degli obiettivi",
-    #         "Come valuti il tuo livello di preparazione sui temi dopo il corso?",
-    #         "Gli incarichi di preparazione erano chiari e comprensibili?",
-    #         "Come valuti il livello di preparazione sui temi e le competenze specialistiche dell’istruttore/istruttrice del corso?",
-    #         "Le domande e i suggerimenti dei/delle partecipanti al corso sono stati accolti e presi sul serio?",
-    #         "Cos’altro vorresti ancora dire all’istruttore/istruttrice del corso?",
-    #         "Raccomanderesti il corso?",
-    #         "Cos’hai apprezzato particolarmente?",
-    #         "Dove vedi un potenziale di miglioramento?",
-    #     ]
-    #
-    #     self.expected_data_fahrzeug[0] = header
-    #
-    #     self._check_export(wb, self.expected_data_fahrzeug, 3, 12)
+        self._check_export(wb, [[None] * 6], 1, 6)
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 8616a2bf..290397fd 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -31,7 +31,7 @@ from vbv_lernwelt.course_session.services.export_attendance import (
     export_attendance,
     make_export_filename,
 )
-from vbv_lernwelt.dashboard.person_export import export_persons
+from vbv_lernwelt.dashboard.person_export import export_persons, PERSONS_EXPORT_FILENAME
 from vbv_lernwelt.dashboard.utils import (
     CourseSessionWithRoles,
     create_course_session_dict,
@@ -41,6 +41,10 @@ from vbv_lernwelt.dashboard.utils import (
 )
 from vbv_lernwelt.duedate.models import DueDate
 from vbv_lernwelt.duedate.serializers import DueDateSerializer
+from vbv_lernwelt.feedback.export import (
+    export_feedback_with_circle_restriction,
+    FEEDBACK_EXPORT_FILE_NAME,
+)
 from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
@@ -396,6 +400,24 @@ def export_competence_elements_as_xsl(request):
 
 @api_view(["POST"])
 def export_feedback_as_xsl(request):
+    circle_ids = request.data.get("circleIds", None)
+    requested_course_session_ids = request.data.get("courseSessionIds", [])
+    course_sessions_with_roles = _get_permitted_courses_sessions_for_user(
+        request.user, requested_course_session_ids
+    )  # noqa
+
+    allowed_circles = _get_permitted_circles_ids_for_user_and_course_session(
+        request.user,
+        course_sessions_with_roles,
+        circle_ids,
+    )  # noqa
+
+    data = export_feedback_with_circle_restriction(allowed_circles, False)
+    return _make_excel_response(data, FEEDBACK_EXPORT_FILE_NAME)
+
+
+@api_view(["POST"])
+def export_persons_as_xsl(request):
     requested_course_session_ids = request.data.get("courseSessionIds", [])
     course_sessions_with_roles = _get_permitted_courses_sessions_for_user(
         request.user, requested_course_session_ids
@@ -404,7 +426,7 @@ def export_feedback_as_xsl(request):
     data = export_persons(
         [cswr.id for cswr in course_sessions_with_roles],
     )
-    return _make_excel_response(data, COMPETENCE_ELEMENT_EXPORT_FILE_NAME)
+    return _make_excel_response(data, PERSONS_EXPORT_FILENAME)
 
 
 def _get_permitted_courses_sessions_for_user(

From f69b607ca8bd5c571cdf1f8e6c4ac68ad31ae5f9 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 14:37:15 +0200
Subject: [PATCH 35/42] Add frontend code

---
 .../pages/dashboard/DashboardPersonsPage.vue  | 49 +++++++++++++++++--
 client/src/services/dashboard.ts              |  9 ++++
 server/config/urls.py                         |  2 +
 .../vbv_lernwelt/dashboard/person_export.py   | 16 +++---
 server/vbv_lernwelt/dashboard/views.py        |  1 +
 5 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 59557836..77256adb 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -6,9 +6,14 @@ import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
 import _ from "lodash";
-import type { DashboardPersonCourseSessionType } from "@/services/dashboard";
+import {
+  type DashboardPersonCourseSessionType,
+  exportPersons,
+} from "@/services/dashboard";
 import { useRouteQuery } from "@vueuse/router";
-import type { DashboardPersonsPageMode } from "@/types";
+import type { DashboardPersonsPageMode, StatisticsFilterItem } from "@/types";
+import { useUserStore } from "@/stores/user";
+import { exportDataAsXls } from "@/utils/export";
 
 log.debug("DashboardPersonsPage created");
 
@@ -28,6 +33,7 @@ type MenuItem = {
 };
 
 const { t } = useTranslation();
+const userStore = useUserStore();
 
 const { loading, dashboardPersons } = useDashboardPersonsDueDates(props.mode);
 
@@ -227,6 +233,32 @@ function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessio
   return "";
 }
 
+function exportData() {
+  const courseSessionIdsSet = new Set<string>();
+  // get all course session ids from users
+  if (selectedSession.value.id === UNFILTERED) {
+    for (const person of filteredPersons.value) {
+      for (const courseSession of person.course_sessions) {
+        courseSessionIdsSet.add(courseSession.id);
+      }
+    }
+  } else {
+    courseSessionIdsSet.add(selectedSession.value.id);
+  }
+
+  // construct StatisticsFilterItems for export call
+  const items: StatisticsFilterItem[] = [];
+  for (const csId of courseSessionIdsSet) {
+    items.push({
+      _id: "",
+      course_session_id: csId,
+      generation: "",
+      circle_id: "",
+    });
+  }
+  exportDataAsXls(items, exportPersons, userStore.language);
+}
+
 watch(selectedCourse, () => {
   selectedRegion.value = regions.value[0];
 });
@@ -253,7 +285,18 @@ watch(selectedRegion, () => {
           <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
           <span class="inline">{{ $t("general.back") }}</span>
         </router-link>
-        <h2 class="my-4">{{ $t("a.Personen") }}</h2>
+        <div class="mb-10 flex items-center justify-between">
+          <h2 class="my-4">{{ $t("a.Personen") }}</h2>
+          <button
+            v-if="userStore.course_session_experts.length > 0"
+            class="flex"
+            data-cy="export-button"
+            @click="exportData"
+          >
+            <it-icon-export></it-icon-export>
+            <span class="ml inline-block">{{ $t("a.Als Excel exportieren") }}</span>
+          </button>
+        </div>
         <div class="bg-white px-4 py-2">
           <section
             v-if="filtersVisible"
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 422bf2dc..f8ee1a37 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -221,6 +221,15 @@ export async function exportCompetenceElements(
   });
 }
 
+export async function exportPersons(
+  data: XlsExportRequestData,
+  language: string
+): Promise<XlsExportResponseData> {
+  return await itPost("/api/dashboard/export/persons/", data, {
+    headers: { "Accept-Language": language },
+  });
+}
+
 export function courseIdForCourseSlug(
   dashboardConfigs: DashboardCourseConfigType[],
   courseSlug: string
diff --git a/server/config/urls.py b/server/config/urls.py
index eeaaa517..79f0bcd7 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -44,6 +44,7 @@ from vbv_lernwelt.dashboard.views import (
     export_attendance_as_xsl,
     export_competence_elements_as_xsl,
     export_feedback_as_xsl,
+    export_persons_as_xsl,
     get_dashboard_config,
     get_dashboard_due_dates,
     get_dashboard_persons,
@@ -143,6 +144,7 @@ urlpatterns = [
     path(r"api/dashboard/export/competence_elements/", export_competence_elements_as_xsl,
          name="export_certificate_as_xsl"),
     path(r"api/dashboard/export/feedback/", export_feedback_as_xsl, name="export_feedback_as_xsl"),
+    path(r"api/dashboard/export/persons/", export_persons_as_xsl, name="export_persons_as_xsl"),
 
     # course
     path(r"api/course/sessions/", get_course_sessions, name="get_course_sessions"),
diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
index 0c7e5eae..e9a0495a 100644
--- a/server/vbv_lernwelt/dashboard/person_export.py
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -78,6 +78,8 @@ def _add_rows(
     users,
     course_session_id,
 ):
+    idx_offset = 0
+
     for row_idx, user in enumerate(users, start=2):
 
         def get_user_cs_by_id(user_cs, cs_id):
@@ -91,17 +93,19 @@ def _add_rows(
                 user_id=user["user_id"],
                 course_session_id=course_session_id,
             )
+            idx_offset += 1
             continue
 
         user_role = (user_cs.get("user_role"),)
+        idx = row_idx - idx_offset
 
-        sheet.cell(row=row_idx, column=1, value=user["first_name"])
-        sheet.cell(row=row_idx, column=2, value=user["last_name"])
-        sheet.cell(row=row_idx, column=3, value=user["email"])
-        sheet.cell(row=row_idx, column=4, value=user.get("Lehrvertragsnummer", ""))
+        sheet.cell(row=idx, column=1, value=user["first_name"])
+        sheet.cell(row=idx, column=2, value=user["last_name"])
+        sheet.cell(row=idx, column=3, value=user["email"])
+        sheet.cell(row=idx, column=4, value=user.get("Lehrvertragsnummer", ""))
         sheet.cell(
-            row=row_idx,
+            row=idx,
             column=5,
             value=user.get("phone", ""),
         )
-        sheet.cell(row=row_idx, column=6, value=user_role[0])
+        sheet.cell(row=idx, column=6, value=user_role[0])
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 290397fd..11f58563 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -424,6 +424,7 @@ def export_persons_as_xsl(request):
     )  # noqa
 
     data = export_persons(
+        request.user,
         [cswr.id for cswr in course_sessions_with_roles],
     )
     return _make_excel_response(data, PERSONS_EXPORT_FILENAME)

From dc4af21e0020c2dc4a6f5ca7c73fd8c751e04d48 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 16:07:32 +0200
Subject: [PATCH 36/42] Add translations in backend

---
 server/locale/de/LC_MESSAGES/django.po        |  26 ++++++++-
 server/locale/fr/LC_MESSAGES/django.mo        | Bin 2743 -> 2855 bytes
 server/locale/fr/LC_MESSAGES/django.po        |  25 ++++++++-
 server/locale/it/LC_MESSAGES/django.mo        | Bin 2646 -> 2746 bytes
 server/locale/it/LC_MESSAGES/django.po        |  25 ++++++++-
 .../vbv_lernwelt/dashboard/person_export.py   |  15 ++++-
 .../dashboard/tests/test_export.py            |  53 ++++++++++++++++--
 7 files changed, 132 insertions(+), 12 deletions(-)

diff --git a/server/locale/de/LC_MESSAGES/django.po b/server/locale/de/LC_MESSAGES/django.po
index d377dfff..b0106577 100644
--- a/server/locale/de/LC_MESSAGES/django.po
+++ b/server/locale/de/LC_MESSAGES/django.po
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Lehrgang-Seite"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:278
+#: vbv_lernwelt/dashboard/person_export.py:116
 msgid "Teilnehmer"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 msgid "Versicherungsvermittler-Lehrgang"
 msgstr ""
 
-#: vbv_lernwelt/course/models.py:351
+#: vbv_lernwelt/course/models.py:350
 msgid "ÜK-Lehrgang"
 msgstr ""
 
@@ -155,10 +155,30 @@ msgstr ""
 msgid "Email"
 msgstr "Email"
 
-#: vbv_lernwelt/course_session/services/export_attendance.py:138
+#: vbv_lernwelt/course_session/services/export_attendance.py:127
 msgid "Lehrvertragsnummer"
 msgstr ""
 
+#: vbv_lernwelt/dashboard/person_export.py:16
+msgid "export_personen"
+msgstr ""
+
+#: vbv_lernwelt/dashboard/person_export.py:68
+msgid "Telefon"
+msgstr ""
+
+#: vbv_lernwelt/dashboard/person_export.py:69
+msgid "Rolle"
+msgstr ""
+
+#: vbv_lernwelt/dashboard/person_export.py:118
+msgid "Trainer"
+msgstr ""
+
+#: vbv_lernwelt/dashboard/person_export.py:120
+msgid "Regionenleiter"
+msgstr ""
+
 #: vbv_lernwelt/feedback/export.py:19
 msgid "export_feedback"
 msgstr ""
diff --git a/server/locale/fr/LC_MESSAGES/django.mo b/server/locale/fr/LC_MESSAGES/django.mo
index 57810233a1dc8e67621a4022cb8761f6c74a6e9b..31cad5f5592e86e242942c10a9703903a3f25e9f 100644
GIT binary patch
delta 917
zcmZY7KWGzC9Ki9PN$o|eQDYmct@T>#P*96omk#kCw1bow)E1XByqeSN-Ep}}2O+3~
zn?p|*!9|1;!KsRFqH%F_6>+eOMMV%N3+ngRT&Movm(P2-m-pW9mwVZ>RBU`MbUYAZ
zknAUiw}_15(F`BNSIprmcHuAFhJSG@=CUF?F^@X$M_o6B1w4-W`x54H5_jQrd)^Q?
zU9f<<!7bd5chSPd)Q72$ag6Vu;$d9DlW28_OyDHW;C&p%pLia-+58CBuov&)K52+7
zG0=)$qu%&E>J2}kcI7*k=t{n`UC9);()H7*7p(HZ8FC%9@(@`nH&H9TgG0EO&R^gT
z=I=1a`SKxs@Da80Rpd<hjk@8V)K2<XWL`kNk`X+OC-4~Fzzg^UFXI~4@DjH@gKscI
zi$k<C3)s-XBL+6UMcsG>wFBQ$*RYRy7q_7iGC=A&jlCr22(JU}6xl-_BKMOTHmTKa
zgmy|p_am;YSEy~*iU&z;nZ8in<ZiNu<oxx@VN>WuwcQ%}w`{~g2KquDAbCZkH+hyB
zPkv-ZlD_P~SlL{41K;?babpun+0^H~*ombac%G4paXsJE=6F&uo|z4NsYH(Jn`rrB
z_DePyw@S%vt9Xu|g@Ippu6V{iH6i6zv%O87;dAzxa-!I+x}oF8QfW24Rx_+|s+<j?
VIVU#rkv(d+$B|n#%df0|ng5h$b5sBT

delta 822
zcmXxiv1=1i9Ki9Pxtc_qnl^3Prq+0=sTd)PI9MS=N*r3mv?+*)f=4*XLAV6(Vh6!M
zH|Zc4M8&CvQo59u4x->75eFwHM+d1OLjM3K{r;}Wk9+U)?(*)J_j~WQ$KNH}KN15k
zg*Z=}rj4Bt$zd!+N9<t~_i+$E;3@oqC-EB&;rHJCA#%wdI-P%n3H*ziCuWEYU=q)W
zv}KAxoCi5f;vDM4GDh$YUc(1?0pH*}e#8aTY<FQ1v$%yT_!Va{%_=9cgcEolwSX2T
z_<w0L&;`7}3~pkPUHFW;kT9#z7viW3O3{&9GN=_^#4uh#)+BRCWm3QyyxF^N^nQPe
zF`lnsl>e9K47Bpscp7(+OWxC!@Dt`S%xZ4qRlJAmSi|3V1D9E46JKE#qa;)FXkrC5
zuZLRj6Kv~Xoxxdrixe(XG!60wk)qc#)?i9dy(a31=HPgP??=yCtJi!Q=Z*=!FD+7c
zh>Z=7Vwg<}wnFFVR_Zy8(ne^y<^33Apj(`#jdy;93ZX@-lQAwEw&Qjd3^QGB`cA{O
z>b6;QS8dOBYqsM{#r9ft-|`POjGu;4ZaJN`$o%zN4Of;d&ul*G?l9Ar?z3vG(dzEV
b((#k3Z9cTB!JE!wTPjQoZoGp_(SM=;x;0%5

diff --git a/server/locale/fr/LC_MESSAGES/django.po b/server/locale/fr/LC_MESSAGES/django.po
index f18ecf09..3498fd8e 100644
--- a/server/locale/fr/LC_MESSAGES/django.po
+++ b/server/locale/fr/LC_MESSAGES/django.po
@@ -88,8 +88,9 @@ msgid "Lehrgang-Seite"
 msgstr ""
 
 #: vbv_lernwelt/course/models.py:278
+#: vbv_lernwelt/dashboard/person_export.py:116
 msgid "Teilnehmer"
-msgstr ""
+msgstr "Participant"
 
 #: vbv_lernwelt/course/models.py:279
 msgid "Experte/Trainer"
@@ -160,6 +161,28 @@ msgstr "E-mail"
 msgid "Lehrvertragsnummer"
 msgstr "Numéro de contrat d'apprentissage"
 
+#: vbv_lernwelt/dashboard/person_export.py:16
+#, fuzzy
+#| msgid "export_anwesenheit"
+msgid "export_personen"
+msgstr "export_presence"
+
+#: vbv_lernwelt/dashboard/person_export.py:68
+msgid "Telefon"
+msgstr "Téléphone"
+
+#: vbv_lernwelt/dashboard/person_export.py:69
+msgid "Rolle"
+msgstr "Rôle"
+
+#: vbv_lernwelt/dashboard/person_export.py:118
+msgid "Trainer"
+msgstr "Formateur / Formatrice"
+
+#: vbv_lernwelt/dashboard/person_export.py:120
+msgid "Regionenleiter"
+msgstr "Responsable CI"
+
 #: vbv_lernwelt/feedback/export.py:19
 msgid "export_feedback"
 msgstr "export_feedback"
diff --git a/server/locale/it/LC_MESSAGES/django.mo b/server/locale/it/LC_MESSAGES/django.mo
index a046bd9415926ec35a412e4d2314c0f5562689d1..2ec499c4d39874cedc1aaaddc627f7324c823099 100644
GIT binary patch
delta 915
zcmZwFPi#z46vy#nrc5cLYD(#-Dea;nEH#lXRDw1ZH6{_=J<V<Vn(Mvs<`o+mVqr&O
zu&@#f5{aaVjj*t?u&}klf&~(d#L}Yi{dHcgoXmNjd*7e?=gj?3dez(f+|zO2h(WSU
z4y`jgj0baEi0{~mKd=jb<3?P;_1Kv=+k!<@zl?fsANJrO)c41*h?BS#&$s(c3$qul
zq6WBuoA4GE@NVYA%*Qy&{b#rzzv4I+I?N_;5~uMV4&g66izNmh#(C_++ql!3W>0Bo
zM{iIoeurA&M^sgQ;y6_)ZfNi146D+PrZZ=dIn1MWehK-+u4Vn3SfPIh`PmYe&G=G%
z=C`*rG~s*HLO!7e_=b9M88zV_<Y#$0ny?FxVmA)sX*`7qsv@uP3a;P?US{wBAK@;{
zQRe0W8f6-~aT0mg0_??w%<HI9KR^m$1EdzB*iPyjjsxX1+eYpsHJ+kEY7=Xrg)92o
zEUcDHW!H`eNgWa$s1n&tY9Y*PJIMcqD#t&w8mit}?4h9py_@8SSYPXTZmhMO8)^0D
z2S%%IE{r1=c^9TGv8rn<`ZP$b8hh`o=0YF2`HMWMIqzoU$ZAOtMlN}AF8?Lp8Y>)`
ziYoQQHC&WBI}vyvrm;q;$5A7=5PDZRK4I0cJt|KYV;|d8kfd%VtOxoi8#w+q@{__+
F?k}kuZR-F4

delta 814
zcmX}q&r1|x9LMo*JL;NkYU{4Q(sisv)}vjN^pJ?O9y0V`1VM8cXkwXJbQZzOf=7=o
z9uy1;qKgN^O9-Bd4xT!B>`)0I_y=?ddVgjYzsxhQXNG5<=lgu0Imw^rYCp0qyGD%A
zhG@APW<|`TxDiL#j-T)rp5RUVhOPJ=Z{vCM`8RUeB{z+~!Yuwp&69D=S}>2DW;Gk6
z)5VJ-=5ZP|a0%1+9H;OV-p4(h!&5AwW_tmP_y9lP3ZCH@7Ra(6=dll8qBc;)EbCj1
zjuP0xQGAbcRN*Tsku+Jz?xq9C+;$JO!*OJ&Jw$S{>E`=cba^fzm%ZUe5o`@JSk-&h
zw=Fs<(Kafx1JnW^@ev;482-U0*hx03z$$LwJ{B>{#~#k$0KUZu{M>y0g$%WSs7kkW
zuz7Wc=%}=l$i{7urqE!8Ces-!7?LDMF4v*zX=nO>v=PqL?$Q*)4U+#$YpFu2mX4yE
zC6iLnPfDqC>Y?4Ck>qvc=(W)bwBGtfYBsg#)kmEP#}C4K$#Dxyl{kn(uk5>z!wrAk
z4`2I1Y|H+7wH$l#@jK_I<E(r+tZ${KChchyx|KDJihWz~%H<%A>{;?+({rQBW@9Q_
N4jP|F#~tlQssGU9R_Oo$

diff --git a/server/locale/it/LC_MESSAGES/django.po b/server/locale/it/LC_MESSAGES/django.po
index 13e9a24a..8aa12dea 100644
--- a/server/locale/it/LC_MESSAGES/django.po
+++ b/server/locale/it/LC_MESSAGES/django.po
@@ -88,8 +88,9 @@ msgid "Lehrgang-Seite"
 msgstr ""
 
 #: vbv_lernwelt/course/models.py:278
+#: vbv_lernwelt/dashboard/person_export.py:116
 msgid "Teilnehmer"
-msgstr ""
+msgstr "Partecipante"
 
 #: vbv_lernwelt/course/models.py:279
 msgid "Experte/Trainer"
@@ -160,6 +161,28 @@ msgstr "Email"
 msgid "Lehrvertragsnummer"
 msgstr "Numero di contratto di tirocinio"
 
+#: vbv_lernwelt/dashboard/person_export.py:16
+#, fuzzy
+#| msgid "export_anwesenheit"
+msgid "export_personen"
+msgstr "esportazione_presenza"
+
+#: vbv_lernwelt/dashboard/person_export.py:68
+msgid "Telefon"
+msgstr "Telefono"
+
+#: vbv_lernwelt/dashboard/person_export.py:69
+msgid "Rolle"
+msgstr "Ruolo"
+
+#: vbv_lernwelt/dashboard/person_export.py:118
+msgid "Trainer"
+msgstr "Trainer"
+
+#: vbv_lernwelt/dashboard/person_export.py:120
+msgid "Regionenleiter"
+msgstr "Responsabile CI"
+
 #: vbv_lernwelt/feedback/export.py:19
 msgid "export_feedback"
 msgstr "esportazione_feedback"
diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
index e9a0495a..67dfb1b0 100644
--- a/server/vbv_lernwelt/dashboard/person_export.py
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -96,7 +96,7 @@ def _add_rows(
             idx_offset += 1
             continue
 
-        user_role = (user_cs.get("user_role"),)
+        user_role = _role_as_string(user_cs.get("user_role"))
         idx = row_idx - idx_offset
 
         sheet.cell(row=idx, column=1, value=user["first_name"])
@@ -108,4 +108,15 @@ def _add_rows(
             column=5,
             value=user.get("phone", ""),
         )
-        sheet.cell(row=idx, column=6, value=user_role[0])
+        sheet.cell(row=idx, column=6, value=user_role)
+
+
+def _role_as_string(role):
+    if role == "MEMBER":
+        return str(_("Teilnehmer"))
+    elif role == "EXPERT":
+        return str(_("Trainer"))
+    elif role == "SUPERVISOR":
+        return str(_("Regionenleiter"))
+    else:
+        return role
diff --git a/server/vbv_lernwelt/dashboard/tests/test_export.py b/server/vbv_lernwelt/dashboard/tests/test_export.py
index ed48761e..c00d1fef 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_export.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_export.py
@@ -1,5 +1,6 @@
 import io
 
+from django.utils.translation import activate
 from openpyxl import load_workbook
 
 from vbv_lernwelt.core.constants import (
@@ -45,7 +46,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
             self.test_student1.email,
             None,
             None,
-            "MEMBER",
+            "Teilnehmer",
         ]
         self.test_student2_row = [
             self.test_student2.first_name,
@@ -53,7 +54,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
             self.test_student2.email,
             None,
             None,
-            "MEMBER",
+            "Teilnehmer",
         ]
         self.test_student3_row = [
             self.test_student3.first_name,
@@ -61,7 +62,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
             self.test_student3.email,
             None,
             None,
-            "MEMBER",
+            "Teilnehmer",
         ]
         self.test_trainer1_row = [
             self.test_trainer1.first_name,
@@ -69,7 +70,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
             self.test_trainer1.email,
             None,
             None,
-            "EXPERT",
+            "Trainer",
         ]
         self.test_trainer2_row = [
             self.test_trainer2.first_name,
@@ -77,7 +78,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
             self.test_trainer2.email,
             None,
             None,
-            "EXPERT",
+            "Trainer",
         ]
 
     def _generate_expected_data(self, rows):
@@ -139,3 +140,45 @@ class PersonsExportTestCase(ExportBaseTestCase):
         wb.active = wb["Test Zürich 2022 a"]
 
         self._check_export(wb, [[None] * 6], 1, 6)
+
+    def test_export_in_fr(self):
+        activate("fr")
+        wb = self._generate_workbook(self.test_trainer1, [self.course_session_be.id])
+        self.assertEqual(len(wb.sheetnames), 1)
+        self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
+        wb.active = wb["Test Bern 2022 a"]
+
+        header = [
+            "Prénom",
+            "Nom de famille",
+            "E-mail",
+            "Numéro de contrat d'apprentissage",
+            "Téléphone",
+            "Rôle",
+        ]
+
+        self.assertEqual([cell.value for cell in wb.active[1]], header)
+        self.assertEqual(wb.active.cell(row=2, column=6).value, "Participant")
+        self.assertEqual(
+            wb.active.cell(row=5, column=6).value, "Formateur / Formatrice"
+        )
+
+    def test_export_in_it(self):
+        activate("it")
+        wb = self._generate_workbook(self.test_trainer1, [self.course_session_be.id])
+        self.assertEqual(len(wb.sheetnames), 1)
+        self.assertEqual(wb.sheetnames[0], "Test Bern 2022 a")
+        wb.active = wb["Test Bern 2022 a"]
+
+        header = [
+            "Nome",
+            "Cognome",
+            "Email",
+            "Numero di contratto di tirocinio",
+            "Telefono",
+            "Ruolo",
+        ]
+
+        self.assertEqual([cell.value for cell in wb.active[1]], header)
+        self.assertEqual(wb.active.cell(row=2, column=6).value, "Partecipante")
+        self.assertEqual(wb.active.cell(row=5, column=6).value, "Trainer")

From 35e5067331d0d23223bf1e1c52221a45161eac93 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 16:17:12 +0200
Subject: [PATCH 37/42] Add cypress tests

---
 cypress/e2e/dashboard/dashboardExport.cy.js |  16 ++++++++++++----
 server/locale/fr/LC_MESSAGES/django.mo      | Bin 2855 -> 2904 bytes
 server/locale/fr/LC_MESSAGES/django.po      |   3 +--
 server/locale/it/LC_MESSAGES/django.po      |   2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/cypress/e2e/dashboard/dashboardExport.cy.js b/cypress/e2e/dashboard/dashboardExport.cy.js
index 565955db..de0be194 100644
--- a/cypress/e2e/dashboard/dashboardExport.cy.js
+++ b/cypress/e2e/dashboard/dashboardExport.cy.js
@@ -26,7 +26,7 @@ function getCurrentDate() {
 function verifyExportFileExists(fileName) {
   const downloadsFolder = Cypress.config("downloadsFolder");
   cy.readFile(
-    path.join(downloadsFolder, `${fileName}_${getCurrentDate()}.xlsx`)
+    path.join(downloadsFolder, `${fileName}_${getCurrentDate()}.xlsx`),
   ).should("exist");
 }
 
@@ -39,7 +39,7 @@ function testExport(url, fileName) {
 describe("dashboardExport.cy.js", () => {
   beforeEach(() => {
     cy.manageCommand(
-      "cypress_reset --create-assignment-evaluation --create-feedback-responses --create-course-completion-performance-criteria --create-attendance-days"
+      "cypress_reset --create-assignment-evaluation --create-feedback-responses --create-course-completion-performance-criteria --create-attendance-days",
     );
   });
 
@@ -55,13 +55,17 @@ describe("dashboardExport.cy.js", () => {
     it("should download the competence elements export", () => {
       testExport(
         "/statistic/test-lehrgang/assignment",
-        "export_kompetenznachweis_elemente"
+        "export_kompetenznachweis_elemente",
       );
     });
 
     it("should download the feedback export", () => {
       testExport("/statistic/test-lehrgang/feedback", "export_feedback");
     });
+
+    it("should download the person export", () => {
+      testExport("/statistic/dashboard/persons", "export_personen");
+    });
   });
 
   describe("as trainer", () => {
@@ -76,12 +80,16 @@ describe("dashboardExport.cy.js", () => {
     it("should download the competence elements export", () => {
       testExport(
         "/statistic/test-lehrgang/assignment",
-        "export_kompetenznachweis_elemente"
+        "export_kompetenznachweis_elemente",
       );
     });
 
     it("should download the feedback export", () => {
       testExport("/statistic/test-lehrgang/feedback", "export_feedback");
     });
+
+    it("should download the person export", () => {
+      testExport("/statistic/dashboard/persons", "export_personen");
+    });
   });
 });
diff --git a/server/locale/fr/LC_MESSAGES/django.mo b/server/locale/fr/LC_MESSAGES/django.mo
index 31cad5f5592e86e242942c10a9703903a3f25e9f..bc305be390a05cf0208370290b7a2d2789bf66f5 100644
GIT binary patch
delta 628
zcmY+=F-SsD6oBF5Q!6vIBvdq{%!<egoEj=9if{@E8YE~EYSD)_=;Y86v=m`AL_-BZ
zqYgpP*4`A<5)_Rs(NYoAf9NhfxbM5?zWdI(_ne3BL$$}Ct1dhVMh_$95E;iwix<xa
zw&5pw(Q=A-(2s76pbz6FPND8gV-TlN|IeZya~Qz&zqlq<vtbK0;V!o00k-0a@xs`^
z3D&Q$AK!5n!!D5w<}in6n8Y7k!X(KDu!0dh#<0{xE}7_!Zc$JCfO^7L?89#p$6G{Z
z=*}4GjciV*|5Z^By2*=LvW?n-9b~H<q2Bxy6WB2E9d=M(UYKaYH}l~OwF4d&sV&{8
z38ThA3=yZ1t&+hx%;G5S<1*gh3dT6)8dh)~pU}o3icD#X4w<Oe*o)7oiJer{PI!$m
tj1iAuCob#_TZ@iFvuf3yfqca-mNr)He5qV4<O@w-OVr)<Z?TXs%P;5SK-&NS

delta 578
zcmXZYF-QVY7{Kw*Q}3><3y!#w9Lj76)M%^Gs38}FATruoj25SG2##oo76;2EXo)~*
zmF6f~8rveG#U&{SqA4NzfA|jW{oeQP-Fx5nJqN8IeDh;X;hEx1@n#|-bC|Ulc;3;)
zE++6B2k;N$=tf0`(L;?>sQc3BV;=SY0(w})5iIxPP<G9R8tMUuIEcsSV8eKByu=08
zuW=eXxP(qjWEG3Jg=d(-FI>k_4xhmaj$<9iBot{e(TZ+SGk!$P@D;TypID$Pp53ox
zjjVKk88yKj2JVnO)XJ;KRyjbe_z2V3F!2oz5kH{I{qkf!yr5RzMedXz)B}HwHhm0;
zePl^yaT(_^hx@pJSGbKmtl%cuuHYS3(cu#9Obv57xnMGh_oxSVP&@Ep?BN7);&jm}
PMWlUVHKXmkos9njRMRz?

diff --git a/server/locale/fr/LC_MESSAGES/django.po b/server/locale/fr/LC_MESSAGES/django.po
index 3498fd8e..89cf1fae 100644
--- a/server/locale/fr/LC_MESSAGES/django.po
+++ b/server/locale/fr/LC_MESSAGES/django.po
@@ -162,10 +162,9 @@ msgid "Lehrvertragsnummer"
 msgstr "Numéro de contrat d'apprentissage"
 
 #: vbv_lernwelt/dashboard/person_export.py:16
-#, fuzzy
 #| msgid "export_anwesenheit"
 msgid "export_personen"
-msgstr "export_presence"
+msgstr "export_personnes"
 
 #: vbv_lernwelt/dashboard/person_export.py:68
 msgid "Telefon"
diff --git a/server/locale/it/LC_MESSAGES/django.po b/server/locale/it/LC_MESSAGES/django.po
index 8aa12dea..4e1712ac 100644
--- a/server/locale/it/LC_MESSAGES/django.po
+++ b/server/locale/it/LC_MESSAGES/django.po
@@ -165,7 +165,7 @@ msgstr "Numero di contratto di tirocinio"
 #, fuzzy
 #| msgid "export_anwesenheit"
 msgid "export_personen"
-msgstr "esportazione_presenza"
+msgstr "esportazione_persone"
 
 #: vbv_lernwelt/dashboard/person_export.py:68
 msgid "Telefon"

From 086f0b7fcb555b7bae5d87909bcc339c8205d983 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 16:24:34 +0200
Subject: [PATCH 38/42] Use phone_number field

---
 server/vbv_lernwelt/dashboard/person_export.py | 2 +-
 server/vbv_lernwelt/dashboard/utils.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
index 67dfb1b0..dacd4272 100644
--- a/server/vbv_lernwelt/dashboard/person_export.py
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -106,7 +106,7 @@ def _add_rows(
         sheet.cell(
             row=idx,
             column=5,
-            value=user.get("phone", ""),
+            value=user.get("phone_number", ""),
         )
         sheet.cell(row=idx, column=6, value=user_role)
 
diff --git a/server/vbv_lernwelt/dashboard/utils.py b/server/vbv_lernwelt/dashboard/utils.py
index 8967eb90..d453ae91 100644
--- a/server/vbv_lernwelt/dashboard/utils.py
+++ b/server/vbv_lernwelt/dashboard/utils.py
@@ -106,7 +106,7 @@ def create_person_list_with_roles(
             "course_sessions": [],
         }
         if include_private_data:
-            user_data["phone"] = user_object.additional_json_data.get("phone", "")
+            user_data["phone_number"] = user_object.phone_number
             user_data["Lehrvertragsnummer"] = user_object.additional_json_data.get(
                 "Lehrvertragsnummer", ""
             )

From efdfb0bf03b086f35b3c3e2169c160627449c763 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Jul 2024 16:42:51 +0200
Subject: [PATCH 39/42] Use correct url

---
 cypress/e2e/dashboard/dashboardExport.cy.js | 4 ++--
 server/vbv_lernwelt/dashboard/views.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/dashboard/dashboardExport.cy.js b/cypress/e2e/dashboard/dashboardExport.cy.js
index de0be194..6db7447c 100644
--- a/cypress/e2e/dashboard/dashboardExport.cy.js
+++ b/cypress/e2e/dashboard/dashboardExport.cy.js
@@ -64,7 +64,7 @@ describe("dashboardExport.cy.js", () => {
     });
 
     it("should download the person export", () => {
-      testExport("/statistic/dashboard/persons", "export_personen");
+      testExport("/dashboard/persons", "export_personen");
     });
   });
 
@@ -89,7 +89,7 @@ describe("dashboardExport.cy.js", () => {
     });
 
     it("should download the person export", () => {
-      testExport("/statistic/dashboard/persons", "export_personen");
+      testExport("/dashboard/persons", "export_personen");
     });
   });
 });
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 11f58563..d1f57e25 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -461,7 +461,7 @@ def _get_course_sessions_with_roles_for_user(
         csr
         for csr in get_course_sessions_with_roles_for_user(user)
         if any(role in allowed_roles for role in csr.roles)
-           and csr.id in requested_cs_ids
+        and csr.id in requested_cs_ids
     ]  # noqa
 
     return all_cs_roles_for_user

From 46760cf8aecda74bcefa568083da3beaccad52f5 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 30 Jul 2024 11:36:08 +0200
Subject: [PATCH 40/42] Fix tests

---
 server/locale/fr/LC_MESSAGES/django.mo        | Bin 2904 -> 3036 bytes
 server/locale/fr/LC_MESSAGES/django.po        |   4 +---
 server/locale/it/LC_MESSAGES/django.mo        | Bin 2746 -> 2874 bytes
 server/locale/it/LC_MESSAGES/django.po        |   3 +--
 .../dashboard/tests/test_export.py            |   4 +++-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/locale/fr/LC_MESSAGES/django.mo b/server/locale/fr/LC_MESSAGES/django.mo
index bc305be390a05cf0208370290b7a2d2789bf66f5..5eac9c775859eace60203a0b7dbd0027adce5ab9 100644
GIT binary patch
delta 947
zcmXxjJ!lj`7{>9}-P22=(HPB#@uKTT8b!n+U?cHj1Wl2I2!V(Y*JF=cIQ9;+ry|5_
z1c@LPr(hul1dGJNA|TiaSBY3E7LwF9f`y8p;Q!fOhs^wDCbKi|yu0_g|I0vgqc`{1
zC?nJYbz+OzC{`UB%30T}1B<vFC$SUfa4TNLZY*cx81?9F)cPgt#bwk!PcertaHm<*
z*68eF;tlrUyYwHniF)80>Y!iPg?}-R9qb}|G6(TAV-JtuJdWcMUc|R}8N1l*C<b_m
z^X)#J5hgZp5Odqi25=a4(^1q7#!!LI;vu}2jqhTStUW>n{E4Xa+$Ji(uQZ%(-%%O)
zi7YjT#V+StCmm8@-FO%a*?3F~7*F92oJIa@fkv6Cpq{&f%FF}g4)z3f(6h`n>}UKM
z70?Hqz>nBGL1&0?=kNkv!4<6FA3To%yVvn0Ds=^RmqqljjN14fDnk!5S8zY$SJ;E^
zkwhig1_i78o9(0SO?qiVV78me`ROZ3r;}THSzkBOrbASvQ<>6hQAYMq4^oGzDx8}H
zm<(u?J$<xh=gba(()+(CV%<(R(Jw+pAC$fc6@3dTdQ~b;>xXm3ne<zy++%JKMy+|*
z>zl5}VJ-5jfme)f28%&d3Bq{&mU}$sPB+5V^ZfY9saj++{-RgE-d<%vZ0+SzrPgS#
Y+DtlA3cRvkYE)xC4sQhOzw-<3KYRvXt^fc4

delta 802
zcmZY7IV?m`6vpwx8;pIQ!7#=id!kZ^WQ2$kiDDvZIwb|K&`31o#Zrg@6&-~{qSLD+
zBtnQ%BN{}){~K53Bxip2zPax%=iR&LO~k)13vC+FNY;{F8D_mWkjW46j$!=3e9ZLB
za<K@runG$??)qJ*aeY{ZgQ)k%u?SOGjB~$z-xl3~Rn&wVn1|b#gZs`S=Lz=n{2ZI`
z4TmrqG8@AbrtlD(@f#<xnaNvl0jqEiqvo5P(a?#mP&>Xw?eGN~@XPh%*=9+q(}OzE
zJiF6-i>QsR@WWcRhN{3iGSqfaCqKYOJaPSNEMR?mrlAR6-5;N*3gq&TwXFg*VU4pD
zBlP=_p*DuYIF8-8g;RKm(->oyv$%jG_=xk^#v;B-v_nH)U;>{|6ML+xO5{6Z7^B~b
zB{+%{#NwpJE6PdMHLeTgH7h0S$!b!OAPdy^4L@BnwKcKI!<^~Qpp!R{DxEG^1*t_V
zN%ohn0Q?JWSY=n}^ZZ2}4PEdWk}H$G1C|Viy#8RxYY&dS`00b!5ef>!$zUQJIb9CV
Fct5kxJRtx8

diff --git a/server/locale/fr/LC_MESSAGES/django.po b/server/locale/fr/LC_MESSAGES/django.po
index 89cf1fae..1351894f 100644
--- a/server/locale/fr/LC_MESSAGES/django.po
+++ b/server/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-27 20:59+0200\n"
+"POT-Creation-Date: 2024-07-30 11:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,7 +121,6 @@ msgid "export_anwesenheit"
 msgstr "export_presence"
 
 #: vbv_lernwelt/course_session/services/export_attendance.py:86
-#| msgid "Anwesenheit"
 msgid "Optionale Anwesenheit"
 msgstr "Présence facultative"
 
@@ -162,7 +161,6 @@ msgid "Lehrvertragsnummer"
 msgstr "Numéro de contrat d'apprentissage"
 
 #: vbv_lernwelt/dashboard/person_export.py:16
-#| msgid "export_anwesenheit"
 msgid "export_personen"
 msgstr "export_personnes"
 
diff --git a/server/locale/it/LC_MESSAGES/django.mo b/server/locale/it/LC_MESSAGES/django.mo
index 2ec499c4d39874cedc1aaaddc627f7324c823099..5bde8f5a931fff1a90c4e72de25d612347c1e944 100644
GIT binary patch
delta 924
zcmX}rziSh57{~Facd@C}*4mn=tv@bp1KOqjpio*J%utM=7K;v|!+}Q|NiIPTiWv;l
zQ3oM(DgFb3L!m>lli(miQE+i9h=?fEK}6Ka_vh~PA>Vs_@0;B7eeSu-Ms6eD+Un0N
z8!^f_#5mJoHi0)B4#Wx9tP4-#E}X)hID<QI7JKkodVULa>21{SYuJzXP<b9<2A8qd
ztYs@q_OS32bND>@!rr1T*g|de8M|>Cv-m4j*>v88lh}tNSjH08u#BsC9sl4cUM1-q
z`&*Mqk%c#S0Ds_q?CDJIw1~Qcaa5rtEZ`L^(X9wo=sH!%7pbq2z3d&T6Yr7K_7SPw
zzG$8OZJUXQzmbm(l0_{X#@$#%t)D^_GKDJSBI;4xL?xa_{l12LtjR&wJwO%m5U24m
z7I70>=b3zGqE=0lZ4vL|ar}usdi4DuF5wtHNzY#)m)Zx^qx+hw+tnk;BMtf=DpH|b
z`{J4UPbkS=2K&X2K-DV97k5VUJfn{>$e`nK3k%3gWCM(&jKd6t+O0eP7b;FKsp1Gj
zT}tA#*$^|m5NfIZ0SZ;GcR-<*D~1!yX@7FgIv4zQ!5wphO4u&DUhZ-us?<Zj8hGcz
z#o%rbE(DcmZNVMNxN|R`wU@G!$Lvx)^cr{cWfa(qU#(W6y3NK5P2a0Gnn{MW&FnYl
EFT2-Tk^lez

delta 796
zcmZwFy>C)c7{~FaTof#dh=7QQP+`FMGTOvA$WSd|F;21(LsAH(6-nErxf%yIO}y%$
zOXFhVWWr)_=;YvF{0FRygPMpYjvYw9Ke*j|!gD|8+?;z}9?mc|OuFCV!RJO4$Shf$
zF}sB413ZYI7{*^1!GCxN$9Mq4j@c26qWW3XxH*jDMb!7#Fp5<?inphI*INF74b%h=
za26k72%q}C^nH!<ynl;l@jF&96f|4JD%SBC7V$6M!UU6-a0%1+7*CjM_J)Q|w2j*F
zC)5tVqN?&6D^w+VaC(xP>`Eu9``$s;uny|vcacwQ)9*jTJpCug&))GkjPKQFefvm5
z3w}mzWCu0D57fXBYQbIPXAT`L7{MzT!xGl;2KG=D`GD&<#xkxkc>}lbBnBw6dyYny
zhF)Ap###fD*!I1TD)kGb5SAmg5yf#*-*6o$r`a*`45|4Pc~Xbi4{cm=YD#-jGL>B?
zE|9t;x=;x+MrtFhYbo-7p~~^kOhVP$kJB`Cp)({`#M0gc=c>2tl)YC@Zt%s)1iew{
ba=e>g?KST;yZxpuG&-GDe`Qb${|W2?GlfD5

diff --git a/server/locale/it/LC_MESSAGES/django.po b/server/locale/it/LC_MESSAGES/django.po
index 4e1712ac..7b9dd192 100644
--- a/server/locale/it/LC_MESSAGES/django.po
+++ b/server/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-07-27 20:59+0200\n"
+"POT-Creation-Date: 2024-07-30 11:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,7 +121,6 @@ msgid "export_anwesenheit"
 msgstr "esportazione_presenza"
 
 #: vbv_lernwelt/course_session/services/export_attendance.py:86
-#| msgid "Anwesenheit"
 msgid "Optionale Anwesenheit"
 msgstr "Presenza opzionale"
 
diff --git a/server/vbv_lernwelt/dashboard/tests/test_export.py b/server/vbv_lernwelt/dashboard/tests/test_export.py
index c00d1fef..565d0e48 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_export.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_export.py
@@ -139,7 +139,9 @@ class PersonsExportTestCase(ExportBaseTestCase):
         self.assertEqual(wb.sheetnames[0], "Test Zürich 2022 a")
         wb.active = wb["Test Zürich 2022 a"]
 
-        self._check_export(wb, [[None] * 6], 1, 6)
+        data = self._generate_expected_data([[None] * 6])
+
+        self._check_export(wb, data, 1, 6)
 
     def test_export_in_fr(self):
         activate("fr")

From 9603b37196e7aaa3a10180030dfb18e2c220acf3 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 30 Jul 2024 14:03:45 +0200
Subject: [PATCH 41/42] Add command for company stats

---
 .../management/commands/count_vv_members.py   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 server/vbv_lernwelt/course_session/management/commands/count_vv_members.py

diff --git a/server/vbv_lernwelt/course_session/management/commands/count_vv_members.py b/server/vbv_lernwelt/course_session/management/commands/count_vv_members.py
new file mode 100644
index 00000000..35b62be1
--- /dev/null
+++ b/server/vbv_lernwelt/course_session/management/commands/count_vv_members.py
@@ -0,0 +1,30 @@
+import djclick as click
+import structlog
+from django.db.models import Count
+
+from vbv_lernwelt.course.models import CourseSessionUser
+
+logger = structlog.get_logger(__name__)
+
+
+@click.command()
+def command():
+    VV_COURSE_SESSIONS = [1, 2, 3]  # DE, FR, IT
+
+    # Aggregation of users per organisation for a specific course session
+    user_counts = (
+        CourseSessionUser.objects.filter(course_session__id__in=VV_COURSE_SESSIONS)
+        .values("user__organisation__organisation_id", "user__organisation__name_de")
+        .annotate(user_count=Count("id"))
+        .order_by("user__organisation__organisation_id")
+    )
+
+    for entry in user_counts:
+        print(
+            f"Organisation Name: {entry['user__organisation__name_de']}, "
+            f"User Count: {entry['user_count']}"
+        )
+
+    print(
+        f"Total number of users: {sum([entry['user_count'] for entry in user_counts])}"
+    )

From af84a0ee01bfdef599508ad9a29cb3b269992bdf Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 31 Jul 2024 11:14:19 +0200
Subject: [PATCH 42/42] Add return type

---
 server/vbv_lernwelt/dashboard/person_export.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/person_export.py b/server/vbv_lernwelt/dashboard/person_export.py
index dacd4272..0a0d76aa 100644
--- a/server/vbv_lernwelt/dashboard/person_export.py
+++ b/server/vbv_lernwelt/dashboard/person_export.py
@@ -1,4 +1,5 @@
 from io import BytesIO
+from typing import Optional
 
 import structlog
 from django.utils.translation import gettext_lazy as _
@@ -22,8 +23,8 @@ def export_persons(
     user: User,
     course_session_ids: list[str],
     save_as_file: bool = False,
-):
-    if len(course_session_ids) == 0:
+) -> Optional[bytes]:
+    if not course_session_ids:
         return
 
     wb = Workbook()