Commit Graph

2160 Commits

Author SHA1 Message Date
Christian Cueni e659b4b410 Merged develop into feature/tracking-code 2024-02-28 11:41:07 +00:00
Christian Cueni 47534d7714 Merged in feature/VBV-654-test-users (pull request #294)
Feature/VBV-654 test users

Approved-by: Daniel Egger
2024-02-28 11:40:19 +00:00
Christian Cueni 5e5b274add Merged develop into feature/VBV-654-test-users 2024-02-28 10:05:40 +00:00
Livio Bieri 2ff51c5136 Merged in feat/vv-kompotenz-navi (pull request #293)
VV KompetenzNavi für Teilnehmer

Approved-by: Daniel Egger
Approved-by: Christian Cueni
2024-02-27 14:45:14 +00:00
Livio Bieri e1cf3ad02c chore: remove debug leftovers 2024-02-27 15:10:47 +01:00
Livio Bieri 9fcad7b499 fix: kompetenz navi order 2024-02-27 15:10:31 +01:00
Christian Cueni a407b76038 Add endpoint and button in admin ui 2024-02-26 13:10:49 +01:00
Christian Cueni abb9b4b7db Add VV reset 2024-02-26 09:33:01 +01:00
Livio Bieri 9dc412502e fix: reset feedback stuff 2024-02-22 21:52:58 +01:00
Livio Bieri e32a2eddf3 feat: navigation for competence pages 2024-02-22 16:40:14 +01:00
Livio Bieri 7224aecc02 fix: formatting code 2024-02-22 16:33:38 +01:00
Livio Bieri 892f0fe598 fix: remove no-longer needed PerformanceCriteriaPage 2024-02-22 16:32:33 +01:00
Livio Bieri b8c7d22400 fix: cypress 2024-02-22 16:30:52 +01:00
Christian Cueni ae97931ca5 WIP: Create uk course session 2024-02-22 15:47:12 +01:00
Livio Bieri 3011fa2ef4 feat: overview page 2024-02-22 14:14:02 +01:00
Livio Bieri 964c1f7276 feat: kompetenznavi overview 2024-02-22 12:58:59 +01:00
Livio Bieri 0d402d7912 chore: constraint was fixed, fixed blocked fixme 2024-02-21 11:40:30 +01:00
Livio Bieri de351bb3c1 feat: kompetenz navi tab 2024-02-20 15:24:02 +01:00
Livio Bieri cc27ed0dd3 feat: expose detail_url // counts 2024-02-20 15:22:26 +01:00
Livio Bieri a1d069186c fix: add another learning unit with feedback 2024-02-20 15:22:02 +01:00
Christian Cueni f8ef905f13 Merged in feature/VBV-649-country-sorting (pull request #289)
Add country ordering

Approved-by: Daniel Egger
2024-02-20 12:21:49 +00:00
Christian Cueni 833dc0e7c7 Add tracking code 2024-02-20 12:50:21 +01:00
Christian Cueni e06895f921 Merged develop into feature/VBV-649-country-sorting 2024-02-20 12:36:02 +01:00
Christian Cueni f94ee0a26d Use FloatField 2024-02-20 11:05:28 +01:00
Christian Cueni dfebf123ae Merged in revert-pr-290 (pull request #291)
Revert "Circle Seite Inhaltstyp Einheit (pull request #290)"
2024-02-20 09:42:44 +00:00
Christian Cueni 41ae32642e Revert "Circle Seite Inhaltstyp Einheit (pull request #290)" 2024-02-20 07:47:34 +00:00
Reto Aebersold 39e3a6ab75 Merged in feature/VBV-521-circle-seite-inhaltstype-einheit (pull request #290)
Circle Seite Inhaltstyp Einheit

Approved-by: Christian Cueni
2024-02-20 07:26:49 +00:00
Reto Aebersold 48d6f7393f feat: circle status cleanup 2024-02-19 13:43:14 +01:00
Reto Aebersold c180fd4406 feat: circle status cleanup 2024-02-19 13:35:55 +01:00
Livio Bieri d1cc58ea60 fix: format code 2024-02-16 16:27:21 +01:00
Livio Bieri f18b152bb8 feat: client fetch VV comp-navi stuff 2024-02-16 16:25:17 +01:00
Livio Bieri a7ca88da79 feat: missing stuff in VV comp-navi API 2024-02-16 16:24:43 +01:00
Livio Bieri 7f8cfcba24 feat: kompnavi api 2024-02-15 21:54:47 +01:00
Christian Cueni 3e270e97ff Add country ordering 2024-02-15 15:08:33 +01:00
Livio Bieri 8e7f69f296 Merge branch 'develop' into feat/vv-kompotenz-navi 2024-02-14 10:45:43 +01:00
Livio Bieri 4ab5df0753 Merged in feat/588-vv-fremdeinschatzung (pull request #277)
Feat/588 - VV Mentor Fremdeinschätzung

Approved-by: Daniel Egger
2024-02-14 06:39:07 +00:00
Christian Cueni cc96bb8a76 Merged develop into feat/588-vv-fremdeinschatzung 2024-02-14 06:26:24 +00:00
Reto Aebersold b5381caf3c Merged in bugfix/VBV-642-lernbegleitung-lehrgang (pull request #287)
fix: allow same mentor in different courses

Approved-by: Christian Cueni
2024-02-13 12:10:58 +00:00
Christian Cueni 29d8f30902 Merged develop into bugfix/VBV-642-lernbegleitung-lehrgang 2024-02-13 11:55:49 +00:00
Reto Aebersold a76e23743b Merged in bugfix/VBV-644-trainer-vorschau-read-only (pull request #288)
fix: allow learning content for trainers

Approved-by: Christian Cueni
2024-02-13 11:55:34 +00:00
Reto Aebersold b307c84db1 fix: allow learning content for trainers
Fixes #VBV-644
2024-02-13 12:19:20 +01:00
Livio Bieri 1540e9d62a chore: migrate all VV learning units
so that their self evaluation pages show the ask for mentor feedback stuff
2024-02-12 22:13:42 +01:00
Livio Bieri 20bd103ab3 chore: simplify query 2024-02-12 22:12:16 +01:00
Livio Bieri 1065e8c2da fix: uk mentor still needed for cypress reset :-/
- uk mentor, which does not really make sense but is still needed for cypress tests
- vv mentor, can't be added yet to the same user, see open PR https://bitbucket.org/iterativ/vbv_lernwelt/pull-requests/287

==> Once 287 is merged, we can add the vv mentor as well
2024-02-12 16:10:17 +01:00
Livio Bieri a97e698165 fix: create_laerning_mentor for vv course 2024-02-12 15:28:22 +01:00
Livio Bieri 8008af0777 fix: format 2024-02-12 14:32:44 +01:00
Livio Bieri c5197c6c70 chore: expose create_learning_mentor to django admin 2024-02-12 14:04:27 +01:00
Livio Bieri 0e5e311829 chore: use page suffix + smaller changes (pr feedback) 2024-02-12 13:28:48 +01:00
Livio Bieri 3625841d80 chore: naming, don't use fetch 2024-02-12 11:53:18 +01:00
Livio Bieri 731e4af960 chore: set vv student's ID 2024-02-12 11:52:52 +01:00