Commit Graph

1396 Commits

Author SHA1 Message Date
Elia Bieri 3a2d12c0b9 Merged in feature/VBV-474-auftragstyp-condition-acceptance (pull request #173)
Add CONDITION_ACCEPTANCE assignment type

* Add CONDITION_ACCEPTANCE assignment type

* Add translations

* Create default CONDITION_ACCEPTANCE assignment

* Move CONDITION_ACCEPTANCE assignment in learning sequence

* Add additional translations

* Add condition acceptance to ÜK basis circle

# Conflicts:
#	server/vbv_lernwelt/course/management/commands/create_default_courses.py

* Move condition acceptance to kickoff circle
2023-08-02 08:13:35 +00:00
Daniel Egger af905090cc VBV-468: Remove DB drop on production environments 2023-07-28 16:49:43 +02:00
Daniel Egger 8cee1346c5 Merged in feature/wagtail (pull request #170)
Feature/wagtail
2023-07-28 14:48:12 +00:00
Daniel Egger a999375f23 Update slugs when parent changes slug due to title change 2023-07-24 13:37:06 +02:00
Daniel Egger 6654d61761 Refactor some course creation stuff 2023-07-24 13:37:06 +02:00
Daniel Egger f3ed9db437 Change some settings for Wagtail 2023-07-24 13:37:06 +02:00
Christian Cueni 15af550ab7 Fix courseSessionUsers admin view 2023-07-24 13:17:28 +02:00
Christian Cueni 4486cb10cf Add uk texts on dashboard 2023-07-24 13:17:28 +02:00
Christian Cueni 031b16c19c Add uk Text on login page 2023-07-24 13:17:28 +02:00
Christian Cueni 0f744332cb Update documents 2023-07-24 08:39:02 +02:00
Daniel Egger 94a335bd9c Merged in feature/redesign-media-library (pull request #164)
Simplify media library models (not ready to merge)

Approved-by: Christian Cueni
2023-07-21 12:35:01 +00:00
Daniel Egger d90030b614 Update urls in course creation scripts 2023-07-21 13:56:09 +02:00
Daniel Egger f357e34536 Fix cypress tests 2023-07-21 13:56:09 +02:00
Daniel Egger 815d81a471 Simplify media library models 2023-07-21 13:56:09 +02:00
Daniel Egger fb7b5a7753 Merged in feature/VBV-472-remove-currents-ci-build-id (pull request #167)
VBV-472: Remove currents.dev ci-build-id
2023-07-21 11:45:37 +00:00
Daniel Egger d59212f702 VBV-472: Remove currents.dev ci-build-id 2023-07-21 13:31:04 +02:00
Christian Cueni a1403f8a54 Merged in feature/VBV-464-excel-importer (pull request #160)
Feature/VBV-464 excel importer

Approved-by: Daniel Egger
2023-07-21 10:07:50 +00:00
Daniel Egger 842b0b4334 Update not delete `CourseSessionAttendanceCourse` 2023-07-21 10:24:52 +02:00
Daniel Egger dfc0a01e9f Add more details to error message 2023-07-21 09:22:54 +02:00
Daniel Egger 4d9aa07b2d Merged in feature/VBV-460-user-profile-circle-read-only (pull request #162)
Bugfix VBV-460: show read-only circle view in cockpit

Approved-by: Elia Bieri
2023-07-21 06:41:57 +00:00
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
Daniel Egger b2eb88b972 Bugfix VBV-460: show read-only circle view in cockpit 2023-07-18 13:30:21 +02:00
Daniel Egger eb50fb0b59 Update generated types 2023-07-18 09:45:59 +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 8e16daa525 Merged in feature/uuid-primary-key (pull request #159)
Feature/uuid primary key

Approved-by: Christian Cueni
2023-07-17 15:21:13 +00: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 5bd8192f05 Merged in feature/VBV-438-reflection-per-circle (pull request #158)
Adapt AssignmentCompletion model to include page_id

Approved-by: Elia Bieri
2023-07-14 11:28:05 +00: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 24d57577cc Merged in feature/VBV-459-refactoring-course-completion-rebase-2 (pull request #156)
Feature/VBV-459 refactoring course completion rebase 2

Approved-by: Elia Bieri
2023-07-12 13:49:44 +00:00
Daniel Egger 5b3da272ce Changes after code review 2023-07-12 15:21:55 +02:00
Daniel Egger dfefdb52ca Fix typecheck errors 2023-07-12 11:47:16 +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 9e5e2e10b7 Fix bug with performance criteria 2023-07-12 10:21:23 +02:00
Daniel Egger 0dbca05892 Fix course_session_id 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