Commit Graph

578 Commits

Author SHA1 Message Date
Lorenz Padberg 9f94191c7a Fix Allowed hosts 2023-05-30 10:56:08 +02:00
Lorenz Padberg 89716db561 Add azure deployment to pipelines 2023-05-30 10:55:59 +02:00
Lorenz Padberg 0a5a6fa4ce Add azure blob storage as default media storage 2023-05-30 10:55:36 +02:00
Lorenz Padberg 6e264b1480 Add azure blob storage to django 2023-05-30 10:55:36 +02:00
Lorenz Padberg d0f48866f5 Add additional Env variables 2023-05-30 10:55:36 +02: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 904d24f566 Add `LearningContentDocumentList` 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
Daniel Egger 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
Elia Bieri db35a037eb Jump to cockpit for trainers and superusers 2023-05-25 13:34:23 +02:00
Christian Cueni abefe878da Set duration default to 0, hide duration info if 0 2023-05-25 11:57:01 +02:00
Elia Bieri 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
Christian Cueni 6816ad8388 Add language parameter to SSO 2023-05-25 09:08:31 +02:00
Daniel Egger b7cca35e88 Merge migrations 2023-05-24 16:02:29 +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 8743441e81 Format code 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 1d0b956b56 Update features of course goals rich text field 2023-05-23 17:30:04 +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
Christian Cueni 03fd182edb Update LK wording 2023-05-22 14:24:14 +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 872657634b Remove "Querverweise" und "Verlinkungen" 2023-05-19 10:17:25 +02:00
Daniel Egger decba980f5 Rework Media Library 2023-05-19 10:17:25 +02:00
Daniel Egger e8d6a9c784 Embed media library as course session specific page 2023-05-19 10:17:24 +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
Elia Bieri bec2348c79 Format code 2023-05-17 13:58:32 +02:00
Elia Bieri 849e49c433 Minor fixes 2023-05-17 13:42:16 +02:00
Elia Bieri c5110e1051 Make migration 2023-05-17 11:00:43 +02:00
Elia Bieri 652cd7d8fb Implement RichTextBlock 2023-05-17 10:59:21 +02:00
Elia Bieri 45a27332cd Initialize LearningContent description with RichText 2023-05-17 10:59:21 +02:00
Daniel Egger 8d879ba981 Add graqhql introspection schema 2023-05-16 17:08:54 +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
Christian Cueni 6534cbf8df Update feedback questions and order 2023-05-09 14:38:40 +02:00
Daniel Egger d1907182a3 Fix cypress tests 2023-05-09 13:46:43 +02:00
Daniel Egger 57a4f447af Show assignment results for user 2023-05-08 17:13:24 +02:00
Daniel Egger 69e96391d9 Show "Bewertung abschliessen" when finished 2023-05-08 16:40:53 +02:00
Daniel Egger edc1eed60d Reset AssignmentCompletion data on reset action 2023-05-08 14:27:40 +02:00
Daniel Egger d2f916bc79 Only copy task data when it's found 2023-05-08 14:27:40 +02:00
Daniel Egger 32c3d6d1b4 Format code 2023-05-08 14:27:40 +02:00
Daniel Egger 5868468a48 Add grades to AssingmentEvaluation 2023-05-08 14:27:40 +02:00
Daniel Egger 2d6cee9f9f Add EvaluationSummary 2023-05-08 14:27:40 +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
Daniel Egger 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
Christian Cueni 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 9bc11e7ae6 Update requirements 2023-04-25 17:53:40 +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
Daniel Egger 8ffea5bc1b Format code 2023-04-25 13:20:02 +02:00
Daniel Egger baf5801b6a Add grading api endpoint 2023-04-25 13:20:02 +02:00
Daniel Egger 9580d79559 Add more validation to `update_assignment_completion` 2023-04-25 13:20:02 +02:00
Daniel Egger 19a7738457 Add `AssignmentCompletionAuditLog` 2023-04-25 13:20:02 +02:00
Lorenz Padberg 766af5444a Merged in feature/improve-test-speed (pull request #61)
Select MD5 (faster) password hasher for tests

Approved-by: Christian Cueni
2023-04-20 15:45:06 +00:00
Lorenz Padberg 7fffd6cbae Select MD5 (faster) password hasher for tests
In the timeline project this reduced test time by 10%.
2023-04-18 16:52:43 +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
Elia Bieri 3cabca8c21 Fix typo 2023-04-11 11:31:51 +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 13b580468d Create test assignment with tasks in code 2023-04-05 21:43:15 +02:00
Daniel Egger 539ddbeaf9 Refactor the models 2023-04-05 21:43:15 +02:00
Elia Bieri 4cf292bbf8 Rework model 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 85a0ba1d25 Fix cypress tests 2023-04-05 18:49:06 +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 4996eb565a Cleanup icons 2023-04-03 13:52:37 +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
Elia Bieri 10f34f53d8 Merged in feature/storybook (pull request #49)
Integrate Storybook

* Merged in feature/caprover-deploy (pull request #47)

Feature/caprover deploy

Approved-by: Christian Cueni
* Merge branch 'feature/storybook' of bitbucket.org:iterativ/vbv_lernwelt into feature/storybook

* Add stories

* Add BuenosAires font to storybook

* Mute typecheck error

* Update bitbucket deployment

* Add ItNavigationProgress component

* Update pipelines file

* Update pipelines file

* Merged develop into feature/storybook

Approved-by: Daniel Egger
2023-03-29 13:45:13 +00: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 c8905847fa Fix small circle unit titles 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 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
Christian Cueni 02315af984 Add demo language switch 2023-03-02 07:07:40 +01:00
Christian Cueni 8dc2fabb03 Add missing circles to üK 2023-03-01 07:09:02 +01:00
Christian Cueni 6b995bc4ae Change circle order 2023-02-22 13:02:47 +01:00
Christian Cueni 062900ab41 Update WBTs 2023-02-21 11:24:23 +01:00
Christian Cueni 96635ff8a7 Update üK competences 2023-02-15 14:19:25 +01:00
Christian Cueni b667140d3e Add language field and API 2023-02-08 13:15:04 +01:00
Elia Bieri b5e4c30d40 Merged in feature/notifications (pull request #15) 2023-02-08 11:39:27 +00:00
Christian Cueni aac1c638df Merge branch 'feature/feedback-json' into develop 2023-02-07 07:11:47 +01:00
Christian Cueni aa5b744285 Migrate form data to json field 2023-02-06 16:03:40 +01:00
Christian Cueni 52a3e4da8c Update topic name 2023-02-06 15:20:03 +01:00
Christian Cueni f5c7ab77e1 Remove "vernetzen" circle 2023-02-06 09:00:13 +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 23fd945cb6 Fix test, lint vue 2023-01-31 08:26:16 +01:00
Christian Cueni bd3388714e Fix UI errors 2023-01-31 08:26:16 +01:00
Christian Cueni 2ab8f580bc Add HorizontalBar component 2023-01-31 08:26:16 +01:00
Christian Cueni b7038c1a9c Add open feedback component, update vertical bar chart 2023-01-31 08:26:16 +01:00
Christian Cueni ec58ca176c Add basic Feedback page 2023-01-31 08:26:15 +01:00
Christian Cueni 44ed154814 Add summary component 2023-01-31 08:26:15 +01:00
Christian Cueni 88848aa292 WIP: Add single feedback endpoint 2023-01-31 08:26:15 +01:00
Christian Cueni 46710d29b9 Add summary endpoint 2023-01-31 08:26:15 +01:00
Christian Cueni 0794a715b3 Add Handlungsfelder SVGs 2023-01-31 08:13:05 +01:00
Christian Cueni f6ffb431c2 Fix circle names 2023-01-30 08:23:58 +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