Commit Graph

766 Commits

Author SHA1 Message Date
Christian Cueni 6f9ef0f79f wip: Add student tests, change submission page 2023-12-04 14:06:07 +01:00
Christian Cueni 0fc428ff06 wip: Add evaluation tests 2023-12-04 14:06:06 +01:00
Christian Cueni 39ea4d8555 wip: Add Reisen Auftrag 2023-12-04 14:06:06 +01:00
Christian Cueni 38fb7bb7a6 wip: Update trainer text 2023-12-04 14:06:06 +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
Reto Aebersold 620a48723a chore: small fixes 2023-11-27 14:58:51 +01:00
Christian Cueni 766944d580 Add Knowledge Assignment (Fachcheck) type 2023-11-23 14:15:56 +01:00
Daniel Egger 0ee783219b VBV-585 feat: "Wissens- und Verständnisfragen im Cockpit" 2023-11-08 08:00:05 +01:00
Daniel Egger be2488ff73 VBV-584 feat: only show "Kompetenznachweis-Elemente" in Regio-Dashboard Arbeiten 2023-11-07 14:43:04 +01:00
Reto Aebersold 1e5fb91343 fix: move experts to feedback 2023-11-06 10:10:14 +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 2077c83f18 feat: format date 2023-10-31 11:29:31 +01:00
Reto Aebersold 3664ddf6d7 feat: add rating colors 2023-10-31 11:20:21 +01:00
Reto Aebersold dfe1bfb845 Merge branch 'develop' into feature/VBV-496-dash-regionalleiter 2023-10-31 10:23:25 +01:00
Reto Aebersold 513b203604 feat: add course list sub page 2023-10-31 09:20:35 +01:00
Reto Aebersold 0ca1ab50f7 chore: loading indicator, ext links 2023-10-31 08:30:06 +01:00
Reto Aebersold 33415b12aa chore: translations 2023-10-30 14:50:45 +01:00
Reto Aebersold bd85c3675e fix: login test 2023-10-30 14:13:21 +01:00
Reto Aebersold 7c50d709e9 feat: assignments records 2023-10-30 13:42:09 +01:00
Reto Aebersold 17b2d03245 feat: competence records 2023-10-30 12:17:31 +01:00
Reto Aebersold 37b2042e7f chore: remove unused stats 2023-10-30 11:52:38 +01:00
Reto Aebersold e2a346caed feat: add feedback list 2023-10-30 11:50:46 +01:00
Reto Aebersold 0635602c68 Merge remote-tracking branch 'origin/feature/VBV-496-dash-regionalleiter' into feature/VBV-496-dash-regionalleiter 2023-10-30 10:58:54 +01:00
Reto Aebersold c079be32e7 feat: add statistic filter 2023-10-30 10:58:09 +01:00
Livio Bieri a354650882 chore: use basebox based boxes for progress page 2023-10-30 10:55:42 +01:00
Livio Bieri 63bcb44fa2 wip: summary boxes 2023-10-27 16:26:15 +02:00
Reto Aebersold ed4f9714d4 chore: remove courseSlug from URL 2023-10-27 11:25:14 +02:00
Reto Aebersold 0b25e8f72b feat: dashboard store 2023-10-27 10:45:58 +02:00
Reto Aebersold d66e392c73 feat: stats dashboard 2023-10-26 17:25:53 +02:00
Reto Aebersold 897d39ceb8 feat: progress dashboard design 2023-10-25 22:43:29 +02:00
Reto Aebersold b9c622b20d chore: title 2023-10-25 16:42:45 +02:00
Reto Aebersold 9d6a0a561b feat: add dashboard page variants 2023-10-25 16:40:41 +02:00
Reto Aebersold 6f973d7e93 chore: format and generate gql schema / types 2023-10-25 11:39:36 +02:00
Reto Aebersold 5833c29817 fix: only show Kompetenznachweis in KompetenzNavi
Closes #VBV-556
2023-10-24 08:40:10 +02:00
Reto Aebersold c7920430ca feat: add course session group 2023-10-23 16:55:26 +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 0df74774d0 Add comment because of load workaround in cockpit 2023-10-15 22:05:16 +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 20ccf7d38b Add user completion data loading hack 2023-10-13 17:18:56 +02:00
Daniel Egger a637775b81 Query performance criteria also by course 2023-10-13 17:06:23 +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 0e3916a41c Fix warnings 2023-10-10 17:01:47 +02:00
Daniel Egger a3e16dc107 Fix problems 2023-10-10 15:55:46 +02:00
Daniel Egger 227e9f317d Fix loading of DueDates 2023-10-10 15:20:48 +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 a1f2c8cd12 Refactor document handling take2 2023-10-10 10:12:58 +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
Daniel Egger 41ead1dad4 Refactor circle handling in cockpit 2023-10-10 10:12:58 +02:00
Daniel Egger b9fa421785 Fix attendance check page 2023-10-10 10:12:58 +02:00
Daniel Egger 6e81f85945 Fix problems after rebase 2023-10-10 10:12:58 +02:00
Daniel Egger 778dde12d7 Improve course session loading 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
Livio Bieri cebfbf011b fix: select course& session if in course session 2023-10-04 21:27:43 +02:00
Daniel Egger 372fa9ceaa Fix typecheck errors 2023-10-04 18:44:29 +02:00
Daniel Egger a180c5c825 Filter appointments by course 2023-10-04 18:27:42 +02:00
Daniel Egger 6048129507 Add courseSessionId query param to url and switch to it 2023-10-04 16:59:59 +02:00
Daniel Egger 8b4b00170a Merged develop into feature/VBV-524 2023-10-04 11:40:00 +00:00
Livio Bieri 79d4246b88 chore: some tests 2023-10-02 16:22:21 +02:00
Livio Bieri 7794203cd9 chore: due dates list refactor 2023-10-02 15:09:37 +02:00
Livio Bieri fd885d7b5e chore: styling 2023-10-02 13:53:26 +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
Daniel Egger 589453a8dc Remove `evaluation_grade` and set `evaluation_points` and `evaluation_passed` fields 2023-09-28 17:56:29 +02:00
Livio Bieri 86e7e0f82e chore: clean up the appointment filtering 2023-09-28 17:45:00 +02:00
Livio Bieri 4672698895 wip: appointment filtering poc 2023-09-28 17:45:00 +02:00
Christian Cueni 7c6d448268 Change feedback order 2023-09-28 15:27:06 +02:00
Daniel Egger 966533e13b Add feedback trainer cypress test 2023-09-26 18:48:25 +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
Daniel Egger ce15054340 VBV-525: Fix feedback rendering 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 18a6eecb49 Merged in feature/VBV-515-preview (pull request #205)
WIP Feature/VBV-515 preview

Approved-by: Daniel Egger
2023-09-21 08:06:30 +00:00
Reto Aebersold 6232901060 Make Circle drop-down full width on mobile 2023-09-21 09:53:27 +02:00
Reto Aebersold 475b0851d6 Add warning if no Circle can / has been selected 2023-09-21 09:38:50 +02:00
Reto Aebersold d673f2fdc9 User status only for selected circle 2023-09-20 19:01:39 +02:00
Livio Bieri fac25e6089 fix: snafu from merge :( 2023-09-20 18:21:01 +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 fa22f5a18e workaround: disable due date links for experts 2023-09-20 16:39:12 +02:00
Livio Bieri 5e8554acda feat: added preview bar 2023-09-20 16:38:45 +02:00
Reto Aebersold 4ba12cbec8 Singe circle selection 2023-09-20 15:32:21 +02:00
Daniel Egger abddf3079a Fix mobile navigation and minor mobile problems 2023-09-18 19:04:49 +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 dbd6b31895 Add cypress tests 2023-09-15 12:21:42 +02:00
Daniel Egger 9eec62c31b Fix problems with slugs in moved ActionCompetences 2023-09-15 09:47:17 +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 45da2ab7d7 Übersetzungen 2023-09-14 15:07:26 +02:00
Daniel Egger e7bbf961d5 Cockpit Mobile Anpassungen 2023-09-14 14:28:06 +02:00
Daniel Egger 2c26a336ac Mobile Anpassungen Kompetenzprofil 2023-09-14 13:40:20 +02:00
Daniel Egger dfa03baa25 Handle closing of self evaluation in KompetenzNavi 2023-09-14 13:19:43 +02:00
Daniel Egger 5dfdd470ae Add PerformanceCriteria page 2023-09-13 18:45:07 +02:00
Daniel Egger e5d6dd60f6 Add ActionCompetences page 2023-09-13 15:42:32 +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 9b654975c0 Mark translation keys 2023-09-08 16:47:37 +02:00
Daniel Egger fde7e2edef Add performanceCriteriaStatusCount to index page 2023-09-08 16:47:37 +02:00
Daniel Egger 24511df01e Add competence detail page 2023-09-08 16:47:37 +02:00
Daniel Egger 93bec05abc Add competence detail page 2023-09-08 16:47:37 +02:00
Daniel Egger aabaced836 Fix creation scripts 2023-09-08 16:47:37 +02:00
Daniel Egger cce82b72ad Format code 2023-09-08 16:47:37 +02:00
Daniel Egger 08edf98e2a More work on frontend 2023-09-08 16:47:37 +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 9f81def537 Show evaluation points in KompetenzNavi 2023-09-08 16:46:54 +02:00
Daniel Egger 2430c02584 Add initial KompetenzNavi Frontend 2023-09-08 16:46:53 +02:00
Daniel Egger c59c44f1dd Move old competence frontend code to "competence-old" 2023-09-08 16:46:53 +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 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 f155ceb26b Fix importer in default prepare_server 2023-08-24 08:06:32 +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 57cd5fe871 Match existing Teilnehmer with multiple parameters 2023-08-17 08:11:15 +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
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 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
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
Christian Cueni 6e9d87797e Fix css 2023-07-18 07:46:18 +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 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 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 1671abe512 Refactor Duedates List to new design 2023-07-10 13:46:56 +02:00
Lorenz Padberg ffefa520e1 Fix typechecker 2023-07-10 13:46:56 +02:00
Lorenz Padberg 9bb3c93cfb Use Due Dates from all course Sessions for Dashboard 2023-07-10 13:46:56 +02:00
Lorenz Padberg 89ff4af3c8 Refactoring 2023-07-10 13:46:56 +02:00
Lorenz Padberg 7ccc771ca7 Add DueDatesLongList to dashboard 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 f4f508aac3 Refactor to i18next 2023-07-05 13:23:55 +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
Elia Bieri 2db7059461 Merged in bugfix/VBV-454-fix-cypress-pipelines (pull request #144)
Fix Cypress pipelines

* Update Cypress

* Attempt to change reload logic

* Fix it checkbox cy data

* Fix notification cypress test

* Rework notification settings saving logic
2023-06-21 11:28:40 +00:00
Christian Cueni 1a9f676381 Add "Gewinnen" assignment, fix titles, update expert info 2023-06-08 16:01:02 +02:00
Christian Cueni cb00862a30 Add link to login-local 2023-06-08 15:07:30 +02:00
Daniel Egger b5736ef9ef Make link out from teams link 2023-06-02 15:16:42 +02:00
Christian Cueni 531f8f1beb Use link, update text 2023-06-01 15:20:00 +02:00
Lorenz Padberg 42471e6c56 Make loading prettier 2023-06-01 15:01:45 +02:00
Lorenz Padberg 2cdf2cc689 Remove Prüfungsresultate add Trainerunterlagen, teams link 2023-06-01 14:58:17 +02:00
Christian Cueni cb40554fe0 Update texts, remove blocks 2023-06-01 14:39:46 +02:00
Christian Cueni a8103c6caa Add no courses message 2023-05-31 12:24:53 +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 1a0a431768 Merged in feature/VBV-370-dev-live-loginpage (pull request #114)
Feature/VBV-370 Separate local and SSO login page

* Implement local and SSO login pages

* Add translations

* Fix typechecks

* Fix env detection


Approved-by: Christian Cueni
2023-05-31 06:55:00 +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
Daniel Egger f33433b77d Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit 2023-05-26 09:39:44 +02:00
Christian Cueni 3ae4dbdf8d Merged in feature/VBV-379-ui-cleanup (pull request #94)
Feature/VBV-379 ui cleanup

Approved-by: Daniel Egger
2023-05-26 06:57:54 +00: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
Elia Bieri f5e367d467 Fix typecheck 2023-05-25 13:40:00 +02: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 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
Christian Cueni b2e9873666 Show plural of "Benachrichtigung" 2023-05-24 08:14:03 +02:00
Christian Cueni 5e01de2d72 Remove fake profile 2023-05-24 07:29:40 +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 7e1bfffac1 Remove fake content 2023-05-22 12:57:25 +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 e8d6a9c784 Embed media library as course session specific page 2023-05-19 10:17:24 +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 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
Elia Bieri 3858cdfc79 Merged in bugfix/auftrag_ui_test_rework (pull request #80)
Auftrag UI Test rework

* UI test rework

* Fix cypress tests
2023-05-11 12:48:33 +00:00
Elia Bieri f3c599c344 Merged in feature/strengthen_lint_rules (pull request #77)
Strengthen lint rules

* Strengthen lint rules

* Fix linting errors

# Conflicts:
#	client/src/components/learningPath/LearningPathDiagram.vue
#	client/src/components/learningPath/LearningPathViewVertical.vue

* Add no-required-prop-with-default rule

# Conflicts:
#	client/src/components/learningPath/LearningPathDiagram.vue

* Fix typechecks

* Reformat eslintrc
2023-05-11 09:52:10 +00:00
Elia Bieri 2e974dc323 Merged in bugfix/VBV-308-bereinigung-altes-lernpfad-diagramm (pull request #74)
Cleanup old learn path diagrams

* Fix Safari mobile bug

* Initial cleanup


Approved-by: Daniel Egger
2023-05-11 07:50:20 +00:00
Daniel Egger 50e15f4aeb Add query url to assignment evaluation page 2023-05-09 18:23:37 +02:00
Daniel Egger eb3db902b9 Add query url and clickable navigation to SelfEvaluation 2023-05-09 18:17:31 +02:00
Daniel Egger 04b179aa52 Add query url and clickable navigation 2023-05-09 18:13:09 +02:00
Christian Cueni 6534cbf8df Update feedback questions and order 2023-05-09 14:38:40 +02:00
Daniel Egger f9a5f7c9a5 Small changes 2023-05-09 14:10:10 +02:00
Daniel Egger d1907182a3 Fix cypress tests 2023-05-09 13:46:43 +02:00
Daniel Egger 02d637f971 Add urls to `ItNavigationProgress` to make them clickable 2023-05-09 08:08:36 +02:00
Daniel Egger 7217424fdc Use query param to store page index 2023-05-09 07:56:38 +02:00
Daniel Egger dbde2eb662 Assignment Cockpit icons 2023-05-08 17:54:51 +02:00
Daniel Egger 57a4f447af Show assignment results for user 2023-05-08 17:13:24 +02:00
Daniel Egger 69e96391d9 Show "Bewertung abschliessen" when finished 2023-05-08 16:40:53 +02:00
Daniel Egger d8ae598be1 Show Assignment details in Cockpit overview 2023-05-08 16:19:30 +02:00
Daniel Egger e2347d8571 Rename `courseSessionStore` to `courseSessionsStore` 2023-05-08 16:03:26 +02:00
Daniel Egger 0401298f85 Reason text for evaluation is mandatory 2023-05-08 15:50:23 +02:00
Daniel Egger 720342f5b9 Render wagtial rich text fields as html 2023-05-08 14:55:54 +02:00
Daniel Egger d213f2d237 Change icons in cockpit 2023-05-08 14:44:24 +02:00
Daniel Egger cfa7309526 Fix after rebase 2023-05-08 14:29:26 +02:00
Daniel Egger 08b2e9e49a Show grade on overview page 2023-05-08 14:27:40 +02:00
Daniel Egger 32c3d6d1b4 Format code 2023-05-08 14:27:40 +02:00
Daniel Egger 447d1d8915 Fix navigation when assignment completion is submitted 2023-05-08 14:27:40 +02:00
Daniel Egger 313417dfd6 Fix typecheck errors 2023-05-08 14:27:40 +02:00
Daniel Egger e688cf2fc8 Improve display 2023-05-08 14:27:40 +02:00
Daniel Egger 5868468a48 Add grades to AssingmentEvaluation 2023-05-08 14:27:40 +02:00
Daniel Egger 2d6cee9f9f Add EvaluationSummary 2023-05-08 14:27:40 +02:00
Daniel Egger d9a6f2dd94 Add EvaluationIntro 2023-05-08 14:27:39 +02:00
Daniel Egger 26caf06391 Show evaluation full screen 2023-05-08 14:27:37 +02:00
Daniel Egger 9a5feb2ba6 Add evaluation task stepper 2023-05-08 14:24:38 +02:00
Daniel Egger fef864df25 VBV-321: squash current work
Load and display AssignmentCompletionStatus

Datenmodell um Bewertungskriterien erweitern

Refactor assignment pages

Show user results

Update some data fields

Show user assignment evaluation

Changes after rebase

Rename `grading` -> `evaluation`

Add evaluation data to AssignmentCompletion

Refactor usage of `assignmentStore`

Store points for evaluation

Only debounce text

Show user responses on evaluation page
2023-05-08 14:24:38 +02:00
Ramon Wenger a11c0d481f Merged in feature/VBV-310-VBV-324-document-improvements (pull request #66)
Feature/VBV-310 VBV 324 document improvements

Approved-by: Elia Bieri
2023-05-08 08:42:33 +00:00
Elia Bieri e4b8d7c301 Merged in feature/VBV-291-kn-frontend-teilnehmer (pull request #56)
VBV-291 Auftrag Frontend

* Fixes in SubmissionView

* Change closing button tag

* Delete client cypress folder

* Add eslint cypress plugin

* Add Cypress tests

* Reformat de.json

* Fix type errors

* Fix cypress tests

* Add cypress commands

* Disable assignment task inputs after submission
2023-05-03 14:53:21 +00:00
Ramon Wenger eba448afec Remove unused code 2023-05-02 17:40:46 +02:00
Ramon Wenger 0ac4f7b395 Move confirm dialog to its own service 2023-05-02 16:22:43 +02:00
Ramon Wenger ba2d4df639 Add body text 2023-05-02 15:32:27 +02:00
Ramon Wenger 17028b8905 Add 2 types of confirm modal
Still need to be refactored into one
2023-05-01 21:41:58 +02:00
Ramon Wenger af7f0c9223 Update layout for document list
Relates to VBV-324
2023-05-01 21:40:04 +02:00
Ramon Wenger 78037b3373 Rename component 2023-04-27 12:01:35 +02:00
Ramon Wenger 0bae4a8cb2 Add info block for teachers
Also refactor CirclePage

Resolves VBV-310
2023-04-27 11:55:45 +02:00
Ramon Wenger 34546d35e2 Add new component for displaying an attendence day 2023-04-25 17:22:49 +02:00
Ramon Wenger d4cb37d229 Refactor LearningContentSimpleLayout component 2023-04-25 16:39:04 +02:00
Elia Bieri bc16f6012b Unregister event bus handler 2023-04-25 13:06:48 +02:00
Elia Bieri 1d77da83da Merged in feature/new-lc-navigation (pull request #60)
Implement new learning content navigation/layout

* Fix first part of cypress tests

* Add event bus type to fix typecheck

* Rework SelfEvaluation to support new layout

* Fix layout

* Hide lang switcher icon in lc footer

Closes https://iterativ.atlassian.net/browse/VBV-319

* Fix cypress tests

* Unregister event bus handler

* Hide ItNavigationProgress on self evaluations with
only a single step

* Last fixes

* Merged develop into feature/new-lc-navigation
2023-04-25 10:06:24 +00:00
Daniel Egger cb37c55732 Merge branch 'develop' into feature/VBV-234-bugfix-create-new-page-in-wagtail 2023-04-13 19:23:24 +02:00
Daniel Egger d4c846a1b9 Changes after code review 2023-04-12 16:08:16 +02:00
Ramon Wenger 27ebe8a69f Refactor variable 2023-04-12 11:34:39 +02:00
Daniel Egger 80cd70ace6 Link courseSessionAssignmentDetails to AssignmentView 2023-04-06 21:39:44 +02:00
Daniel Egger d92b324f8e Add frontend types and loading code for Assignment 2023-04-06 10:58:31 +02:00
Daniel Egger a7cc07cc80 Refactor courseSessionStore names 2023-04-04 10:59:26 +02:00
Daniel Egger 1d88117d99 Refactor `attendance_days` to its own field 2023-04-04 08:45:42 +02:00
Daniel Egger 9ee97ffc55 Format code 2023-04-03 18:55:05 +02:00
Daniel Egger 9177b9e003 Get attendance day details in relevant views 2023-04-03 18:39:36 +02:00
Daniel Egger 1437bc9b53 VBV-304: Add `AssignmentDayBlock` 2023-04-03 18:09:22 +02:00
Daniel Egger e17817b166 Refactor learninPath according to the new page code hierarchy 2023-04-03 16:42:34 +02:00
Daniel Egger 4996eb565a Cleanup icons 2023-04-03 13:52:37 +02:00
Daniel Egger a0f9e0dfee Refactor learningPathStore to use setup syntax 2023-03-31 23:49:01 +02:00
Daniel Egger 26b986b732 Fix URL in SinglePerformanceCriteria 2023-03-31 23:32:33 +02:00
Daniel Egger 18f7728793 VBV-302: Refactor Header for course session switching 2023-03-31 15:21:20 +02:00
Daniel Egger d09ef0054f Fix TypeScript config for upgrade to 5.0 2023-03-31 10:17:53 +02:00
Daniel Egger edcfab1dd3 Format code according to new library rules 2023-03-31 10:07:27 +02:00
Elia Bieri 10f34f53d8 Merged in feature/storybook (pull request #49)
Integrate Storybook

* Merged in feature/caprover-deploy (pull request #47)

Feature/caprover deploy

Approved-by: Christian Cueni
* Merge branch 'feature/storybook' of bitbucket.org:iterativ/vbv_lernwelt into feature/storybook

* Add stories

* Add BuenosAires font to storybook

* Mute typecheck error

* Update bitbucket deployment

* Add ItNavigationProgress component

* Update pipelines file

* Update pipelines file

* Merged develop into feature/storybook

Approved-by: Daniel Egger
2023-03-29 13:45:13 +00:00
Elia Bieri 6733e7a311 Merged in bugfix/new_learnpath_refactorings (pull request #36)
Minor refactorings in new learnpath

* Refactor media query watching into composable

* Refactor media query to use vueuse package

* Get rid of custom scroll boundary watch logic

* Use template ref instead of id

* Switch to typed learning path key

* Move to-component-scrolling into the components themselves

* Minor cleanup

* Fix minor issues


Approved-by: Daniel Egger
2023-03-08 17:10:49 +00:00
Elia Bieri a7dcb86cfe Merged in feature/VBV-260-implement-new-learnpath (pull request #28)
Feature/VBV-260 implement new learnpath

* Fix linting problems

* Fix cypress tests

* Change various texts to gray-800

* Rework progress bar to show in progress circles

* Scroll to initial circle

* Make list view circles clickable

* Minor rework actions

* Rework

* Fix LearningPathScrollButton alignment

* Additional fix for LearningPathScrollButton alignment
2023-03-02 16:58:16 +00:00
Christian Cueni 02315af984 Add demo language switch 2023-03-02 07:07:40 +01:00
Daniel Egger d1615954df Fix in itPost 2023-02-14 10:31:36 +01:00
Elia Bieri 9930d9adf9 Fix type error in StyleGuidePage 2023-02-09 11:10:38 +01:00
Elia Bieri bac7acb021 Merged in feature/VBV-259-create-new-circle-component (pull request #21) 2023-02-09 09:31:03 +00:00
Elia Bieri b5e4c30d40 Merged in feature/notifications (pull request #15) 2023-02-08 11:39:27 +00:00
Christian Cueni bbd74d85b3 Add multiple rows in cockpit list circles 2023-01-31 16:37:00 +01:00
Christian Cueni 23fd945cb6 Fix test, lint vue 2023-01-31 08:26:16 +01:00
Christian Cueni 229262a609 Remove unused code, use prettier 2023-01-31 08:26:16 +01:00
Christian Cueni 2ab8f580bc Add HorizontalBar component 2023-01-31 08:26:16 +01:00
Christian Cueni b7038c1a9c Add open feedback component, update vertical bar chart 2023-01-31 08:26:16 +01:00
Christian Cueni 956970ce5f Style VerticalbarChart 2023-01-31 08:26:15 +01:00
Christian Cueni ec58ca176c Add basic Feedback page 2023-01-31 08:26:15 +01:00
Christian Cueni 44ed154814 Add summary component 2023-01-31 08:26:15 +01:00
Christian Cueni 0794a715b3 Add Handlungsfelder SVGs 2023-01-31 08:13:05 +01:00
Ramon Wenger ef0354ec5c Add component for horizontal bar charts 2023-01-26 07:54:45 +01:00
Ramon Wenger 5d955e14cb Replace custom CSS with tailwind classes where possible 2023-01-26 07:18:50 +01:00
Ramon Wenger a707afb4fe Rename horizontal bar chart to vertical
Because that's what it actually is 🥴
2023-01-26 07:18:50 +01:00
Ramon Wenger c509deb092 Add wrapper component for a question summary
Also add mobile version of the horizontal bar chart
2023-01-26 07:18:50 +01:00
Ramon Wenger 47e84f992f Add horizontal bar chart component 2023-01-26 07:18:50 +01:00
Ramon Wenger 31527eb99f Add title and label to rating scale component, fix some bugs 2023-01-26 07:18:50 +01:00
Ramon Wenger f3d61bff8a Add empty bar and rating number 2023-01-26 07:18:50 +01:00
Ramon Wenger e86c36248c Add rating scale component 2023-01-26 07:18:50 +01:00
Christian Cueni c34d3729fc Assign users to new course 2023-01-23 09:31:10 +01:00
Christian Cueni cac03fce57 VBV-232: WIP: Style bottom navigation, add progress 2023-01-19 07:43:01 +01:00
Daniel Egger cbd14abe65 Fix bug when loading courseSessions and its users 2023-01-11 17:20:09 +01:00
Daniel Egger 503f819d38 Refactor expert handling 2023-01-11 15:54:50 +01:00
Daniel Egger 9fc834e99e Refactor cockpit circle handling 2023-01-11 15:54:50 +01:00
Christian Cueni ae62b43606 Fix upload, add delete s3 files command 2023-01-11 07:38:47 +01:00