From f9f213231b1e3358041e350ee99490f56e55a325 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Tue, 27 Sep 2022 13:53:46 +0200 Subject: [PATCH 01/18] WIP: Add competence page and progress --- .../competences/CompetenceProgress.vue | 28 ++++ client/src/pages/CompetencesMainView.vue | 142 ++++++++++++++++++ client/src/pages/ComptencesView.vue | 26 ++++ client/src/router/index.ts | 11 ++ 4 files changed, 207 insertions(+) create mode 100644 client/src/components/competences/CompetenceProgress.vue create mode 100644 client/src/pages/CompetencesMainView.vue create mode 100644 client/src/pages/ComptencesView.vue diff --git a/client/src/components/competences/CompetenceProgress.vue b/client/src/components/competences/CompetenceProgress.vue new file mode 100644 index 00000000..4fc51757 --- /dev/null +++ b/client/src/components/competences/CompetenceProgress.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/client/src/pages/CompetencesMainView.vue b/client/src/pages/CompetencesMainView.vue new file mode 100644 index 00000000..039c9aa1 --- /dev/null +++ b/client/src/pages/CompetencesMainView.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/client/src/pages/ComptencesView.vue b/client/src/pages/ComptencesView.vue new file mode 100644 index 00000000..dcb0fcb4 --- /dev/null +++ b/client/src/pages/ComptencesView.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/client/src/router/index.ts b/client/src/router/index.ts index 24285c6e..a76d36e0 100644 --- a/client/src/router/index.ts +++ b/client/src/router/index.ts @@ -52,6 +52,17 @@ const router = createRouter({ }, ], }, + { + path: '/competences/:competencesPageSlug', + props: true, + component: () => import('@/views/ComptencesView.vue'), + children: [ + { + path: 'overview', + component: () => import('@/views/CompetencesMainView.vue'), + }, + ], + }, { path: "/learn/:learningPathSlug", component: () => import("../pages/learningPath/LearningPathPage.vue"), From 7d7a5c198f5d5de70f9246d034d9d31fa8897c23 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Tue, 27 Sep 2022 15:21:20 +0200 Subject: [PATCH 02/18] WIP: Add self assesment --- .../competences/CompetenceProgress.vue | 5 +- client/src/pages/CompetencesMainView.vue | 53 +++++++++++++++++-- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/client/src/components/competences/CompetenceProgress.vue b/client/src/components/competences/CompetenceProgress.vue index 4fc51757..71d41629 100644 --- a/client/src/components/competences/CompetenceProgress.vue +++ b/client/src/components/competences/CompetenceProgress.vue @@ -6,9 +6,8 @@ const props = defineProps<{ open: number }>() -const done = 100 * props.done / props.total -const notDone = 100 * ((props.total - props.open - props.done) / props.total) + done -console.log(done, notDone) +const done = 100 * props.done / props.total; +const notDone = 100 * ((props.total - props.open - props.done) / props.total) + done; diff --git a/client/src/pages/CompetencesMainView.vue b/client/src/pages/CompetencesMainView.vue index 039c9aa1..0e242b06 100644 --- a/client/src/pages/CompetencesMainView.vue +++ b/client/src/pages/CompetencesMainView.vue @@ -111,7 +111,13 @@ const lastCompetences = [ } ] } -] +]; + +const summary = { + ok: 325, + nok: 32, + open: 28 +}; @@ -123,7 +129,7 @@ const lastCompetences = [ -
+

Letzte verbesserte Kompetenzen

    @@ -133,7 +139,48 @@ const lastCompetences = [
- + + Alle anschauen + + +
+
+
+
+

Einschätzungen

+
    +
  • +
    «Das muss ich nochmals anschauen»
    +
    + +

    {{summary.nok}}

    +
    +
  • +
  • +
    «Ja, ich kann das»
    +
    + +

    {{summary.ok}}

    +
    +
  • +
  • +
    Nicht eingeschätzt
    +
    + +

    {{summary.open}}

    +
    +
  • +
+ + Alle anschauen + +
From c96fa96a240b62609b881909098f544c46e216c4 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Sep 2022 08:26:56 +0200 Subject: [PATCH 03/18] WIP: Add LK row --- .../competences/LeistungskriteriumRow.vue | 40 ++++++ client/src/pages/CompetencesMainView.vue | 119 ++++++++++++------ 2 files changed, 123 insertions(+), 36 deletions(-) create mode 100644 client/src/components/competences/LeistungskriteriumRow.vue diff --git a/client/src/components/competences/LeistungskriteriumRow.vue b/client/src/components/competences/LeistungskriteriumRow.vue new file mode 100644 index 00000000..811cdf67 --- /dev/null +++ b/client/src/components/competences/LeistungskriteriumRow.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/client/src/pages/CompetencesMainView.vue b/client/src/pages/CompetencesMainView.vue index 0e242b06..ca97e9eb 100644 --- a/client/src/pages/CompetencesMainView.vue +++ b/client/src/pages/CompetencesMainView.vue @@ -2,6 +2,7 @@ import * as log from 'loglevel' import { ref, watch } from 'vue' import ComptenceProgress from '@/components/competences/CompetenceProgress.vue' +import LeistungskriteriumRow from '@/components/competences/LeistungskriteriumRow.vue' log.debug('CompetencesMainView created') @@ -119,6 +120,27 @@ const summary = { open: 28 }; +const nokCriteria = [ + { + unitId: 1, + unit: 'Fahrzeuge', + unitUrl: 'https://www.iterativ.ch', + description: 'Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, die Ziele und Pläne des Kunden zu ergründen (SOLL).' + }, + { + unitId: 2, + unit: 'Reisen', + unitUrl: 'https://www.iterativ.ch', + description: 'Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, die IST-Situation des Kunden mit der geeigneten Gesprächs-/Fragetechnik zu erfassen.' + }, + { + unitId: 3, + unit: 'Einkommenssicherung', + unitUrl: 'https://www.iterativ.ch', + description: 'Innerhalb des Handlungsfelds «Einkommenssicherung» bin ich fähig, mir intern und extern die nötigen Informationen über den (Neu-) Kunden zu beschaffen.' + }, +] + From 9756902ce2710c0cbd94bb50d8993badb16c2ec8 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 28 Sep 2022 11:45:58 +0200 Subject: [PATCH 04/18] WIP: Add competence detail view --- .../competences/CompetenceDetail.vue | 49 ++++++ .../competences/CompetenceProgress.vue | 2 +- .../competences/LeistungskriteriumRow.vue | 4 +- client/src/pages/CompetencesDetailView.vue | 144 ++++++++++++++++++ client/src/pages/CompetencesMainView.vue | 1 - client/src/router/index.ts | 4 + 6 files changed, 200 insertions(+), 4 deletions(-) create mode 100644 client/src/components/competences/CompetenceDetail.vue create mode 100644 client/src/pages/CompetencesDetailView.vue diff --git a/client/src/components/competences/CompetenceDetail.vue b/client/src/components/competences/CompetenceDetail.vue new file mode 100644 index 00000000..4ee9f1c8 --- /dev/null +++ b/client/src/components/competences/CompetenceDetail.vue @@ -0,0 +1,49 @@ + + + + diff --git a/client/src/components/competences/CompetenceProgress.vue b/client/src/components/competences/CompetenceProgress.vue index 71d41629..155acdd1 100644 --- a/client/src/components/competences/CompetenceProgress.vue +++ b/client/src/components/competences/CompetenceProgress.vue @@ -12,7 +12,7 @@ const notDone = 100 * ((props.total - props.open - props.done) / props.total) +