Commit Graph

617 Commits

Author SHA1 Message Date
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
Christian Cueni dfc395b6ec Update course participants 2023-06-07 14:39:54 +02:00
Daniel Egger 9df76ab69a Fix unit tests 2023-06-02 16:17:58 +02:00
Daniel Egger b5736ef9ef Make link out from teams link 2023-06-02 15:16:42 +02:00
Daniel Egger 791413066c Attach import users as trainers to UK 2023-06-02 15:16:42 +02:00
Daniel Egger 261952f605 Change LOGIN_URL for server logout 2023-06-02 15:16:41 +02:00
Daniel Egger 183135bcb7 VBV-409: onboarding anpassungen 2023-06-02 15:16:41 +02:00
Daniel Egger 631893c60f Fix in sso login 2023-06-02 15:16:41 +02:00
Daniel Egger 32233ec38e Import students from excel 2023-06-02 15:16:41 +02:00
Daniel Egger d6df9b624b Refactor import data loading 2023-06-02 15:16:41 +02:00
Daniel Egger 5f534dee9f Import without changing file 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 2e7a069d0a Add trainer import code 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 e6c782fe5b Parse attendance course data 2023-06-02 15:16:41 +02:00
Daniel Egger 73d44478db Add datetime parsing function from MyService 2023-06-02 15:16:41 +02:00
Daniel Egger 9c1684bce3 Add excel import code 2023-06-02 15:16:41 +02:00
Daniel Egger 61ce0897cf Refactor user creation code for sso and import 2023-06-02 15:16:41 +02:00
Daniel Egger 353992441b Fix test settings 2023-06-02 11:45:13 +02:00
Daniel Egger db78f1a9cf Fix static files problem with correct whitenoise settings 2023-06-02 11:12:00 +02:00
Daniel Egger 9d0c41322c More cleanup 2023-06-02 09:36:29 +02:00
Daniel Egger 3158033d57 Rework VITE_* variables... 2023-06-02 00:10:34 +02:00
Daniel Egger 8a1e9221c8 Cleanup unused stuff 2023-06-01 23:12:47 +02:00
Daniel Egger a67a06d69b Cleanup oauth env variables 2023-06-01 22:44:42 +02:00
Daniel Egger 6ab8be4e58 Cleanup env variables 2023-06-01 22:14:13 +02:00
Daniel Egger fb74ffeeb2 VBV-381: rename app env variable to VITE_APP_ENVIRONMENT 2023-06-01 21:55:56 +02:00
Daniel Egger 800a07ba7e Set default app env for local development to "local" 2023-06-01 21:48:35 +02:00
Lorenz Padberg 69445b546c Change default admin passwort (for tests) 2023-06-01 16:18:58 +02:00
Lorenz Padberg 6826410d82 Change default admin passord to environment variable 2023-06-01 15:39:57 +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
Lorenz Padberg 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
Lorenz Padberg 515f7a7b1b Update Env Variables with correct SSO parameters 2023-05-30 16:31:20 +02:00
Daniel Egger 1c0a61bde7 Merged in feature/VBV-313-azure-rebase1 (pull request #112)
Feature/VBV-313 azure rebase1

Approved-by: Lorenz Padberg
2023-05-30 13:47:13 +00:00
Daniel Egger 8eb87327df Remove references to `IT_USE_AZURE_BLOB_STORAGE` 2023-05-30 11:41:42 +02:00
Lorenz Padberg c66d25daa3 Format with ufmt 2023-05-30 10:56:08 +02:00
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