Commit Graph

1121 Commits

Author SHA1 Message Date
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
Christian Cueni e233d2a744 wip: Add settings field to Course model 2023-11-28 10:54:41 +01:00
Reto Aebersold 620a48723a chore: small fixes 2023-11-27 14:58:51 +01:00
Reto Aebersold 337b0cc14c chore: do not test for hostname 2023-11-27 12:20:28 +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 103ff2cfee Merge remote-tracking branch 'origin/feature/VBV-496-dash-regionalleiter' into feature/VBV-496-dash-regionalleiter 2023-11-06 10:10:57 +01:00
Reto Aebersold 1e5fb91343 fix: move experts to feedback 2023-11-06 10:10:14 +01:00
Livio Bieri 1fdc28419d chore: adds missing cypress test for assignment 2023-11-06 10:00:13 +01:00
Reto Aebersold 9d1328c89d fix: rating to color 2023-11-06 09:11:36 +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
Livio Bieri 3748ce44fa chore: cypress tests supervisor dashboard 2023-11-01 17:14:47 +01:00
Livio Bieri 2e0c8205ee wip: e2e cypress tests 2023-11-01 15:16:12 +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
Livio Bieri 555c4407dc chore: put ts-ignore to correct import 2023-10-31 17:44:07 +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
Livio Bieri e453fcaf3b fix: round average satisfaction 2023-10-30 15:14:03 +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
Livio Bieri 62c3aaf849 fix: assigment summary missing _id 2023-10-30 11:31:35 +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 d78b216875 fix: fixes small ui bug in dashboard 2023-10-30 10:02:31 +01:00
Livio Bieri 235c3985e6 feat: wraps up dashboard boxes ui 2023-10-30 09:56:04 +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
Livio Bieri 743ad06260 hack: make supervisor ephemeral expert of every circle in the course universe 2023-10-27 11:01:24 +02:00
Reto Aebersold 0b25e8f72b feat: dashboard store 2023-10-27 10:45:58 +02:00
Livio Bieri e55cb31e9f wip: to be reverted 2023-10-26 18:33:15 +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 0ecb03275e chore: add _id field 2023-10-25 19:10:04 +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 b36754991e Log graphql error when using `useCourseData` 2023-10-15 21:51:04 +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 99f9147804 Make content_assignment mandatory on EdoniqTest 2023-10-14 01:36:05 +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 61dfdfda9d Recode `useLearningPath` to use graphql query programatically 2023-10-12 21:25:50 +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
Daniel Egger 6510d74549 Add first basic LEARNING_PATH_QUERY 2023-10-11 17:26:46 +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 13581389c0 fix: navigation 2023-10-02 13:53:39 +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
Livio Bieri 4068a3d365 chore: course appointment route 2023-10-02 09:21:08 +02:00
Livio Bieri 540f8c7eb7 chore: use new due date format 2023-10-02 09:20:26 +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 daaecb57a0 fix: use trainer url 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
Livio Bieri dbe74f754b chore: more tests for mobile navigation 2023-09-28 09:38:48 +02:00
Livio Bieri 5247b6061b chore: navigation tests (desktop) 2023-09-28 09:38:48 +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 3ae215296b Remove console.logs 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 5edf573471 Update translation files, remove locize sync 2023-09-26 12:48:26 +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 9020692ea9 fix: linting 2023-09-20 18:46:31 +02:00
Livio Bieri 46faea8c1c cleanup: navigation (duplicated code, logic) 2023-09-20 18:21:25 +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 1e27f80949 refactor: main navigation, reduce duplication 2023-09-20 17:16:35 +02:00
Livio Bieri 93f05e4722 fix: mobile menu 2023-09-20 17:16:07 +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
Livio Bieri 326e42c99f wip: course preview poc 2023-09-16 22:27:19 +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 e6fbf0d276 Fix link in to KompetenzNavi in main navigation bar 2023-09-15 10:59:44 +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 21174d17db Attach completion data to `Assignment` in GraphQL schema 2023-09-08 16:46:54 +02:00
Daniel Egger 4bc1ca636c Add result data for edoniq test 2023-09-08 16:46:54 +02:00
Daniel Egger 428ac294e0 Add `--create-assignment-evaulation` cli parameter 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 a95974c54f Extend graphql scheme for KompetenzNavi 2023-09-08 16:46:53 +02:00
Daniel Egger 0537d96dbb Add models for KompetenzNavi and GraphQL-Types 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 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