Commit Graph

786 Commits

Author SHA1 Message Date
Daniel Egger 515ef3707a Bugfix: load only assignment completion data with given learning_content_id. Will fix bug with Reflexion 2023-09-06 17:31:27 +02:00
Daniel Egger 6175ca75ed Add circle title to dropdown text 2023-09-06 16:58:49 +02:00
Daniel Egger abe923b2e4 Fix bug so that you can select different attendance courses 2023-09-06 16:47:38 +02:00
Daniel Egger da56f2a346 Refactor Notification model 2023-08-30 18:47:36 +02:00
Daniel Egger f155ceb26b Fix importer in default prepare_server 2023-08-24 08:06:32 +02:00
Daniel Egger 9f8686e592 Improve django admin 2023-08-23 19:06:32 +02:00
Daniel Egger acdda923da Make `start` in DueDate mandatory 2023-08-23 15:38:26 +02:00
Daniel Egger 969c55f15d Sort dueDates by start date 2023-08-23 15:38:26 +02:00
Daniel Egger 2fa17e1204 Refactor dueDate frontent 2023-08-23 15:38:26 +02:00
Daniel Egger 279b6c1dd5 Refactor some fields in `DueDate` 2023-08-23 15:38:26 +02:00
Christian Cueni a8819296e2 Make importer more resilient 2023-08-23 14:20:27 +02:00
Christian Cueni 9e68abd5f9 Add CourseSessionEdoniqTest to importer
Add tests for CourseSessionEdoniqTest
2023-08-23 07:33:29 +02:00
Christian Cueni c140f225ea Add Edoniq testblock
WIP: Add sso code

Update content name

WIP: Add redirect endpoint

mend

Fix after rebase

WIP: Update model

WIP: Add extended time test url

Update trufflehog config, use sso

Update test
2023-08-23 07:33:29 +02:00
Christian Cueni 81351aa9fa Exclude email, fix dates, don't check "Geburtsdatum" field 2023-08-17 14:41:47 +02:00
Christian Cueni ee33d999d1 Fix sort date (move dates with no end date to the back 2023-08-17 11:42:59 +02:00
Christian Cueni 45a70f6b75 Merged in feature/update-importer (pull request #188)
Feature/update importer
2023-08-17 09:18:22 +00:00
Christian Cueni 57cd5fe871 Match existing Teilnehmer with multiple parameters 2023-08-17 08:11:15 +02:00
Christian Cueni 2f8b548ea7 Merged in fix/dates (pull request #187)
Fix/dates
2023-08-16 14:18:13 +00:00
Christian Cueni c622db7e22 Remove unusable link, don't open in blank 2023-08-16 15:31:14 +02:00
Christian Cueni 0bbd1a830d Add missing translations 2023-08-16 14:49:07 +02:00
Christian Cueni 6195c9d32a Use page id for feedbacks, filter by course session id 2023-08-14 19:57:31 +02:00
Christian Cueni a411cc82d1 Fix missing "contact trainer"-functionality 2023-08-14 18:04:35 +02:00
Christian Cueni f1f479a6f4 Add due date for casework 2023-08-14 17:20:33 +02:00
Elia Bieri adc9e763f2 Merged in bugfix/VBV-344-auftrag-frontend-trainer-mobile (pull request #171)
VBV-344- Improve assignment grading layout on mobile

* Improve assignment grading layout on mobile


Approved-by: Christian Cueni
2023-08-10 07:24:35 +00:00
Elia Bieri 667ef96b14 Merged in bugfix/VBV-470-abgabe-aufträge-homogenisierung (pull request #166)
Bugfix/VBV-470 Homogenisierung Abgabe Aufträge

* Make feedback non-checkable without submission

* Submit preparation_assignment on close

# Conflicts:
#	client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue

* Also submit reflection on close

* Fix CourseSessionCompletionData reloading

* User can self toggle LearningContentFeedback completion

* Show submission view for all assignments

* Fix cockpit for condition acceptance

* Close assignments after submission


Approved-by: Dario Aebersold
Approved-by: Daniel Egger
2023-08-03 06:32:47 +00:00
Christian Cueni 6083ab8c92 Add demo courses again 2023-08-03 08:06:55 +02:00
Christian Cueni b746e235d3 Update login page 2023-08-03 07:37:56 +02:00
Christian Cueni 28b2265465 Add prepwork IT/FR, add link to allowed features 2023-08-02 18:34:15 +02:00
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
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
Daniel Egger 815d81a471 Simplify media library models 2023-07-21 13:56:09 +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
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
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 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 dfefdb52ca Fix typecheck errors 2023-07-12 11:47:16 +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