Commit Graph

254 Commits

Author SHA1 Message Date
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 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 9e46e844c6 Fix userprofile data 2024-07-29 09:49:14 +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 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 7d2715ead1 Merged develop into feature/cembra-enable 2024-07-24 13:26:53 +00: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
Daniel Egger aa30dadfd7 Update cypress tests 2024-07-16 15:57:24 +02:00
Daniel Egger d56c346512 Add more editable profile fields 2024-07-16 14:37:19 +02:00
Daniel Egger 2c4cd093a2 Merged develop into branch 2024-07-10 18:17:33 +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 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 e776103eb7 Add new fields for cembra pay 2024-07-04 14:54:22 +02:00
Christian Cueni 8af955f794 Add migration, handle sync for mentors and supervisors 2024-06-27 11:32:42 +02:00
Christian Cueni cc3b6bbf0d Clean up some code 2024-06-27 11:32:42 +02:00
Christian Cueni e6eae79171 Refactor json data handling 2024-06-27 11:32:20 +02:00
Christian Cueni 857c4a4742 Add sso models, move all code to sso-app 2024-06-27 11:32:20 +02:00
Christian Cueni 9437dafb76 wip: Add error model, move code, add exception 2024-06-27 11:32:20 +02:00
Christian Cueni 13789a9619 wip: Add sync method 2024-06-27 11:32:20 +02:00
Daniel Egger 53d30572c8 Fix failing dueDates.cy.js test 2024-06-20 09:20:58 +02:00
Christian Cueni f7798cfa55 Merged develop into feature/abacus-export 2024-06-20 05:21:05 +00:00
Daniel Egger 6de5660f31 Add `ABACUS_` env var values for prod 2024-06-04 11:30:18 +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
Daniel Egger 2646b072ee Refactor country handling code 2024-05-30 15:35:17 +02:00
Daniel Egger 590b6a17bc Add `abacus_debitor_number` and `abacus_order_id` model fields 2024-05-29 15:35:03 +02:00
Daniel Egger 059a4cad5c Add empty user 2024-05-29 13:48:40 +02:00
Christian Cueni 0cad9666c5 Merged develop into feature/VBV-684-export-trainer-rl 2024-05-29 09:41:49 +00:00
Christian Cueni bcf5676afd wip: Add access tests 2024-05-29 11:40:17 +02:00
Daniel Egger aa4f0a0d92 Add cypress tests 2024-05-23 14:45:35 +02:00
Daniel Egger 7c4300f40c Add `evaluation_points_deducted` field 2024-05-23 14:45:35 +02:00
Christian Cueni 1634943c21 Hide Fremdeinschätzung in a users profile if in uk course 2024-05-06 13:24:15 +02:00
Christian Cueni 1d995bff91 Add cypress tests for course specific settings 2024-05-06 07:57:43 +02:00
Daniel Egger bb57591387 Add avatar images to dashboar persons page 2024-04-25 18:49:02 +02:00
Christian Cueni 1e5db1f0f7 Add learning mentor template test, don't allow invitations in courses without mentors 2024-04-18 10:22:04 +02:00
Christian Cueni bc909ae1b6 Check learning mentor term in uk and vv 2024-04-18 08:28:40 +02:00
Livio Bieri c946330ca6 fix: course_session instead of course setup 2024-03-19 16:42:02 +01:00
Livio Bieri e374ad98de chore: learning mentor course → course session 2024-03-19 16:24:18 +01:00
Livio Bieri b48d8c0fc3 fix: format 2024-03-18 15:39:41 +01:00
Livio Bieri c881561fde chore: adds new user that is student and mentor


2024-03-18 15:22:06 +01:00
Livio Bieri 61a7f77650 Merge branch 'develop' into feat/geteilter-bereich 2024-03-05 09:24:02 +01:00
Christian Cueni f117a6b5fb Update password, update names 2024-02-29 10:47:18 +01:00