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
|
15f19f5756
|
Merged in feature/zulassungsprofil-VBV-666-2024-08-07 (pull request #372)
Feature/zulassungsprofil VBV-666 2024 08 07
|
2024-08-09 11:17:38 +00: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
|
7ad406eb45
|
Add missing translation
|
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
|
4d3ab9ce39
|
Display correct profile filter when none is chosen yet
|
2024-08-08 07:21:53 +02:00 |
|
Ramon Wenger
|
c50b19d0d7
|
Fix unit tests
|
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
|
708e24785d
|
Fix formatting
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
0bcafab8a8
|
Add 'all' CourseProfile to database
|
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
|
e0dad5ff40
|
Add more circles as base circles
|
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
|
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 |