Commit Graph

652 Commits

Author SHA1 Message Date
Daniel Egger 0798efc7f2 Merged in feature/VBV-453-graphql-learningpath-server (pull request #161)
Feature/VBV-453 graphql learningpath server

Approved-by: Elia Bieri
2023-07-21 06:40:25 +00:00
Elia Bieri b970597a81 Merged in feature/VBV-451-anwesenheitskontrolle-frontend (pull request #150)
VBV-451 Anwesenheitskontrolle frontend & neues Cockpit

* Regenerate graphql types after rebase

* Fix grading progress

* Fix cypress tests

* Fix circle selection and add CourseSessionAssignment for Fahrzeug Vorbereitungsauftrag

* Use `LearningContentAssignment` explictly

* Improve type safety without `as`

* Disable feedback details button when no feedback

* Extend submission overview titles after review

* Improve attendance check state handling

* Minor translation/wording fixes


Approved-by: Daniel Egger
2023-07-20 16:22:28 +00:00
Christian Cueni 5d0f7b88b5 Add sync 2023-07-20 15:34:10 +02:00
Christian Cueni 12977b01cc Add real courses data, update importer
Make course optional on import

Add importer in admin

Use new trainer format in xls

Import trainers via admin interface

Add participant import

Update tests

Update url, handle error

Refactor importer

Add json field

Fix tests

Add update test
2023-07-20 15:34:10 +02:00
Christian Cueni 65d527d894 Add student export for edoniq 2023-07-19 16:02:11 +02:00
Christian Cueni 6e9d87797e Fix css 2023-07-18 07:46:18 +02:00
Christian Cueni 1ca8a8cf81 Translate circles 2023-07-18 07:46:18 +02:00
Daniel Egger da03b407bb Add GraphQL server code for learning path 2023-07-17 17:52:27 +02:00
Daniel Egger e8178fa36a Format code 2023-07-14 17:14:00 +02:00
Daniel Egger e208fdabbc Change after making UUIDs 2023-07-14 17:13:21 +02:00
Daniel Egger f25602c84c Change types to use UUID ids 2023-07-14 14:55:45 +02:00
Daniel Egger 5ed883e83b Use UUIDs as primary key for models with user context 2023-07-14 14:37:59 +02:00
Daniel Egger 7c2190feaa Reset migrations 2023-07-14 14:16:38 +02:00
Daniel Egger 76e53a205c Improve error handling a bit... 2023-07-14 13:15:28 +02:00
Daniel Egger c97ec9b399 Adapt AssignmentCompletion model to include page_id 2023-07-12 19:06:51 +02:00
Elia Bieri 4b0a881055 Merged in feature/VBV-326-auftrag-benachrichtigungen-rebased (pull request #157)
Feature/VBV-326 auftrag benachrichtigungen rebased

* Implement notifications for assignments

# Conflicts:
#	server/vbv_lernwelt/assignment/services.py

* Add cypress test for student assignment submission

* Update django-notifications-hq

* Rework


Approved-by: Daniel Egger
2023-07-12 14:32:49 +00:00
Daniel Egger 5b3da272ce Changes after code review 2023-07-12 15:21:55 +02:00
Daniel Egger 5d29fb7a76 Set due_dates for courses explicitly 2023-07-12 11:45:02 +02:00
Daniel Egger c1f29a02a0 Fix problems after rebase 2023-07-12 10:21:23 +02:00
Daniel Egger 3d4654efbc Mark LearningContentAssignment completion in backend 2023-07-12 10:21:23 +02:00
Daniel Egger 36152a4364 Do not auto mark completion if the user should not be able to do it 2023-07-12 10:21:23 +02:00
Daniel Egger 1b7a3a401e VBV-459: Add flag for user course completion self toggle 2023-07-12 10:21:23 +02:00
Daniel Egger 3bd489d2ae Refactor `CourseCompletion` model 2023-07-12 10:21:23 +02:00
Daniel Egger ab8dbd09ef Working with enums in graphql... 2023-07-12 10:21:23 +02:00
Daniel Egger b9c9b009ff Add more typing 2023-07-12 10:21:23 +02:00
Daniel Egger 46b14bd4e7 Refactor attendance_course code into its own module 2023-07-12 10:21:23 +02:00
Daniel Egger eb0b03f413 Create mutation with test case 2023-07-12 10:21:23 +02:00
Daniel Egger a75bb14e4c Add simple graphql types for CourseSessionAttendanceCourse 2023-07-12 10:21:22 +02:00
Daniel Egger 282e62ef6f "start" not "end" should be mandatory 2023-07-12 09:59:29 +02:00
Daniel Egger c4d10badf6 Standardize name `duedates` to `due_dates` 2023-07-12 09:15:21 +02:00
Daniel Egger 5890e908f2 Add CourseSessionAssignment to serializer 2023-07-11 17:42:30 +02:00
Lorenz Padberg 324725964b Add deadline to course session assigments in test_course 2023-07-11 15:57:07 +02:00
Lorenz Padberg bf3582d338 Fix linting 2023-07-11 11:23:36 +02:00
Lorenz Padberg 9911117df5 Resolve comments from Pullrequest 2023-07-11 11:19:00 +02:00
Lorenz Padberg b06fc4bcbf Add translations 2023-07-11 11:02:39 +02:00
Lorenz Padberg 6b8541f9c5 Format code 2023-07-10 13:47:23 +02:00
Lorenz Padberg a15eee3266 Remove failling tests 2023-07-10 13:47:23 +02:00
Lorenz Padberg 4fd10db935 Improve test data generation 2023-07-10 13:47:23 +02:00
Lorenz Padberg acbeb82184 Fix importer 2023-07-10 13:47:23 +02:00
Lorenz Padberg e0dbdde7cd Fix Linting errors 2023-07-10 13:47:23 +02:00
Lorenz Padberg 1405e728a2 Remove unused factories 2023-07-10 13:47:23 +02:00
Lorenz Padberg 9663cdc743 Add migrations 2023-07-10 13:47:23 +02:00
Lorenz Padberg 858541134e Add due date formatting to Attendance course 2023-07-10 13:47:23 +02:00
Lorenz Padberg b2a7c2e282 Add DateEmbedding component 2023-07-10 13:47:12 +02:00
Lorenz Padberg 78b0a08bb3 Remove attendance_course and assignment_details json fielsd 2023-07-10 13:46:56 +02:00
Lorenz Padberg ea81fc15ef Remove related name 2023-07-10 13:46:56 +02:00
Lorenz Padberg 347cc37a28 Add DueDates to CourseSession and Course Session Assignment 2023-07-10 13:46:56 +02:00
Lorenz Padberg 2706d6785d Add CourseSessionAttendance course and CourseSessionAssignment 2023-07-10 13:46:56 +02:00
Daniel Egger a5acc66981 VBV-450: Custom CourseSessionAttendanceCourse model 2023-07-10 13:46:56 +02:00
Lorenz Padberg 89ff4af3c8 Refactoring 2023-07-10 13:46:56 +02:00
Lorenz Padberg b92ac8b08a Add duedates to frontend 2023-07-10 13:46:55 +02:00
Lorenz Padberg cda7ae07a8 Add duedate to API 2023-07-10 13:46:21 +02:00
Lorenz Padberg f05d7b2279 Rename Event -> DueDate 2023-07-10 13:46:21 +02:00
Lorenz Padberg f43a2c94e8 Add default event genration function for Course assignment 2023-07-10 13:46:21 +02:00
Lorenz Padberg 4d8c219076 Add events app 2023-07-10 13:46:21 +02:00
Christian Cueni e02a386359 Update courses url 2023-07-10 07:35:38 +02:00
Daniel Egger a692c819ee Add generated types so that they can be referenced in code 2023-07-07 18:43:57 +02:00
Daniel Egger 2fdae7c120 Use different naming convention for GraphQL types 2023-07-07 18:43:57 +02:00
Daniel Egger df13e99d6f Play with generated graphql code 2023-07-07 18:43:57 +02:00
Daniel Egger 9860a59cef Clean up assignment graphql
* Remove old assignment api REST code which is unused
* Refactor handling AssignmentCompletionStatus enum
* Add full test for GraphQL assignment completion mutation
* Hide wagtail INFO logs on local dev
2023-07-07 18:43:57 +02:00
Daniel Egger 6e7935a005 Add locize cli script 2023-07-05 19:20:10 +02:00
Elia Bieri dcf855a443 Cherrypick logging configuration from VBV-326 2023-06-28 17:17:05 +02:00
Christian Cueni 18c21e00e7 Update participants, add staff group 2023-06-28 13:16:48 +02:00
Christian Cueni b8f1fd8cee Add participants 2023-06-27 11:18:36 +02:00
Daniel Egger c715a462d9 Delete notifications before test 2023-06-21 14:44:20 +02:00
Elia Bieri 8a7453ce0e Soft delete notifications 2023-06-20 13:18:00 +02:00
Elia Bieri fbde06f0ef Fix notification settings cypress test 2023-06-20 13:18:00 +02:00
Christian Cueni d5e3142cc1 Add IT presentation 2023-06-20 07:39:32 +02:00
Christian Cueni fec1fb9a8a Add flag to toggle test and Fallarbeit 2023-06-19 14:59:18 +02:00
Christian Cueni f2438f6d57 Add IT uk and training course 2023-06-19 14:59:18 +02:00
Christian Cueni ab4e3fc8dd Update participants 2023-06-15 15:53:39 +02:00
Christian Cueni f9414eba9a Update course name 2023-06-15 12:52:19 +02:00
Christian Cueni 6127746854 Add competences FR, update excel 2023-06-15 08:37:18 +02:00
Christian Cueni 8c1088ab4b Use lowercase emails, use raw field 2023-06-15 08:37:18 +02:00
Christian Cueni bfa4349658 Add quickfix for Präsenztag FR 2023-06-15 08:37:18 +02:00
Christian Cueni 5088450f0c Update translations, update import files 2023-06-15 08:37:18 +02:00
Daniel Egger 22ef30c3ca Change Trainer Import File -> one line per language 2023-06-15 08:37:18 +02:00
Daniel Egger 8c65ae3295 Make import work with different language courses 2023-06-15 08:37:18 +02:00
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
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