Commit Graph

1368 Commits

Author SHA1 Message Date
Elia Bieri bbc4e3da3f Fix python tests 2024-08-14 09:50:00 +02:00
Elia Bieri 0d4aa58990 Merged develop into feature/vbv-676-berufsbildner-2 2024-08-14 07:31:24 +00:00
Christian Cueni 225f787de5 Fix error when chosen_profile_id == "" 2024-08-12 17:44:38 +02:00
Christian Cueni ac2f1f1714 Use different templates for invoice and cc 2024-08-12 08:19:10 +02:00
Christian Cueni 6978a2de91 Merge migrations 2024-08-10 13:37: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 785057fd96 Add merge migration 2024-08-08 07:21:53 +02:00
Ramon Wenger 5ff582ea32 Fix typo in creator method 2024-08-08 07:21:53 +02:00
Christian Cueni 7d974cc358 Add another misspelled circle 2024-08-08 07:21:53 +02:00
Ramon Wenger 4f231955fe Format code 2024-08-08 07:21:53 +02:00
Ramon Wenger 71e4840c35 Add misspelled circle to migration 2024-08-08 07:21:53 +02:00
Ramon Wenger 1272037e73 Update migration to assign circles to profiles 2024-08-08 07:21:53 +02:00
Ramon Wenger c50b19d0d7 Fix unit tests 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 708e24785d Fix formatting 2024-08-08 07:21:52 +02:00
Ramon Wenger b0909c52d3 Add ordering to course profiles 2024-08-08 07:21:52 +02:00
Ramon Wenger a1228f7753 Add another unit test 2024-08-08 07:21:52 +02:00
Ramon Wenger d0ef9bd5fd Add unit test for course profile update 2024-08-08 07:21:52 +02:00
Ramon Wenger 488dc0843f Fix linting issue in python 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 d75fb9e836 Remove print statement 2024-08-08 07:21:51 +02:00
Ramon Wenger 6a0f2239af Change Circles.profiles to be a ParentalManyToManyField 2024-08-08 07:21:51 +02:00
Daniel Egger 418eba5623 Fix unit tests 2024-08-08 07:21:51 +02:00
Daniel Egger 0c5e48aa30 Fix cypress tests 2024-08-08 07:21:51 +02:00
Daniel Egger dacda2e19a Use order_id as refno 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 ca4ba26005 Add Course Profile selection step to checkout flow 2024-08-08 07:21:50 +02:00
Ramon Wenger 0bcafab8a8 Add 'all' CourseProfile to database 2024-08-08 07:21:50 +02:00
Ramon Wenger e0dad5ff40 Add more circles as base circles 2024-08-08 07:21:50 +02:00
Ramon Wenger 6da8907816 Return CourseProfiles depending on the course configuration 2024-08-08 07:10:40 +02:00
Ramon Wenger fc27d000ab Add missing migrations 2024-08-08 07:10:39 +02:00
Ramon Wenger 59c695b838 Display chosen profile on user profile page 2024-08-08 07:10:39 +02:00
Ramon Wenger d22a7c296f Add admin form to be able to edit the profiles 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 208fa3c8b9 Add base circle property to circle 2024-08-08 07:10:39 +02:00
Ramon Wenger 9713850afa Add data migration for course profiles 2024-08-08 07:10:39 +02:00
Ramon Wenger 281b7c900c Safely access the code property 2024-08-08 07:10:39 +02:00
Ramon Wenger 31df04357b Format code 2024-08-08 07:10:39 +02:00
Ramon Wenger 457aff5bfd Update model and add migrations 2024-08-08 07:10:39 +02:00
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