Commit Graph

1445 Commits

Author SHA1 Message Date
Ramon Wenger a43d2df082 Fix type references 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 eaeac374c1 Add mutation to update chosen profile 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 dd1d1ff6fe Add proof of concept implementation for the profile filter 2024-08-08 07:10:37 +02:00
Elia Bieri c84b25cc32 Merged in feature/VBV-704-eine-note-im-kn-für-ük (pull request #369)
VBV-704 Eine Note im KN für ÜK
2024-08-07 16:17:29 +00: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
Christian Cueni 047b508714 Update icon 2024-08-06 07:27:58 +02:00
Christian Cueni fb4f334120 Include sensitive data 2024-08-05 09:03:20 +02:00
Christian Cueni f2a765ee3b Merge migrations 2024-08-05 07:33:08 +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
Christian Cueni 7110b5f97c Add admin command to create & sync Berufsbildner 2024-07-31 15:27:06 +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 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 af84a0ee01 Add return type 2024-07-31 11:14:19 +02:00
Christian Cueni 579655a4c9 Merged develop into feature/VBV-712-billing-address 2024-07-31 05:14:56 +00:00
Christian Cueni 494ad8e531 Merged develop into feature/VBV-712-billing-address 2024-07-30 12:12:48 +00:00
Christian Cueni 9603b37196 Add command for company stats 2024-07-30 14:03:45 +02:00
Christian Cueni 46760cf8ae Fix tests 2024-07-30 11:36:08 +02:00
Christian Cueni efdfb0bf03 Use correct url 2024-07-30 11:02:10 +02:00
Christian Cueni 086f0b7fcb Use phone_number field 2024-07-30 10:44:08 +02:00
Christian Cueni 35e5067331 Add cypress tests 2024-07-30 10:44:08 +02:00
Christian Cueni dc4af21e00 Add translations in backend 2024-07-30 10:44:06 +02:00
Christian Cueni f69b607ca8 Add frontend code 2024-07-30 10:38:16 +02:00
Christian Cueni b8c4125b37 Add tests 2024-07-30 10:38:16 +02:00
Christian Cueni 9f880baffd wip: Fix export, add test 2024-07-30 10:38:16 +02:00
Christian Cueni fd2cbb96bc wip: Add functions for person export [skip ci] 2024-07-30 10:38:13 +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 fabb759daa Update tests, add translations 2024-07-27 21:21:34 +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 c7afae928b Fix unit tests 2024-07-26 18:50:16 +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 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 ca37f74e45 Fix supervisor cypress 2024-07-25 17:31:31 +02:00
Daniel Egger 661f5aa435 Show correct numbers for subset of users on AssignmentSubmissionProgress 2024-07-25 17:19:39 +02:00
Daniel Egger 4f6b14efae Fix unit tests 2024-07-25 17:19:39 +02:00
Daniel Egger 50709a34e8 Only query live assignments 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 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 b6590c0b86 Add `BERUFSBILDNER`-role 2024-07-25 17:19:38 +02:00
Daniel Egger 57384fcf5d Add initial script to create `berufsbildner-mobi@example.com` 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
Christian Cueni b52781fe22 Add optional attendance flag to export 2024-07-25 15:56:40 +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
Christian Cueni dec5691d8f Add info to attendance page 2024-07-25 09:52:15 +02:00
Christian Cueni d750a19d24 Add migration and admin field 2024-07-25 08:44:10 +02:00
Christian Cueni 85f0b680b5 Merged develop into fix/optimize-queries 2024-07-25 05:29:27 +00:00
Christian Cueni 7d2715ead1 Merged develop into feature/cembra-enable 2024-07-24 13:26:53 +00:00
Daniel Egger bc922e1845 Merged in feature/vbv-695-phone-company-profile-2 (pull request #354)
Feature/vbv 695 phone company profile 2

Approved-by: Christian Cueni
2024-07-24 13:08:47 +00:00
Christian Cueni fe2b91e619 Add debug middleware 2024-07-24 14:00:29 +02:00
Christian Cueni 58908bc5c6 Fix context 2024-07-24 11:47:27 +02:00
Christian Cueni c1e1f38a27 Optimize duedates in dashboards 2024-07-24 11:18:19 +02:00
Christian Cueni 4d4e202a24 Preselect user 2024-07-24 09:45:02 +02:00
Christian Cueni bcecffbc9e Merged develop into feature/vbv-695-phone-company-profile-2 2024-07-23 13:59:41 +00:00
Daniel Egger 08b65f00d7 Enable cembra/byjuno payment for PROD env 2024-07-23 14:40:22 +02:00
Daniel Egger ab60eebd25 Use order_id as refno 2024-07-23 14:40:22 +02:00
Daniel Egger 74c4099b8b Test-Deployment improvements 2024-07-23 14:40:22 +02:00
Daniel Egger e803e5308f Fix unit tests 2024-07-23 14:40:22 +02:00
Daniel Egger 46daea0511 Enable cembra/byjuno payment 2024-07-23 14:40:22 +02:00
Christian Cueni 0fef8ec9b6 Extend evaluation period 2024-07-23 13:55:16 +02:00
Christian Cueni dbcae57091 Add CourseSessionUsers to context 2024-07-22 16:26:00 +02:00
Christian Cueni 8e7f805067 Add context 2024-07-22 16:07:12 +02:00
Christian Cueni 9424979bef Select related data 2024-07-22 14:59:53 +02:00
Christian Cueni 69ea3c8c17 Use specific 2024-07-22 14:41:53 +02:00
Christian Cueni 128c8da2e6 Optimize competences queries 2024-07-22 13:33:22 +02:00
Christian Cueni 7b166d3ca8 Fix import urls 2024-07-22 08:13:02 +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
Christian Cueni 07a0d67a09 Merged in feature/VBV-456-dj-upgrade (pull request #352)
Upgrade Django

* Upgrade Django

* Update French translation for `Email`

* Update French translation for `Email` take 2

* Update translation for `Email` take 3

* Update translation for `Email` take 6


Approved-by: Daniel Egger
2024-07-12 08:41:14 +00:00
Christian Cueni 88cfa79b97 Add blocking view 2024-07-12 08:19:36 +02:00
Christian Cueni 211d478181 Downgrade wagtail and packages 2024-07-11 12:17:56 +02:00
Daniel Egger 2c4cd093a2 Merged develop into branch 2024-07-10 18:17:33 +02:00
Christian Cueni 9692b441b2 Merged develop into feature/VBV-692-keycloak 2024-07-10 10:14:29 +00:00
Christian Cueni 0cf0102f3d Add prod roles 2024-07-10 09:33:56 +02:00
Daniel Egger 0eeae993cb VBV-703: abacus filename: timestamp comes first 2024-07-09 13:39:07 +02:00
Christian Cueni bdb671c6e9 Use user language if there's a mismatch 2024-07-08 13:16:22 +02:00
Christian Cueni ae3ecec979 Use slug not title 2024-07-08 08:44:05 +02:00
Daniel Egger 8d9e111892 Log datatrans webhook on Database 2024-07-04 15:49:09 +02:00
Daniel Egger dc576f4fa3 Ignore test_cypress_datatrans.py 2024-07-04 14:54:23 +02:00
Daniel Egger d0b357c33c Fix tests 2024-07-04 14:54:23 +02:00
Daniel Egger 517d1df38f Add `refno2` field 2024-07-04 14:54:23 +02:00
Daniel Egger 4f58415ff5 Refactor VV_PRODUCT_NUMBER as const 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