Commit Graph

1575 Commits

Author SHA1 Message Date
Elia Bieri 5560ec2ede Fix translation 2024-09-18 09:41:28 +02:00
Elia Bieri a049a450ce Implement new form field order 2024-09-17 17:16:20 +02:00
Elia Bieri 6c63027834 Rework 2024-09-17 16:41:38 +02:00
Elia Bieri 678ea12c73 Rename chosen profile option 2024-09-17 15:36:04 +02:00
Elia Bieri 044bba759f Add E2E tests 2024-09-17 15:20:09 +02:00
Elia Bieri f24fd040f9 Add test data 2024-09-17 11:49:07 +02:00
Elia Bieri 0a4bbb0df7 Sort person by paid year 2024-09-12 17:07:52 +02:00
Elia Bieri c65c1be0a8 Add pie chart to dashboard 2024-09-12 13:10:53 +02:00
Elia Bieri bd95776ec7 Initial implementation 2024-09-11 16:34:10 +02:00
Daniel Egger e470cba641 Increase `unread_count` polling interval 2024-08-28 22:11:32 +02:00
Daniel Egger a405c70bf9 Add "prettier-plugin-organize-imports" plugin -> imports got sorted 2024-08-27 15:30:51 +02:00
Daniel Egger 889922725a VBV-721: Export für Berufsbildner 2024-08-27 15:11:09 +02:00
Daniel Egger 0f6ec66122 Merged in feature/berufsbilnder-cypress (pull request #378)
Feature/berufsbilnder cypress

* Berufsbildner cypress test

* Fix tests
2024-08-23 13:26:47 +00:00
Christian Cueni 9779c96d74 Fix mentor for real 2024-08-21 07:30:02 +02:00
Christian Cueni 563897d96b Quickfix expert id error 2024-08-20 12:58:04 +02:00
Christian Cueni b763587a25 Fix non-display of grade 2024-08-19 16:01:46 +02:00
Christian Cueni c55be997dc Fix profiles 2024-08-19 13:48:56 +02:00
Elia Bieri dbd0f84c5f Fix frontend tests 2024-08-14 14:28:36 +02:00
Christian Cueni 05c4d471d8 Fix typecheck 2024-08-10 13:30:15 +02:00
Christian Cueni aca066a376 Merge branch 'develop' into feature/vbv-676-berufsbildner-2
# Conflicts:
#	client/src/composables.ts
#	client/src/gql/gql.ts
#	client/src/gql/graphql.ts
#	client/src/graphql/queries.ts
#	client/src/pages/competence/CompetenceCertificateDetailPage.vue
#	client/src/pages/competence/CompetenceCertificateListPage.vue
#	client/src/pages/competence/CompetenceIndexPage.vue
#	client/src/types.ts
#	cypress/support/commands.js
#	server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py
2024-08-09 18:01:25 +02:00
Christian Cueni 7ad406eb45 Add missing translation 2024-08-08 07:21:53 +02:00
Ramon Wenger 4d3ab9ce39 Display correct profile filter when none is chosen yet 2024-08-08 07:21:53 +02:00
Ramon Wenger cea47b4f61 Update lint scripts 2024-08-08 07:21:53 +02:00
Ramon Wenger dff81c0a6b Display profile filter on mobile also 2024-08-08 07:21:53 +02:00
Ramon Wenger bf5482e39c Replace the course profile filter pills with a dropdown 2024-08-08 07:21:53 +02:00
Ramon Wenger 17b466ea29 Fix layout of topics when there is enough space 2024-08-08 07:21:52 +02:00
Ramon Wenger 537c614a57 Add bullet point to VV start page 2024-08-08 07:21:52 +02:00
Ramon Wenger 1290703095 Make course profile filter more mobile friendly 2024-08-08 07:21:52 +02:00
Ramon Wenger f6e459fafe Add additional checks in cypress test 2024-08-08 07:21:52 +02:00
Ramon Wenger dc689bd20a Fix linting issue in client code 2024-08-08 07:21:51 +02:00
Ramon Wenger 10cd228d56 Refactor code and add filtering to circle progress displays 2024-08-08 07:21:51 +02:00
Ramon Wenger b780061641 Fix filter bug when "all" course profile is selected 2024-08-08 07:21:51 +02:00
Ramon Wenger a8ac9c2a0a Remove debug info 2024-08-08 07:21:51 +02:00
Daniel Egger 507c1a63f7 Format code, fix lint errors 2024-08-08 07:21:51 +02:00
Ramon Wenger 794c18fb41 Pass chosen_profile through checkout step to end up in CourseProfile 2024-08-08 07:21:50 +02:00
Ramon Wenger cf5aa64a24 Update wizard to show the correct step number 2024-08-08 07:21:50 +02:00
Ramon Wenger ca4ba26005 Add Course Profile selection step to checkout flow 2024-08-08 07:21:50 +02:00
Ramon Wenger 493b3197cf Add filter to user profile page 2024-08-08 07:21:50 +02:00
Ramon Wenger 6ea37447f4 Make "all" filter more explicit 2024-08-08 07:21:50 +02:00
Ramon Wenger bb894a4ccd Update logic for last circle 2024-08-08 07:21:50 +02:00
Ramon Wenger 438f3a1650 Fix linting issue 2024-08-08 07:21:50 +02:00
Ramon Wenger 417fab75bc Add missing dependency 2024-08-08 07:21:46 +02:00
Ramon Wenger 2513aa6fac Fix linting issues 2024-08-08 07:10:40 +02:00
Ramon Wenger 1d2224e941 Add filter to learning path list view, refactor code 2024-08-08 07:10:40 +02:00
Ramon Wenger 770dbc94ea Fix bug with scroll arrows 2024-08-08 07:10:40 +02:00
Ramon Wenger 59c695b838 Display chosen profile on user profile page 2024-08-08 07:10:39 +02:00
Ramon Wenger 544649a516 Only display the profile filter on VV learningpath(s) 2024-08-08 07:10:39 +02:00
Ramon Wenger e3090fcfa1 Update filter to always display base circles 2024-08-08 07:10:39 +02:00
Ramon Wenger f5fe285986 Add course profile and circle data as migration and also inside django
command
2024-08-08 07:10:39 +02:00
Ramon Wenger e8cf40cafc Fix linting issue 2024-08-08 07:10:39 +02:00
Ramon Wenger 3258aaa5d3 Fix type error 2024-08-08 07:10:39 +02:00
Ramon Wenger 6a827ae0ae Use reactive course query to be able to work with cache 2024-08-08 07:10:38 +02:00
Ramon Wenger c32520548c Add translation to profile filter 2024-08-08 07:10:38 +02:00
Ramon Wenger 829f724ca9 Update queries and mutations with some more fields 2024-08-08 07:10:38 +02:00
Ramon Wenger ce46f14c4c Add mutation to client 2024-08-08 07:10:38 +02:00
Ramon Wenger 195151ae34 Refactor filter into component 2024-08-08 07:10:38 +02:00
Ramon Wenger 28c247653a Add dynamic filtering 2024-08-08 07:10:38 +02:00
Ramon Wenger 8bce53b410 Update schema 2024-08-08 07:10:38 +02:00
Ramon Wenger bb1afd7205 Rename 'filters' to 'profiles', to be more exact 2024-08-08 07:10:38 +02:00
Ramon Wenger 09570f18c2 Add profiles to courses 2024-08-08 07:10:38 +02:00
Ramon Wenger 46ee6f9edd Add style for tags 2024-08-08 07:10:38 +02:00
Ramon Wenger dd1d1ff6fe Add proof of concept implementation for the profile filter 2024-08-08 07:10:37 +02:00
Elia Bieri 8baecc0736 Refactor common code into composable 2024-08-07 18:03:28 +02:00
Elia Bieri 49a74a6d32 Make linter happy :-) 2024-08-07 10:53:32 +02:00
Elia Bieri 51f71fb3f1 Switch course session on jump to assignment in circle 2024-08-07 10:38:19 +02:00
Christian Cueni ed1375ba33 Fix utils 2024-08-07 09:29:33 +02:00
Christian Cueni 77dce844d3 Merge branch 'develop' into feature/vbv-676-berufsbildner-2 2024-08-06 19:55:04 +02:00
Elia Bieri f70569f319 Show course session inf CompetenceAssignmentRow 2024-08-06 17:35:43 +02:00
Christian Cueni cb2eb3cc7f Rename component 2024-08-05 20:44:25 +02:00
Christian Cueni 6447843656 Add Person count widget (VBV-718) 2024-08-05 16:01:13 +02:00
Christian Cueni 37758961b0 Remove course specifc data from dashboard navbar 2024-08-05 16:00:13 +02:00
Christian Cueni 6b2628b333 Show different links for different roles 2024-08-05 14:11:26 +02:00
Christian Cueni 9706d7a2f0 Don't route to main profile for child pages 2024-08-04 19:14:56 +02:00
Christian Cueni 41a0bbc22e Merge branch 'develop' into feature/vbv-676-berufsbildner-2
# Conflicts:
#	client/src/gql/gql.ts
#	client/src/gql/graphql.ts
2024-07-31 15:33:03 +02:00
Elia Bieri 6f2b437a5c Merged develop into feature/VBV-704-eine-note-im-kn-für-ük 2024-07-31 12:54:26 +00:00
Elia Bieri dd028e1769 Remove unused imports 2024-07-31 14:35:21 +02:00
Elia Bieri 78d18034fa Implement unified grading 2024-07-31 14:30:01 +02:00
Christian Cueni c9a75c2867 Merged develop into feature/VBV-696-person-export 2024-07-31 09:16:50 +00:00
Christian Cueni 494ad8e531 Merged develop into feature/VBV-712-billing-address 2024-07-30 12:12:48 +00:00
Christian Cueni f69b607ca8 Add frontend code 2024-07-30 10:38:16 +02:00
Christian Cueni 5defb386bd Merge branch 'develop' into feature/vbv-676-berufsbildner-2
# Conflicts:
#	server/vbv_lernwelt/competence/services.py
#	server/vbv_lernwelt/dashboard/graphql/types/assignment.py
#	server/vbv_lernwelt/dashboard/graphql/types/competence.py
2024-07-30 10:12:53 +02:00
Christian Cueni 0313abb010 Allow other billing address for cembra 2024-07-30 08:24:27 +02:00
Christian Cueni 29fe1bdf83 Merged develop into feature/VBV-698-optional-flag 2024-07-29 07:56:02 +00:00
Christian Cueni 9e46e844c6 Fix userprofile data 2024-07-29 09:49:14 +02:00
Christian Cueni a552ff75fe Change payment message 2024-07-29 08:09:46 +02:00
Daniel Egger e41b3222bf Add Grade widget in dashboard 2024-07-27 15:53:43 +02:00
Daniel Egger 29c42f3512 Filter for list, add average grade 2024-07-27 15:01:02 +02:00
Daniel Egger b7231fb1b7 Styling 2024-07-27 10:00:09 +02:00
Daniel Egger d36a6e3693 Fix competence data loading for profile user 2024-07-26 18:38:24 +02:00
Daniel Egger b24dbc84c8 Make AgentCompetenceGradeDetailPage 2024-07-26 18:13:51 +02:00
Daniel Egger da348b7756 Refactor completions query to get completions for a list of users 2024-07-26 17:02:30 +02:00
Daniel Egger 9674abfa94 Add AgentCompetenceGradeDetailPage 2024-07-26 15:54:31 +02:00
Daniel Egger 82a0cf8daa Show list 2024-07-26 15:45:23 +02:00
Daniel Egger f4fbe1a894 Calculate average grade in Berufsbildner 2024-07-26 15:27:24 +02:00
Daniel Egger eef166575f Fix problem with persons for `Berufsbildner` 2024-07-26 13:05:38 +02:00
Daniel Egger 661f5aa435 Show correct numbers for subset of users on AssignmentSubmissionProgress 2024-07-25 17:19:39 +02:00
Daniel Egger 61ee85668e Add dashboard persons code for Berufsbildner 2024-07-25 17:19:39 +02:00
Daniel Egger 4b2fcc09ec AssignmentDetailPage for Berufsbildner 2024-07-25 17:19:39 +02:00
Daniel Egger 89152ce729 Make AssignmentList work for Berufsbildner 2024-07-25 17:19:38 +02:00
Daniel Egger 40ff65ad2d Add `UK_BERUFSBILDNER_STATISTICS_WIDGET` 2024-07-25 17:19:38 +02:00
Daniel Egger 0581f3d820 Add `average_evaluation_percent` to assignment metrics 2024-07-25 17:19:38 +02:00
Daniel Egger 1f79693e59 Show (wrong) competence dashboard widget for `BERUFSBILDNER` 2024-07-25 17:19:38 +02:00
Daniel Egger cdfb9d2c5b Refactor `LearningMentor` model to flat `AgentParticipantRelation` model 2024-07-25 17:19:36 +02:00
Daniel Egger 3f02fd254a Add cypress test for mentor invitation 2024-07-25 17:19:22 +02:00
Daniel Egger f150751219 Add cypress test for "Feedback Praxisauftrag" 2024-07-25 17:19:21 +02:00
Daniel Egger af2b63b15f Add cypress test for "Fremdeinschätzung" 2024-07-25 17:19:18 +02:00
Christian Cueni 848647fb97 Add cypress tests 2024-07-25 13:57:06 +02:00
Christian Cueni fd3effc673 Add optional attendance information to profile 2024-07-25 11:07:46 +02:00
Elia Bieri 125d3b2b14 Calculate competence certificate grades over all course sessions 2024-07-25 11:04:32 +02:00
Christian Cueni dec5691d8f Add info to attendance page 2024-07-25 09:52:15 +02:00
Elia Bieri a6a83e6b90 Install watcher to resolve warning 2024-07-25 09:48:26 +02:00
Christian Cueni 13528f5394 Merged develop into feature/VBV-707-spinner 2024-07-25 05:44:43 +00:00
Christian Cueni 7d2715ead1 Merged develop into feature/cembra-enable 2024-07-24 13:26:53 +00:00
Christian Cueni bd59f24ea9 Add loading spinner to widget 2024-07-24 09:20:28 +02:00
Daniel Egger 08b65f00d7 Enable cembra/byjuno payment for PROD env 2024-07-23 14:40:22 +02:00
Daniel Egger aa30dadfd7 Update cypress tests 2024-07-16 15:57:24 +02:00
Daniel Egger f0acdaf254 Add custom organisation name 2024-07-16 15:13:52 +02:00
Daniel Egger d56c346512 Add more editable profile fields 2024-07-16 14:37:19 +02:00
Daniel Egger 47896444a6 Make `ItDatePicker` component 2024-07-12 11:19:38 +02:00
Daniel Egger 12476740df Merged in feature/npm-node-upgrade (pull request #350)
Feature/npm node upgrade

* Upgrade npm dependencies, node20, remove Storybook

* Upgrade more libs


Approved-by: Christian Cueni
2024-07-12 08:44:14 +00:00
Daniel Egger 3d3556f692 Filter out "cembra_byjuno" for prod 2024-07-10 18:12:25 +02:00
Daniel Egger d9efdb0d73 chore: `paymentMethods` does not have to be computed 2024-07-10 18:08:25 +02:00
Daniel Egger a53459f8bf Theming for date picker 2024-07-04 14:54:23 +02:00
Daniel Egger d0b357c33c Fix tests 2024-07-04 14:54:23 +02:00
Daniel Egger b58a7313a8 Add @vuepic/vue-datepicker for birth date in onboarding 2024-07-04 14:54:23 +02:00
Daniel Egger 52f2b30a58 Translations 2024-07-04 14:54:23 +02:00
Daniel Egger fab9297989 Test cembra/byjuno invoice 2024-07-04 14:54:22 +02:00
Daniel Egger 3ef1ba18b2 Improve Cypress tests 2024-07-04 14:54:22 +02:00
Daniel Egger 9d91a9102a Add more logging in app/database 2024-07-04 14:54:22 +02:00
Daniel Egger b9f8e5d771 Handle phone numbers 2024-07-04 14:54:22 +02:00
Daniel Egger 42fd2f1377 Add logic/validation for cembra fields 2024-07-04 14:54:22 +02:00
Daniel Egger b6e4f30b58 Add device fingerprint code 2024-07-04 14:54:22 +02:00
Daniel Egger e776103eb7 Add new fields for cembra pay 2024-07-04 14:54:22 +02:00
Daniel Egger da5c6d07d2 Add Cypress test for checkout process 2024-07-04 14:54:22 +02:00
Christian Cueni c0a94ca988 Add attendance export in cockpit 2024-07-02 15:03:42 +02:00
Christian Cueni 767f6c42f6 Add export to feedback cockpit page 2024-07-02 14:07:43 +02:00
Christian Cueni f7798cfa55 Merged develop into feature/abacus-export 2024-06-20 05:21:05 +00:00
Daniel Egger ca01bf1196 Try to fix flaky cypress test 2024-06-19 16:27:11 +02:00
Daniel Egger de6b659ea7 Try to fix flaky cypress test 2024-06-19 16:24:37 +02:00
Christian Cueni 7a8ee56109 Add language to request, add language backend tests, add icon 2024-06-18 15:56:17 +02:00
Christian Cueni 7c21070b96 Add frontend tests, add translations 2024-06-18 08:26:30 +02:00
Christian Cueni 232959b92d Display export only to experts 2024-06-17 20:07:47 +02:00
Christian Cueni 033886f00b Add frontend export 2024-06-17 16:32:27 +02:00
Christian Cueni 0a9a4af5b2 wip: Use ints as input 2024-06-17 14:21:47 +02:00
Christian Cueni 50d5c4080d Revert "wip: Remove old code"
This reverts commit 06572c9e1f.
2024-06-13 15:36:47 +02:00
Christian Cueni b8813482b0 Fix export, add client code and urls 2024-06-13 14:45:53 +02:00
Christian Cueni 06572c9e1f wip: Remove old code 2024-06-13 13:05:54 +02:00
Daniel Egger f4729cb4c8 Start abacus upload manually from admin interface 2024-05-31 19:11:46 +02:00
Daniel Egger f8c6e135e1 Add fake datatrans endpoints for e2e tests 2024-05-31 16:00:05 +02:00
Daniel Egger ec21238ece Remove unused BillingAddress model 2024-05-31 09:54:42 +02:00