Livio Bieri
cc27ed0dd3
feat: expose detail_url // counts
2024-02-20 15:22:26 +01:00
Livio Bieri
a1d069186c
fix: add another learning unit with feedback
2024-02-20 15:22:02 +01:00
Christian Cueni
833dc0e7c7
Add tracking code
2024-02-20 12:50:21 +01: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
Reto Aebersold
cb9977bab3
feat: circle status cleanup
2024-02-20 10:43:45 +01:00
Christian Cueni
41ae32642e
Revert "Circle Seite Inhaltstyp Einheit (pull request #290 )"
2024-02-20 07:47:34 +00:00
Reto Aebersold
c180fd4406
feat: circle status cleanup
2024-02-19 13:35:55 +01:00
Livio Bieri
d1cc58ea60
fix: format code
2024-02-16 16:27:21 +01:00
Livio Bieri
a7ca88da79
feat: missing stuff in VV comp-navi API
2024-02-16 16:24:43 +01:00
Livio Bieri
7f8cfcba24
feat: kompnavi api
2024-02-15 21:54:47 +01:00
Christian Cueni
3e270e97ff
Add country ordering
2024-02-15 15:08:33 +01:00
Christian Cueni
cc96bb8a76
Merged develop into feat/588-vv-fremdeinschatzung
2024-02-14 06:26:24 +00:00
Christian Cueni
29d8f30902
Merged develop into bugfix/VBV-642-lernbegleitung-lehrgang
2024-02-13 11:55:49 +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
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
0c170979c0
Merged develop into feature/VBV-641-vorschau-lernbegleitung
2024-02-09 08:00:27 +00:00
Christian Cueni
5186f9e83d
Merged develop into fix/praxisauftrag-translations
2024-02-08 13:59:32 +00:00
Christian Cueni
6fc58cfbcb
Use correct translation for Praxisauftrag
2024-02-08 13:35:54 +01:00
Livio Bieri
c0538bb9db
chore: add test for company address not set in checkout
2024-02-08 12:43:22 +01: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
Livio Bieri
bd5cbd3394
fix: return binary if not image type, not crash e.g. on svg
2024-02-06 15:16:20 +01:00
Reto Aebersold
d9fefe1d62
feat: save profile
2024-02-05 18:12:51 +01:00
Reto Aebersold
befbee23b4
feat: user store
2024-02-05 12:02:15 +01:00
Reto Aebersold
ab31695dab
Merge branch 'develop' into feature/VBV-529-prototyp-persoenliches-profil
2024-02-05 09:19:14 +01:00
Livio Bieri
a921d5f548
fix: make test more robust ;)
2024-02-02 18:52:06 +01:00
Livio Bieri
bd3f2a4513
chore: tests for various things
2024-02-02 15:41:50 +01:00
Livio Bieri
0734894cb9
chore: test notifications are sent
2024-02-02 15:16:09 +01:00
Livio Bieri
c696e1f483
feat: urls for provider / requester
2024-02-01 19:06:22 +01:00
Livio Bieri
db731f5295
feat: send notification
2024-02-01 19:04:16 +01:00
Livio Bieri
3cbea17f39
chore: refactor frontend url parts handling
2024-02-01 19:02:33 +01:00
Livio Bieri
3f40e2fe07
feat: adds notification
2024-02-01 19:01:55 +01:00
Livio Bieri
f228f9ee47
feat: mentor feedback
2024-01-30 22:59:29 +01:00
Livio Bieri
abb371d4a0
fix: formatting snafu?
2024-01-30 19:04:23 +01:00
Livio Bieri
e84ed21c28
fix: introducing Viktor Vollgas
...
more realistic name for the typical VV member ;) and looks more realistic when working on the frontend.
2024-01-30 19:03:53 +01:00
Livio Bieri
55b016b86a
feat: expose title of learning unit for mentor eval
2024-01-30 11:34:02 +01:00
Livio Bieri
95a5d1b671
Merge branch 'develop' into feat/588-vv-fremdeinschatzung
2024-01-29 16:41:46 +01:00
Livio Bieri
f123e2bddf
feat: mentor feedback UI
2024-01-29 16:34:06 +01:00
Christian Cueni
ccbeb9725f
Use different verbs for different types of assignments
2024-01-29 13:14:49 +01:00
Livio Bieri
123adb7bf1
chore: logs & naming
2024-01-26 13:23:32 +01:00
Livio Bieri
67188a5b73
fix: include learning units without feedback requested
2024-01-26 13:04:13 +01:00
Reto Aebersold
01f7d87c3f
feat: test profile
2024-01-25 21:46:12 +01:00
Livio Bieri
3f8420ed61
fix: format code
2024-01-25 18:56:35 +01:00
Livio Bieri
864a00107e
feat: mentor cockpit self evaluation feedback
2024-01-25 18:32:46 +01:00
Livio Bieri
654ccb0d47
feat: feedback received screen
2024-01-25 13:39:13 +01:00
Livio Bieri
bc78fe2533
fix: missing migration dependency
2024-01-25 11:43:14 +01:00
Reto Aebersold
a0888fe966
feat: address rendering
2024-01-25 10:28:30 +01:00
Reto Aebersold
911c35ae6c
feat: fill profile address from onboarding
2024-01-25 09:44:12 +01:00
Reto Aebersold
19548b2b07
feat: move models for profile page
2024-01-24 21:00:26 +01:00
Livio Bieri
40127ed92e
fix: missing migrations
2024-01-24 11:23:09 +01:00
Christian Cueni
da3b1f03af
Add new Lehrgang
2024-01-24 07:38:51 +01:00
Christian Cueni
b1631b6b28
Merged develop into feature/VBV-635-invalid-emails
2024-01-24 06:08:38 +00:00
Livio Bieri
412172515f
feat: wraps self evaluation feedback request member side
2024-01-23 22:34:04 +01:00
Livio Bieri
3a519e2220
feat: Feedback member API to get/put lu feedback
2024-01-23 14:26:32 +01:00
Livio Bieri
16cd16212a
feat: Feedback member API to get/put lu feedback
2024-01-23 13:55:39 +01:00
Livio Bieri
d2352d6166
feat: API for feedback provider to add feedback
2024-01-23 11:19:20 +01:00
Reto Aebersold
07b3a4e9d5
feat: add proper permission
2024-01-23 10:01:22 +01:00
Reto Aebersold
55d418602f
feat: vv user profile
2024-01-23 09:05:42 +01:00
Reto Aebersold
0e487cd7d0
Merge branch 'develop' into feature/VBV-621-teilnehmer-profil
2024-01-23 08:38:58 +01:00
Livio Bieri
a8b25ec216
wip: missing import
2024-01-22 18:01:57 +01:00
Livio Bieri
8eee03cb69
wip: API for feedback provider to add assessment
2024-01-22 17:51:41 +01:00
Livio Bieri
8bf762173a
feat: API to list self evaluation feedback for fb provider
2024-01-22 15:54:54 +01:00
Christian Cueni
587f354e52
Handle invalid recipient email addresses
2024-01-22 15:38:37 +01:00
Reto Aebersold
4af56f721b
fix: cockpit url double slash
2024-01-22 12:18:17 +01:00
Livio Bieri
becbbd01ca
fix: test
2024-01-22 12:18:17 +01:00
Livio Bieri
fa2e96d220
wip: mentor feedback (praxisauftrag)
2024-01-22 12:18:16 +01:00
Livio Bieri
51ad79d986
wip: mentor feedback (praxisauftrag)
2024-01-22 12:18:16 +01:00
Livio Bieri
278b6e6b64
wip: mentor feedback (praxisauftrag)
2024-01-22 12:18:16 +01:00
Livio Bieri
a7922743fd
wip: self evaluation mentor api
2024-01-21 21:16:49 +01:00
Christian Cueni
6de8d72e52
Fix assignment reminder user group
2024-01-18 14:49:41 +01:00
Reto Aebersold
57f80ea109
chore: format
2024-01-18 08:33:08 +01:00
Reto Aebersold
b6ac2ac4b3
Merge branch 'develop' into feature/VBV-621-teilnehmer-profil
2024-01-18 08:32:31 +01:00
Livio Bieri
9a601e0169
poc: feedback - abgabe step for if MENTOR_FEEDBACK
2024-01-17 17:42:32 +01:00
Livio Bieri
359d4482a4
chore: let frontend know if feedback is needed
2024-01-17 16:40:41 +01:00
Livio Bieri
756a0740e0
chore: adds one self assessment competence to vv
2024-01-17 15:09:36 +01:00
Livio Bieri
780be68a58
feat: adds feedback_user to LearningUnit model
2024-01-17 14:18:34 +01:00
Reto Aebersold
0a2198e830
Merge branch 'develop' into feature/VBV-599-avatar-upload
2024-01-16 09:18:57 +01:00
Christian Cueni
1e934c15b1
Make icon square
2024-01-16 07:17:58 +01:00
Reto Aebersold
1310bf1d3d
Merge branch 'develop' into feature/VBV-621-teilnehmer-profil
2024-01-15 14:40:19 +01:00
Reto Aebersold
a8c09651db
chore: hide profile links and add profile test
2024-01-15 14:39:17 +01:00
Reto Aebersold
6a985ce607
feat: cockpit user profile
2024-01-15 11:33:45 +01:00
Christian Cueni
a2eda11179
Sort organizations by name
2024-01-11 21:09:42 +01:00
Christian Cueni
a154341fae
Add search and filter fields
2024-01-11 08:01:39 +01:00
Reto Aebersold
ef56623143
chore: clarify model hack
2024-01-10 09:36:09 +01:00
Reto Aebersold
1626bcbdbc
chore: clarify model hack
2024-01-10 09:30:52 +01:00
Reto Aebersold
20885a53db
feat: add avatar migration
2024-01-10 09:28:46 +01:00
Christian Cueni
6272b84b8e
Lower evaluation limit
2024-01-10 07:49:32 +01:00
Reto Aebersold
28445cf1a5
feat: add avatar upload
2024-01-09 17:21:06 +01:00
Christian Cueni
44de8c8013
Add missing icon
2024-01-08 20:47:54 +01:00
Christian Cueni
6a99e6829f
Re-enable VV on start page, format py Code
2023-12-28 17:09:26 +01:00
Christian Cueni
909803f3c1
Update payment email templates
2023-12-28 17:02:22 +01:00
Christian Cueni
da24ffe8db
Add new slugs for Haushalt circles
2023-12-28 12:05:04 +01:00
Christian Cueni
2bd6e02fa1
Update email context
2023-12-22 20:24:40 +01:00
Reto Aebersold
df5fc71aca
Merged in bugfix/VBV-613-anzeige-mit-selbsteinschätzung-i (pull request #256 )
...
fix: show only the user's competences
Approved-by: Christian Cueni
2023-12-22 19:23:07 +00:00
Daniel Egger
799144defd
Enable S3 storage tests by env variable
2023-12-22 09:11:30 +01:00
Reto Aebersold
77eeef8b2c
feat: trainer / mentor circle contact
2023-12-21 15:26:54 +01:00
Reto Aebersold
5252480d6d
fix: show only the user's competences
2023-12-21 10:00:07 +01:00
Reto Aebersold
4cabf7e375
Merge branch 'develop' into feature/VBV-597-umsetzung-cockpit-lernbegleitung
2023-12-20 10:05:00 +01:00
Reto Aebersold
091c8ca625
chore: sensible test case name
2023-12-20 09:21:14 +01:00
Christian Cueni
6595890c48
Remove Duedates with no dates from list in store
2023-12-19 19:53:35 +01:00
Reto Aebersold
4f942eb925
chore: format
2023-12-19 10:02:06 +01:00
Reto Aebersold
480c82e466
Merge branch 'develop' into feature/VBV-597-umsetzung-cockpit-lernbegleitung
2023-12-19 10:01:16 +01:00
Christian Cueni
8d6fb38129
Add missing file
2023-12-19 09:00:15 +01:00
Christian Cueni
a10b4fa5ec
Hide VV onboarding
2023-12-18 15:55:14 +01:00
Christian Cueni
be3100ee46
Update price, fix uk page
2023-12-18 15:44:00 +01:00
Livio Bieri
12932296e7
wip: pass next on signup sso
2023-12-18 15:43:59 +01:00
Livio Bieri
b8accb0c62
feat: send welcome mail vv
2023-12-18 15:43:59 +01:00
Livio Bieri
b414e4cf93
chore: shop vv-it, vv-de, vv-fr
2023-12-18 15:43:59 +01:00
Livio Bieri
561f9e3c96
feat: datatrans re-init on double checkout
2023-12-18 15:43:59 +01:00
Livio Bieri
2c5643e929
fix: format
2023-12-18 15:43:59 +01:00
Livio Bieri
fb24ec24e4
feat: vv-de vv-fr vv-it API support
2023-12-18 15:43:59 +01:00
Livio Bieri
9fdc2faecd
chore: adds test for sso flows
2023-12-18 15:43:59 +01:00
Reto Aebersold
30d624d0c5
fix: country objects
2023-12-18 15:43:59 +01:00
Livio Bieri
a282427f24
feat: sso login flow
2023-12-18 15:43:58 +01:00
Livio Bieri
6f90d381f3
chore: get datatrans admin helper cleanup
2023-12-18 15:43:58 +01:00
Livio Bieri
a9056a008b
feat: datatrans cleanup & tests
2023-12-18 15:43:58 +01:00
Reto Aebersold
1281be2221
feat: invoice customer
2023-12-18 15:43:58 +01:00
Reto Aebersold
5d21fd0f42
feat: add invoice generation
2023-12-18 15:43:58 +01:00
Reto Aebersold
e6f2f29622
chore: expose profile infos in admin
2023-12-18 15:43:58 +01:00
Livio Bieri
7a21988a5c
chore: more tests
2023-12-18 15:43:58 +01:00
Livio Bieri
33bea6c08a
chore: incomplete product setup error handling
2023-12-18 15:43:58 +01:00
Livio Bieri
809c45235f
chore: test for checkout flow
2023-12-18 15:43:58 +01:00
Livio Bieri
fdcb6ca3d9
fix: format
2023-12-18 15:43:58 +01:00
Livio Bieri
54428d78d7
chore: create csu on settled | transmitted
2023-12-18 15:43:58 +01:00
Livio Bieri
93c9f73a46
fix: format
2023-12-18 15:43:58 +01:00
Livio Bieri
083af9e308
chore: add price help text
2023-12-18 15:43:58 +01:00
Reto Aebersold
f8ae88ac1a
fix: urls
2023-12-18 15:43:58 +01:00
Reto Aebersold
68c9c895a6
chore: move shop urls
2023-12-18 15:43:57 +01:00
Livio Bieri
ac98ec7338
fix: webhook url
2023-12-18 15:43:57 +01:00
Reto Aebersold
3787e1726a
feat: show payment error message
2023-12-18 15:43:57 +01:00
Livio Bieri
dc1eaad412
chore: small stuff
2023-12-18 15:43:57 +01:00
Livio Bieri
b1439122e1
chore: validate signature & cleanup
2023-12-18 15:43:57 +01:00
Reto Aebersold
bbf4208228
feat: address handling
2023-12-18 15:43:57 +01:00
Livio Bieri
9011e579df
chore: format
2023-12-18 15:42:41 +01:00
Livio Bieri
cf329e5046
wip: product admin
2023-12-18 15:42:41 +01:00
Livio Bieri
be160f5fa7
wip: walking skeleton for datatrans
2023-12-18 15:42:41 +01:00
Livio Bieri
4faa034609
chore: datatrans service
2023-12-18 15:42:41 +01:00
Livio Bieri
c9fe4007f7
chore: migrations
2023-12-18 15:42:41 +01:00
Reto Aebersold
30d2919be2
fix: load entities for tests
2023-12-18 15:42:41 +01:00
Reto Aebersold
cd6585790e
fix: initial data loading
2023-12-18 15:42:41 +01:00
Reto Aebersold
458d62daf3
feat: entities API
2023-12-18 15:42:41 +01:00
Reto Aebersold
5916212857
fix: address stuff
2023-12-18 15:42:41 +01:00
Livio Bieri
9d806e6ede
chore: 2-way binding for address forms, like this?
...
follow up to 1f0c9e2
2023-12-18 15:42:41 +01:00
Livio Bieri
c3a0cbf5e2
fix: billing address naming snafu
2023-12-18 15:42:37 +01:00
Reto Aebersold
437ffde8b1
feat: add organisations as model
2023-12-18 15:42:11 +01:00
Reto Aebersold
0f6232e6f4
fix: static assets
2023-12-18 15:42:11 +01:00
Reto Aebersold
9febbc0857
fix: static assets
2023-12-18 15:42:11 +01:00
Livio Bieri
22d1e975af
fix: Aaaaaaah! 🤦 Fixes pytest in pipeline.
2023-12-18 15:42:11 +01:00
Livio Bieri
d5602ee094
fix: format
2023-12-18 15:42:11 +01:00
Livio Bieri
ab3dcd378e
feat: shop app; billing address apis
2023-12-18 15:42:05 +01:00
Reto Aebersold
bfeca6e8e0
feat: use orgs in profile
2023-12-18 15:41:27 +01:00
Reto Aebersold
4ac735c3be
feat: setup complete back
2023-12-18 15:40:57 +01:00
Livio Bieri
02a155410e
chore: list organisations
2023-12-18 15:40:54 +01:00
Livio Bieri
7238b28c30
chore: test for /me
2023-12-18 15:39:07 +01:00
Livio Bieri
9a23ee8a06
Revert "wip: sso snafu"
...
This reverts commit 5aa8f739a0f90a902f18a850b814d7d66dd914c6.
To not get confused, lets just redo those steps once Lernnetz
has fixed the Keycloak SSO side of things. ;)
2023-12-18 15:39:07 +01:00
Livio Bieri
82760211b1
wip: sso snafu
2023-12-18 15:39:07 +01:00
Livio Bieri
e16cc575aa
wip: sso flow test (error), existing
2023-12-18 15:39:07 +01:00
Reto Aebersold
c4418676fb
feat: wizard uk
2023-12-18 15:34:31 +01:00
Reto Aebersold
a39b105780
feat: wizard POC
2023-12-18 15:34:31 +01:00
Livio Bieri
193638f3ca
wip: update steps to reproduce for prod
2023-12-18 15:34:31 +01:00
Livio Bieri
8e057458f2
wip: adds datatrans proof of concept
2023-12-18 15:34:31 +01:00
Livio Bieri
296ae32c9a
wip: bootstrap payment app
2023-12-18 15:34:31 +01:00
Livio Bieri
86594973ff
wip: adds a walking skeleton test for SSO Authorize callback
2023-12-18 15:34:31 +01:00
Reto Aebersold
e87c5a7cd8
feat: generic task rendering
2023-12-18 14:52:59 +01:00
Reto Aebersold
5ee6cc2596
feat: store assigment user
2023-12-18 12:25:59 +01:00
Reto Aebersold
3b0f562a7a
feat: mentor dashboard
2023-12-15 10:50:41 +01:00
Reto Aebersold
28542f8540
chore: skip storage tests
2023-12-15 10:50:14 +01:00
Reto Aebersold
2bf741ab67
feat: praxis assigment evaluation user
2023-12-14 15:22:15 +01:00
Livio Bieri
9706b41413
chore: cleanup get_cockpit_type a bit
2023-12-14 12:01:19 +01:00
Livio Bieri
49f2c68889
fix: cockpit type for supervisor
2023-12-14 11:48:01 +01:00
Livio Bieri
368ef7d16e
fix: don't crash dashboard as mentor
2023-12-14 11:34:02 +01:00
Reto Aebersold
6479683ad8
feat: praxis assigment evaluation user
2023-12-14 11:03:04 +01:00
Livio Bieri
acd9c3959b
chore: adds a test-mentor1@example.ch
2023-12-13 19:13:55 +01:00
Livio Bieri
e61dce95f6
chore: cockpit for mentor
2023-12-13 18:43:17 +01:00
Reto Aebersold
4866602c26
feat: manage invitation
2023-12-13 11:25:17 +01:00
Livio Bieri
c3a16a7bec
chore: render mentor / expert cockpit based on role
2023-12-12 16:15:27 +01:00
Reto Aebersold
ed1493bc00
feat: accept invitation
2023-12-12 14:59:18 +01:00
Reto Aebersold
2a8b3198b2
feat: learning mentor mgmt UI
2023-12-12 11:02:07 +01:00
Reto Aebersold
e5ad3f08d2
Merge branch 'develop' into feature/VBV-597-umsetzung-cockpit-lernbegleitung
2023-12-12 10:02:08 +01:00
Reto Aebersold
6bd913307c
feat: learning mentor mgmt UI
2023-12-12 10:01:11 +01:00
Reto Aebersold
e2c32b7fb6
feat: cockpit type
2023-12-11 16:51:33 +01:00
Reto Aebersold
27ab8caf24
feat: mentor mgmt
2023-12-11 14:48:42 +01:00
Reto Aebersold
b75737468c
feat: mentor invite
2023-12-11 13:55:40 +01:00
Reto Aebersold
86d3644ca6
feat: mentor invite
2023-12-11 13:39:17 +01:00
Christian Cueni
a4ac834699
Don't show CourseSession* without dates
2023-12-11 13:14:18 +01:00
Reto Aebersold
cfb38cc9fe
feat: mentor invite
2023-12-11 12:03:17 +01:00
Reto Aebersold
16a6334802
feat: mentor invitation URLs
2023-12-11 10:01:24 +01:00
Daniel Egger
3c7b88ae73
Merge branch 'develop' into feature/VBV-563-feedback-vv
2023-12-08 17:17:36 +01:00
Livio Bieri
a7e99bc60d
chore: adds a django admin action that re-syncs urls
2023-12-08 11:45:54 +01:00
Reto Aebersold
66cc2dab2b
fix: round points for now
2023-12-08 10:20:54 +01:00
Reto Aebersold
3205eac33f
feat: mentor invitation
2023-12-08 08:31:42 +01:00