-
+
-
{{competence.description}}
-
-
+
-
+ v-for="performanceCriteria in competence.criteria"
+ :key="performanceCriteria.description"
+ class="mb-4 pb-4 border-b border-gray-500"
+ >
+ :unit-id="performanceCriteria.learning_unit.id"
+ >
diff --git a/client/src/components/competences/CompetenceProgress.vue b/client/src/components/competences/CompetenceProgress.vue
index 155acdd1..fdead048 100644
--- a/client/src/components/competences/CompetenceProgress.vue
+++ b/client/src/components/competences/CompetenceProgress.vue
@@ -1,25 +1,25 @@
-
-
diff --git a/client/src/components/competences/LeistungskriteriumRow.vue b/client/src/components/competences/LeistungskriteriumRow.vue
index e3c1265b..6220d4fd 100644
--- a/client/src/components/competences/LeistungskriteriumRow.vue
+++ b/client/src/components/competences/LeistungskriteriumRow.vue
@@ -1,39 +1,39 @@
Sich nochmals einschätzen
diff --git a/client/src/pages/CompetencePerfomanceCriteriaView.vue b/client/src/pages/CompetencePerfomanceCriteriaView.vue
index c4d225ce..ba3a34cb 100644
--- a/client/src/pages/CompetencePerfomanceCriteriaView.vue
+++ b/client/src/pages/CompetencePerfomanceCriteriaView.vue
@@ -1,100 +1,104 @@
-
+
Einschätzungen
@@ -102,41 +106,48 @@ const shownCriteria = computed(() => {
-
+
+ :class="{ 'bg-gray-200': activeState === UserCriteriaState.Nok }"
+ class="flex flex-row items-center py-4 px-2 mr-6"
+ >
«Das muss ich nochmals anschauen»
+ :class="{ 'bg-gray-200': activeState === UserCriteriaState.Done }"
+ class="flex flex-row items-center py-4 px-2 mr-6"
+ >
«Ja, ich kann das»
+ :class="{ 'bg-gray-200': activeState === UserCriteriaState.Open }"
+ class="flex flex-row items-center py-4 px-2"
+ >
Nicht eingeschätzt
-
+
diff --git a/client/src/pages/CompetencesDetailView.vue b/client/src/pages/CompetencesDetailView.vue
index 261529b2..508ea742 100644
--- a/client/src/pages/CompetencesDetailView.vue
+++ b/client/src/pages/CompetencesDetailView.vue
@@ -1,189 +1,197 @@
-
+
Kompetenzen
@@ -191,11 +199,15 @@ const userProgress = {
- -
+
-
+ :user-progress="userProgress"
+ >
diff --git a/client/src/pages/CompetencesMainView.vue b/client/src/pages/CompetencesMainView.vue
index 893cd6a2..5e4287e8 100644
--- a/client/src/pages/CompetencesMainView.vue
+++ b/client/src/pages/CompetencesMainView.vue
@@ -1,175 +1,192 @@
@@ -185,81 +202,79 @@ const nokCriteria = [
Letzte verbesserte Kompetenzen
-
- Alle anschauen
-
-
+
+ Alle anschauen
+
+