From ed5e409992dc8d94a8723591bf7e610600eb1267 Mon Sep 17 00:00:00 2001 From: Lorenz Padberg Date: Mon, 13 Jun 2022 18:01:20 +0200 Subject: [PATCH] added basic grafics to topics --- client/package.json | 1 + .../circle/LearningPathCircleDiagram.vue | 299 ++++++++++++++++++ client/src/views/LearningPathView.vue | 19 +- server/vbv_lernwelt/learnpath/models.py | 2 +- 4 files changed, 305 insertions(+), 16 deletions(-) create mode 100644 client/src/components/circle/LearningPathCircleDiagram.vue diff --git a/client/package.json b/client/package.json index a97d722b..8cc8e949 100644 --- a/client/package.json +++ b/client/package.json @@ -16,6 +16,7 @@ "d3": "^7.4.4", "loglevel": "^1.8.0", "pinia": "^2.0.13", + "underscore": "^1.13.4", "vue": "^3.2.31", "vue-i18n": "^9.1.9", "vue-router": "^4.0.14" diff --git a/client/src/components/circle/LearningPathCircleDiagram.vue b/client/src/components/circle/LearningPathCircleDiagram.vue new file mode 100644 index 00000000..8cc97a90 --- /dev/null +++ b/client/src/components/circle/LearningPathCircleDiagram.vue @@ -0,0 +1,299 @@ + + + + + diff --git a/client/src/views/LearningPathView.vue b/client/src/views/LearningPathView.vue index d272f49f..1f54ea75 100644 --- a/client/src/views/LearningPathView.vue +++ b/client/src/views/LearningPathView.vue @@ -3,7 +3,7 @@ import axios from 'axios'; import * as log from 'loglevel'; import MainNavigationBar from '../components/MainNavigationBar.vue'; -import SimpleCircleDiagram from '../components/circle/SimpleCircleDiagram.vue'; +import SimpleCircleDiagram from '../components/circle/LearningPathCircleDiagram.vue'; export default { components: {MainNavigationBar, SimpleCircleDiagram}, @@ -52,6 +52,8 @@ export default { } }); learningPathContents.topics.push(topic) + console.log(learningPathContents) + console.log('oskadfjnmlasdmflkmsadlf') this.learningPathContents = learningPathContents; @@ -70,23 +72,10 @@ export default {
-
-
-
{{topic.title}}
-
- + -
- - -
- -
{{ learningPathData.title }} diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py index 862a901f..22fd92c1 100644 --- a/server/vbv_lernwelt/learnpath/models.py +++ b/server/vbv_lernwelt/learnpath/models.py @@ -87,7 +87,7 @@ class Circle(Page): @property def learning_sequences(self): - return self.get_children().filter(content_type__model='learningsequence').values('id', 'title') + return self.get_children().filter(content_type__model='learningsequence').values('id', 'title') @classmethod def get_serializer_class(cls):