d80400ea8c
VBV-525: Fix feedback data rest endpoint
2023-09-26 13:43:44 +02:00
db40368244
VBV-514: Termine nur für ausgewählte Circles anzeigen im Cockpit
2023-09-15 14:50:52 +02:00
f5d44bcb90
VBV-520: Replace "Fahrzeug"-image
2023-09-15 14:14:00 +02:00
68d37e4f8e
Fix test
2023-09-15 09:55:45 +02:00
9eec62c31b
Fix problems with slugs in moved ActionCompetences
2023-09-15 09:47:17 +02:00
b5e9b9e355
Fix tests
2023-09-14 18:11:45 +02:00
00a36b52c8
Übersetzungen
2023-09-14 17:01:42 +02:00
83fcb84303
Add "Kompetenznachweis"-text to AssignmentIntroductionView
2023-09-14 15:57:35 +02:00
73694d983e
Setup "KompetenzNavi for existing courses
2023-09-13 14:50:45 +02:00
e43e351e9d
Refactor design of learning contents in circle page
2023-09-08 16:47:38 +02:00
853c8746ea
VBV-329: Add link to competence certificate in circle view
2023-09-08 16:47:38 +02:00
93bec05abc
Add competence detail page
2023-09-08 16:47:37 +02:00
7597311220
Add circle title to assignment in wagtail cms view
2023-09-08 16:47:37 +02:00
aabaced836
Fix creation scripts
2023-09-08 16:47:37 +02:00
cce82b72ad
Format code
2023-09-08 16:47:37 +02:00
b48ab5ec3d
Add flags in admin from for cypress_reset_view
2023-09-08 16:47:37 +02:00
1196aba79d
Show result in EdoniqTestBlock
2023-09-08 16:47:33 +02:00
2569411959
Fix upsert on initial loading of assignment in circle
2023-09-08 16:46:54 +02:00
9f81def537
Show evaluation points in KompetenzNavi
2023-09-08 16:46:54 +02:00
21174d17db
Attach completion data to `Assignment` in GraphQL schema
2023-09-08 16:46:54 +02:00
4bc1ca636c
Add result data for edoniq test
2023-09-08 16:46:54 +02:00
428ac294e0
Add `--create-assignment-evaulation` cli parameter
2023-09-08 16:46:54 +02:00
a95974c54f
Extend graphql scheme for KompetenzNavi
2023-09-08 16:46:53 +02:00
0537d96dbb
Add models for KompetenzNavi and GraphQL-Types
2023-09-08 16:46:53 +02:00
cff3d6e49b
Fix unit test
2023-09-08 16:25:33 +02:00
5b01a68cdb
Translate notifications
2023-09-08 14:39:13 +02:00
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
6175ca75ed
Add circle title to dropdown text
2023-09-06 16:58:49 +02:00
da56f2a346
Refactor Notification model
2023-08-30 18:47:36 +02:00
b26ec64edb
Add custom django CustomNotificationAdmin
2023-08-30 13:41:06 +02:00
d8bce90b8e
User supervisord in docker to start supercronic and gunicorn
2023-08-30 09:55:41 +02:00
88e7e0edcc
Add ability to send email, when it was not sent before
2023-08-29 15:08:12 +02:00
ae9d7cf471
Try to fix deadlock import error by lazy loading openpyxl
2023-08-29 14:39:14 +02:00
f6a01b3ad1
Add result and statistics data to reminder job
2023-08-29 14:31:47 +02:00
5790fac78f
Add `LoggedCommand` to JobLogs in django admin interface
2023-08-29 14:31:43 +02:00
6badbc480c
Use django constance to add EMAIL_RECIPIENT_WHITELIST
2023-08-29 14:31:21 +02:00
d83f660918
Change email function to use email address directly
2023-08-29 14:31:21 +02:00
31af4e933f
Refactor default handling of dict parameter
2023-08-29 14:31:21 +02:00
56e454cc8b
Squash merge of code from Elia
2023-08-29 14:31:18 +02:00
ae075e47dd
Add documentation
2023-08-29 13:53:40 +02:00
a7f7d0b184
Fail save json dump for `structlog_convert_to_json_for_new_relic`
2023-08-29 09:05:28 +02:00
2c4ae02c4d
Try to neste json string in message for new relic logs
2023-08-28 22:03:57 +02:00
e08d5574f7
Render logs as json with python-json-logger
2023-08-28 13:47:41 +02:00
946d5671b8
Cleanup azure settings and docs
2023-08-25 12:04:34 +02:00
c855753c4d
Add header for excel
2023-08-24 14:33:51 +02:00
f155ceb26b
Fix importer in default prepare_server
2023-08-24 08:06:32 +02:00
9f8686e592
Improve django admin
2023-08-23 19:06:32 +02:00
584aee1829
Use `start` date for due dates with single dates in importer
2023-08-23 17:05:40 +02:00
acdda923da
Make `start` in DueDate mandatory
2023-08-23 15:38:26 +02:00
2fa17e1204
Refactor dueDate frontent
2023-08-23 15:38:26 +02:00
279b6c1dd5
Refactor some fields in `DueDate`
2023-08-23 15:38:26 +02:00
9483c1f6d3
Ignore date of birth in export
2023-08-23 13:56:05 +02:00
50bc7391e9
Use slugs from prod in importer
2023-08-23 13:15:26 +02:00
6ba3be2710
Make importer more resilient
2023-08-23 07:33:29 +02:00
9e68abd5f9
Add CourseSessionEdoniqTest to importer
...
Add tests for CourseSessionEdoniqTest
2023-08-23 07:33:29 +02:00
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
f7de5bae47
Fix performance criteria parent
2023-08-21 15:19:57 +02:00
9ef2a4e8b3
Rename content to reflect real data, refactor import
2023-08-17 19:41:52 +02:00
81351aa9fa
Exclude email, fix dates, don't check "Geburtsdatum" field
2023-08-17 14:41:47 +02:00
45a70f6b75
Merged in feature/update-importer (pull request #188 )
...
Feature/update importer
2023-08-17 09:18:22 +00:00
3447de19ca
Add trainer and combined export
2023-08-17 10:58:33 +02:00
57cd5fe871
Match existing Teilnehmer with multiple parameters
2023-08-17 08:11:15 +02:00
2f8b548ea7
Merged in fix/dates (pull request #187 )
...
Fix/dates
2023-08-16 14:18:13 +00:00
81734f76ae
Make start optional
2023-08-16 15:13:59 +02:00
5c7baab570
Fix tests
2023-08-16 07:48:31 +02:00
95a6d404b5
Add export for trainers
2023-08-15 16:47:03 +02:00
6195c9d32a
Use page id for feedbacks, filter by course session id
2023-08-14 19:57:31 +02:00
a411cc82d1
Fix missing "contact trainer"-functionality
2023-08-14 18:04:35 +02:00
406cf425c2
Enable FeedbackResponses in admin
2023-08-14 17:27:23 +02:00
f1f479a6f4
Add due date for casework
2023-08-14 17:20:33 +02:00
4f437fe562
Add RichText Features
2023-08-10 07:55:27 +02:00
3f8be0a96b
Merged in feature/fix-import (pull request #179 )
...
Feature/fix import
Approved-by: Elia Bieri
2023-08-09 14:16:17 +00:00
45a58abb47
Update docs
2023-08-09 15:59:59 +02:00
19ab428d47
Update content
2023-08-09 08:30:44 +02:00
5ed289c912
WIP: Fix and extend importer test
2023-08-09 08:00:45 +02:00
502aa9c543
WIP: Add update test, add trainer test
2023-08-08 16:01:44 +02:00
977e0cb7c4
WIP: Add import test
2023-08-07 16:29:18 +02:00
6b67a6cd80
Update content
2023-08-07 14:18:57 +02:00
63b9be4238
Add documents
2023-08-03 14:46:54 +02:00
2bbb35eb99
Add Redlichkeitserklärung to documents
2023-08-03 13:39:56 +02:00
8d0c48d91c
Add IT VV course
2023-08-03 12:54:34 +02:00
ee7b3122d1
Add correct links, update learningpath
2023-08-03 10:53:05 +02:00
6083ab8c92
Add demo courses again
2023-08-03 08:06:55 +02:00
097750184c
Add acceptance to IT/FR uk
2023-08-02 18:38:01 +02:00
28b2265465
Add prepwork IT/FR, add link to allowed features
2023-08-02 18:34:15 +02:00
a7dde5e58c
WIP: use parameters for vv creation
...
Use competence page from course, make multilang fns
2023-08-02 18:33:11 +02:00
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
a999375f23
Update slugs when parent changes slug due to title change
2023-07-24 13:37:06 +02:00
6654d61761
Refactor some course creation stuff
2023-07-24 13:37:06 +02:00
f3ed9db437
Change some settings for Wagtail
2023-07-24 13:37:06 +02:00
15af550ab7
Fix courseSessionUsers admin view
2023-07-24 13:17:28 +02:00
0f744332cb
Update documents
2023-07-24 08:39:02 +02:00
d90030b614
Update urls in course creation scripts
2023-07-21 13:56:09 +02:00
f357e34536
Fix cypress tests
2023-07-21 13:56:09 +02:00
815d81a471
Simplify media library models
2023-07-21 13:56:09 +02:00
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
842b0b4334
Update not delete `CourseSessionAttendanceCourse`
2023-07-21 10:24:52 +02:00
dfc0a01e9f
Add more details to error message
2023-07-21 09:22:54 +02:00
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
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
5d0f7b88b5
Add sync
2023-07-20 15:34:10 +02:00
12977b01cc
Add real courses data, update importer
...
Make course optional on import
Add importer in admin
Use new trainer format in xls
Import trainers via admin interface
Add participant import
Update tests
Update url, handle error
Refactor importer
Add json field
Fix tests
Add update test
2023-07-20 15:34:10 +02:00
65d527d894
Add student export for edoniq
2023-07-19 16:02:11 +02:00
6e9d87797e
Fix css
2023-07-18 07:46:18 +02:00
1ca8a8cf81
Translate circles
2023-07-18 07:46:18 +02:00
da03b407bb
Add GraphQL server code for learning path
2023-07-17 17:52:27 +02:00
e8178fa36a
Format code
2023-07-14 17:14:00 +02:00
e208fdabbc
Change after making UUIDs
2023-07-14 17:13:21 +02:00
5ed883e83b
Use UUIDs as primary key for models with user context
2023-07-14 14:37:59 +02:00
7c2190feaa
Reset migrations
2023-07-14 14:16:38 +02:00
76e53a205c
Improve error handling a bit...
2023-07-14 13:15:28 +02:00
c97ec9b399
Adapt AssignmentCompletion model to include page_id
2023-07-12 19:06:51 +02:00
4b0a881055
Merged in feature/VBV-326-auftrag-benachrichtigungen-rebased (pull request #157 )
...
Feature/VBV-326 auftrag benachrichtigungen rebased
* Implement notifications for assignments
# Conflicts:
# server/vbv_lernwelt/assignment/services.py
* Add cypress test for student assignment submission
* Update django-notifications-hq
* Rework
Approved-by: Daniel Egger
2023-07-12 14:32:49 +00:00
5b3da272ce
Changes after code review
2023-07-12 15:21:55 +02:00
5d29fb7a76
Set due_dates for courses explicitly
2023-07-12 11:45:02 +02:00
c1f29a02a0
Fix problems after rebase
2023-07-12 10:21:23 +02:00
3d4654efbc
Mark LearningContentAssignment completion in backend
2023-07-12 10:21:23 +02:00
36152a4364
Do not auto mark completion if the user should not be able to do it
2023-07-12 10:21:23 +02:00
1b7a3a401e
VBV-459: Add flag for user course completion self toggle
2023-07-12 10:21:23 +02:00
3bd489d2ae
Refactor `CourseCompletion` model
2023-07-12 10:21:23 +02:00
ab8dbd09ef
Working with enums in graphql...
2023-07-12 10:21:23 +02:00
b9c9b009ff
Add more typing
2023-07-12 10:21:23 +02:00
46b14bd4e7
Refactor attendance_course code into its own module
2023-07-12 10:21:23 +02:00
eb0b03f413
Create mutation with test case
2023-07-12 10:21:23 +02:00
a75bb14e4c
Add simple graphql types for CourseSessionAttendanceCourse
2023-07-12 10:21:22 +02:00
282e62ef6f
"start" not "end" should be mandatory
2023-07-12 09:59:29 +02:00
c4d10badf6
Standardize name `duedates` to `due_dates`
2023-07-12 09:15:21 +02:00
5890e908f2
Add CourseSessionAssignment to serializer
2023-07-11 17:42:30 +02:00
324725964b
Add deadline to course session assigments in test_course
2023-07-11 15:57:07 +02:00
bf3582d338
Fix linting
2023-07-11 11:23:36 +02:00
9911117df5
Resolve comments from Pullrequest
2023-07-11 11:19:00 +02:00
b06fc4bcbf
Add translations
2023-07-11 11:02:39 +02:00
6b8541f9c5
Format code
2023-07-10 13:47:23 +02:00
a15eee3266
Remove failling tests
2023-07-10 13:47:23 +02:00
4fd10db935
Improve test data generation
2023-07-10 13:47:23 +02:00
acbeb82184
Fix importer
2023-07-10 13:47:23 +02:00
e0dbdde7cd
Fix Linting errors
2023-07-10 13:47:23 +02:00
1405e728a2
Remove unused factories
2023-07-10 13:47:23 +02:00
9663cdc743
Add migrations
2023-07-10 13:47:23 +02:00
858541134e
Add due date formatting to Attendance course
2023-07-10 13:47:23 +02:00
b2a7c2e282
Add DateEmbedding component
2023-07-10 13:47:12 +02:00
78b0a08bb3
Remove attendance_course and assignment_details json fielsd
2023-07-10 13:46:56 +02:00
ea81fc15ef
Remove related name
2023-07-10 13:46:56 +02:00
347cc37a28
Add DueDates to CourseSession and Course Session Assignment
2023-07-10 13:46:56 +02:00
2706d6785d
Add CourseSessionAttendance course and CourseSessionAssignment
2023-07-10 13:46:56 +02:00
a5acc66981
VBV-450: Custom CourseSessionAttendanceCourse model
2023-07-10 13:46:56 +02:00
89ff4af3c8
Refactoring
2023-07-10 13:46:56 +02:00
b92ac8b08a
Add duedates to frontend
2023-07-10 13:46:55 +02:00
cda7ae07a8
Add duedate to API
2023-07-10 13:46:21 +02:00
f05d7b2279
Rename Event -> DueDate
2023-07-10 13:46:21 +02:00
f43a2c94e8
Add default event genration function for Course assignment
2023-07-10 13:46:21 +02:00
4d8c219076
Add events app
2023-07-10 13:46:21 +02:00
e02a386359
Update courses url
2023-07-10 07:35:38 +02:00
a692c819ee
Add generated types so that they can be referenced in code
2023-07-07 18:43:57 +02:00
2fdae7c120
Use different naming convention for GraphQL types
2023-07-07 18:43:57 +02:00
df13e99d6f
Play with generated graphql code
2023-07-07 18:43:57 +02:00
9860a59cef
Clean up assignment graphql
...
* Remove old assignment api REST code which is unused
* Refactor handling AssignmentCompletionStatus enum
* Add full test for GraphQL assignment completion mutation
* Hide wagtail INFO logs on local dev
2023-07-07 18:43:57 +02:00
dcf855a443
Cherrypick logging configuration from VBV-326
2023-06-28 17:17:05 +02:00
18c21e00e7
Update participants, add staff group
2023-06-28 13:16:48 +02:00
b8f1fd8cee
Add participants
2023-06-27 11:18:36 +02:00
c715a462d9
Delete notifications before test
2023-06-21 14:44:20 +02:00
8a7453ce0e
Soft delete notifications
2023-06-20 13:18:00 +02:00
fbde06f0ef
Fix notification settings cypress test
2023-06-20 13:18:00 +02:00
d5e3142cc1
Add IT presentation
2023-06-20 07:39:32 +02:00
fec1fb9a8a
Add flag to toggle test and Fallarbeit
2023-06-19 14:59:18 +02:00
f2438f6d57
Add IT uk and training course
2023-06-19 14:59:18 +02:00
ab4e3fc8dd
Update participants
2023-06-15 15:53:39 +02:00
f9414eba9a
Update course name
2023-06-15 12:52:19 +02:00
6127746854
Add competences FR, update excel
2023-06-15 08:37:18 +02:00
8c1088ab4b
Use lowercase emails, use raw field
2023-06-15 08:37:18 +02:00
bfa4349658
Add quickfix for Präsenztag FR
2023-06-15 08:37:18 +02:00
5088450f0c
Update translations, update import files
2023-06-15 08:37:18 +02:00
22ef30c3ca
Change Trainer Import File -> one line per language
2023-06-15 08:37:18 +02:00
8c65ae3295
Make import work with different language courses
2023-06-15 08:37:18 +02:00
0712b331ea
Add FR reflection
...
Add circle "Fahrzeug" FR
Add fahrzeug preparation
Add content FR
Add bewertung
Lint and add IT reflection
2023-06-15 08:37:18 +02:00
95479ae5e2
VBV-444: Bugfix circle in import file
2023-06-12 13:46:25 +02:00
5298eb8049
Update participants
2023-06-12 09:32:38 +02:00
2e12e30b4d
Fix content
2023-06-11 20:21:23 +02:00
f5b58dc2ee
Merged develop into feature/VBV-424-vv-content
2023-06-08 14:21:07 +00:00
1a9f676381
Add "Gewinnen" assignment, fix titles, update expert info
2023-06-08 16:01:02 +02:00
391c88e588
Update FR translations
2023-06-08 15:07:30 +02:00
cf0ffe66ac
Update goals
...
Update basis
Update circle Haushalt
Update Reisen
Add Pensionierung
Update Gesundheit
Update Vorbereitung
Update WBTs
Update kmu
Add Vermittler reflection
Add VV assignment "Gesundheit"
Add assignment "Gesundheit"
Add link to Fachcheck
2023-06-08 15:07:30 +02:00
dfc395b6ec
Update course participants
2023-06-07 14:39:54 +02:00
9df76ab69a
Fix unit tests
2023-06-02 16:17:58 +02:00
b5736ef9ef
Make link out from teams link
2023-06-02 15:16:42 +02:00
791413066c
Attach import users as trainers to UK
2023-06-02 15:16:42 +02:00
183135bcb7
VBV-409: onboarding anpassungen
2023-06-02 15:16:41 +02:00
631893c60f
Fix in sso login
2023-06-02 15:16:41 +02:00
32233ec38e
Import students from excel
2023-06-02 15:16:41 +02:00
d6df9b624b
Refactor import data loading
2023-06-02 15:16:41 +02:00
5f534dee9f
Import without changing file
2023-06-02 15:16:41 +02:00
ab2e4c5df2
Refactor admin
2023-06-02 15:16:41 +02:00
f42aae19ee
Import trainer from excel file
2023-06-02 15:16:41 +02:00
2e7a069d0a
Add trainer import code
2023-06-02 15:16:41 +02:00
281521a8d0
Import course sesssions from excel file
2023-06-02 15:16:41 +02:00
e6c782fe5b
Parse attendance course data
2023-06-02 15:16:41 +02:00
73d44478db
Add datetime parsing function from MyService
2023-06-02 15:16:41 +02:00
9c1684bce3
Add excel import code
2023-06-02 15:16:41 +02:00
61ce0897cf
Refactor user creation code for sso and import
2023-06-02 15:16:41 +02:00
353992441b
Fix test settings
2023-06-02 11:45:13 +02:00
db78f1a9cf
Fix static files problem with correct whitenoise settings
2023-06-02 11:12:00 +02:00
8a1e9221c8
Cleanup unused stuff
2023-06-01 23:12:47 +02:00
69445b546c
Change default admin passwort (for tests)
2023-06-01 16:18:58 +02:00
6826410d82
Change default admin passord to environment variable
2023-06-01 15:39:57 +02:00
cb40554fe0
Update texts, remove blocks
2023-06-01 14:39:46 +02:00
d106c49b33
Update content order
2023-05-31 13:33:48 +02:00
6d662626dc
Merged in feature/VBV-386-lerneinheiten-titel-entfernbar-machen (pull request #111 )
...
Add ability to hide learning unit titles
* Add ability to hide learning unit titles
# Conflicts:
# server/vbv_lernwelt/course/creators/uk_course.py
* Fix rebase
* Undo faulty rebase
Approved-by: Christian Cueni
2023-05-31 09:39:27 +00:00
dd7efdd7a5
Merged in bugfix/VBV-397-reihenfolge-präsenztag (pull request #116 )
...
Swap “Präsenztag” and “Dokumente für den Unterricht”
* Swap “Präsenztag” and “Dokumente für den Unterricht”
Approved-by: Christian Cueni
2023-05-31 06:55:46 +00:00
ded684ecc2
Merged in feature/VBV-313-azure-rebase1 (pull request #115 )
...
Update Env Variables with correct SSO parameters
2023-05-30 15:31:03 +00:00
515f7a7b1b
Update Env Variables with correct SSO parameters
2023-05-30 16:31:20 +02:00
aeae89fedb
Update exam url
2023-05-30 10:48:30 +02:00
2ec48cf4a6
Fix html
2023-05-30 10:41:59 +02:00
38b1b0ff4e
Add documents fahrzeuge
2023-05-26 18:16:05 +02:00
3b6971aa97
Add data for circle basis
2023-05-26 17:57:12 +02:00
45161788cc
Create Vorbereitungsauftrag Kickoff
2023-05-26 17:28:48 +02:00
1fa420a11b
VBV-355: Inhaltstyp Test
2023-05-26 16:49:50 +02:00
2d58cdd9fe
Add code after rebase
2023-05-26 16:07:42 +02:00
904d24f566
Add `LearningContentDocumentList`
2023-05-26 16:07:42 +02:00
142c979b24
Add demo tag course session
2023-05-26 15:55:19 +02:00
cee6c03630
Add üK-Training course
2023-05-26 15:55:19 +02:00
f269ca3bf8
Anpassungen Inhalt kopiert von Chrigu
2023-05-26 15:29:07 +02:00
885b9e8dce
Move uk course creation code
2023-05-26 15:19:49 +02:00
6368188d2f
Rename back to `get_frontend_url`
2023-05-26 09:45:36 +02:00
f33433b77d
Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit
2023-05-26 09:39:44 +02:00
4b06654954
Merged in feature/VBV-278-vorbereitungsauftrag (pull request #96 )
...
Feature/VBV-278 vorbereitungsauftrag
Approved-by: Elia Bieri
2023-05-25 16:31:41 +00:00
db35a037eb
Jump to cockpit for trainers and superusers
2023-05-25 13:34:23 +02:00
abefe878da
Set duration default to 0, hide duration info if 0
2023-05-25 11:57:01 +02:00
1908665596
Merged in feature/VBV-377-umsetzung-das-lernst-du-in-diese (pull request #93 )
...
Umsetzung: das lernst du in diesem Circle
Approved-by: Christian Cueni
2023-05-25 09:47:25 +00:00
6816ad8388
Add language parameter to SSO
2023-05-25 09:08:31 +02:00
b7cca35e88
Merge migrations
2023-05-24 16:02:29 +02:00
321c57b709
Make assignment creation more generic
2023-05-24 15:20:49 +02:00
0f0d1632a7
VBV-279: Inhaltstyp Reflexion
2023-05-24 15:20:47 +02:00
b1d14fd691
Fix tests
2023-05-24 15:20:30 +02:00
8743441e81
Format code
2023-05-24 15:20:30 +02:00
9be0ce9d39
Frontend: "Vorbereitungsauftrag"
2023-05-24 15:19:49 +02:00
951d9b42e6
Add text for "Vorbereitunsauftrag"
2023-05-24 15:19:10 +02:00
1d0b956b56
Update features of course goals rich text field
2023-05-23 17:30:04 +02:00
100e42bdd2
Reformat code
2023-05-23 16:43:24 +02:00
09dcfcc418
Implement additional fields
2023-05-23 16:43:18 +02:00
b7cdc0ddde
Add attendance course start- and endtime
2023-05-23 15:35:19 +02:00
132c115e8b
Rename attendance days to attendance courses
2023-05-23 15:34:59 +02:00
03fd182edb
Update LK wording
2023-05-22 14:24:14 +02:00
bc368e7a2f
Fix cypress tests
2023-05-19 14:50:41 +02:00
4fb534aa25
Create `create_course_uk_de_completion_data` with algo
2023-05-19 14:05:14 +02:00
872657634b
Remove "Querverweise" und "Verlinkungen"
2023-05-19 10:17:25 +02:00
decba980f5
Rework Media Library
2023-05-19 10:17:25 +02:00
e8d6a9c784
Embed media library as course session specific page
2023-05-19 10:17:24 +02:00
500228a7f8
Merge branch 'develop' into feature/VBV-372-lk-update
2023-05-17 19:21:19 +02:00
9e3124160a
Add some test data and clean up some things
2023-05-17 19:09:33 +02:00
d139744f4f
Update competences
2023-05-17 14:26:47 +02:00
bec2348c79
Format code
2023-05-17 13:58:32 +02:00
849e49c433
Minor fixes
2023-05-17 13:42:16 +02:00
c5110e1051
Make migration
2023-05-17 11:00:43 +02:00
652cd7d8fb
Implement RichTextBlock
2023-05-17 10:59:21 +02:00
45a27332cd
Initialize LearningContent description with RichText
2023-05-17 10:59:21 +02:00
31dae0a5cd
VBV-306: Use GraphQL for assignment code
2023-05-15 19:07:06 +02:00
e130d65f37
Merged in feature/VBV-339-assignment-cypress-test (pull request #79 )
...
Feature/VBV-339 assignment cypress test UNFINISHED
* Create assignment submission test data for cypress test
* Add first assignment trainer test
* Add first cypress test which checks DB entry with all instrumentation
2023-05-12 14:33:14 +00:00
b313bad031
Rename field `type` to `content_type` in REST response
...
In Wagtail Grapple/GraphQL the field is already called `content_type`
2023-05-12 13:38:35 +02:00
a15af2bf86
VBV-350: Refactor LearningContent to individual wagtail pages
2023-05-12 11:51:02 +02:00
6534cbf8df
Update feedback questions and order
2023-05-09 14:38:40 +02:00
d1907182a3
Fix cypress tests
2023-05-09 13:46:43 +02:00
57a4f447af
Show assignment results for user
2023-05-08 17:13:24 +02:00
69e96391d9
Show "Bewertung abschliessen" when finished
2023-05-08 16:40:53 +02:00
edc1eed60d
Reset AssignmentCompletion data on reset action
2023-05-08 14:27:40 +02:00
d2f916bc79
Only copy task data when it's found
2023-05-08 14:27:40 +02:00
32c3d6d1b4
Format code
2023-05-08 14:27:40 +02:00
5868468a48
Add grades to AssingmentEvaluation
2023-05-08 14:27:40 +02:00
2d6cee9f9f
Add EvaluationSummary
2023-05-08 14:27:40 +02:00
d9a6f2dd94
Add EvaluationIntro
2023-05-08 14:27:39 +02:00
fef864df25
VBV-321: squash current work
...
Load and display AssignmentCompletionStatus
Datenmodell um Bewertungskriterien erweitern
Refactor assignment pages
Show user results
Update some data fields
Show user assignment evaluation
Changes after rebase
Rename `grading` -> `evaluation`
Add evaluation data to AssignmentCompletion
Refactor usage of `assignmentStore`
Store points for evaluation
Only debounce text
Show user responses on evaluation page
2023-05-08 14:24:38 +02:00
3d13a646f7
Update icons
2023-05-08 14:07:43 +02:00
Ramon Wenger
a11c0d481f
Merged in feature/VBV-310-VBV-324-document-improvements (pull request #66 )
...
Feature/VBV-310 VBV 324 document improvements
Approved-by: Elia Bieri
2023-05-08 08:42:33 +00:00
dd49d050ef
Replace font files, update styles
2023-05-03 14:43:50 +02:00
Ramon Wenger
af7f0c9223
Update layout for document list
...
Relates to VBV-324
2023-05-01 21:40:04 +02:00
Ramon Wenger
96334b4eb6
Merged in feature/VBV-304-praesenztag-ui (pull request #65 )
...
Feature/VBV-304 praesenztag ui
Approved-by: Daniel Egger
2023-04-26 09:57:22 +00:00
Ramon Wenger
fba93a8f63
Fix ufmt issues
2023-04-25 17:59:25 +02:00
Ramon Wenger
9dd9a02592
Add new package to help with editing JSON fields
2023-04-25 17:23:58 +02:00
Ramon Wenger
2ef998c12f
Add new icons
2023-04-25 17:21:45 +02:00
8ffea5bc1b
Format code
2023-04-25 13:20:02 +02:00
baf5801b6a
Add grading api endpoint
2023-04-25 13:20:02 +02:00
9580d79559
Add more validation to `update_assignment_completion`
2023-04-25 13:20:02 +02:00
19a7738457
Add `AssignmentCompletionAuditLog`
2023-04-25 13:20:02 +02:00
adc61479fc
Merged in feature/VBV-290-kn-backend (pull request #59 )
...
Feature/VBV-290 kn backend
* Add initial assignment completion model
* Add first version of `update_assignment_completion`
* Upgrade wagtail>=4 for new functions needed in assignment api
* Add API to update assignment user data
* Post API via assignment not learning_content
* Add GET api endpoints for AssignmentCompletion
* Add some initial assignment completion data
* Add admin view for AssignmentCompletion
Approved-by: Elia Bieri
2023-04-18 08:07:29 +00:00
5955ad83a3
Add widget to pretty print JSONFields in admin
2023-04-14 16:11:31 +02:00
c0dc4d6a2f
Fix python tests
2023-04-14 10:02:33 +02:00
c64341a6c1
Refactor test course to make it more realistic
2023-04-14 09:31:37 +02:00
a3e4a50ba0
Add unit test to test creation of slug while saving
2023-04-13 20:03:09 +02:00
3cabca8c21
Fix typo
2023-04-11 11:31:51 +02:00
80cd70ace6
Link courseSessionAssignmentDetails to AssignmentView
2023-04-06 21:39:44 +02:00
8f84ef7502
Adapt api so it can fetch assignment page by id
2023-04-05 21:43:15 +02:00
b0cc789549
Attach Assignment to LearningPath
2023-04-05 21:43:15 +02:00
13b580468d
Create test assignment with tasks in code
2023-04-05 21:43:15 +02:00
539ddbeaf9
Refactor the models
2023-04-05 21:43:15 +02:00
4cf292bbf8
Rework model
2023-04-05 21:43:15 +02:00
9ecb9a9add
Add initial wagtail models
2023-04-05 21:43:15 +02:00
2c3b77b0d8
VBV-234: Bugfix neue Seiten im Wagtail erstellen
...
Der `parent` einer Page ist erst in der `save` Funktion
vorhanden für eine neue Seite. Deshalb muss man das
Überschreiben der `slug` im `save` machen.
2023-04-05 21:43:00 +02:00
85a0ba1d25
Fix cypress tests
2023-04-05 18:49:06 +02:00
1d88117d99
Refactor `attendance_days` to its own field
2023-04-04 08:45:42 +02:00
9ee97ffc55
Format code
2023-04-03 18:55:05 +02:00
9177b9e003
Get attendance day details in relevant views
2023-04-03 18:39:36 +02:00
1437bc9b53
VBV-304: Add `AssignmentDayBlock`
2023-04-03 18:09:22 +02:00
4996eb565a
Cleanup icons
2023-04-03 13:52:37 +02:00
8d41d3d3a2
VBV-193 refactored course completion for course sessions
2023-03-31 18:27:47 +02:00
18f7728793
VBV-302: Refactor Header for course session switching
2023-03-31 15:21:20 +02:00
724f31f4a8
Handle multiple CourseSessions for user
2023-03-31 11:18:55 +02:00
edcfab1dd3
Format code according to new library rules
2023-03-31 10:07:27 +02:00
a0c7dec316
Improve course creation scripts to only create some courses
2023-03-29 17:39:09 +02:00
2263c82ce6
Remove creation of Versicherungsvermittler (alt)
2023-03-29 16:20:55 +02:00
97879b570c
Show only start and stop icon in circle
2023-03-27 11:34:09 +02:00
1f7b9252ab
Remove api page chache -> it is not needed anymore
2023-03-17 11:15:56 +01:00
45533e0b2d
Refactor `frontend_url` calculation to avoid DB access and improve
...
performance
Das initiale Laden des Lernpfads dauerte so lange, weil das berechnen
des Felds `frontend_url` sehr viele DB-Zugriffe auf die jeweiligen
"parents" einer Page machten.
Die gleiche Berechnung kann man aber auch direkt aus dem `slug`
ohne Zugriff auf die Parents machen.
Das wurde hier gemacht. Das ganze beruht darauf, dass die page-`slug`
in einem bestimmten Format ist. Um das weiter zu bearbeiten,
habe ich VBV-296 erstellt.
2023-03-17 11:12:42 +01:00
b2cc2788df
Add FR üK Trainer, add DE üK student
2023-03-15 06:59:27 +01:00
b1a1d52810
VBV-293: Link zu Mediathek in ÜK upgrade
2023-03-14 17:27:31 +01:00
8d0386c945
Fix formatting
2023-03-14 17:20:14 +01:00
57c25da542
VBV-293: Link zu Mediathek in ÜK
2023-03-14 17:16:40 +01:00
f68e20515d
VBV-293: Link zu Mediathek in Versicherungsvermittlerin Lehrgang wieder eingefügt
2023-03-14 15:03:01 +01:00
4efd4c72a3
Remove "Selbsteinschätzung" from Circle Fahrzeug
2023-03-12 13:24:05 +01:00
d233b782bc
Use RichField for circle detail data
2023-03-09 15:30:50 +01:00
c8905847fa
Fix small circle unit titles
2023-03-09 15:30:50 +01:00
30ead5a261
Update üK structure
2023-03-09 15:11:50 +01:00
154b123bec
Update FR ük
2023-03-06 11:40:59 +01:00
cdaee0fc5a
Add 🇫🇷 UI texts
2023-03-03 13:11:24 +01:00
bf7f6d3ca7
Add FR course
...
Translate circles
2023-03-02 09:09:29 +01:00
b4227bff25
Merged in feature/language-switch (pull request #32 )
...
Add demo language switch
Approved-by: Elia Bieri
2023-03-02 06:39:18 +00:00
02315af984
Add demo language switch
2023-03-02 07:07:40 +01:00
8dc2fabb03
Add missing circles to üK
2023-03-01 07:09:02 +01:00
6b995bc4ae
Change circle order
2023-02-22 13:02:47 +01:00
062900ab41
Update WBTs
2023-02-21 11:24:23 +01:00
96635ff8a7
Update üK competences
2023-02-15 14:19:25 +01:00
b667140d3e
Add language field and API
2023-02-08 13:15:04 +01:00
b5e4c30d40
Merged in feature/notifications (pull request #15 )
2023-02-08 11:39:27 +00:00
aac1c638df
Merge branch 'feature/feedback-json' into develop
2023-02-07 07:11:47 +01:00
aa5b744285
Migrate form data to json field
2023-02-06 16:03:40 +01:00
52a3e4da8c
Update topic name
2023-02-06 15:20:03 +01:00
f5c7ab77e1
Remove "vernetzen" circle
2023-02-06 09:00:13 +01:00
8b2aab8298
Add Chrigi to üK, change numbers of feedbacks
2023-01-31 11:49:26 +01:00
28341131e4
Fix cypress tests
2023-01-31 11:24:59 +01:00
23fd945cb6
Fix test, lint vue
2023-01-31 08:26:16 +01:00
bd3388714e
Fix UI errors
2023-01-31 08:26:16 +01:00
2ab8f580bc
Add HorizontalBar component
2023-01-31 08:26:16 +01:00
b7038c1a9c
Add open feedback component, update vertical bar chart
2023-01-31 08:26:16 +01:00
ec58ca176c
Add basic Feedback page
2023-01-31 08:26:15 +01:00
44ed154814
Add summary component
2023-01-31 08:26:15 +01:00
88848aa292
WIP: Add single feedback endpoint
2023-01-31 08:26:15 +01:00
46710d29b9
Add summary endpoint
2023-01-31 08:26:15 +01:00
0794a715b3
Add Handlungsfelder SVGs
2023-01-31 08:13:05 +01:00
f6ffb431c2
Fix circle names
2023-01-30 08:23:58 +01:00
4be2bb1975
VBV-251: Neusten Vermittlerlehrgang abbilden
2023-01-25 16:29:54 +01:00
bf704cccc5
Add experts to all circles
2023-01-23 13:40:47 +01:00
c34d3729fc
Assign users to new course
2023-01-23 09:31:10 +01:00
6c0aaaa9cf
Rename Vermittler courses
2023-01-23 08:39:41 +01:00
429f6241d2
Add missing expert
2023-01-19 07:43:04 +01:00
6bbd509faf
Add feedback icon, add feedback to default path
2023-01-19 07:43:04 +01:00
1aaf0810bd
VBV-243: Add new Versicherungsvermittler learning path
2023-01-18 18:25:54 +01:00
503f819d38
Refactor expert handling
2023-01-11 15:54:50 +01:00
fb458be776
Refactor permission functions
2023-01-11 15:54:50 +01:00
9fc834e99e
Refactor cockpit circle handling
2023-01-11 15:54:50 +01:00
1b87aa5bac
Refactor cockpit user loading
2023-01-11 15:54:50 +01:00
47770bde90
Refactor course expert serializer
2023-01-11 15:54:50 +01:00
597c9f267b
Check permissions for accessing user completions
2023-01-11 15:54:50 +01:00
99da03bc37
Remove WBTs from LFS and git (they are on AWS now)
2023-01-11 15:34:23 +01:00
6d6126add7
Fix small navigation bar bug
2023-01-11 15:34:23 +01:00
a4ecaf2430
Link WBTs to AWS S3 hosted version
2023-01-11 15:34:23 +01:00
276cd20e99
Use dynamic medialibrary link
2023-01-11 13:45:42 +01:00
Ramon Wenger
1a8024e789
Add missing migration
2023-01-11 10:44:22 +01:00
ae62b43606
Fix upload, add delete s3 files command
2023-01-11 07:38:47 +01:00
e2ce704a40
Add sso_id field
2023-01-11 07:11:38 +01:00
e197a17f15
Fix user header on circle page
2023-01-10 08:58:44 +01:00
0d64f8fbb6
Change model name
2023-01-10 08:09:16 +01:00
cb9249328e
Add delete unreferenced file command
2023-01-10 08:09:13 +01:00
d65d786f4f
Fix permissions, refactor upload code
2023-01-10 08:05:02 +01:00
fc017961ab
Verify permissions
2023-01-10 08:05:02 +01:00
8ad84cc778
WIP: Add tests
2023-01-10 08:05:02 +01:00
7a3e4324d9
VBV-213: Filter criteria by selected circle
...
Show upload button only to circle experts
Add files app and basic frontend test
Add service, refactor form
WIP: Upload file
WIP: Upload file to s3
WIP: Add course models, add view
WIP: Add local upload
WIP: Add basic get
WIP: Validate form
WIP: Add file list, download by name
WIP: Update documents after upload
WIP: Add delete button and API
WIP: Reset upload_finished_at when document is deleted
WIP: Handle upload error
Add s3 document
2023-01-10 08:04:56 +01:00
Ramon Wenger
6b343805a0
Merged in feature/feedback-form-2022-12-29 (pull request #18 )
...
Feature/feedback form 2022 12 29
2023-01-09 15:12:44 +00:00
fd7bc7fdca
VBV-192: Add better completation data for cockpit user demo
2023-01-09 15:05:48 +01:00
Ramon Wenger
f58b2f6303
Format python code according to ufmt
2022-12-29 16:32:50 +01:00
Ramon Wenger
9d848c3f9b
Add course session to feedback model
2022-12-29 16:29:13 +01:00
Ramon Wenger
c64bc463db
Make formatter happy
2022-12-29 16:28:36 +01:00
Ramon Wenger
44599d455c
Replace deprecated fields
2022-12-29 16:26:31 +01:00
Ramon Wenger
5e559b66b0
Update Feedback model, add Wagtail block
2022-12-29 16:26:31 +01:00
Ramon Wenger
6a2859e641
Swap serializer mutation for form mutation
2022-12-29 16:20:20 +01:00
Ramon Wenger
e1d9df7d31
Add initial implementation of feedback form
2022-12-29 16:20:20 +01:00
c8eb505cd2
Add fake üK-Content
2022-12-19 09:39:46 +01:00
58bb1d5fef
Use own icon for learning content
2022-12-15 09:40:46 +01:00
15b5223dc5
Fix cypress tests
2022-12-14 22:05:10 +01:00
e8073753be
Add circle view for user profiles in cockpit
2022-12-14 19:02:48 +01:00
b950f11942
Update course slugs
2022-12-13 20:31:35 +01:00
4ac1c78a4f
Update path name
2022-12-13 14:21:26 +01:00
5e0b69702f
Add file upload modal
2022-12-13 08:42:29 +01:00
2248ad4396
Merge branch 'feature/cockpit-ui' into develop
2022-12-12 13:34:33 +01:00
3375d0f121
Return circle expert data, use circle data
2022-12-12 11:02:06 +01:00
Ramon Wenger
b29e56fe4c
Pacify ufmt
2022-12-08 17:21:49 +01:00
Ramon Wenger
09e22a7616
Add command for clearing the course cache
2022-12-08 17:06:25 +01:00
Ramon Wenger
41c6346136
Add favicon
2022-12-08 17:06:04 +01:00
0cbce3c42b
Load separate competence profile for every user
2022-12-02 17:49:40 +01:00
0adf734846
Url handling
2022-12-02 17:10:57 +01:00
5aa73e4997
Fix problem in competence pages
2022-12-02 16:57:44 +01:00
218756e3dc
Add drf view to request completion data for user
2022-12-02 14:53:49 +01:00
48cf9026d9
Add cockpit store
2022-12-02 14:24:02 +01:00
963250a8da
Add role to course session user
2022-12-02 13:59:27 +01:00
205cb3c1d4
Add view for course session members
2022-12-02 13:44:28 +01:00
00d2527b29
Refactor urls for courses, learning paths and competence profile
2022-12-02 11:18:56 +01:00
cb9505b54c
Add some more demo users
2022-12-02 10:27:27 +01:00
d9390ef82d
Add basic cockpit page
2022-12-01 16:02:43 +00:00
dc59b41455
Update video content
2022-11-21 10:37:02 +00:00
2313587f6a
Update text
2022-11-15 13:02:37 +01:00
a3c3e60763
Show only uniqe courses (not course sessions) on Dashboar
2022-11-14 11:20:37 +01:00
64b6356ef5
Add more test users
2022-11-11 11:22:41 +01:00
2295ede996
Add python unit tests
2022-11-09 12:40:01 +01:00
6f6fbc3cf8
Replace email from Bianca
2022-11-09 12:40:01 +01:00
93a0fdaadb
Add ÜK1 course
2022-11-09 12:40:01 +01:00
e6e5b77d0e
Create default `CourseSessionUser`s
2022-11-09 12:40:01 +01:00
efd8892d6a
Select Circle expert/trainer on the admin field (not dynamic)
2022-11-09 12:40:01 +01:00
a119cc122d
Add CourseSession admin model
2022-11-09 12:40:01 +01:00
17eaf80d2c
Add CourseSession serializer and view
2022-11-09 12:40:00 +01:00
05e02449c8
Refactor course access check
2022-11-09 12:40:00 +01:00
b36b0e8d96
Fix test by assigning admin user
2022-11-09 12:40:00 +01:00
c61ea10c7d
Format code
2022-11-09 12:40:00 +01:00
d8577c70d5
Limit page access to users which can access course
2022-11-09 12:40:00 +01:00
d8148158a1
Refactor serialization code
2022-11-09 12:40:00 +01:00
f8d00040f6
Add basic model
2022-11-09 12:40:00 +01:00
25749bf915
Fix video location
2022-11-08 16:05:14 +01:00
f3c5999cad
Make changes for demo
2022-11-08 14:40:57 +01:00
2015ab25de
Update WBTs
2022-11-08 08:28:26 +01:00
ff088257ce
Add video in Einstieg
2022-11-07 13:24:19 +01:00
9a2675cd16
Use HF detail image from backend
2022-11-07 11:39:25 +01:00
c9a5fd573c
Add learning module
2022-11-05 17:59:06 +01:00
44d8c1645e
Add new types, update name
2022-11-03 07:15:36 +01:00
1d7816f664
Show all Hfs
2022-11-02 21:52:33 +01:00
bd520134f1
Add changes for demo
...
New user name
Hide unfinished HFs
Make unfinished HFs in path placeholders
2022-11-01 21:25:45 +01:00
6254e63d01
Don't show "in Umsetzung" labels, add demo user
2022-10-27 12:45:43 +02:00
5ce25fe4da
Add new icons
2022-10-25 13:19:07 +02:00
4626065b7c
Add fake landing page
2022-10-25 09:35:32 +02:00
579865d478
Fix python tests
2022-10-21 18:05:37 +02:00
924bf6f140
Fix `npm run test`
2022-10-21 18:00:22 +02:00
c8824763f6
Refactor types
2022-10-21 13:44:11 +02:00
e653f915fe
Update HF icons
2022-10-19 12:01:30 +02:00
7fbac1aaea
Rename Profil to Navi
2022-10-18 15:56:25 +02:00
566e7bc6d0
Use email as username if no username available
2022-10-18 11:01:03 +02:00
bb1db2d845
Add Beispiel Transferauftrag
2022-10-14 18:10:07 +02:00
4d24d3b295
Add "Beenden" content
2022-10-14 14:43:23 +02:00
189cfcde3f
Weitere Circle-Texte übernommen
2022-10-14 12:57:34 +02:00
06d78d5bdb
Add player-0.0.11.min.js files
2022-10-13 14:47:45 +02:00
c9bf1d2753
Add wbt files to git lfs
2022-10-12 17:22:03 +02:00
126f0de318
Anpassungen Mobile
2022-10-11 16:46:53 +02:00
34a21eeed3
Use <router-link> instead of <a> for internal links
2022-10-11 16:46:53 +02:00
cf873e6f23
Add circles to competence api json
2022-10-11 16:46:53 +02:00
3c386f31ca
Add linking to `evaluate_url` for learning unit
2022-10-07 17:22:28 +02:00
ebfeec4184
Refactor competence profile
2022-10-07 17:08:55 +02:00
dc3b1a4ca6
Add backend data to competence profile
2022-10-07 11:35:43 +02:00
115c512e84
Fix reset_schema script used by caprover
2022-10-05 17:09:42 +02:00
7872125167
Fix npm build error
2022-10-05 15:56:42 +02:00
df6f331811
Anpassung "Verankerung im Lernpfad"
2022-10-05 15:29:29 +02:00
914223bc77
Adapt design of media library
2022-10-05 14:12:03 +02:00
b7e4d83e76
Add wbts to lernfpad oktober demo
2022-10-05 12:15:26 +02:00
3bf9e75714
Add urls to media_libraries in Lernpfad
2022-10-05 11:32:40 +02:00
dec1b874a7
Add Performance Criteria for oktober demo
2022-10-05 11:16:52 +02:00
647631491d
Add Performance Criteria for oktober demo
2022-10-04 17:37:30 +02:00
dbf3db3d23
Add more circle data
2022-10-04 16:55:48 +02:00
ad532dc50d
Add placeholder learning content
2022-10-04 16:26:34 +02:00
a33c161231
Add learning path data for oktober demo
2022-10-04 15:48:53 +02:00
17eb308f6e
Add data for mediathek "Reisen" und "Fahrzeug"
2022-10-04 14:43:06 +02:00
e95086850b
Default data for mediathek
2022-10-04 14:42:34 +02:00
fd6c15c282
Fix cypress tests
2022-10-04 14:42:34 +02:00
a8e7b6f433
Add learn media page
2022-10-04 14:42:34 +02:00
63a5039134
Work on media library frontend
2022-10-04 14:42:34 +02:00
cbdbdba6b8
Add `frontend_url` field to wagtail pages
2022-10-04 14:42:34 +02:00
5b3a751704
Load media items from backend to show in frontend
2022-10-04 14:42:34 +02:00
71b072ade2
Refactor media content data models
2022-10-04 14:42:34 +02:00
9d1eff5a42
Rename "Media Center" to "Media Library"
2022-09-30 17:55:35 +02:00
827e7a0fc0
Add code formatting with prettier and black
2022-09-30 17:43:06 +02:00
3bd604215a
Fix cypress tests
2022-09-28 17:55:47 +02:00
bdae082550
Fix self-evalution checkboxes
2022-09-28 16:19:01 +02:00
e230c0b8e5
Fix python tests
2022-09-28 15:34:07 +02:00
8ab17f9370
Readd completion code
2022-09-28 15:11:08 +02:00
b5804c2696
Fix test lerngang
2022-09-28 14:52:25 +02:00
d5e484a6c7
Add CompetencePage
2022-09-28 13:09:36 +02:00
9be2fa0d3a
Serialize LearningPath with PerformanceCriteria
2022-09-28 13:09:34 +02:00
5284d6f1cf
Serialize LearningPath with PerformanceCriteria
2022-09-27 17:53:22 +02:00
8cfde35704
Serializer for CompetenceProfile
2022-09-27 17:19:47 +02:00
46998668d8
Add course_category to LearningUnit
2022-09-27 16:41:54 +02:00
9c77526646
Add initial competence django app
2022-09-27 15:57:17 +02:00
c0e7662c8f
Merge branch 'develop' into feature/mediathek-frontend
2022-09-27 15:01:47 +02:00
129507bf6e
Merged in feature/vbv-132-learning-content-badges-20220921 (pull request #9 )
...
Implement learning content type badges
2022-09-27 08:37:46 +00:00
5667921518
Take MediaCategoryDetail data from api
2022-09-23 17:47:19 +02:00
8941f4ad24
Merge branch 'feature/mediathek-server' into feature/mediathek-frontend
2022-09-23 16:17:02 +02:00
a7f0d79c0f
Add serializer for media_library models
2022-09-23 15:38:06 +02:00
79c0fb8b11
Refactor
2022-09-23 15:14:42 +02:00
5425c1b22c
Add content collections with create_default script
2022-09-23 14:55:21 +02:00
f9c3e82b66
Adapt LearningPath to new course model
2022-09-23 14:55:21 +02:00
ee4f6fb565
Add course app with default course model
2022-09-23 14:55:21 +02:00
a75a29f57c
Squashed commit of feature/Mediathek from Renzo
...
commit ac0707296df479c0de5399b8adcccc24da749810
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Thu Sep 15 11:39:01 2022 +0200
Revert "Upgrade to Wagtail 4.0"
This reverts commit e6f43f6b11e91a923badbaec33ab460a3cfac60e.
commit d5b28e362f604d17fed32fabe8295865b82350de
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Thu Sep 15 11:38:14 2022 +0200
Add factories for category content
commit e6ebabc1c6b01ccbc14413bbe40e71a348dfa565
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Tue Sep 13 16:10:58 2022 +0200
Simplify Mediathek models
commit b4dd179b891960babb8c26a70d3cecfcabb72264
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Mon Sep 12 15:53:00 2022 +0200
Add Document and Link to Mediathek
commit 707ab8d9abc622f3ef5935472ddc7e7c74a352e6
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Mon Sep 12 14:16:49 2022 +0200
Add Media Library Models, including factory and default data
commit e6f43f6b11e91a923badbaec33ab460a3cfac60e
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Mon Sep 12 11:09:46 2022 +0200
Upgrade to Wagtail 4.0
2022-09-23 14:55:21 +02:00
442ee3e4da
Add basic mediacenter store
2022-09-19 14:40:06 +02:00
a0ea8a18a6
WIP: Add basic Handlungsfeld page
2022-09-19 14:40:06 +02:00
070c79a0d9
WIP: Add icons to safelist
2022-09-19 14:38:50 +02:00
5663fe1a74
Try to make cypress tests less flaky
2022-09-14 16:29:41 +02:00
a3171da28d
Dynamic "Weiter gehts" "Leider gehts"
2022-09-14 15:52:44 +02:00
20a3de4d80
VBV-144: enable `hyphens: auto` on body tag
2022-09-14 15:52:44 +02:00
48b143b99a
Remove superfluous media files
2022-09-09 11:57:45 +02:00
3ff2b23cf7
VBV-142: move "/media" to "/static/media"
2022-09-09 11:56:49 +02:00
9c24ede7ab
Add player from scormcontent
2022-09-08 14:32:17 +02:00
2e59d2464c
Add parent prefix to slugs
2022-09-02 17:42:14 +02:00
d5f4b37cfe
VBV-102: refactor server urls
2022-09-02 14:33:38 +02:00
18acf10c9a
Refactor to new url structure for learningPath and circle
2022-08-31 15:28:17 +02:00
26139304a3
Generate additional simple learningPath for development
2022-08-30 15:56:54 +02:00
919edf1a24
Add cypress tests for circle page
2022-08-29 16:22:31 +02:00
52632708db
Make cypress tests run on bitbucket
2022-08-26 18:18:32 +02:00
75a209e04f
Upgrade to Cypress 10, add first login test
2022-08-26 15:06:22 +02:00
01ff7c2f79
Fix trufflehog exclude patterns
2022-08-26 14:39:19 +02:00
0ad8706625
Fix unit tests
2022-08-26 10:47:01 +02:00
c2e2d596b2
Add function to create simple learningpath for unit tests
2022-08-26 10:02:43 +02:00
78ec4569ad
Merge branch 'feature/demodaten_anpassung' into develop
2022-08-25 11:30:18 +02:00
ad4c8771a8
Fix Selbsteinschätzung in "testen"
2022-08-25 08:19:02 +02:00
7ba1857ee2
Add more content
2022-08-24 17:12:01 +02:00
422315e699
Add wbts to media folder 🔥
2022-08-24 17:05:16 +02:00
ec479235f7
Add exercise url as wbt
2022-08-24 17:04:36 +02:00
bef3b59188
test
2022-08-23 15:44:10 +02:00
5af1041a12
Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop
2022-08-18 15:27:30 +02:00
3c2d0a26db
Add Document factories and Collections to test data
2022-08-18 15:27:18 +02:00
08d0245a04
Add media_library app
2022-08-18 11:35:59 +02:00
38d5fc3369
Add logout
2022-08-18 11:09:38 +02:00
df903f2663
Add back link, remove unused code, fix mobile menu margins
2022-08-17 15:59:01 +02:00
3280fc44fa
Fix get email, remove versions from deploy script
2022-08-16 08:00:05 +02:00
67b8aa9f8d
Remove test data, read correct string
2022-08-15 15:51:36 +02:00
b06db37d05
WIP: Add test url
2022-08-15 15:51:36 +02:00
cd829a3c9a
WIP: Update config
2022-08-15 15:51:36 +02:00
55592b1cc6
Fix oauth client selection
2022-08-10 17:09:30 +02:00
759dd97de4
Fix avatar url
2022-08-10 11:00:51 +02:00
abdd91ae72
Add sso params
2022-08-10 09:45:02 +02:00
8bfd2ac953
Update sso settings, add user manager
2022-08-10 08:49:33 +02:00
75b5c5fd5c
Allow other default passwords for users
2022-08-08 11:01:40 +02:00
63e12009ec
Add new test users
2022-08-04 07:17:43 +02:00
d5cea6b969
Update icons
2022-08-02 12:39:54 +02:00
987eeb9def
Style LearningUnit in Wagtail
2022-07-14 16:08:18 +02:00
8edea0b92f
Add page cache for learningpath pages
2022-07-05 15:44:11 +02:00
96020bf83d
performance optimization to get full learningpath content
2022-07-05 13:11:45 +02:00
2daf659d71
Small fixes
2022-07-05 07:40:26 +02:00
ad9c495c9c
Merge remote-tracking branch 'origin/develop' into develop
2022-07-04 12:23:16 +02:00
5f39cfb2e9
fixed learning path text wrapping
2022-07-04 12:22:38 +02:00
2557d478c9
Show finished learningSequences in LearningPathDiagram
2022-07-04 12:15:49 +02:00
cc293400b4
More (copied) content for learningpath
2022-07-04 09:37:26 +02:00
b5e2f5af50
Filter to "de-CH"
2022-06-30 15:25:02 +02:00
d679eeb17d
VBV-78: WBT in Circle eingebaut
2022-06-30 14:11:22 +02:00
4bc533a656
Add new client pages
2022-06-30 14:11:22 +02:00
2af7439b97
VBV-76: Refactor user and login handling
2022-06-30 14:11:21 +02:00
4b02991f0d
Improve DB reset for caprover deployment
2022-06-30 14:11:21 +02:00
ad380f741e
Use wagtail-localize for translations
2022-06-30 14:11:21 +02:00
2c8baf21e4
added player
2022-06-29 14:01:45 +02:00
e90790a006
added wbt
2022-06-29 13:56:12 +02:00
16a4c8ccb4
Make responsive
2022-06-23 19:06:52 +02:00
500ed0f111
Step through circle
2022-06-23 18:33:20 +02:00
3686924cfe
Refactor completion api
2022-06-22 19:04:35 +02:00
12322638dc
Add LearningUnitQuestion as custom model
2022-06-22 16:26:12 +02:00
7e5debb5ca
update icon stuff
2022-06-22 11:21:28 +02:00
2c36ea9242
Add previous-/next- attributes to LearningContents
2022-06-21 18:23:35 +02:00
b893dcbcc8
Add component for learning content
2022-06-21 15:58:05 +02:00
9d768c8205
Changes for deployment
2022-06-21 13:39:48 +02:00
a27fa35fe3
Toggle learning contents
2022-06-14 16:41:21 +02:00
ad7d63a8e9
Copy icons directly as delivered from Steph
2022-06-14 15:33:20 +02:00
a83c2d808a
Add `ItCheckbox` component
2022-06-14 14:15:37 +02:00
1705faee6e
Reset migrations, remove APIFields
2022-06-14 10:56:32 +02:00
c26a3091bb
Show checkboxes correctly in circle
2022-06-14 10:42:29 +02:00
3019f34013
Add dropdown example
2022-06-14 10:42:29 +02:00
736ecb2449
Refactor client can complete learning contents
2022-06-14 10:42:29 +02:00
c334c25f1c
Client can complete learning contents
2022-06-14 10:42:29 +02:00
0d54437bf8
Add first api to complete learning contents
2022-06-14 10:42:29 +02:00
08e5672623
Add completion app
2022-06-14 10:42:29 +02:00
ff23e3b4f7
Refactor circle data model
2022-06-14 10:42:23 +02:00
4cac282dc8
Merge remote-tracking branch 'origin/develop' into feature/learingpath-view
...
# Conflicts:
# server/vbv_lernwelt/learnpath/urls.py
# server/vbv_lernwelt/learnpath/views.py
2022-06-14 10:36:06 +02:00
ed5e409992
added basic grafics to topics
2022-06-13 18:01:20 +02:00
c3481c22d7
added dynamic number of learning sequences
2022-06-08 17:20:11 +02:00
a39f5de67d
added topics to learnpath visualisation
2022-06-08 12:06:47 +02:00
d88d44ecb0
Refactor icons as Web Components
2022-06-08 12:03:47 +02:00
3a9ad53e7a
Upgrade to Wagtail 3.0
2022-06-07 18:16:53 +02:00
bfb34177a8
Added learning path api and view
2022-06-07 16:56:26 +02:00
d02afcf501
Redirect to sorted cms index page
2022-06-07 14:56:30 +02:00
5fda07a5c2
Add workaround for vitejs resolving font path
2022-06-05 21:25:40 +02:00
20d10da944
Refactor Circle data model
2022-06-03 17:52:22 +02:00
fd008be527
Style home page a bit
2022-06-03 10:12:52 +02:00
f480665537
Working serialization
2022-06-01 22:11:10 +02:00
4a2d049969
Refactor data model
2022-06-01 16:41:17 +02:00
cd676bbe96
Update circle view
2022-06-01 11:29:19 +02:00
19cc0c2af3
Add Style Guide page
2022-06-01 10:41:14 +02:00
424af03ce1
Update scripts for building and deployment
2022-05-30 16:58:22 +02:00
a431f35743
Update docs and scripts
2022-05-27 11:01:08 +02:00
5081ddf107
Rename env variable stuff
2022-05-25 18:31:43 +02:00
49aaa526b5
Styling of circle page
2022-05-25 18:23:42 +02:00
ba81ce2215
added content structure to the circle api fields
2022-05-25 15:40:54 +02:00
be99631c9a
Update tailwind
2022-05-23 14:45:49 +02:00
342d0bdd02
Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop
...
# Conflicts:
# server/README.md
2022-05-23 14:40:21 +02:00
5af863fb6c
added api stuff to readme
2022-05-23 14:35:05 +02:00
56a14d2942
removed graphql fields
2022-05-23 14:34:43 +02:00
23c1ccfe7a
Added port info to site, so the links in api work
2022-05-23 11:31:23 +02:00
c3f5e47be0
Add integrated tailwind support for client and server
2022-05-23 11:09:07 +02:00
532212bf03
Serve vue index page in development directly from vue
2022-05-23 09:23:35 +02:00
2a93c05bc2
added wagtail v2 api
2022-05-16 16:57:21 +02:00
515f01c450
fix cms admin page bug
2022-05-16 15:26:02 +02:00
95376290d6
Add local config
2022-05-16 14:42:03 +02:00
36ffd8ed6f
Merge branch 'feature/graphql-api' into develop
...
# Conflicts:
# server/config/settings/base.py
# server/config/urls.py
# server/example.env
# server/requirements/requirements-dev.txt
# server/requirements/requirements.txt
2022-05-16 11:37:29 +02:00
1df0f47966
added graphql fields for wagtail models
2022-05-12 17:15:09 +02:00
cb0611ce6e
added grapple and graphene
2022-05-12 17:14:34 +02:00
3de2c1a2c8
added competence models
2022-05-05 10:28:21 +02:00
fe3d5443a8
created new templates first version of models
2022-05-03 16:28:53 +02:00
19eafd8b35
Experiment with new model structure
2022-05-02 13:42:37 +02:00
65313668cc
Fix typo, make linter happy
2022-04-21 15:57:59 +02:00
14965aa60b
Add middleware and guards
2022-04-21 14:23:52 +02:00
eb289ed729
added more features to topic
2022-04-20 15:36:33 +02:00
3917def262
Use structlogger
2022-04-20 15:24:29 +02:00
bc8d1b0a21
Update env variables, use env variables in vite.config.js
2022-04-20 15:23:10 +02:00
149ba17580
Update oauth redirects
2022-04-20 15:16:32 +02:00
616113aaf9
Login user
2022-04-20 15:16:32 +02:00
61b4e91d67
Add new redirect page
2022-04-20 15:16:32 +02:00
32182fab27
Add local login flag
2022-04-20 14:43:04 +02:00
29258c4348
Fix OpenId login
2022-04-20 14:43:04 +02:00
c6adf1ca41
Fix sso
2022-04-20 14:43:04 +02:00
796db1e83b
Remove models, update settings
2022-04-20 14:43:04 +02:00
95e1228269
Add app structure
2022-04-20 14:43:04 +02:00
5e1b5de187
small changes to template
2022-04-19 17:31:40 +02:00
589c8cfe84
Added example rise module to media
2022-04-19 16:14:48 +02:00
daa51619dc
added video and wbt learning unit content
2022-04-19 16:14:26 +02:00
53675aa69c
Added category to learning sequence
2022-04-14 15:03:36 +02:00
25afc5d8a1
no chli figuretlet
2022-04-13 17:22:48 +02:00
cd8fd49bb9
added circle
2022-04-13 15:06:17 +02:00
ef81bee960
added basic styling to templates
2022-04-13 14:33:07 +02:00
024358917c
refactored template
2022-04-12 16:41:46 +02:00
a6f1b8572f
added basic html templates
2022-04-12 16:24:26 +02:00
cd4276a7a5
Added function to create testdata and DB
2022-04-12 14:53:50 +02:00
3496a20489
created learnpath factories
2022-04-05 11:07:03 +02:00
35d26276e1
fixed tests with multilanguage stuff
2022-04-04 16:01:02 +02:00
03640646be
added locale test
2022-04-04 14:18:27 +02:00
af3b7da461
fixed imports
2022-03-31 17:35:48 +02:00
18233aa4e6
added example tests
2022-03-31 15:17:32 +02:00
3c56ba308f
added learningpath apps and fist tests
2022-03-30 15:10:02 +02:00
45ab89ea07
added learnpath app
2022-03-28 17:41:58 +02:00
ca709c9766
Refactor logging config
2022-02-08 21:37:02 +01:00
b5a243b141
Configure logging
2022-02-08 18:50:56 +01:00
e4a04b8bdd
Add configuration
2022-02-08 17:03:40 +01:00
7549d42e1e
Add rate limit libraries
2022-02-08 16:16:12 +01:00
09b525eb15
Add cypress tests
2022-02-08 14:44:11 +01:00
8dd3316f8f
Prepare django for cypress
2022-02-08 13:45:40 +01:00
db291b50c0
Add simpletodo htmx example app
2022-02-08 08:37:51 +01:00
15bea892e4
Add simpletodo app
2022-02-03 21:37:43 +01:00
d41e1da419
Add tests
2022-02-03 21:23:30 +01:00
aa476b4318
Improved logging
2022-02-03 18:38:53 +01:00
045391fc59
Code formatting
2022-02-03 17:52:21 +01:00
425273c5a3
Move django project to `server` directory
2022-02-03 17:33:59 +01:00
Daniel Egger
Elia Bieri
Christian Cueni
Daniel Egger
Lorenz Padberg
Ramon Wenger