Commit Graph

221 Commits

Author SHA1 Message Date
Reto Aebersold 9e31975d76 fix: cockpit url base 2023-12-18 12:25:19 +01:00
Livio Bieri c769247146 feat: mentor pages 2023-12-15 16:29:16 +01:00
Livio Bieri aff3f680f6 wip: mentor overview 2023-12-15 15:02:25 +01:00
Livio Bieri 36e2b2f3d0 chore: show circle-less experts warning 2023-12-15 13:29:53 +01:00
Livio Bieri bad9ed1926 fix: small screen 2023-12-15 13:28:35 +01:00
Reto Aebersold cc857e31b9 feat: mentor detail page 2023-12-15 11:11:20 +01:00
Reto Aebersold c02cd2b73f feat: mentor dashboard 2023-12-15 10:58:49 +01:00
Reto Aebersold 183c3cb86b feat: mentor dashboard 2023-12-15 10:58:09 +01:00
Reto Aebersold f642d2b57e feat: mentor dashboard 2023-12-15 10:56:29 +01:00
Reto Aebersold 3b0f562a7a feat: mentor dashboard 2023-12-15 10:50:41 +01:00
Livio Bieri 14e8d5da49 feat: mentor has no medialibrary 2023-12-13 15:44:26 +01:00
Christian Cueni 59051f884a Show evaluator sample solution if present 2023-12-13 08:49:32 +01:00
Livio Bieri c3a16a7bec chore: render mentor / expert cockpit based on role 2023-12-12 16:15:27 +01:00
Livio Bieri 522d781887 refactor: cockpit store -> expert cockpit store
prepares for mentor cockpit store
2023-12-12 11:53:56 +01:00
Livio Bieri 9eb2bbceba chore: removes CockpitParentPage.vue 2023-12-12 10:24:11 +01:00
Reto Aebersold e5ad3f08d2 Merge branch 'develop' into feature/VBV-597-umsetzung-cockpit-lernbegleitung 2023-12-12 10:02:08 +01:00
Reto Aebersold 3e2cededc7 chore: fix button links 2023-12-11 16:13:25 +01:00
Christian Cueni 6317df0cc8 wip: Add tests 2023-12-07 13:22:18 +01:00
Christian Cueni c3b2dde902 fix: Fix e2e tests 2023-12-07 10:49:27 +01:00
Christian Cueni aa5077bf3c wip: Split cockpit feedback pages 2023-12-07 10:12:23 +01:00
Christian Cueni d1504f592d wip: Add new content types 2023-12-07 10:11:24 +01:00
Reto Aebersold 278d659905 wip: learning mentor 2023-12-07 08:42:24 +01:00
Christian Cueni 421a10524b Fix display of text 2023-12-06 08:34:52 +01:00
Christian Cueni ec85b4fba5 Change default case to unkown type 2023-12-05 16:01:37 +01:00
Daniel Egger 1aec1e6508 Fix scrolling of submitted data in AssignmentEvaluationPage 2023-12-05 11:30:28 +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 6bb08ab316 wip: Display documents based on flag 2023-11-28 10:54:41 +01:00
Daniel Egger 0ee783219b VBV-585 feat: "Wissens- und Verständnisfragen im Cockpit" 2023-11-08 08:00:05 +01:00
Reto Aebersold 4776206bb8 feat: Rich-text component for ext. link handling 2023-11-01 14:27:53 +01:00
Daniel Egger 0df74774d0 Add comment because of load workaround in cockpit 2023-10-15 22:05:16 +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 cc800501c1 Calc next learning content 2023-10-14 01:02:08 +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 8621d4af07 Load CompletionData 2023-10-12 17:29:05 +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 7a9cf339f9 add files to overview 2023-10-11 09:53:33 +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 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
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 589453a8dc Remove `evaluation_grade` and set `evaluation_points` and `evaluation_passed` fields 2023-09-28 17:56:29 +02:00
Daniel Egger 966533e13b Add feedback trainer cypress test 2023-09-26 18:48:25 +02:00
Daniel Egger ce15054340 VBV-525: Fix feedback rendering 2023-09-26 13:43:44 +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
Reto Aebersold 4ba12cbec8 Singe circle selection 2023-09-20 15:32:21 +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 9eec62c31b Fix problems with slugs in moved ActionCompetences 2023-09-15 09:47:17 +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 e7bbf961d5 Cockpit Mobile Anpassungen 2023-09-14 14:28:06 +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 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 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 2fa17e1204 Refactor dueDate frontent 2023-08-23 15:38:26 +02:00
Christian Cueni 6195c9d32a Use page id for feedbacks, filter by course session id 2023-08-14 19:57:31 +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
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
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 5890e908f2 Add CourseSessionAssignment to serializer 2023-07-11 17:42:30 +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