61ce0897cf
Refactor user creation code for sso and import
2023-06-02 15:16:41 +02:00
353992441b
Fix test settings
2023-06-02 11:45:13 +02:00
db78f1a9cf
Fix static files problem with correct whitenoise settings
2023-06-02 11:12:00 +02:00
8a1e9221c8
Cleanup unused stuff
2023-06-01 23:12:47 +02:00
69445b546c
Change default admin passwort (for tests)
2023-06-01 16:18:58 +02:00
6826410d82
Change default admin passord to environment variable
2023-06-01 15:39:57 +02:00
cb40554fe0
Update texts, remove blocks
2023-06-01 14:39:46 +02:00
d106c49b33
Update content order
2023-05-31 13:33:48 +02:00
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
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
ded684ecc2
Merged in feature/VBV-313-azure-rebase1 (pull request #115 )
...
Update Env Variables with correct SSO parameters
2023-05-30 15:31:03 +00:00
515f7a7b1b
Update Env Variables with correct SSO parameters
2023-05-30 16:31:20 +02:00
aeae89fedb
Update exam url
2023-05-30 10:48:30 +02:00
2ec48cf4a6
Fix html
2023-05-30 10:41:59 +02:00
38b1b0ff4e
Add documents fahrzeuge
2023-05-26 18:16:05 +02:00
3b6971aa97
Add data for circle basis
2023-05-26 17:57:12 +02:00
45161788cc
Create Vorbereitungsauftrag Kickoff
2023-05-26 17:28:48 +02:00
1fa420a11b
VBV-355: Inhaltstyp Test
2023-05-26 16:49:50 +02:00
2d58cdd9fe
Add code after rebase
2023-05-26 16:07:42 +02:00
904d24f566
Add `LearningContentDocumentList`
2023-05-26 16:07:42 +02:00
142c979b24
Add demo tag course session
2023-05-26 15:55:19 +02:00
cee6c03630
Add üK-Training course
2023-05-26 15:55:19 +02:00
f269ca3bf8
Anpassungen Inhalt kopiert von Chrigu
2023-05-26 15:29:07 +02:00
885b9e8dce
Move uk course creation code
2023-05-26 15:19:49 +02:00
6368188d2f
Rename back to `get_frontend_url`
2023-05-26 09:45:36 +02:00
f33433b77d
Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit
2023-05-26 09:39:44 +02:00
4b06654954
Merged in feature/VBV-278-vorbereitungsauftrag (pull request #96 )
...
Feature/VBV-278 vorbereitungsauftrag
Approved-by: Elia Bieri
2023-05-25 16:31:41 +00:00
db35a037eb
Jump to cockpit for trainers and superusers
2023-05-25 13:34:23 +02:00
abefe878da
Set duration default to 0, hide duration info if 0
2023-05-25 11:57:01 +02:00
1908665596
Merged in feature/VBV-377-umsetzung-das-lernst-du-in-diese (pull request #93 )
...
Umsetzung: das lernst du in diesem Circle
Approved-by: Christian Cueni
2023-05-25 09:47:25 +00:00
6816ad8388
Add language parameter to SSO
2023-05-25 09:08:31 +02:00
b7cca35e88
Merge migrations
2023-05-24 16:02:29 +02:00
321c57b709
Make assignment creation more generic
2023-05-24 15:20:49 +02:00
0f0d1632a7
VBV-279: Inhaltstyp Reflexion
2023-05-24 15:20:47 +02:00
b1d14fd691
Fix tests
2023-05-24 15:20:30 +02:00
8743441e81
Format code
2023-05-24 15:20:30 +02:00
9be0ce9d39
Frontend: "Vorbereitungsauftrag"
2023-05-24 15:19:49 +02:00
951d9b42e6
Add text for "Vorbereitunsauftrag"
2023-05-24 15:19:10 +02:00
1d0b956b56
Update features of course goals rich text field
2023-05-23 17:30:04 +02:00
100e42bdd2
Reformat code
2023-05-23 16:43:24 +02:00
09dcfcc418
Implement additional fields
2023-05-23 16:43:18 +02:00
b7cdc0ddde
Add attendance course start- and endtime
2023-05-23 15:35:19 +02:00
132c115e8b
Rename attendance days to attendance courses
2023-05-23 15:34:59 +02:00
03fd182edb
Update LK wording
2023-05-22 14:24:14 +02:00
bc368e7a2f
Fix cypress tests
2023-05-19 14:50:41 +02:00
4fb534aa25
Create `create_course_uk_de_completion_data` with algo
2023-05-19 14:05:14 +02:00
872657634b
Remove "Querverweise" und "Verlinkungen"
2023-05-19 10:17:25 +02:00
decba980f5
Rework Media Library
2023-05-19 10:17:25 +02:00
e8d6a9c784
Embed media library as course session specific page
2023-05-19 10:17:24 +02:00
500228a7f8
Merge branch 'develop' into feature/VBV-372-lk-update
2023-05-17 19:21:19 +02:00
9e3124160a
Add some test data and clean up some things
2023-05-17 19:09:33 +02:00
d139744f4f
Update competences
2023-05-17 14:26:47 +02:00
bec2348c79
Format code
2023-05-17 13:58:32 +02:00
849e49c433
Minor fixes
2023-05-17 13:42:16 +02:00
c5110e1051
Make migration
2023-05-17 11:00:43 +02:00
652cd7d8fb
Implement RichTextBlock
2023-05-17 10:59:21 +02:00
45a27332cd
Initialize LearningContent description with RichText
2023-05-17 10:59:21 +02:00
31dae0a5cd
VBV-306: Use GraphQL for assignment code
2023-05-15 19:07:06 +02:00
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
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
a15af2bf86
VBV-350: Refactor LearningContent to individual wagtail pages
2023-05-12 11:51:02 +02:00
6534cbf8df
Update feedback questions and order
2023-05-09 14:38:40 +02:00
d1907182a3
Fix cypress tests
2023-05-09 13:46:43 +02:00
57a4f447af
Show assignment results for user
2023-05-08 17:13:24 +02:00
69e96391d9
Show "Bewertung abschliessen" when finished
2023-05-08 16:40:53 +02:00
edc1eed60d
Reset AssignmentCompletion data on reset action
2023-05-08 14:27:40 +02:00
d2f916bc79
Only copy task data when it's found
2023-05-08 14:27:40 +02:00
32c3d6d1b4
Format code
2023-05-08 14:27:40 +02:00
5868468a48
Add grades to AssingmentEvaluation
2023-05-08 14:27:40 +02:00
2d6cee9f9f
Add EvaluationSummary
2023-05-08 14:27:40 +02:00
d9a6f2dd94
Add EvaluationIntro
2023-05-08 14:27:39 +02:00
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
3d13a646f7
Update icons
2023-05-08 14:07:43 +02:00
Ramon Wenger
a11c0d481f
Merged in feature/VBV-310-VBV-324-document-improvements (pull request #66 )
...
Feature/VBV-310 VBV 324 document improvements
Approved-by: Elia Bieri
2023-05-08 08:42:33 +00:00
dd49d050ef
Replace font files, update styles
2023-05-03 14:43:50 +02:00
Ramon Wenger
af7f0c9223
Update layout for document list
...
Relates to VBV-324
2023-05-01 21:40:04 +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
Ramon Wenger
2ef998c12f
Add new icons
2023-04-25 17:21:45 +02:00
8ffea5bc1b
Format code
2023-04-25 13:20:02 +02:00
baf5801b6a
Add grading api endpoint
2023-04-25 13:20:02 +02:00
9580d79559
Add more validation to `update_assignment_completion`
2023-04-25 13:20:02 +02:00
19a7738457
Add `AssignmentCompletionAuditLog`
2023-04-25 13:20:02 +02:00
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
5955ad83a3
Add widget to pretty print JSONFields in admin
2023-04-14 16:11:31 +02:00
c0dc4d6a2f
Fix python tests
2023-04-14 10:02:33 +02:00
c64341a6c1
Refactor test course to make it more realistic
2023-04-14 09:31:37 +02:00
a3e4a50ba0
Add unit test to test creation of slug while saving
2023-04-13 20:03:09 +02:00
3cabca8c21
Fix typo
2023-04-11 11:31:51 +02:00
80cd70ace6
Link courseSessionAssignmentDetails to AssignmentView
2023-04-06 21:39:44 +02:00
8f84ef7502
Adapt api so it can fetch assignment page by id
2023-04-05 21:43:15 +02:00
b0cc789549
Attach Assignment to LearningPath
2023-04-05 21:43:15 +02:00
13b580468d
Create test assignment with tasks in code
2023-04-05 21:43:15 +02:00
539ddbeaf9
Refactor the models
2023-04-05 21:43:15 +02:00
4cf292bbf8
Rework model
2023-04-05 21:43:15 +02:00
9ecb9a9add
Add initial wagtail models
2023-04-05 21:43:15 +02:00
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
85a0ba1d25
Fix cypress tests
2023-04-05 18:49:06 +02:00
1d88117d99
Refactor `attendance_days` to its own field
2023-04-04 08:45:42 +02:00
9ee97ffc55
Format code
2023-04-03 18:55:05 +02:00
9177b9e003
Get attendance day details in relevant views
2023-04-03 18:39:36 +02:00
1437bc9b53
VBV-304: Add `AssignmentDayBlock`
2023-04-03 18:09:22 +02:00
4996eb565a
Cleanup icons
2023-04-03 13:52:37 +02:00
8d41d3d3a2
VBV-193 refactored course completion for course sessions
2023-03-31 18:27:47 +02:00
18f7728793
VBV-302: Refactor Header for course session switching
2023-03-31 15:21:20 +02:00
724f31f4a8
Handle multiple CourseSessions for user
2023-03-31 11:18:55 +02:00
edcfab1dd3
Format code according to new library rules
2023-03-31 10:07:27 +02:00
a0c7dec316
Improve course creation scripts to only create some courses
2023-03-29 17:39:09 +02:00
2263c82ce6
Remove creation of Versicherungsvermittler (alt)
2023-03-29 16:20:55 +02:00
97879b570c
Show only start and stop icon in circle
2023-03-27 11:34:09 +02:00
1f7b9252ab
Remove api page chache -> it is not needed anymore
2023-03-17 11:15:56 +01:00
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
b2cc2788df
Add FR üK Trainer, add DE üK student
2023-03-15 06:59:27 +01:00
b1a1d52810
VBV-293: Link zu Mediathek in ÜK upgrade
2023-03-14 17:27:31 +01:00
8d0386c945
Fix formatting
2023-03-14 17:20:14 +01:00
57c25da542
VBV-293: Link zu Mediathek in ÜK
2023-03-14 17:16:40 +01:00
f68e20515d
VBV-293: Link zu Mediathek in Versicherungsvermittlerin Lehrgang wieder eingefügt
2023-03-14 15:03:01 +01:00
4efd4c72a3
Remove "Selbsteinschätzung" from Circle Fahrzeug
2023-03-12 13:24:05 +01:00
d233b782bc
Use RichField for circle detail data
2023-03-09 15:30:50 +01:00
c8905847fa
Fix small circle unit titles
2023-03-09 15:30:50 +01:00
30ead5a261
Update üK structure
2023-03-09 15:11:50 +01:00
154b123bec
Update FR ük
2023-03-06 11:40:59 +01:00
cdaee0fc5a
Add 🇫🇷 UI texts
2023-03-03 13:11:24 +01:00
bf7f6d3ca7
Add FR course
...
Translate circles
2023-03-02 09:09:29 +01:00
b4227bff25
Merged in feature/language-switch (pull request #32 )
...
Add demo language switch
Approved-by: Elia Bieri
2023-03-02 06:39:18 +00:00
02315af984
Add demo language switch
2023-03-02 07:07:40 +01:00
8dc2fabb03
Add missing circles to üK
2023-03-01 07:09:02 +01:00
6b995bc4ae
Change circle order
2023-02-22 13:02:47 +01:00
062900ab41
Update WBTs
2023-02-21 11:24:23 +01:00
96635ff8a7
Update üK competences
2023-02-15 14:19:25 +01:00
b667140d3e
Add language field and API
2023-02-08 13:15:04 +01:00
b5e4c30d40
Merged in feature/notifications (pull request #15 )
2023-02-08 11:39:27 +00:00
aac1c638df
Merge branch 'feature/feedback-json' into develop
2023-02-07 07:11:47 +01:00
aa5b744285
Migrate form data to json field
2023-02-06 16:03:40 +01:00
52a3e4da8c
Update topic name
2023-02-06 15:20:03 +01:00
f5c7ab77e1
Remove "vernetzen" circle
2023-02-06 09:00:13 +01:00
8b2aab8298
Add Chrigi to üK, change numbers of feedbacks
2023-01-31 11:49:26 +01:00
28341131e4
Fix cypress tests
2023-01-31 11:24:59 +01:00
23fd945cb6
Fix test, lint vue
2023-01-31 08:26:16 +01:00
bd3388714e
Fix UI errors
2023-01-31 08:26:16 +01:00
2ab8f580bc
Add HorizontalBar component
2023-01-31 08:26:16 +01:00
b7038c1a9c
Add open feedback component, update vertical bar chart
2023-01-31 08:26:16 +01:00
ec58ca176c
Add basic Feedback page
2023-01-31 08:26:15 +01:00
44ed154814
Add summary component
2023-01-31 08:26:15 +01:00
88848aa292
WIP: Add single feedback endpoint
2023-01-31 08:26:15 +01:00
46710d29b9
Add summary endpoint
2023-01-31 08:26:15 +01:00
0794a715b3
Add Handlungsfelder SVGs
2023-01-31 08:13:05 +01:00
f6ffb431c2
Fix circle names
2023-01-30 08:23:58 +01:00
4be2bb1975
VBV-251: Neusten Vermittlerlehrgang abbilden
2023-01-25 16:29:54 +01:00
bf704cccc5
Add experts to all circles
2023-01-23 13:40:47 +01:00
c34d3729fc
Assign users to new course
2023-01-23 09:31:10 +01:00
6c0aaaa9cf
Rename Vermittler courses
2023-01-23 08:39:41 +01:00
429f6241d2
Add missing expert
2023-01-19 07:43:04 +01:00
6bbd509faf
Add feedback icon, add feedback to default path
2023-01-19 07:43:04 +01:00
1aaf0810bd
VBV-243: Add new Versicherungsvermittler learning path
2023-01-18 18:25:54 +01:00
503f819d38
Refactor expert handling
2023-01-11 15:54:50 +01:00
fb458be776
Refactor permission functions
2023-01-11 15:54:50 +01:00
9fc834e99e
Refactor cockpit circle handling
2023-01-11 15:54:50 +01:00
1b87aa5bac
Refactor cockpit user loading
2023-01-11 15:54:50 +01:00
47770bde90
Refactor course expert serializer
2023-01-11 15:54:50 +01:00
597c9f267b
Check permissions for accessing user completions
2023-01-11 15:54:50 +01:00
99da03bc37
Remove WBTs from LFS and git (they are on AWS now)
2023-01-11 15:34:23 +01:00
6d6126add7
Fix small navigation bar bug
2023-01-11 15:34:23 +01:00
a4ecaf2430
Link WBTs to AWS S3 hosted version
2023-01-11 15:34:23 +01:00
276cd20e99
Use dynamic medialibrary link
2023-01-11 13:45:42 +01:00
Ramon Wenger
1a8024e789
Add missing migration
2023-01-11 10:44:22 +01:00
ae62b43606
Fix upload, add delete s3 files command
2023-01-11 07:38:47 +01:00
e2ce704a40
Add sso_id field
2023-01-11 07:11:38 +01:00
e197a17f15
Fix user header on circle page
2023-01-10 08:58:44 +01:00
0d64f8fbb6
Change model name
2023-01-10 08:09:16 +01:00
cb9249328e
Add delete unreferenced file command
2023-01-10 08:09:13 +01:00
d65d786f4f
Fix permissions, refactor upload code
2023-01-10 08:05:02 +01:00
fc017961ab
Verify permissions
2023-01-10 08:05:02 +01:00
8ad84cc778
WIP: Add tests
2023-01-10 08:05:02 +01:00
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
Ramon Wenger
6b343805a0
Merged in feature/feedback-form-2022-12-29 (pull request #18 )
...
Feature/feedback form 2022 12 29
2023-01-09 15:12:44 +00:00
fd7bc7fdca
VBV-192: Add better completation data for cockpit user demo
2023-01-09 15:05:48 +01:00
Ramon Wenger
f58b2f6303
Format python code according to ufmt
2022-12-29 16:32:50 +01:00
Ramon Wenger
9d848c3f9b
Add course session to feedback model
2022-12-29 16:29:13 +01:00
Ramon Wenger
c64bc463db
Make formatter happy
2022-12-29 16:28:36 +01:00
Ramon Wenger
44599d455c
Replace deprecated fields
2022-12-29 16:26:31 +01:00
Ramon Wenger
5e559b66b0
Update Feedback model, add Wagtail block
2022-12-29 16:26:31 +01:00
Ramon Wenger
6a2859e641
Swap serializer mutation for form mutation
2022-12-29 16:20:20 +01:00
Ramon Wenger
e1d9df7d31
Add initial implementation of feedback form
2022-12-29 16:20:20 +01:00
c8eb505cd2
Add fake üK-Content
2022-12-19 09:39:46 +01:00
58bb1d5fef
Use own icon for learning content
2022-12-15 09:40:46 +01:00
15b5223dc5
Fix cypress tests
2022-12-14 22:05:10 +01:00
e8073753be
Add circle view for user profiles in cockpit
2022-12-14 19:02:48 +01:00
b950f11942
Update course slugs
2022-12-13 20:31:35 +01:00
4ac1c78a4f
Update path name
2022-12-13 14:21:26 +01:00
5e0b69702f
Add file upload modal
2022-12-13 08:42:29 +01:00
2248ad4396
Merge branch 'feature/cockpit-ui' into develop
2022-12-12 13:34:33 +01:00
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
Ramon Wenger
41c6346136
Add favicon
2022-12-08 17:06:04 +01:00
0cbce3c42b
Load separate competence profile for every user
2022-12-02 17:49:40 +01:00
0adf734846
Url handling
2022-12-02 17:10:57 +01:00
5aa73e4997
Fix problem in competence pages
2022-12-02 16:57:44 +01:00
Daniel Egger
Lorenz Padberg
Christian Cueni
Elia Bieri
Daniel Egger
Ramon Wenger