Commit Graph

364 Commits

Author SHA1 Message Date
Christian Cueni 0712b331ea Add FR reflection
Add circle "Fahrzeug" FR

Add fahrzeug preparation

Add content FR

Add bewertung

Lint and add IT reflection
2023-06-15 08:37:18 +02:00
Christian Cueni 1a9f676381 Add "Gewinnen" assignment, fix titles, update expert info 2023-06-08 16:01:02 +02:00
Christian Cueni 391c88e588 Update FR translations 2023-06-08 15:07:30 +02:00
Christian Cueni cf0ffe66ac Update goals
Update basis

Update circle Haushalt

Update Reisen

Add Pensionierung

Update Gesundheit

Update Vorbereitung

Update WBTs

Update kmu

Add Vermittler reflection

Add VV assignment "Gesundheit"

Add assignment "Gesundheit"

Add link to Fachcheck
2023-06-08 15:07:30 +02:00
Daniel Egger 791413066c Attach import users as trainers to UK 2023-06-02 15:16:42 +02:00
Daniel Egger 32233ec38e Import students from excel 2023-06-02 15:16:41 +02:00
Daniel Egger ab2e4c5df2 Refactor admin 2023-06-02 15:16:41 +02:00
Daniel Egger f42aae19ee Import trainer from excel file 2023-06-02 15:16:41 +02:00
Daniel Egger 281521a8d0 Import course sesssions from excel file 2023-06-02 15:16:41 +02:00
Daniel Egger 9c1684bce3 Add excel import code 2023-06-02 15:16:41 +02:00
Christian Cueni cb40554fe0 Update texts, remove blocks 2023-06-01 14:39:46 +02:00
Christian Cueni d106c49b33 Update content order 2023-05-31 13:33:48 +02:00
Elia Bieri 6d662626dc Merged in feature/VBV-386-lerneinheiten-titel-entfernbar-machen (pull request #111)
Add ability to hide learning unit titles

* Add ability to hide learning unit titles

# Conflicts:
#	server/vbv_lernwelt/course/creators/uk_course.py

* Fix rebase

* Undo faulty rebase


Approved-by: Christian Cueni
2023-05-31 09:39:27 +00:00
Elia Bieri dd7efdd7a5 Merged in bugfix/VBV-397-reihenfolge-präsenztag (pull request #116)
Swap “Präsenztag” and “Dokumente für den Unterricht”

* Swap “Präsenztag” and “Dokumente für den Unterricht”


Approved-by: Christian Cueni
2023-05-31 06:55:46 +00:00
Christian Cueni aeae89fedb Update exam url 2023-05-30 10:48:30 +02:00
Christian Cueni 2ec48cf4a6 Fix html 2023-05-30 10:41:59 +02:00
Daniel Egger 38b1b0ff4e Add documents fahrzeuge 2023-05-26 18:16:05 +02:00
Daniel Egger 3b6971aa97 Add data for circle basis 2023-05-26 17:57:12 +02:00
Daniel Egger 45161788cc Create Vorbereitungsauftrag Kickoff 2023-05-26 17:28:48 +02:00
Daniel Egger 1fa420a11b VBV-355: Inhaltstyp Test 2023-05-26 16:49:50 +02:00
Daniel Egger 2d58cdd9fe Add code after rebase 2023-05-26 16:07:42 +02:00
Daniel Egger 142c979b24 Add demo tag course session 2023-05-26 15:55:19 +02:00
Christian Cueni cee6c03630 Add üK-Training course 2023-05-26 15:55:19 +02:00
Daniel Egger f269ca3bf8 Anpassungen Inhalt kopiert von Chrigu 2023-05-26 15:29:07 +02:00
Daniel Egger 885b9e8dce Move uk course creation code 2023-05-26 15:19:49 +02:00
Daniel Egger 6368188d2f Rename back to `get_frontend_url` 2023-05-26 09:45:36 +02:00
Daniel Egger f33433b77d Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit 2023-05-26 09:39:44 +02:00
Elia Bieri db35a037eb Jump to cockpit for trainers and superusers 2023-05-25 13:34:23 +02:00
Daniel Egger 321c57b709 Make assignment creation more generic 2023-05-24 15:20:49 +02:00
Daniel Egger 0f0d1632a7 VBV-279: Inhaltstyp Reflexion 2023-05-24 15:20:47 +02:00
Daniel Egger b1d14fd691 Fix tests 2023-05-24 15:20:30 +02:00
Daniel Egger 9be0ce9d39 Frontend: "Vorbereitungsauftrag" 2023-05-24 15:19:49 +02:00
Daniel Egger 951d9b42e6 Add text for "Vorbereitunsauftrag" 2023-05-24 15:19:10 +02:00
Elia Bieri 100e42bdd2 Reformat code 2023-05-23 16:43:24 +02:00
Elia Bieri 09dcfcc418 Implement additional fields 2023-05-23 16:43:18 +02:00
Elia Bieri b7cdc0ddde Add attendance course start- and endtime 2023-05-23 15:35:19 +02:00
Elia Bieri 132c115e8b Rename attendance days to attendance courses 2023-05-23 15:34:59 +02:00
Daniel Egger bc368e7a2f Fix cypress tests 2023-05-19 14:50:41 +02:00
Daniel Egger 4fb534aa25 Create `create_course_uk_de_completion_data` with algo 2023-05-19 14:05:14 +02:00
Daniel Egger decba980f5 Rework Media Library 2023-05-19 10:17:25 +02:00
Daniel Egger 500228a7f8 Merge branch 'develop' into feature/VBV-372-lk-update 2023-05-17 19:21:19 +02:00
Daniel Egger 9e3124160a Add some test data and clean up some things 2023-05-17 19:09:33 +02:00
Christian Cueni d139744f4f Update competences 2023-05-17 14:26:47 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +02:00
Daniel Egger e130d65f37 Merged in feature/VBV-339-assignment-cypress-test (pull request #79)
Feature/VBV-339 assignment cypress test UNFINISHED

* Create assignment submission test data for cypress test

* Add first assignment trainer test

* Add first cypress test which checks DB entry with all instrumentation
2023-05-12 14:33:14 +00:00
Daniel Egger b313bad031 Rename field `type` to `content_type` in REST response
In Wagtail Grapple/GraphQL the field is already called `content_type`
2023-05-12 13:38:35 +02:00
Daniel Egger a15af2bf86 VBV-350: Refactor LearningContent to individual wagtail pages 2023-05-12 11:51:02 +02:00
Daniel Egger d1907182a3 Fix cypress tests 2023-05-09 13:46:43 +02:00
Daniel Egger d9a6f2dd94 Add EvaluationIntro 2023-05-08 14:27:39 +02:00
Daniel Egger fef864df25 VBV-321: squash current work
Load and display AssignmentCompletionStatus

Datenmodell um Bewertungskriterien erweitern

Refactor assignment pages

Show user results

Update some data fields

Show user assignment evaluation

Changes after rebase

Rename `grading` -> `evaluation`

Add evaluation data to AssignmentCompletion

Refactor usage of `assignmentStore`

Store points for evaluation

Only debounce text

Show user responses on evaluation page
2023-05-08 14:24:38 +02:00
Ramon Wenger 96334b4eb6 Merged in feature/VBV-304-praesenztag-ui (pull request #65)
Feature/VBV-304 praesenztag ui

Approved-by: Daniel Egger
2023-04-26 09:57:22 +00:00
Ramon Wenger fba93a8f63 Fix ufmt issues 2023-04-25 17:59:25 +02:00
Ramon Wenger 9dd9a02592 Add new package to help with editing JSON fields 2023-04-25 17:23:58 +02:00
Daniel Egger 9580d79559 Add more validation to `update_assignment_completion` 2023-04-25 13:20:02 +02:00
Daniel Egger adc61479fc Merged in feature/VBV-290-kn-backend (pull request #59)
Feature/VBV-290 kn backend

* Add initial assignment completion model

* Add first version of `update_assignment_completion`

* Upgrade wagtail>=4 for new functions needed in assignment api

* Add API to update assignment user data

* Post API via assignment not learning_content

* Add GET api endpoints for AssignmentCompletion

* Add some initial assignment completion data

* Add admin view for AssignmentCompletion


Approved-by: Elia Bieri
2023-04-18 08:07:29 +00:00
Daniel Egger 5955ad83a3 Add widget to pretty print JSONFields in admin 2023-04-14 16:11:31 +02:00
Daniel Egger c0dc4d6a2f Fix python tests 2023-04-14 10:02:33 +02:00
Daniel Egger c64341a6c1 Refactor test course to make it more realistic 2023-04-14 09:31:37 +02:00
Daniel Egger a3e4a50ba0 Add unit test to test creation of slug while saving 2023-04-13 20:03:09 +02:00
Daniel Egger 80cd70ace6 Link courseSessionAssignmentDetails to AssignmentView 2023-04-06 21:39:44 +02:00
Daniel Egger 8f84ef7502 Adapt api so it can fetch assignment page by id 2023-04-05 21:43:15 +02:00
Daniel Egger b0cc789549 Attach Assignment to LearningPath 2023-04-05 21:43:15 +02:00
Daniel Egger 539ddbeaf9 Refactor the models 2023-04-05 21:43:15 +02:00
Elia Bieri 9ecb9a9add Add initial wagtail models 2023-04-05 21:43:15 +02:00
Daniel Egger 2c3b77b0d8 VBV-234: Bugfix neue Seiten im Wagtail erstellen
Der `parent` einer Page ist erst in der `save` Funktion
vorhanden für eine neue Seite. Deshalb muss man das
Überschreiben der `slug` im `save` machen.
2023-04-05 21:43:00 +02:00
Daniel Egger 1d88117d99 Refactor `attendance_days` to its own field 2023-04-04 08:45:42 +02:00
Daniel Egger 9ee97ffc55 Format code 2023-04-03 18:55:05 +02:00
Daniel Egger 9177b9e003 Get attendance day details in relevant views 2023-04-03 18:39:36 +02:00
Daniel Egger 1437bc9b53 VBV-304: Add `AssignmentDayBlock` 2023-04-03 18:09:22 +02:00
Daniel Egger 8d41d3d3a2 VBV-193 refactored course completion for course sessions 2023-03-31 18:27:47 +02:00
Daniel Egger 18f7728793 VBV-302: Refactor Header for course session switching 2023-03-31 15:21:20 +02:00
Daniel Egger 724f31f4a8 Handle multiple CourseSessions for user 2023-03-31 11:18:55 +02:00
Daniel Egger edcfab1dd3 Format code according to new library rules 2023-03-31 10:07:27 +02:00
Daniel Egger a0c7dec316 Improve course creation scripts to only create some courses 2023-03-29 17:39:09 +02:00
Daniel Egger 2263c82ce6 Remove creation of Versicherungsvermittler (alt) 2023-03-29 16:20:55 +02:00
Christian Cueni 97879b570c Show only start and stop icon in circle 2023-03-27 11:34:09 +02:00
Daniel Egger 1f7b9252ab Remove api page chache -> it is not needed anymore 2023-03-17 11:15:56 +01:00
Daniel Egger 45533e0b2d Refactor `frontend_url` calculation to avoid DB access and improve
performance

Das initiale Laden des Lernpfads dauerte so lange, weil das berechnen
des Felds `frontend_url` sehr viele DB-Zugriffe auf die jeweiligen
"parents" einer Page machten.
Die gleiche Berechnung kann man aber auch direkt aus dem `slug`
ohne Zugriff auf die Parents machen.
Das wurde hier gemacht. Das ganze beruht darauf, dass die page-`slug`
in einem bestimmten Format ist. Um das weiter zu bearbeiten,
habe ich VBV-296 erstellt.
2023-03-17 11:12:42 +01:00
Christian Cueni b2cc2788df Add FR üK Trainer, add DE üK student 2023-03-15 06:59:27 +01:00
Daniel Egger b1a1d52810 VBV-293: Link zu Mediathek in ÜK upgrade 2023-03-14 17:27:31 +01:00
Daniel Egger 8d0386c945 Fix formatting 2023-03-14 17:20:14 +01:00
Daniel Egger 57c25da542 VBV-293: Link zu Mediathek in ÜK 2023-03-14 17:16:40 +01:00
Daniel Egger f68e20515d VBV-293: Link zu Mediathek in Versicherungsvermittlerin Lehrgang wieder eingefügt 2023-03-14 15:03:01 +01:00
Christian Cueni 4efd4c72a3 Remove "Selbsteinschätzung" from Circle Fahrzeug 2023-03-12 13:24:05 +01:00
Christian Cueni d233b782bc Use RichField for circle detail data 2023-03-09 15:30:50 +01:00
Christian Cueni 30ead5a261 Update üK structure 2023-03-09 15:11:50 +01:00
Christian Cueni 154b123bec Update FR ük 2023-03-06 11:40:59 +01:00
Christian Cueni cdaee0fc5a Add 🇫🇷 UI texts 2023-03-03 13:11:24 +01:00
Christian Cueni bf7f6d3ca7 Add FR course
Translate circles
2023-03-02 09:09:29 +01:00
Christian Cueni 8dc2fabb03 Add missing circles to üK 2023-03-01 07:09:02 +01:00
Christian Cueni 96635ff8a7 Update üK competences 2023-02-15 14:19:25 +01:00
Christian Cueni 8b2aab8298 Add Chrigi to üK, change numbers of feedbacks 2023-01-31 11:49:26 +01:00
Christian Cueni 28341131e4 Fix cypress tests 2023-01-31 11:24:59 +01:00
Christian Cueni 44ed154814 Add summary component 2023-01-31 08:26:15 +01:00
Christian Cueni 46710d29b9 Add summary endpoint 2023-01-31 08:26:15 +01:00
Daniel Egger 4be2bb1975 VBV-251: Neusten Vermittlerlehrgang abbilden 2023-01-25 16:29:54 +01:00
Christian Cueni bf704cccc5 Add experts to all circles 2023-01-23 13:40:47 +01:00
Christian Cueni c34d3729fc Assign users to new course 2023-01-23 09:31:10 +01:00
Christian Cueni 6c0aaaa9cf Rename Vermittler courses 2023-01-23 08:39:41 +01:00
Christian Cueni 429f6241d2 Add missing expert 2023-01-19 07:43:04 +01:00
Daniel Egger 1aaf0810bd VBV-243: Add new Versicherungsvermittler learning path 2023-01-18 18:25:54 +01:00
Daniel Egger 503f819d38 Refactor expert handling 2023-01-11 15:54:50 +01:00
Daniel Egger fb458be776 Refactor permission functions 2023-01-11 15:54:50 +01:00
Daniel Egger 9fc834e99e Refactor cockpit circle handling 2023-01-11 15:54:50 +01:00
Daniel Egger 1b87aa5bac Refactor cockpit user loading 2023-01-11 15:54:50 +01:00
Daniel Egger 47770bde90 Refactor course expert serializer 2023-01-11 15:54:50 +01:00
Daniel Egger 597c9f267b Check permissions for accessing user completions 2023-01-11 15:54:50 +01:00
Daniel Egger 6d6126add7 Fix small navigation bar bug 2023-01-11 15:34:23 +01:00
Christian Cueni ae62b43606 Fix upload, add delete s3 files command 2023-01-11 07:38:47 +01:00
Christian Cueni e197a17f15 Fix user header on circle page 2023-01-10 08:58:44 +01:00
Christian Cueni 0d64f8fbb6 Change model name 2023-01-10 08:09:16 +01:00
Christian Cueni cb9249328e Add delete unreferenced file command 2023-01-10 08:09:13 +01:00
Christian Cueni d65d786f4f Fix permissions, refactor upload code 2023-01-10 08:05:02 +01:00
Christian Cueni fc017961ab Verify permissions 2023-01-10 08:05:02 +01:00
Christian Cueni 8ad84cc778 WIP: Add tests 2023-01-10 08:05:02 +01:00
Daniel Egger 7a3e4324d9 VBV-213: Filter criteria by selected circle
Show upload button only to circle experts

Add files app and basic frontend test

Add service, refactor form

WIP: Upload file

WIP: Upload file to s3

WIP: Add course models, add view

WIP: Add local upload

WIP: Add basic get

WIP: Validate form

WIP: Add file list, download by name

WIP: Update documents after upload

WIP: Add delete button and API

WIP: Reset upload_finished_at when document is deleted

WIP: Handle upload error

Add s3 document
2023-01-10 08:04:56 +01:00
Daniel Egger fd7bc7fdca VBV-192: Add better completation data for cockpit user demo 2023-01-09 15:05:48 +01:00
Christian Cueni c8eb505cd2 Add fake üK-Content 2022-12-19 09:39:46 +01:00
Christian Cueni 58bb1d5fef Use own icon for learning content 2022-12-15 09:40:46 +01:00
Daniel Egger e8073753be Add circle view for user profiles in cockpit 2022-12-14 19:02:48 +01:00
Christian Cueni b950f11942 Update course slugs 2022-12-13 20:31:35 +01:00
Christian Cueni 4ac1c78a4f Update path name 2022-12-13 14:21:26 +01:00
Christian Cueni 2248ad4396 Merge branch 'feature/cockpit-ui' into develop 2022-12-12 13:34:33 +01:00
Christian Cueni 3375d0f121 Return circle expert data, use circle data 2022-12-12 11:02:06 +01:00
Ramon Wenger b29e56fe4c Pacify ufmt 2022-12-08 17:21:49 +01:00
Ramon Wenger 09e22a7616 Add command for clearing the course cache 2022-12-08 17:06:25 +01:00
Daniel Egger 0cbce3c42b Load separate competence profile for every user 2022-12-02 17:49:40 +01:00
Daniel Egger 0adf734846 Url handling 2022-12-02 17:10:57 +01:00
Daniel Egger 5aa73e4997 Fix problem in competence pages 2022-12-02 16:57:44 +01:00
Daniel Egger 218756e3dc Add drf view to request completion data for user 2022-12-02 14:53:49 +01:00
Daniel Egger 48cf9026d9 Add cockpit store 2022-12-02 14:24:02 +01:00
Daniel Egger 963250a8da Add role to course session user 2022-12-02 13:59:27 +01:00
Daniel Egger 205cb3c1d4 Add view for course session members 2022-12-02 13:44:28 +01:00
Daniel Egger 00d2527b29 Refactor urls for courses, learning paths and competence profile 2022-12-02 11:18:56 +01:00
Daniel Egger cb9505b54c Add some more demo users 2022-12-02 10:27:27 +01:00
Daniel Egger a3c3e60763 Show only uniqe courses (not course sessions) on Dashboar 2022-11-14 11:20:37 +01:00
Daniel Egger 64b6356ef5 Add more test users 2022-11-11 11:22:41 +01:00
Daniel Egger 2295ede996 Add python unit tests 2022-11-09 12:40:01 +01:00
Daniel Egger 93a0fdaadb Add ÜK1 course 2022-11-09 12:40:01 +01:00
Daniel Egger e6e5b77d0e Create default `CourseSessionUser`s 2022-11-09 12:40:01 +01:00
Daniel Egger efd8892d6a Select Circle expert/trainer on the admin field (not dynamic) 2022-11-09 12:40:01 +01:00
Daniel Egger a119cc122d Add CourseSession admin model 2022-11-09 12:40:01 +01:00
Daniel Egger 17eaf80d2c Add CourseSession serializer and view 2022-11-09 12:40:00 +01:00
Daniel Egger 05e02449c8 Refactor course access check 2022-11-09 12:40:00 +01:00
Daniel Egger c61ea10c7d Format code 2022-11-09 12:40:00 +01:00
Daniel Egger d8577c70d5 Limit page access to users which can access course 2022-11-09 12:40:00 +01:00
Daniel Egger d8148158a1 Refactor serialization code 2022-11-09 12:40:00 +01:00
Daniel Egger f8d00040f6 Add basic model 2022-11-09 12:40:00 +01:00
Daniel Egger 924bf6f140 Fix `npm run test` 2022-10-21 18:00:22 +02:00
Christian Cueni 7fbac1aaea Rename Profil to Navi 2022-10-18 15:56:25 +02:00
Daniel Egger fd6c15c282 Fix cypress tests 2022-10-04 14:42:34 +02:00
Daniel Egger a8e7b6f433 Add learn media page 2022-10-04 14:42:34 +02:00
Daniel Egger 63a5039134 Work on media library frontend 2022-10-04 14:42:34 +02:00
Daniel Egger cbdbdba6b8 Add `frontend_url` field to wagtail pages 2022-10-04 14:42:34 +02:00
Daniel Egger 71b072ade2 Refactor media content data models 2022-10-04 14:42:34 +02:00
Daniel Egger 827e7a0fc0 Add code formatting with prettier and black 2022-09-30 17:43:06 +02:00
Daniel Egger e230c0b8e5 Fix python tests 2022-09-28 15:34:07 +02:00
Daniel Egger 8ab17f9370 Readd completion code 2022-09-28 15:11:08 +02:00
Daniel Egger b5804c2696 Fix test lerngang 2022-09-28 14:52:25 +02:00
Daniel Egger 46998668d8 Add course_category to LearningUnit 2022-09-27 16:41:54 +02:00
Daniel Egger a7f0d79c0f Add serializer for media_library models 2022-09-23 15:38:06 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger f9c3e82b66 Adapt LearningPath to new course model 2022-09-23 14:55:21 +02:00
Daniel Egger ee4f6fb565 Add course app with default course model 2022-09-23 14:55:21 +02:00