Commit Graph

1257 Commits

Author SHA1 Message Date
Christian Cueni 6ea45eff66 WIP: Add ui config 2024-04-08 08:08:12 +02:00
Daniel Egger 91ee3e605b Add action link 2024-04-04 13:06:14 +02:00
Daniel Egger 15d6baac81 Display persons 2024-04-04 11:59:07 +02:00
Daniel Egger de91814c6a Add learning mentor relations to persons view 2024-04-03 12:25:19 +02:00
Daniel Egger d6885f4e7f Add more course config 2024-04-03 11:38:00 +02:00
Daniel Egger e13d72eb8a Add dashboard persons api view 2024-04-03 11:26:50 +02:00
Christian Cueni 2f77bf7734 WIP: Add Praxisbildner switch, move code to type 2024-04-03 11:14:44 +02:00
Daniel Egger 16ebd23edf Add roles to course_session_permissions 2024-04-03 06:56:41 +02:00
Christian Cueni 6edb5be093 WIP: Add own components 2024-04-02 15:55:34 +02:00
Livio Bieri 3eb098be35 Merge branch 'develop' into feat/geteilter-bereich 2024-03-27 15:40:50 +01:00
Livio Bieri ea51f4f770 fix: snafu in LearningMentor model __str__ method 2024-03-27 15:03:46 +01:00
Christian Cueni 5de6b737da Fix typo 🤦‍♂️ 2024-03-26 14:37:52 +01:00
Daniel Egger a804df5ae4 Fix order in migration 2024-03-26 11:41:32 +01:00
Christian Cueni a723b88277 Merged develop into feature/VBV-650-dont-log-duplicates 2024-03-25 13:30:49 +00:00
Livio Bieri 260cdf2ba1 fix: do not just take the first course session
be explicit about the course session ID to use
2024-03-21 15:11:53 +01:00
Christian Cueni e4c9a3ef44 Sanitize worksheet titles 2024-03-21 11:20:52 +01:00
Livio Bieri dd121fe1ac feat: mentor can remove mentee 2024-03-20 14:42:07 +01:00
Christian Cueni 6018572d89 Don't create AssignmentCompletionAuditLog for edoniq tests 2024-03-20 13:38:25 +01:00
Livio Bieri 5f9b7a86fd feat: api for removal of participant as menotor 2024-03-20 09:14:54 +01:00
Livio Bieri c946330ca6 fix: course_session instead of course setup 2024-03-19 16:42:02 +01:00
Livio Bieri 0b01856e69 Merge branch 'develop' into feat/geteilter-bereich 2024-03-19 16:26:55 +01:00
Livio Bieri e374ad98de chore: learning mentor course → course session 2024-03-19 16:24:18 +01:00
Christian Cueni b7608e0e07 Merged develop into feature/bugfix-import-ticino 2024-03-19 06:11:13 +00:00
Christian Cueni 51ea7a7f7c Ignore learning units that are none 2024-03-18 19:47:56 +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 f6d9cc9b63 chore: remove getCircleTitleById 2024-03-15 13:45:02 +01:00
Livio Bieri 9b5845d89b feat: participants 2024-03-14 12:19:54 +01:00
Livio Bieri 04d05eb5c5 fix: change target url for notification 2024-03-14 10:46:52 +01:00
Livio Bieri 58ee450014 fix: test w/ updated url 2024-03-14 10:42:35 +01:00
Livio Bieri 35b8770482 fix: actions test 2024-03-14 10:40:54 +01:00
Livio Bieri 8e076c3dac fix: various links that broke when moving stuff around 2024-03-13 16:02:03 +01:00
Livio Bieri 9e30efd59d chore: move AssignmentEvaluationPage.vue out of cockpit (shared) 2024-03-13 15:37:15 +01:00
Livio Bieri 767885bbb1 chore: actions naming 2024-03-13 13:53:47 +01:00
Livio Bieri 3a2775ef5d fix: self-eval-feedback notification url 2024-03-13 13:28:44 +01:00
Livio Bieri 050d0a6e72 fix: prepare router / routing 2024-03-13 10:36:55 +01:00
Livio Bieri 2989085a42 feat: adds mentor dashboard type 2024-03-11 11:33:12 +01:00
Livio Bieri 754fa52fd3 fix: tests 2024-03-11 10:20:36 +01:00
Livio Bieri 742801bf22 feat: cockpit type / navigation
TODO dashboard -> cockpit/mentor (temporary)
TODO dashboard -> cockpit/expert
2024-03-08 16:19:38 +01:00
Daniel Egger c10d73b3c1 Bugfix import ticino 2024-03-07 18:56:35 +01:00
Livio Bieri 7743039938 Merge branch 'develop' into feat/vv-read-only-komp-navi 2024-03-06 20:28:14 +01:00
Livio Bieri 709931c888 Merged in feat/course-feature-toggles (pull request #295)
Introduce Course Configuration

Approved-by: Daniel Egger
2024-03-06 19:24:53 +00:00
Livio Bieri 2b92928060 fix: harmonize user_id type 2024-03-06 13:46:27 +01:00
Livio Bieri 53b2b77472 fix: format 2024-03-06 13:14:01 +01:00
Livio Bieri 1ab6566716 fix: be more permissive on mark completion
only let the request.user mark his completions...
2024-03-05 16:58:52 +01:00
Livio Bieri 8ee64d52ae fix: test case for principle_user accessing target_user 2024-03-05 14:36:14 +01:00
Livio Bieri 61063d9604 fix: user_id is uuid 2024-03-05 13:39:17 +01:00
Livio Bieri cfa3450704 feat: comp.navi. in cockpit profile page 2024-03-04 17:59:50 +01:00
Reto Aebersold fff16da479 Merge branch 'develop' into feature/circle-page-unify 2024-03-03 22:47:11 +01:00
Livio Bieri fd9e2b7310 fix: keep test-course compatible with existing tests 2024-02-29 16:00:35 +01:00
Livio Bieri 52a6a0e642 fix: harmonize / fix course configuration 2024-02-29 14:49:26 +01:00
Livio Bieri cc81d81553 chore: format code 2024-02-29 13:58:47 +01:00
Livio Bieri e3f8e4556f chore: remove feedback_user
removed in favor of just using the course-level configuration.
2024-02-29 13:57:00 +01:00
Christian Cueni f117a6b5fb Update password, update names 2024-02-29 10:47:18 +01:00
Livio Bieri e64bab918e Merge branch 'develop' into feat/course-feature-toggles 2024-02-29 09:47:48 +01:00
Christian Cueni 87824c7980 Merged develop into feature/tracking-code 2024-02-29 07:50:35 +00:00
Christian Cueni be6fcfa779 Merged develop into fix/floating 2024-02-29 06:13:12 +00:00
Christian Cueni 72e87c345a Merged develop into feature/mf-exam-course 2024-02-28 16:27:20 +00:00
Christian Cueni 8e338f4773 Add Motorfahrzeug Prüfungs circle 2024-02-28 17:16:18 +01:00
Christian Cueni 19981c7d54 Merged develop into feature/VBV-656-dj-feedback-export 2024-02-28 14:39:36 +00:00
Christian Cueni 36c7a1a5b3 Handle uk feedback as well 2024-02-28 15:35:20 +01:00
Livio Bieri f6643fc15e fix: sensibly round evaluation points 2024-02-28 15:13:54 +01:00
Christian Cueni 93efd7333e Handle export for multiple course sessions 2024-02-28 14:57:19 +01:00
Livio Bieri e4329194ee chore: introduce course configuration "feature" flags in client 2024-02-28 14:14:23 +01:00
Christian Cueni e659b4b410 Merged develop into feature/tracking-code 2024-02-28 11:41:07 +00:00
Christian Cueni 022b83819e Merged develop into feature/VBV-656-dj-feedback-export 2024-02-28 11:40:04 +00:00
Christian Cueni 798c159ee7 Move code to service, add admin action 2024-02-28 11:40:10 +01:00
Christian Cueni 5e5b274add Merged develop into feature/VBV-654-test-users 2024-02-28 10:05:40 +00:00
Christian Cueni 603c0544c2 WIP: Add view 2024-02-28 10:50:03 +01:00
Livio Bieri 51609591e1 chore: also expose course config in dashboard 2024-02-28 10:25:01 +01:00
Christian Cueni a3d65eb78d WIP: Add feedback export to file 2024-02-28 07:51:19 +01:00
Livio Bieri 3b2385afe1 Merge branch 'develop' into feat/course-feature-toggles 2024-02-27 16:25:51 +01:00
Livio Bieri f052e33478 fix: save configuration 2024-02-27 16:18:37 +01:00
Livio Bieri 2ff51c5136 Merged in feat/vv-kompotenz-navi (pull request #293)
VV KompetenzNavi für Teilnehmer

Approved-by: Daniel Egger
Approved-by: Christian Cueni
2024-02-27 14:45:14 +00:00
Livio Bieri c4bb5b0351 feat: introduce course config 2024-02-27 14:52:33 +01:00
Christian Cueni a407b76038 Add endpoint and button in admin ui 2024-02-26 13:10:49 +01:00
Christian Cueni abb9b4b7db Add VV reset 2024-02-26 09:33:01 +01:00
Reto Aebersold af9ca8f650 Merged develop into feature/circle-page-unify 2024-02-26 07:27:52 +00:00
Livio Bieri 9dc412502e fix: reset feedback stuff 2024-02-22 21:52:58 +01:00
Livio Bieri 7224aecc02 fix: formatting code 2024-02-22 16:33:38 +01:00
Christian Cueni ae97931ca5 WIP: Create uk course session 2024-02-22 15:47:12 +01:00
Livio Bieri 964c1f7276 feat: kompetenznavi overview 2024-02-22 12:58:59 +01:00
Livio Bieri 0d402d7912 chore: constraint was fixed, fixed blocked fixme 2024-02-21 11:40:30 +01:00
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 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 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