Commit Graph

573 Commits

Author SHA1 Message Date
Daniel Egger 95479ae5e2 VBV-444: Bugfix circle in import file 2023-06-12 13:46:25 +02:00
Christian Cueni 5298eb8049 Update participants 2023-06-12 09:32:38 +02:00
Christian Cueni 2e12e30b4d Fix content 2023-06-11 20:21:23 +02:00
Christian Cueni f5b58dc2ee Merged develop into feature/VBV-424-vv-content 2023-06-08 14:21:07 +00: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
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