Commit Graph

594 Commits

Author SHA1 Message Date
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 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 9d6a0a561b feat: add dashboard page variants 2023-10-25 16:40:41 +02:00
Daniel Egger 0c40bb9341 Rename composable to useCourseData 2023-10-14 16:06:16 +02:00
Daniel Egger aa67c2c8b7 Remove unneeded feedbackSummary 2023-10-14 01:42:24 +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 2eddb93be5 Adapt code to user more of the codegen generated typescript types 2023-10-12 10:51:10 +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 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 778dde12d7 Improve course session loading 2023-10-10 10:12:58 +02:00
Daniel Egger d92b514759 Merge branch 'develop' into feature/VBV-488-import-edoniq-data 2023-10-05 09:16:49 +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 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 540f8c7eb7 chore: use new due date format 2023-10-02 09:20:26 +02:00
Daniel Egger f8c6daf9eb VBV-519: Anpassungen Darstellung Wissens- und Verständnisfragen für Lernende 2023-09-28 17:56:29 +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
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 3ae215296b Remove console.logs 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
Livio Bieri 46faea8c1c cleanup: navigation (duplicated code, logic) 2023-09-20 18:21:25 +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
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 e6fbf0d276 Fix link in to KompetenzNavi in main navigation bar 2023-09-15 10:59:44 +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 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 fde7e2edef Add performanceCriteriaStatusCount to index page 2023-09-08 16:47:37 +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 06a3706d29 VBV-489: Übersetzungen 2023-09-08 09:53:43 +02:00
Daniel Egger da56f2a346 Refactor Notification model 2023-08-30 18:47:36 +02:00
Daniel Egger 9f8686e592 Improve django admin 2023-08-23 19:06:32 +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
Christian Cueni c622db7e22 Remove unusable link, don't open in blank 2023-08-16 15:31:14 +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 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
Daniel Egger 815d81a471 Simplify media library models 2023-07-21 13:56:09 +02: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
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 3bd489d2ae Refactor `CourseCompletion` model 2023-07-12 10:21:23 +02:00
Daniel Egger c4d10badf6 Standardize name `duedates` to `due_dates` 2023-07-12 09:15:21 +02:00
Daniel Egger ba7533614d Format [Uhr] for single dates 2023-07-11 18:13:11 +02:00
Lorenz Padberg b06fc4bcbf Add translations 2023-07-11 11:02:39 +02:00
Lorenz Padberg 57143a0209 Fix Types 2023-07-10 13:47:23 +02:00
Lorenz Padberg 24d816f950 Remove import defineprops 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 e631cc4d13 Add Weekday to long list 2023-07-10 13:46:56 +02:00
Lorenz Padberg ffefa520e1 Fix typechecker 2023-07-10 13:46:56 +02:00
Lorenz Padberg e7917a6cdb Fix linting errors 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
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 e6a5af56a8 Refactor cypress checkbox tests
Fix cypress circle tests

Fix cypress tests
2023-06-21 14:24:09 +02:00
Daniel Egger ad10bae641 Upgrade npm libraries
Remove unneeded graphql codegen step

Adapt build step

Revert "Remove unneeded graphql codegen step"

This reverts commit 9009e82669a828496ea4d19ffb07f8b85a73645a.
2023-06-21 14:23:19 +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
Daniel Egger 95479ae5e2 VBV-444: Bugfix circle in import file 2023-06-12 13:46:25 +02:00
Daniel Egger 3158033d57 Rework VITE_* variables... 2023-06-02 00:10:34 +02:00
Daniel Egger 6ab8be4e58 Cleanup env variables 2023-06-01 22:14:13 +02:00
Christian Cueni 3c6c80a8bc Open links in new tab, update text 2023-05-30 10:42:16 +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
Elia Bieri db35a037eb Jump to cockpit for trainers and superusers 2023-05-25 13:34:23 +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 3a6a143b7c Fix type, remove FAQ from footer 2023-05-24 14:51:02 +02:00
Christian Cueni fac1f53f29 Fix footer, add it 2023-05-24 13:37:24 +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
Daniel Egger bc368e7a2f Fix cypress tests 2023-05-19 14:50:41 +02:00
Daniel Egger e1b0add09b Hide Media Library navbar icon on mobile 2023-05-19 10:17:24 +02:00
Daniel Egger 38d753de42 Add "media library" navigation link 2023-05-19 10:17:24 +02:00
Daniel Egger 4d4b6c5405 Fiddle with height of notification icon 2023-05-19 10:17:24 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +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 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 35e629f64c Add navigation cypress tests 2023-05-09 14:22:53 +02:00
Daniel Egger 726d5dc9bd Calculate step when there is no start badge 2023-05-09 11:04:01 +02:00
Daniel Egger 02d637f971 Add urls to `ItNavigationProgress` to make them clickable 2023-05-09 08:08:36 +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 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 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
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
Ramon Wenger 53fb5c0572 Fix ts lint, remove unused component 2023-04-12 17:47:59 +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
Ramon Wenger 10d70c2170 Fix some linting issues 2023-04-06 17:11:53 +02:00
Ramon Wenger bec5924bb6 Fix typo 2023-04-06 16:50:29 +02:00
Ramon Wenger 812d70b1c8 Clean up MainNavigationBar 2023-04-06 16:50:29 +02:00
Ramon Wenger 5922678363 Add cypress to client for component and frontend tests 2023-04-06 16:50:29 +02:00
Ramon Wenger d6b45f9f7f Update CourseSessionsMenu 2023-04-06 16:50:29 +02:00
Ramon Wenger 54231d6cce Add some components and stories
Still to be defined which ones to use in the end
2023-04-06 16:50:29 +02:00
Daniel Egger a7cc07cc80 Refactor courseSessionStore names 2023-04-04 10:59:26 +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 26b986b732 Fix URL in SinglePerformanceCriteria 2023-03-31 23:32:33 +02:00
Daniel Egger 8d41d3d3a2 VBV-193 refactored course completion for course sessions 2023-03-31 18:27:47 +02:00
Daniel Egger ddc7a3bd70 VBV-302: Add course session switch 2023-03-31 16:24:52 +02:00
Daniel Egger 18f7728793 VBV-302: Refactor Header for course session switching 2023-03-31 15:21:20 +02:00
Daniel Egger 724f31f4a8 Handle multiple CourseSessions for user 2023-03-31 11:18:55 +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
Christian Cueni 6d9b16172d Display learning unit icons based on name 2023-03-28 07:00:38 +02:00
Christian Cueni 97879b570c Show only start and stop icon in circle 2023-03-27 11:34:09 +02:00
Daniel Egger f68e20515d VBV-293: Link zu Mediathek in Versicherungsvermittlerin Lehrgang wieder eingefügt 2023-03-14 15:03:01 +01:00