Commit Graph

2135 Commits

Author SHA1 Message Date
Christian Cueni abb9b4b7db Add VV reset 2024-02-26 09:33:01 +01:00
Christian Cueni ae97931ca5 WIP: Create uk course session 2024-02-22 15:47:12 +01:00
Christian Cueni f8ef905f13 Merged in feature/VBV-649-country-sorting (pull request #289)
Add country ordering

Approved-by: Daniel Egger
2024-02-20 12:21:49 +00:00
Christian Cueni e06895f921 Merged develop into feature/VBV-649-country-sorting 2024-02-20 12:36:02 +01:00
Christian Cueni f94ee0a26d Use FloatField 2024-02-20 11:05:28 +01:00
Christian Cueni dfebf123ae Merged in revert-pr-290 (pull request #291)
Revert "Circle Seite Inhaltstyp Einheit (pull request #290)"
2024-02-20 09:42:44 +00:00
Christian Cueni 41ae32642e Revert "Circle Seite Inhaltstyp Einheit (pull request #290)" 2024-02-20 07:47:34 +00:00
Reto Aebersold 39e3a6ab75 Merged in feature/VBV-521-circle-seite-inhaltstype-einheit (pull request #290)
Circle Seite Inhaltstyp Einheit

Approved-by: Christian Cueni
2024-02-20 07:26:49 +00:00
Reto Aebersold 48d6f7393f feat: circle status cleanup 2024-02-19 13:43:14 +01:00
Reto Aebersold c180fd4406 feat: circle status cleanup 2024-02-19 13:35:55 +01:00
Christian Cueni 3e270e97ff Add country ordering 2024-02-15 15:08:33 +01:00
Livio Bieri 4ab5df0753 Merged in feat/588-vv-fremdeinschatzung (pull request #277)
Feat/588 - VV Mentor Fremdeinschätzung

Approved-by: Daniel Egger
2024-02-14 06:39:07 +00:00
Christian Cueni cc96bb8a76 Merged develop into feat/588-vv-fremdeinschatzung 2024-02-14 06:26:24 +00:00
Reto Aebersold b5381caf3c Merged in bugfix/VBV-642-lernbegleitung-lehrgang (pull request #287)
fix: allow same mentor in different courses

Approved-by: Christian Cueni
2024-02-13 12:10:58 +00:00
Christian Cueni 29d8f30902 Merged develop into bugfix/VBV-642-lernbegleitung-lehrgang 2024-02-13 11:55:49 +00:00
Reto Aebersold a76e23743b Merged in bugfix/VBV-644-trainer-vorschau-read-only (pull request #288)
fix: allow learning content for trainers

Approved-by: Christian Cueni
2024-02-13 11:55:34 +00:00
Reto Aebersold b307c84db1 fix: allow learning content for trainers
Fixes #VBV-644
2024-02-13 12:19:20 +01:00
Livio Bieri 1540e9d62a chore: migrate all VV learning units
so that their self evaluation pages show the ask for mentor feedback stuff
2024-02-12 22:13:42 +01:00
Livio Bieri 20bd103ab3 chore: simplify query 2024-02-12 22:12:16 +01:00
Livio Bieri 1065e8c2da fix: uk mentor still needed for cypress reset :-/
- uk mentor, which does not really make sense but is still needed for cypress tests
- vv mentor, can't be added yet to the same user, see open PR https://bitbucket.org/iterativ/vbv_lernwelt/pull-requests/287

==> Once 287 is merged, we can add the vv mentor as well
2024-02-12 16:10:17 +01:00
Livio Bieri a97e698165 fix: create_laerning_mentor for vv course 2024-02-12 15:28:22 +01:00
Livio Bieri 8008af0777 fix: format 2024-02-12 14:32:44 +01:00
Livio Bieri c5197c6c70 chore: expose create_learning_mentor to django admin 2024-02-12 14:04:27 +01:00
Livio Bieri 0e5e311829 chore: use page suffix + smaller changes (pr feedback) 2024-02-12 13:28:48 +01:00
Livio Bieri 3625841d80 chore: naming, don't use fetch 2024-02-12 11:53:18 +01:00
Livio Bieri 731e4af960 chore: set vv student's ID 2024-02-12 11:52:52 +01:00
Reto Aebersold bfff7eff9d fix: allow same mentor in different courses 2024-02-12 10:28:32 +01:00
Christian Cueni b0c63b8a3e Merged in fix/remove-twint-text (pull request #285)
Revert "Add payment problems text"
2024-02-09 11:49:31 +00:00
Christian Cueni 7148651147 Revert "Add payment problems text"
This reverts commit 9a405b6900.
2024-02-09 12:31:59 +01:00
Reto Aebersold b9bdb745ce Merged in feature/VBV-641-vorschau-lernbegleitung (pull request #281)
Vorschau Lernbegleitung

Approved-by: Christian Cueni
2024-02-09 08:15:46 +00:00
Christian Cueni 0c170979c0 Merged develop into feature/VBV-641-vorschau-lernbegleitung 2024-02-09 08:00:27 +00:00
Christian Cueni 595119e9e4 Merged in fix/praxisauftrag-translations (pull request #284)
Use correct translation for Praxisauftrag
2024-02-08 14:40:17 +00:00
Christian Cueni 5186f9e83d Merged develop into fix/praxisauftrag-translations 2024-02-08 13:59:32 +00:00
Livio Bieri a06dd7b4d4 Merged in fix/company-country-not-set-test (pull request #283)
chore: add test for company address not set in checkout

Approved-by: Christian Cueni
2024-02-08 12:42:39 +00:00
Christian Cueni 6fc58cfbcb Use correct translation for Praxisauftrag 2024-02-08 13:35:54 +01:00
Christian Cueni 9458708b5d Merged develop into fix/company-country-not-set-test 2024-02-08 12:28:04 +00:00
Livio Bieri c0538bb9db chore: add test for company address not set in checkout 2024-02-08 12:43:22 +01:00
Livio Bieri b557c832b9 Merged in fix/company-country-not-set (pull request #282)
fix: do not fail if company_country is not set

Approved-by: Christian Cueni
2024-02-08 11:23:06 +00:00
Livio Bieri a4ef999684 fix: do not fail if company_country is not set
it's optional
2024-02-08 11:25:37 +01:00
Reto Aebersold 8cff12fc10 feat: add course session permissions 2024-02-08 10:04:17 +01:00
Reto Aebersold 1ced57212d Merged in feature/VBV-529-prototyp-persoenliches-profil (pull request #280)
Persönliches Profil

Approved-by: Christian Cueni
2024-02-07 15:15:08 +00:00
Reto Aebersold 6f2094d4c9 Merge branch 'develop' into feature/VBV-529-prototyp-persoenliches-profil 2024-02-07 12:48:12 +01:00
Reto Aebersold f855ff25e0 fix: default edit mode 2024-02-06 16:03:41 +01:00
Reto Aebersold cc61816c92 feat: manually close popovers 2024-02-06 16:01:57 +01:00
Reto Aebersold c103d29f31 feat: remove settings 2024-02-06 15:53:33 +01:00
Reto Aebersold 6263d905fd feat: split profile edit 2024-02-06 15:35:25 +01:00
Livio Bieri bd5cbd3394 fix: return binary if not image type, not crash e.g. on svg 2024-02-06 15:16:20 +01:00
Livio Bieri 162f8a50a9 fix: visual fixes 2024-02-06 14:54:12 +01:00
Reto Aebersold a40f066279 feat: avatar upload 2024-02-06 11:03:55 +01:00
Reto Aebersold 2d2b5a86c3 fix: user state name 2024-02-06 09:20:09 +01:00