Commit Graph

796 Commits

Author SHA1 Message Date
Livio Bieri 500a376877 fix: filter out feedback
experts that might have submitted just for testing -> should not be
included in the feedback results / API
2023-10-12 15:55:35 +02:00
Livio Bieri 98ad158913 refactor: unify different reminders (manage.py) 2023-10-12 13:41:38 +02:00
Livio Bieri d93a563880 fix: format 2023-10-12 13:41:38 +02:00
Livio Bieri 4e7f7b9da8 fix: use correct template, split edoniq & casework/prepass 2023-10-12 13:41:38 +02:00
Livio Bieri e44dc5e31d feat: assignment reminder mails 2023-10-12 13:41:38 +02:00
Livio Bieri 3cd764ee76 wip: reminder for assignments 2023-10-12 13:41:30 +02:00
Daniel Egger 627e4f6873 Refactor CirclePage 2023-10-12 13:36:43 +02:00
Daniel Egger 2eddb93be5 Adapt code to user more of the codegen generated typescript types 2023-10-12 10:51:10 +02:00
Daniel Egger 6510d74549 Add first basic LEARNING_PATH_QUERY 2023-10-11 17:26:46 +02:00
Daniel Egger 5a3753f510 Add `file_submission_required=True` to test data creation script 2023-10-11 16:33:54 +02:00
Reto Aebersold 4cc942a1ee chore: format 2023-10-11 10:01:04 +02:00
Reto Aebersold 75351b9986 chore: format 2023-10-11 09:53:32 +02:00
Reto Aebersold d4cb978de3 Add assigment task file upload 2023-10-11 09:51:43 +02:00
Daniel Egger 0e3916a41c Fix warnings 2023-10-10 17:01:47 +02:00
Daniel Egger a3e16dc107 Fix problems 2023-10-10 15:55:46 +02:00
Daniel Egger 227e9f317d Fix loading of DueDates 2023-10-10 15:20:48 +02:00
Daniel Egger dcf450339d Every REST response returns `id`-field as string 2023-10-10 15:02:03 +02:00
Daniel Egger 49a3fa99e1 Document handling via REST 2023-10-10 14:26:47 +02:00
Daniel Egger 000e963730 Refactor document handling 2023-10-10 10:12:58 +02:00
Daniel Egger f75590dd0b Refactor code to use `useCourseSessionDetailQuery` 2023-10-10 10:12:58 +02:00
Daniel Egger 778dde12d7 Improve course session loading 2023-10-10 10:12:58 +02:00
Daniel Egger a8b4454482 Open extended time test url when user has done this 2023-10-05 18:36:55 +02:00
Daniel Egger 919d3267c7 VBV-544: Import edoniq data via "Kursfreigaben ID"/edoniq_course_release_id 2023-10-05 18:04:13 +02:00
Daniel Egger 86cf8f44d3 Add percent for results and "Bestanden"/"Nicht Bestanden" 2023-10-05 14:06:33 +02:00
Daniel Egger 2b50c1d90f Pass `user_points` and `max_points` to edoniq test result cypress_reset 2023-10-05 09:59:43 +02:00
Daniel Egger d92b514759 Merge branch 'develop' into feature/VBV-488-import-edoniq-data 2023-10-05 09:16:49 +02:00
Daniel Egger 6048129507 Add courseSessionId query param to url and switch to it 2023-10-04 16:59:59 +02:00
Daniel Egger 8b4b00170a Merged develop into feature/VBV-524 2023-10-04 11:40:00 +00:00
Christian Cueni 218ef78e3a fix: update edoniq period duration 2023-10-04 08:52:04 +02:00
Livio Bieri ac06dff5c3 feat: migration for url_expert 2023-10-03 17:03:20 +02:00
Daniel Egger 28c2425671 Fix bug found with failed cypress test 2023-09-29 18:32:05 +02:00
Daniel Egger 7d291b3e3f VBV-488: Verarbeite Edoniq Test-Resultate 2023-09-29 17:55:05 +02:00
Daniel Egger 4123e15f22 VBV-514: Bewertung von Assignments ist "opt-in" 2023-09-29 12:48:33 +02:00
Daniel Egger f8c6daf9eb VBV-519: Anpassungen Darstellung Wissens- und Verständnisfragen für Lernende 2023-09-28 17:56:29 +02:00
Daniel Egger 589453a8dc Remove `evaluation_grade` and set `evaluation_points` and `evaluation_passed` fields 2023-09-28 17:56:29 +02:00
Daniel Egger 884fc8d5b0 VBV-488: create edoniq sftp client 2023-09-28 17:56:28 +02:00
Livio Bieri 18bbc6701c fix: due date CI errors fixes 2023-09-28 17:45:00 +02:00
Livio Bieri 9fc6260781 revert: snafu unused debugging variable 2023-09-28 17:45:00 +02:00
Livio Bieri 97edbbd751 wip: expose url for expert in duedate model 2023-09-28 17:45:00 +02:00
Daniel Egger b819225f10 Try to fix feedbackStudent continute button on pipelines 2023-09-27 16:10:40 +02:00
Daniel Egger dab8c6c734 New `LearningContentFeedback` cannot be self toggled in future 2023-09-27 15:49:50 +02:00
Daniel Egger 7b64859dcf Fix unit tests 2023-09-27 15:48:01 +02:00
Daniel Egger 966533e13b Add feedback trainer cypress test 2023-09-26 18:48:25 +02:00
Daniel Egger 66b50d6b1d Refactor feedback response creation 2023-09-26 18:13:33 +02:00
Daniel Egger 89e068fb09 Add cypress test for student 2023-09-26 14:34:22 +02:00
Daniel Egger 7a037e05ec Remove automatic feedback creation in prepare scripts 2023-09-26 13:43:44 +02:00
Daniel Egger 0444658ce3 Fix unit tests 2023-09-26 13:43:44 +02:00
Daniel Egger 733063399f VBV-525: Feedback can only be sent once per person 2023-09-26 13:43:44 +02:00
Daniel Egger 70655935b0 VBV-525: Refactor feedback submission 2023-09-26 13:43:44 +02:00
Daniel Egger d80400ea8c VBV-525: Fix feedback data rest endpoint 2023-09-26 13:43:44 +02:00
Daniel Egger db40368244 VBV-514: Termine nur für ausgewählte Circles anzeigen im Cockpit 2023-09-15 14:50:52 +02:00
Daniel Egger f5d44bcb90 VBV-520: Replace "Fahrzeug"-image 2023-09-15 14:14:00 +02:00
Daniel Egger 68d37e4f8e Fix test 2023-09-15 09:55:45 +02:00
Daniel Egger 9eec62c31b Fix problems with slugs in moved ActionCompetences 2023-09-15 09:47:17 +02:00
Daniel Egger b5e9b9e355 Fix tests 2023-09-14 18:11:45 +02:00
Daniel Egger 00a36b52c8 Übersetzungen 2023-09-14 17:01:42 +02:00
Daniel Egger 83fcb84303 Add "Kompetenznachweis"-text to AssignmentIntroductionView 2023-09-14 15:57:35 +02:00
Daniel Egger 73694d983e Setup "KompetenzNavi for existing courses 2023-09-13 14:50:45 +02:00
Daniel Egger e43e351e9d Refactor design of learning contents in circle page 2023-09-08 16:47:38 +02:00
Daniel Egger 853c8746ea VBV-329: Add link to competence certificate in circle view 2023-09-08 16:47:38 +02:00
Daniel Egger 93bec05abc Add competence detail page 2023-09-08 16:47:37 +02:00
Daniel Egger 7597311220 Add circle title to assignment in wagtail cms view 2023-09-08 16:47:37 +02:00
Daniel Egger aabaced836 Fix creation scripts 2023-09-08 16:47:37 +02:00
Daniel Egger cce82b72ad Format code 2023-09-08 16:47:37 +02:00
Daniel Egger b48ab5ec3d Add flags in admin from for cypress_reset_view 2023-09-08 16:47:37 +02:00
Daniel Egger 1196aba79d Show result in EdoniqTestBlock 2023-09-08 16:47:33 +02:00
Daniel Egger 2569411959 Fix upsert on initial loading of assignment in circle 2023-09-08 16:46:54 +02:00
Daniel Egger 9f81def537 Show evaluation points in KompetenzNavi 2023-09-08 16:46:54 +02:00
Daniel Egger 21174d17db Attach completion data to `Assignment` in GraphQL schema 2023-09-08 16:46:54 +02:00
Daniel Egger 4bc1ca636c Add result data for edoniq test 2023-09-08 16:46:54 +02:00
Daniel Egger 428ac294e0 Add `--create-assignment-evaulation` cli parameter 2023-09-08 16:46:54 +02:00
Daniel Egger a95974c54f Extend graphql scheme for KompetenzNavi 2023-09-08 16:46:53 +02:00
Daniel Egger 0537d96dbb Add models for KompetenzNavi and GraphQL-Types 2023-09-08 16:46:53 +02:00
Daniel Egger cff3d6e49b Fix unit test 2023-09-08 16:25:33 +02:00
Daniel Egger 5b01a68cdb Translate notifications 2023-09-08 14:39:13 +02:00
Daniel Egger 515ef3707a Bugfix: load only assignment completion data with given learning_content_id. Will fix bug with Reflexion 2023-09-06 17:31:27 +02:00
Daniel Egger 6175ca75ed Add circle title to dropdown text 2023-09-06 16:58:49 +02:00
Daniel Egger da56f2a346 Refactor Notification model 2023-08-30 18:47:36 +02:00
Daniel Egger b26ec64edb Add custom django CustomNotificationAdmin 2023-08-30 13:41:06 +02:00
Daniel Egger d8bce90b8e User supervisord in docker to start supercronic and gunicorn 2023-08-30 09:55:41 +02:00
Daniel Egger 88e7e0edcc Add ability to send email, when it was not sent before 2023-08-29 15:08:12 +02:00
Daniel Egger ae9d7cf471 Try to fix deadlock import error by lazy loading openpyxl 2023-08-29 14:39:14 +02:00
Daniel Egger f6a01b3ad1 Add result and statistics data to reminder job 2023-08-29 14:31:47 +02:00
Daniel Egger 5790fac78f Add `LoggedCommand` to JobLogs in django admin interface 2023-08-29 14:31:43 +02:00
Daniel Egger 6badbc480c Use django constance to add EMAIL_RECIPIENT_WHITELIST 2023-08-29 14:31:21 +02:00
Daniel Egger d83f660918 Change email function to use email address directly 2023-08-29 14:31:21 +02:00
Daniel Egger 31af4e933f Refactor default handling of dict parameter 2023-08-29 14:31:21 +02:00
Elia Bieri 56e454cc8b Squash merge of code from Elia 2023-08-29 14:31:18 +02:00
Daniel Egger ae075e47dd Add documentation 2023-08-29 13:53:40 +02:00
Daniel Egger a7f7d0b184 Fail save json dump for `structlog_convert_to_json_for_new_relic` 2023-08-29 09:05:28 +02:00
Daniel Egger 2c4ae02c4d Try to neste json string in message for new relic logs 2023-08-28 22:03:57 +02:00
Daniel Egger e08d5574f7 Render logs as json with python-json-logger 2023-08-28 13:47:41 +02:00
Daniel Egger 946d5671b8 Cleanup azure settings and docs 2023-08-25 12:04:34 +02:00
Christian Cueni c855753c4d Add header for excel 2023-08-24 14:33:51 +02:00
Daniel Egger f155ceb26b Fix importer in default prepare_server 2023-08-24 08:06:32 +02:00
Daniel Egger 9f8686e592 Improve django admin 2023-08-23 19:06:32 +02:00
Daniel Egger 584aee1829 Use `start` date for due dates with single dates in importer 2023-08-23 17:05:40 +02:00
Daniel Egger acdda923da Make `start` in DueDate mandatory 2023-08-23 15:38:26 +02:00
Daniel Egger 2fa17e1204 Refactor dueDate frontent 2023-08-23 15:38:26 +02:00
Daniel Egger 279b6c1dd5 Refactor some fields in `DueDate` 2023-08-23 15:38:26 +02:00
Christian Cueni 9483c1f6d3 Ignore date of birth in export 2023-08-23 13:56:05 +02:00
Christian Cueni 50bc7391e9 Use slugs from prod in importer 2023-08-23 13:15:26 +02:00
Christian Cueni 6ba3be2710 Make importer more resilient 2023-08-23 07:33:29 +02:00
Christian Cueni 9e68abd5f9 Add CourseSessionEdoniqTest to importer
Add tests for CourseSessionEdoniqTest
2023-08-23 07:33:29 +02:00
Christian Cueni c140f225ea Add Edoniq testblock
WIP: Add sso code

Update content name

WIP: Add redirect endpoint

mend

Fix after rebase

WIP: Update model

WIP: Add extended time test url

Update trufflehog config, use sso

Update test
2023-08-23 07:33:29 +02:00
Christian Cueni f7de5bae47 Fix performance criteria parent 2023-08-21 15:19:57 +02:00
Christian Cueni 9ef2a4e8b3 Rename content to reflect real data, refactor import 2023-08-17 19:41:52 +02:00
Christian Cueni 81351aa9fa Exclude email, fix dates, don't check "Geburtsdatum" field 2023-08-17 14:41:47 +02:00
Christian Cueni 45a70f6b75 Merged in feature/update-importer (pull request #188)
Feature/update importer
2023-08-17 09:18:22 +00:00
Christian Cueni 3447de19ca Add trainer and combined export 2023-08-17 10:58:33 +02:00
Christian Cueni 57cd5fe871 Match existing Teilnehmer with multiple parameters 2023-08-17 08:11:15 +02:00
Christian Cueni 2f8b548ea7 Merged in fix/dates (pull request #187)
Fix/dates
2023-08-16 14:18:13 +00:00
Christian Cueni 81734f76ae Make start optional 2023-08-16 15:13:59 +02:00
Christian Cueni 5c7baab570 Fix tests 2023-08-16 07:48:31 +02:00
Christian Cueni 95a6d404b5 Add export for trainers 2023-08-15 16:47:03 +02:00
Christian Cueni 6195c9d32a Use page id for feedbacks, filter by course session id 2023-08-14 19:57:31 +02:00
Christian Cueni a411cc82d1 Fix missing "contact trainer"-functionality 2023-08-14 18:04:35 +02:00
Christian Cueni 406cf425c2 Enable FeedbackResponses in admin 2023-08-14 17:27:23 +02:00
Christian Cueni f1f479a6f4 Add due date for casework 2023-08-14 17:20:33 +02:00
Christian Cueni 4f437fe562 Add RichText Features 2023-08-10 07:55:27 +02:00
Christian Cueni 3f8be0a96b Merged in feature/fix-import (pull request #179)
Feature/fix import

Approved-by: Elia Bieri
2023-08-09 14:16:17 +00:00
Christian Cueni 45a58abb47 Update docs 2023-08-09 15:59:59 +02:00
Christian Cueni 19ab428d47 Update content 2023-08-09 08:30:44 +02:00
Christian Cueni 5ed289c912 WIP: Fix and extend importer test 2023-08-09 08:00:45 +02:00
Christian Cueni 502aa9c543 WIP: Add update test, add trainer test 2023-08-08 16:01:44 +02:00
Christian Cueni 977e0cb7c4 WIP: Add import test 2023-08-07 16:29:18 +02:00
Christian Cueni 6b67a6cd80 Update content 2023-08-07 14:18:57 +02:00
Christian Cueni 63b9be4238 Add documents 2023-08-03 14:46:54 +02:00
Christian Cueni 2bbb35eb99 Add Redlichkeitserklärung to documents 2023-08-03 13:39:56 +02:00
Christian Cueni 8d0c48d91c Add IT VV course 2023-08-03 12:54:34 +02:00
Christian Cueni ee7b3122d1 Add correct links, update learningpath 2023-08-03 10:53:05 +02:00
Christian Cueni 6083ab8c92 Add demo courses again 2023-08-03 08:06:55 +02:00
Christian Cueni 097750184c Add acceptance to IT/FR uk 2023-08-02 18:38:01 +02:00
Christian Cueni 28b2265465 Add prepwork IT/FR, add link to allowed features 2023-08-02 18:34:15 +02:00
Christian Cueni a7dde5e58c WIP: use parameters for vv creation
Use competence page from course, make multilang fns
2023-08-02 18:33:11 +02:00
Elia Bieri 3a2d12c0b9 Merged in feature/VBV-474-auftragstyp-condition-acceptance (pull request #173)
Add CONDITION_ACCEPTANCE assignment type

* Add CONDITION_ACCEPTANCE assignment type

* Add translations

* Create default CONDITION_ACCEPTANCE assignment

* Move CONDITION_ACCEPTANCE assignment in learning sequence

* Add additional translations

* Add condition acceptance to ÜK basis circle

# Conflicts:
#	server/vbv_lernwelt/course/management/commands/create_default_courses.py

* Move condition acceptance to kickoff circle
2023-08-02 08:13:35 +00:00
Daniel Egger a999375f23 Update slugs when parent changes slug due to title change 2023-07-24 13:37:06 +02:00
Daniel Egger 6654d61761 Refactor some course creation stuff 2023-07-24 13:37:06 +02:00
Daniel Egger f3ed9db437 Change some settings for Wagtail 2023-07-24 13:37:06 +02:00
Christian Cueni 15af550ab7 Fix courseSessionUsers admin view 2023-07-24 13:17:28 +02:00
Christian Cueni 0f744332cb Update documents 2023-07-24 08:39:02 +02:00
Daniel Egger d90030b614 Update urls in course creation scripts 2023-07-21 13:56:09 +02:00
Daniel Egger f357e34536 Fix cypress tests 2023-07-21 13:56:09 +02:00
Daniel Egger 815d81a471 Simplify media library models 2023-07-21 13:56:09 +02:00
Christian Cueni a1403f8a54 Merged in feature/VBV-464-excel-importer (pull request #160)
Feature/VBV-464 excel importer

Approved-by: Daniel Egger
2023-07-21 10:07:50 +00:00
Daniel Egger 842b0b4334 Update not delete `CourseSessionAttendanceCourse` 2023-07-21 10:24:52 +02:00
Daniel Egger dfc0a01e9f Add more details to error message 2023-07-21 09:22:54 +02:00
Daniel Egger 0798efc7f2 Merged in feature/VBV-453-graphql-learningpath-server (pull request #161)
Feature/VBV-453 graphql learningpath server

Approved-by: Elia Bieri
2023-07-21 06:40:25 +00:00
Elia Bieri b970597a81 Merged in feature/VBV-451-anwesenheitskontrolle-frontend (pull request #150)
VBV-451 Anwesenheitskontrolle frontend & neues Cockpit

* Regenerate graphql types after rebase

* Fix grading progress

* Fix cypress tests

* Fix circle selection and add CourseSessionAssignment for Fahrzeug Vorbereitungsauftrag

* Use `LearningContentAssignment` explictly

* Improve type safety without `as`

* Disable feedback details button when no feedback

* Extend submission overview titles after review

* Improve attendance check state handling

* Minor translation/wording fixes


Approved-by: Daniel Egger
2023-07-20 16:22:28 +00:00
Christian Cueni 5d0f7b88b5 Add sync 2023-07-20 15:34:10 +02:00