ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add E2E tests

This commit is contained in:
Elia Bieri 2024-09-17 14:51:20 +02:00
parent a29171f32f
commit 044bba759f
7 changed files with 125 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/components/dashboard/AttendancePerChosenProfileChart.vue
View File

@ -1,14 +1,14 @@
<script setup lang="ts">
import { ArcElement, Chart as ChartJS } from "chart.js";
import { useTranslation } from "i18next-vue";
import { computed } from "vue";
import { Pie } from "vue-chartjs";
import { useChosenProfileMapping } from "./composables";
ChartJS.register(ArcElement);
const props = defineProps<{ data: Record<string, number> }>();
const { t } = useTranslation();
const { CHOSEN_PROFILE_TO_COLOR, CHOSEN_PROFILE_TO_NAME } = useChosenProfileMapping();
const data = computed(() => ({
labels: Object.entries(props.data).map(([key]) => key),
@ -21,20 +21,6 @@ const data = computed(() => ({
},
],
}));
const CHOSEN_PROFILE_TO_NAME: Record<string, string> = {
all: t("a.Allbranche"),
leben: t("a.Leben"),
nichtleben: t("a.Nichtleben"),
krankenzusatzversicherung: t("a.Krankenzusatzversicherungen"),
};
const CHOSEN_PROFILE_TO_COLOR: Record<string, string> = {
all: "#558AED",
leben: "#FE955A",
nichtleben: "#54CE8B",
krankenzusatzversicherung: "#FAC852",
};
</script>
w
<template>
@ -58,6 +44,7 @@ w
v-for="(value, key) in props.data"
:key="key"
class="flex items-center space-x-2"
:data-cy="`dashboard.stats.trainingResponsible.chart.${CHOSEN_PROFILE_TO_NAME[key]}.${value}`"
>
<div
class="h-4 w-4 rounded-full"

10
client/src/components/dashboard/TrainingResponsibleStatistics.vue
View File

@ -55,14 +55,17 @@ const attendanceCountPerChosenProfile = computed(() => {
<div class="flex flex-col flex-wrap items-stretch md:flex-row">
<BaseBox
:details-link="`/dashboard/cost/${courseSessionId}`"
data-cy="dashboard.mentor.competenceSummary"
data-cy="dashboard.stats.trainingResponsible.cost"
class="w-1/2"
>
<template #title>{{ $t("Kosten in") }} {{ new Date().getFullYear() }}</template>
<template #content>
<div class="flex flex-row space-x-3 bg-white pb-6">
<div class="flex h-[74px] items-center justify-center py-1 pr-3">
<span class="text-3xl font-bold">
<span
class="text-3xl font-bold"
data-cy="dashboard.stats.trainingResponsible.totalCost"
>
{{ formatCurrencyChfCentimes(totalCostInCurrentYear) }}
</span>
<span class="ml-4">CHF</span>
@ -72,13 +75,14 @@ const attendanceCountPerChosenProfile = computed(() => {
</BaseBox>
<BaseBox
:details-link="`/dashboard/persons?course=${courseId}`"
data-cy="dashboard.mentor.competenceSummary"
data-cy="dashboard.stats.trainingResponsible.participants"
>
<template #title>{{ $t("Teilnehmer im 2024") }}</template>
<template #content>
<div class="flex flex-row space-x-3 bg-white pb-6">
<div
class="flex h-[74px] items-center justify-center py-1 pr-3 text-3xl font-bold"
data-cy="dashboard.stats.trainingResponsible.participantsInCurrentYear"
>
<span>{{ attendanceCountInCurrentYear }}</span>
</div>

24
client/src/components/dashboard/composables.ts Normal file
View File

@ -0,0 +1,24 @@
import { useTranslation } from "i18next-vue";
export function useChosenProfileMapping() {
const { t } = useTranslation();
const CHOSEN_PROFILE_TO_NAME: Record<string, string> = {
all: t("a.Allbranche"),
leben: t("a.Leben"),
nichtleben: t("a.Nichtleben"),
krankenzusatzversicherung: t("a.Krankenzusatzversicherungen"),
};
const CHOSEN_PROFILE_TO_COLOR: Record<string, string> = {
all: "#558AED",
leben: "#FE955A",
nichtleben: "#54CE8B",
krankenzusatzversicherung: "#FAC852",
};
return {
CHOSEN_PROFILE_TO_NAME,
CHOSEN_PROFILE_TO_COLOR,
};
}

5
client/src/pages/dashboard/DashboardCostPage.vue
View File

@ -45,15 +45,14 @@ const participantsForYear = (year: number) => {
<div
v-for="entry in statistics?.training_responsible_statistics?.cost_per_year"
:key="entry?.year"
data-cy="year"
class="w-full border-b pb-2 pt-2 first:pt-0 last:border-b-0 last:pb-0"
>
<div class="flex w-full flex-row justify-between">
<p class="text-base">{{ entry?.year }}</p>
<p class="text-base">
<p class="text-base" :data-cy="`participants-${entry?.year}`">
{{ participantsForYear(entry?.year ?? 0) }} {{ $t("a.Teilnehmer") }}
</p>
<p class="text-base font-bold">
<p class="text-base font-bold" :data-cy="`cost-${entry?.year}`">
{{ formatCurrencyChfCentimes(entry?.total_cost) }} CHF
</p>
</div>

7
client/src/pages/dashboard/DashboardPersonsPage.vue
View File

@ -1,4 +1,5 @@
<script setup lang="ts">
import { useChosenProfileMapping } from "@/components/dashboard/composables";
import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
import { useDashboardPersonsDueDates } from "@/composables";
@ -37,6 +38,7 @@ const { t } = useTranslation();
const userStore = useUserStore();
const { loading, dashboardPersons } = useDashboardPersonsDueDates(props.mode);
const { CHOSEN_PROFILE_TO_NAME } = useChosenProfileMapping();
const courses = computed(() => {
return [
@ -173,18 +175,17 @@ const chosenProfiles = computed(() => {
const values = _(dashboardPersons.value)
.map((cs) => {
return Object.assign({}, cs, {
name: cs.chosen_profile,
name: CHOSEN_PROFILE_TO_NAME[cs.chosen_profile],
id: cs.chosen_profile,
});
})
.filter((cs) => cs.chosen_profile !== "all")
.uniqBy("id")
.orderBy("name")
.value();
return [
{
id: "all",
id: UNFILTERED,
name: `${t("Zulassungsprofil")}: ${t("a.Alle")}`,
},
...values,

79
cypress/e2e/ausbildungsverantwortlicher/ausbildungsverantwortlicher.cy.js Normal file
View File

@ -0,0 +1,79 @@
import { login } from "../helpers"
function selectDropboxItem(dropboxSelector, item) {
cy.get(dropboxSelector).click()
cy.get(dropboxSelector).contains(item).click()
}
describe("ausbildungsverantwortlicher.cy.js", () => {
it("check data on dashboard", () => {
login("test-ausbildungsverantwortlicher1@example.com", "test")
cy.visit("/")
cy.get('[data-cy="panel-role-key"]').should("contain", "Ausbildungsverantwortlicher")
cy.get('[data-cy="num-dashboard-persons"]').should("contain", "2 Personen")
cy.get('[data-cy="dashboard.stats.trainingResponsible.totalCost"]').should(
"contain",
"324",
)
cy.get('[data-cy="dashboard.stats.trainingResponsible.participantsInCurrentYear"]').should(
"contain",
"1",
)
cy.get('[data-cy="dashboard.stats.trainingResponsible.chart.Allbranche.1"]').should(
'exist'
)
cy.get('[data-cy="dashboard.stats.trainingResponsible.chart.Nichtleben.1"]').should(
'exist'
)
})
it("check cost detail page", () => {
login("test-ausbildungsverantwortlicher1@example.com", "test")
cy.visit("/")
cy.get(
'[data-cy="dashboard.stats.trainingResponsible.cost"] [data-cy="basebox.detailsLink"]',
).click()
cy.get('[data-cy="cost-2024"]').should("have.length", 1)
cy.get('[data-cy="cost-2023"]').should("have.length", 1)
cy.get('[data-cy="cost-2024"]').should("contain", "324 CHF")
cy.get('[data-cy="cost-2023"]').should("contain", "324 CHF")
cy.get('[data-cy="participants-2024"]').should("contain", "1")
cy.get('[data-cy="participants-2023"]').should("contain", "1")
})
it("check participants detail page", () => {
login("test-ausbildungsverantwortlicher1@example.com", "test")
cy.visit("/")
cy.get(
'[data-cy="dashboard.stats.trainingResponsible.participants"] [data-cy="basebox.detailsLink"]',
).click()
// Test paid year filter
cy.get('[data-cy="person"]').should("have.length", 2)
selectDropboxItem('[data-cy="select-paid-year"]', "2023")
cy.get('[data-cy="person"]').should("have.length", 1)
selectDropboxItem('[data-cy="select-paid-year"]', "2024")
cy.get('[data-cy="person"]').should("have.length", 1)
selectDropboxItem('[data-cy="select-paid-year"]', "Jahr: Alle")
cy.get('[data-cy="person"]').should("have.length", 2)
// Test chosen profile filter
selectDropboxItem('[data-cy="select-chosen-profile"]', "Nichtleben")
cy.get('[data-cy="person"]').should("have.length", 1)
selectDropboxItem('[data-cy="select-chosen-profile"]', "Allbranche")
cy.get('[data-cy="person"]').should("have.length", 1)
selectDropboxItem('[data-cy="select-chosen-profile"]', "Alle")
cy.get('[data-cy="person"]').should("have.length", 2)
})
})

9
server/vbv_lernwelt/course/management/commands/create_default_courses.py
View File

@ -267,7 +267,6 @@ def create_versicherungsvermittlerin_course(
chosen_profile=CourseProfile.objects.get_or_create(
id=COURSE_PROFILE_NICHTLEBEN_ID,
code=COURSE_PROFILE_NICHTLEBEN_CODE,
order=3,
)[0],
)
@ -305,12 +304,16 @@ def create_versicherungsvermittlerin_course(
participant=student_3_csu,
role=AgentParticipantRoleType.BERUFSBILDNER.value,
)
CheckoutInformationFactory(
checkout = CheckoutInformationFactory(
user=User.objects.get(id=TEST_STUDENT1_VV_USER_ID),
)
CheckoutInformationFactory(
checkout.created_at = datetime(2024, 9, 1, tzinfo=timezone.utc)
checkout.save()
checkout = CheckoutInformationFactory(
user=User.objects.get(id=TEST_STUDENT3_VV_USER_ID),
)
checkout.created_at = datetime(2023, 9, 1, tzinfo=timezone.utc)
checkout.save()
def create_versicherungsvermittlerin_pruefung_course(