Commit Graph

330 Commits

Author SHA1 Message Date
Christian Cueni 6317df0cc8 wip: Add tests 2023-12-07 13:22:18 +01:00
Lorenz Padberg e8ae8bdc14 VBV-440: Musterlösung und Refactoring S3 2023-12-07 10:38:58 +01:00
Christian Cueni fa31def0b5 wip: Add user tests 2023-12-07 10:11:24 +01:00
Christian Cueni 3a5c941360 wip: Make linter and TS happy, fix cypress 2023-12-07 10:11:24 +01:00
Christian Cueni fa76989bbf wip: Update UK feedback component 2023-12-07 10:11:24 +01:00
Christian Cueni 2a6b6c9658 wip: Add base feedback component 2023-12-07 10:11:24 +01:00
Christian Cueni d1504f592d wip: Add new content types 2023-12-07 10:11:24 +01:00
Christian Cueni 6f9ef0f79f wip: Add student tests, change submission page 2023-12-04 14:06:07 +01:00
Christian Cueni 8fafba755d wip: Rename types 2023-12-04 14:06:06 +01:00
Christian Cueni b0ed6fb147 wip: Add to new casework type to frontend 2023-12-04 14:06:06 +01:00
Christian Cueni 5c140f00de wip: Rename CASEWORK 2023-12-04 14:06:06 +01:00
Christian Cueni 6afc9dcbc9 Remove no due date title, make course_session_assignment editable 2023-11-30 08:04:01 +01:00
Christian Cueni 01c288f686 Add tests 2023-11-28 10:54:41 +01:00
Christian Cueni 6bb08ab316 wip: Display documents based on flag 2023-11-28 10:54:41 +01:00
Christian Cueni 766944d580 Add Knowledge Assignment (Fachcheck) type 2023-11-23 14:15:56 +01:00
Daniel Egger e6aa6f0cbe Merge branch 'develop' into feature/VBV-496-dash-regionalleiter 2023-11-03 10:44:22 +01:00
Reto Aebersold d99ebbcd18 Merged in feature/VBV-487-links-mit-_blank (pull request #227)
feat: Rich-text component for ext. link handling

Approved-by: Christian Cueni
2023-11-02 16:05:37 +00:00
Christian Cueni 2159473e99 Use different content height for preview 2023-11-02 08:47:14 +01:00
Reto Aebersold 4776206bb8 feat: Rich-text component for ext. link handling 2023-11-01 14:27:53 +01:00
Reto Aebersold eebb512348 fix: FF rendering bug & cleanup 2023-11-01 08:54:34 +01:00
Reto Aebersold 5833c29817 fix: only show Kompetenznachweis in KompetenzNavi
Closes #VBV-556
2023-10-24 08:40:10 +02:00
Christian Cueni f59b829008 Update translation keys 2023-10-18 13:39:07 +02:00
Daniel Egger 76113de9ad Try to fix flaky cypress test 2023-10-15 22:26:34 +02:00
Daniel Egger 4d3b46de59 Add cypress tests which check contents of learning path and circle page 2023-10-15 21:45:39 +02:00
Daniel Egger 0c40bb9341 Rename composable to useCourseData 2023-10-14 16:06:16 +02:00
Daniel Egger 00357ad4f3 Fix cypress tests 2023-10-14 16:04:05 +02:00
Daniel Egger 5ea9d09c1b Fix document block 2023-10-14 01:58:44 +02:00
Daniel Egger aa67c2c8b7 Remove unneeded feedbackSummary 2023-10-14 01:42:24 +02:00
Daniel Egger cc800501c1 Calc next learning content 2023-10-14 01:02:08 +02:00
Daniel Egger e5cc0aa80e useCompetenceStore is not needed anymore 2023-10-13 17:35:35 +02:00
Daniel Egger a6cf4ad128 Show Diagram for users in cockpit 2023-10-13 14:21:26 +02:00
Daniel Egger 8544898bbf Load stuff 2023-10-12 18:38:14 +02:00
Daniel Egger 8621d4af07 Load CompletionData 2023-10-12 17:29:05 +02:00
Daniel Egger 627e4f6873 Refactor CirclePage 2023-10-12 13:36:43 +02:00
Daniel Egger 2eddb93be5 Adapt code to user more of the codegen generated typescript types 2023-10-12 10:51:10 +02:00
Reto Aebersold de1949407b disable doc updates if assigment not in progress 2023-10-11 09:53:33 +02:00
Reto Aebersold 7a9cf339f9 add files to overview 2023-10-11 09:53:33 +02:00
Reto Aebersold d4cb978de3 Add assigment task file upload 2023-10-11 09:51:43 +02:00
Daniel Egger a3e16dc107 Fix problems 2023-10-10 15:55:46 +02:00
Daniel Egger dcf450339d Every REST response returns `id`-field as string 2023-10-10 15:02:03 +02:00
Daniel Egger 49a3fa99e1 Document handling via REST 2023-10-10 14:26:47 +02:00
Daniel Egger 000e963730 Refactor document handling 2023-10-10 10:12:58 +02:00
Daniel Egger f75590dd0b Refactor code to use `useCourseSessionDetailQuery` 2023-10-10 10:12:58 +02:00
Daniel Egger 06d284b1ce Refactor course url handling 2023-10-10 10:12:58 +02:00
Christian Cueni bb50cc60e9 Fix result display 2023-10-09 11:28:37 +02:00
Daniel Egger a8b4454482 Open extended time test url when user has done this 2023-10-05 18:36:55 +02:00
Daniel Egger 86cf8f44d3 Add percent for results and "Bestanden"/"Nicht Bestanden" 2023-10-05 14:06:33 +02:00
Daniel Egger d92b514759 Merge branch 'develop' into feature/VBV-488-import-edoniq-data 2023-10-05 09:16:49 +02:00
Reto Aebersold 417b2c58b8 Move document upload to cockpit 2023-10-02 11:27:14 +02:00
Daniel Egger 4123e15f22 VBV-514: Bewertung von Assignments ist "opt-in" 2023-09-29 12:48:33 +02:00
Daniel Egger f8c6daf9eb VBV-519: Anpassungen Darstellung Wissens- und Verständnisfragen für Lernende 2023-09-28 17:56:29 +02:00
Christian Cueni 7c6d448268 Change feedback order 2023-09-28 15:27:06 +02:00
Daniel Egger 89e068fb09 Add cypress test for student 2023-09-26 14:34:22 +02:00
Daniel Egger 497f3a8f68 Make text responses mandatory 2023-09-26 13:50:35 +02:00
Daniel Egger 7a037e05ec Remove automatic feedback creation in prepare scripts 2023-09-26 13:43:44 +02:00
Daniel Egger 0444658ce3 Fix unit tests 2023-09-26 13:43:44 +02:00
Daniel Egger 733063399f VBV-525: Feedback can only be sent once per person 2023-09-26 13:43:44 +02:00
Daniel Egger 70655935b0 VBV-525: Refactor feedback submission 2023-09-26 13:43:44 +02:00
Christian Cueni 4b6cdef08e Add title and border 2023-09-25 14:34:56 +02:00
Livio Bieri f6d7f6e89e Merge remote-tracking branch 'origin/develop' into feature/VBV-515-preview
# Conflicts:
#	client/src/components/dueDates/DueDateSingle.vue
#	client/src/components/header/MainNavigationBar.vue
#	client/src/components/header/MobileMenu.vue
#	client/src/pages/cockpit/cockpitPage/CockpitDates.vue
2023-09-20 17:33:01 +02:00
Livio Bieri 5e8554acda feat: added preview bar 2023-09-20 16:38:45 +02:00
Daniel Egger db40368244 VBV-514: Termine nur für ausgewählte Circles anzeigen im Cockpit 2023-09-15 14:50:52 +02:00
Daniel Egger b4638e372f Open Assignment evaluation on last step when not in progress 2023-09-14 17:31:00 +02:00
Daniel Egger 00a36b52c8 Übersetzungen 2023-09-14 17:01:42 +02:00
Daniel Egger 83fcb84303 Add "Kompetenznachweis"-text to AssignmentIntroductionView 2023-09-14 15:57:35 +02:00
Daniel Egger c7e443a4e3 Style changes in circle page 2023-09-14 15:24:12 +02:00
Daniel Egger e7bbf961d5 Cockpit Mobile Anpassungen 2023-09-14 14:28:06 +02:00
Daniel Egger dfa03baa25 Handle closing of self evaluation in KompetenzNavi 2023-09-14 13:19:43 +02:00
Daniel Egger dbab03228b Show result in EdoniqTestBlock 2023-09-08 16:56:24 +02:00
Daniel Egger 2e4ba6ad53 VBV-515: Kompetenznachweis mit 0 Punkten 2023-09-08 16:48:06 +02:00
Daniel Egger e43e351e9d Refactor design of learning contents in circle page 2023-09-08 16:47:38 +02:00
Daniel Egger 853c8746ea VBV-329: Add link to competence certificate in circle view 2023-09-08 16:47:38 +02:00
Daniel Egger 1196aba79d Show result in EdoniqTestBlock 2023-09-08 16:47:33 +02:00
Daniel Egger 2569411959 Fix upsert on initial loading of assignment in circle 2023-09-08 16:46:54 +02:00
Daniel Egger abf83b9fb8 VBV-512: Anwesenheit erneut bearbeiten 2023-09-08 15:32:10 +02:00
Daniel Egger 4909b38428 Translations assignment frontend 2023-09-08 15:11:59 +02:00
Daniel Egger bc011e47be VBV-489: Open external links in new tab in assignment 2023-09-08 11:36:57 +02:00
Daniel Egger 06a3706d29 VBV-489: Übersetzungen 2023-09-08 09:53:43 +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 0bbd1a830d Add missing translations 2023-08-16 14:49:07 +02:00
Christian Cueni a411cc82d1 Fix missing "contact trainer"-functionality 2023-08-14 18:04:35 +02: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
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 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
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 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 3d4654efbc Mark LearningContentAssignment completion in backend 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 282e62ef6f "start" not "end" should be mandatory 2023-07-12 09:59:29 +02:00
Daniel Egger ba7533614d Format [Uhr] for single dates 2023-07-11 18:13:11 +02:00
Daniel Egger 5890e908f2 Add CourseSessionAssignment to serializer 2023-07-11 17:42:30 +02:00
Lorenz Padberg b06fc4bcbf Add translations 2023-07-11 11:02:39 +02:00
Lorenz Padberg e0dbdde7cd Fix Linting errors 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 a7d17f7b69 Add date embedding to assigment submission date 2023-07-10 13:47:23 +02:00
Lorenz Padberg b2a7c2e282 Add DateEmbedding component 2023-07-10 13:47:12 +02:00
Lorenz Padberg 77aacfc01c Refactor Styleing 2023-07-10 13:46:56 +02:00
Lorenz Padberg ffefa520e1 Fix typechecker 2023-07-10 13:46:56 +02:00
Lorenz Padberg 89ff4af3c8 Refactoring 2023-07-10 13:46:56 +02:00
Lorenz Padberg 639683c06d Add DueDatesFrontendComponents 2023-07-10 13:46:56 +02:00
Lorenz Padberg b92ac8b08a Add duedates to frontend 2023-07-10 13:46:55 +02:00
Daniel Egger 6e7935a005 Add locize cli script 2023-07-05 19:20:10 +02:00
Daniel Egger aaf226dde9 Working example with i18next 2023-07-04 15:18:40 +02:00
Daniel Egger c96fe25bba Add comment to recheck vueuse/router situtation 2023-06-21 16:14:51 +02:00
Daniel Egger b5736ef9ef Make link out from teams link 2023-06-02 15:16:42 +02:00
Lorenz Padberg 42471e6c56 Make loading prettier 2023-06-01 15:01:45 +02:00
Christian Cueni cb40554fe0 Update texts, remove blocks 2023-06-01 14:39:46 +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
Christian Cueni 37e43158b4 Remove icon, fix json 2023-05-30 13:23:21 +02:00
Christian Cueni 64407a622e Fix duration display 2023-05-29 07:44:50 +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 9937951728 Wire document list to frontend 2023-05-26 16:07:42 +02:00
Daniel Egger 30cdd8c189 Remove overview nav 2023-05-26 15:30:30 +02:00
Elia Bieri f8e309e424 Fix language switching 2023-05-26 14:37:51 +02:00
Christian Cueni b58405f568 Merged in feature/VBV-318-dashboard (pull request #90)
Remove fake content

Approved-by: Daniel Egger
2023-05-26 06:54:06 +00: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
Christian Cueni 0c06a169bc Use v-if 2023-05-25 14:39:20 +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
Daniel Egger 0f0d1632a7 VBV-279: Inhaltstyp Reflexion 2023-05-24 15:20:47 +02:00
Daniel Egger de320be3cb Provide LearningContent to badge logic 2023-05-24 15:19:52 +02:00
Daniel Egger 9be0ce9d39 Frontend: "Vorbereitungsauftrag" 2023-05-24 15:19:49 +02:00
Christian Cueni a7986085ba Add fake "no events" text 2023-05-24 14:46:12 +02:00
Elia Bieri 322077ec82 Rework CircleOverview modal 2023-05-24 11:24:18 +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
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 decba980f5 Rework Media Library 2023-05-19 10:17:25 +02:00
Daniel Egger a0593bbacd Remove debug stuff 2023-05-19 10:02:35 +02:00
Daniel Egger bcc42eaf83 Make `useCurrentCourseSession` reactive 2023-05-19 09:58:55 +02:00
Daniel Egger 8793b30b56 Add comments for documentation 2023-05-17 19:30:10 +02:00
Daniel Egger 2f9fbed8f5 Access courseSession by `useCurrentCourseSession` 2023-05-17 19:30:10 +02:00
Daniel Egger 518b8c2ad0 Merge branch 'develop' into feature/VBV-331-inhaltstyp-statischer-text 2023-05-17 19:11:37 +02:00
Daniel Egger 9e3124160a Add some test data and clean up some things 2023-05-17 19:09:33 +02:00
Elia Bieri 4d614b10cc Fix circle diagram text 2023-05-17 15:19:16 +02:00
Elia Bieri 849e49c433 Minor fixes 2023-05-17 13:42:16 +02:00
Elia Bieri 652cd7d8fb Implement RichTextBlock 2023-05-17 10:59:21 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +02: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