Commit Graph

248 Commits

Author SHA1 Message Date
Daniel Egger a999375f23 Update slugs when parent changes slug due to title change 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 5d0f7b88b5 Add sync 2023-07-20 15:34:10 +02:00
Christian Cueni 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
Christian Cueni 65d527d894 Add student export for edoniq 2023-07-19 16:02:11 +02:00
Daniel Egger e8178fa36a Format code 2023-07-14 17:14:00 +02:00
Daniel Egger f25602c84c Change types to use UUID ids 2023-07-14 14:55:45 +02:00
Daniel Egger a5acc66981 VBV-450: Custom CourseSessionAttendanceCourse model 2023-07-10 13:46:56 +02:00
Lorenz Padberg 89ff4af3c8 Refactoring 2023-07-10 13:46:56 +02:00
Lorenz Padberg f05d7b2279 Rename Event -> DueDate 2023-07-10 13:46:21 +02:00
Lorenz Padberg 4d8c219076 Add events app 2023-07-10 13:46:21 +02:00
Daniel Egger 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
Daniel Egger 6e7935a005 Add locize cli script 2023-07-05 19:20:10 +02:00
Elia Bieri dcf855a443 Cherrypick logging configuration from VBV-326 2023-06-28 17:17:05 +02:00
Daniel Egger 261952f605 Change LOGIN_URL for server logout 2023-06-02 15:16:41 +02:00
Daniel Egger 353992441b Fix test settings 2023-06-02 11:45:13 +02:00
Daniel Egger db78f1a9cf Fix static files problem with correct whitenoise settings 2023-06-02 11:12:00 +02:00
Daniel Egger 9d0c41322c More cleanup 2023-06-02 09:36:29 +02:00
Daniel Egger 3158033d57 Rework VITE_* variables... 2023-06-02 00:10:34 +02:00
Daniel Egger a67a06d69b Cleanup oauth env variables 2023-06-01 22:44:42 +02:00
Daniel Egger 6ab8be4e58 Cleanup env variables 2023-06-01 22:14:13 +02:00
Daniel Egger fb74ffeeb2 VBV-381: rename app env variable to VITE_APP_ENVIRONMENT 2023-06-01 21:55:56 +02:00
Daniel Egger 800a07ba7e Set default app env for local development to "local" 2023-06-01 21:48:35 +02:00
Daniel Egger 8eb87327df Remove references to `IT_USE_AZURE_BLOB_STORAGE` 2023-05-30 11:41:42 +02:00
Lorenz Padberg c66d25daa3 Format with ufmt 2023-05-30 10:56:08 +02:00
Lorenz Padberg 9f94191c7a Fix Allowed hosts 2023-05-30 10:56:08 +02:00
Lorenz Padberg 0a5a6fa4ce Add azure blob storage as default media storage 2023-05-30 10:55:36 +02:00
Lorenz Padberg 6e264b1480 Add azure blob storage to django 2023-05-30 10:55:36 +02:00
Lorenz Padberg d0f48866f5 Add additional Env variables 2023-05-30 10:55:36 +02:00
Daniel Egger 8d879ba981 Add graqhql introspection schema 2023-05-16 17:08:54 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +02:00
Daniel Egger 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
Daniel Egger 32c3d6d1b4 Format code 2023-05-08 14:27:40 +02:00
Daniel Egger 5868468a48 Add grades to AssingmentEvaluation 2023-05-08 14:27:40 +02:00
Daniel Egger 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
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 9dd9a02592 Add new package to help with editing JSON fields 2023-04-25 17:23:58 +02:00
Daniel Egger 8ffea5bc1b Format code 2023-04-25 13:20:02 +02:00
Daniel Egger baf5801b6a Add grading api endpoint 2023-04-25 13:20:02 +02:00
Lorenz Padberg 766af5444a Merged in feature/improve-test-speed (pull request #61)
Select MD5 (faster) password hasher for tests

Approved-by: Christian Cueni
2023-04-20 15:45:06 +00:00
Lorenz Padberg 7fffd6cbae Select MD5 (faster) password hasher for tests
In the timeline project this reduced test time by 10%.
2023-04-18 16:52:43 +02:00
Daniel Egger 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
Daniel Egger 8f84ef7502 Adapt api so it can fetch assignment page by id 2023-04-05 21:43:15 +02:00
Elia Bieri 9ecb9a9add Add initial wagtail models 2023-04-05 21:43:15 +02:00
Daniel Egger 8d41d3d3a2 VBV-193 refactored course completion for course sessions 2023-03-31 18:27:47 +02:00
Elia Bieri 10f34f53d8 Merged in feature/storybook (pull request #49)
Integrate Storybook

* Merged in feature/caprover-deploy (pull request #47)

Feature/caprover deploy

Approved-by: Christian Cueni
* Merge branch 'feature/storybook' of bitbucket.org:iterativ/vbv_lernwelt into feature/storybook

* Add stories

* Add BuenosAires font to storybook

* Mute typecheck error

* Update bitbucket deployment

* Add ItNavigationProgress component

* Update pipelines file

* Update pipelines file

* Merged develop into feature/storybook

Approved-by: Daniel Egger
2023-03-29 13:45:13 +00:00
Daniel Egger 1f7b9252ab Remove api page chache -> it is not needed anymore 2023-03-17 11:15:56 +01:00
Elia Bieri b5e4c30d40 Merged in feature/notifications (pull request #15) 2023-02-08 11:39:27 +00:00
Christian Cueni 44ed154814 Add summary component 2023-01-31 08:26:15 +01:00
Christian Cueni 88848aa292 WIP: Add single feedback endpoint 2023-01-31 08:26:15 +01:00
Christian Cueni 46710d29b9 Add summary endpoint 2023-01-31 08:26:15 +01:00
Daniel Egger 9fc834e99e Refactor cockpit circle handling 2023-01-11 15:54:50 +01:00
Daniel Egger 597c9f267b Check permissions for accessing user completions 2023-01-11 15:54:50 +01:00
Christian Cueni ae62b43606 Fix upload, add delete s3 files command 2023-01-11 07:38:47 +01:00
Christian Cueni e197a17f15 Fix user header on circle page 2023-01-10 08:58:44 +01:00
Christian Cueni 660c288f6f Change default expiry, add file size hint 2023-01-10 08:09:16 +01:00
Christian Cueni cb9249328e Add delete unreferenced file command 2023-01-10 08:09:13 +01:00
Christian Cueni fc017961ab Verify permissions 2023-01-10 08:05:02 +01:00
Christian Cueni 8ad84cc778 WIP: Add tests 2023-01-10 08:05:02 +01:00
Daniel Egger 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 c64bc463db Make formatter happy 2022-12-29 16:28:36 +01:00
Ramon Wenger e1d9df7d31 Add initial implementation of feedback form 2022-12-29 16:20:20 +01:00
Daniel Egger 5aa73e4997 Fix problem in competence pages 2022-12-02 16:57:44 +01:00
Daniel Egger 218756e3dc Add drf view to request completion data for user 2022-12-02 14:53:49 +01:00
Daniel Egger 963250a8da Add role to course session user 2022-12-02 13:59:27 +01:00
Daniel Egger 205cb3c1d4 Add view for course session members 2022-12-02 13:44:28 +01:00
Christian Cueni d9390ef82d Add basic cockpit page 2022-12-01 16:02:43 +00:00
Ramon Wenger cb7b00ff40 Add GraphQL urls 2022-11-21 12:04:57 +01:00
Ramon Wenger 7b4860f170 Add settings for S3 storage and Grapple/GraphQL 2022-11-17 15:19:27 +01:00
Daniel Egger 93a0fdaadb Add ÜK1 course 2022-11-09 12:40:01 +01:00
Daniel Egger 17eaf80d2c Add CourseSession serializer and view 2022-11-09 12:40:00 +01:00
Daniel Egger c61ea10c7d Format code 2022-11-09 12:40:00 +01:00
Daniel Egger d8577c70d5 Limit page access to users which can access course 2022-11-09 12:40:00 +01:00
Ramon Wenger 5cfce209b6 Re-add reading of local .env file 2022-11-09 10:52:23 +01:00
Christian Cueni 03bbd26774 Add translations strings 2022-11-08 15:05:54 +01:00
Christian Cueni 3608156353 WIP: Setup i18n 2022-10-27 16:09:06 +02:00
Daniel Egger be68854545 Enable django watchfiles runserver reloader 2022-10-11 16:46:53 +02:00
Daniel Egger a2bb4aeb18 Upgrade some python packages 2022-10-11 16:46:53 +02:00
Daniel Egger 5b3a751704 Load media items from backend to show in frontend 2022-10-04 14:42:34 +02:00
Daniel Egger 71b072ade2 Refactor media content data models 2022-10-04 14:42:34 +02:00
Daniel Egger 827e7a0fc0 Add code formatting with prettier and black 2022-09-30 17:43:06 +02:00
Daniel Egger bdae082550 Fix self-evalution checkboxes 2022-09-28 16:19:01 +02:00
Daniel Egger 8ab17f9370 Readd completion code 2022-09-28 15:11:08 +02:00
Daniel Egger b5804c2696 Fix test lerngang 2022-09-28 14:52:25 +02:00
Daniel Egger 9c77526646 Add initial competence django app 2022-09-27 15:57:17 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger ee4f6fb565 Add course app with default course model 2022-09-23 14:55:21 +02:00
Daniel Egger 2e59d2464c Add parent prefix to slugs 2022-09-02 17:42:14 +02:00
Daniel Egger d5f4b37cfe VBV-102: refactor server urls 2022-09-02 14:33:38 +02:00
Daniel Egger b404578926 Upgrade client libraries 2022-08-30 15:56:54 +02:00
Daniel Egger 52632708db Make cypress tests run on bitbucket 2022-08-26 18:18:32 +02:00
Daniel Egger 0ad8706625 Fix unit tests 2022-08-26 10:47:01 +02:00
Daniel Egger 742d527ffa VBV-133: Aufbau Stage- und Prod-Umgebung auf CapRover 2022-08-24 15:40:34 +02:00
Lorenz Padberg 5af1041a12 Merge branch 'develop' of bitbucket.org:iterativ/vbv_lernwelt into develop 2022-08-18 15:27:30 +02:00
Lorenz Padberg 3c2d0a26db Add Document factories and Collections to test data 2022-08-18 15:27:18 +02:00
Lorenz Padberg 08d0245a04 Add media_library app 2022-08-18 11:35:59 +02:00
Christian Cueni 38d5fc3369 Add logout 2022-08-18 11:09:38 +02:00
Christian Cueni b06db37d05 WIP: Add test url 2022-08-15 15:51:36 +02:00
Christian Cueni cd829a3c9a WIP: Update config 2022-08-15 15:51:36 +02:00
Christian Cueni abdd91ae72 Add sso params 2022-08-10 09:45:02 +02:00
Christian Cueni 8bfd2ac953 Update sso settings, add user manager 2022-08-10 08:49:33 +02:00
Daniel Egger 8edea0b92f Add page cache for learningpath pages 2022-07-05 15:44:11 +02:00
Daniel Egger d679eeb17d VBV-78: WBT in Circle eingebaut 2022-06-30 14:11:22 +02:00
Daniel Egger 2af7439b97 VBV-76: Refactor user and login handling 2022-06-30 14:11:21 +02:00
Daniel Egger 4b02991f0d Improve DB reset for caprover deployment 2022-06-30 14:11:21 +02:00
Daniel Egger ad380f741e Use wagtail-localize for translations 2022-06-30 14:11:21 +02:00
Daniel Egger c334c25f1c Client can complete learning contents 2022-06-14 10:42:29 +02:00
Daniel Egger 08e5672623 Add completion app 2022-06-14 10:42:29 +02:00
Daniel Egger 3a9ad53e7a Upgrade to Wagtail 3.0 2022-06-07 18:16:53 +02:00
Daniel Egger d02afcf501 Redirect to sorted cms index page 2022-06-07 14:56:30 +02:00
Daniel Egger 5fda07a5c2 Add workaround for vitejs resolving font path 2022-06-05 21:25:40 +02:00
Daniel Egger fd008be527 Style home page a bit 2022-06-03 10:12:52 +02:00
Daniel Egger 65ecf77a59 Update client with new api data model 2022-06-01 22:24:49 +02:00
Daniel Egger f480665537 Working serialization 2022-06-01 22:11:10 +02:00
Daniel Egger 424af03ce1 Update scripts for building and deployment 2022-05-30 16:58:22 +02:00
Daniel Egger a431f35743 Update docs and scripts 2022-05-27 11:01:08 +02:00
Daniel Egger 5081ddf107 Rename env variable stuff 2022-05-25 18:31:43 +02:00
Daniel Egger 7d233f21ea Style learning sequence 2022-05-25 18:23:42 +02:00
Daniel Egger 740488cdeb Add example view to load data from wagtail API 2022-05-23 10:36:15 +02:00
Daniel Egger 532212bf03 Serve vue index page in development directly from vue 2022-05-23 09:23:35 +02:00
Lorenz Padberg 2a93c05bc2 added wagtail v2 api 2022-05-16 16:57:21 +02:00
Daniel Egger 95376290d6 Add local config 2022-05-16 14:42:03 +02:00
Lorenz Padberg 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
Lorenz Padberg cb0611ce6e added grapple and graphene 2022-05-12 17:14:34 +02:00
Lorenz Padberg d4e6778259 removed django debug toolbar,because it makes wagtail slow 2022-05-03 16:29:25 +02:00
Christian Cueni 14965aa60b Add middleware and guards 2022-04-21 14:23:52 +02:00
Christian Cueni 513b66ff31 Update env variable, add basic http util, remove html 2022-04-20 15:25:29 +02:00
Christian Cueni bc8d1b0a21 Update env variables, use env variables in vite.config.js 2022-04-20 15:23:10 +02:00
Christian Cueni 61b4e91d67 Add new redirect page 2022-04-20 15:16:32 +02:00
Christian Cueni 32182fab27 Add local login flag 2022-04-20 14:43:04 +02:00
Christian Cueni c6adf1ca41 Fix sso 2022-04-20 14:43:04 +02:00
Christian Cueni 796db1e83b Remove models, update settings 2022-04-20 14:43:04 +02:00
Lorenz Padberg cd4276a7a5 Added function to create testdata and DB 2022-04-12 14:53:50 +02:00
Lorenz Padberg 35d26276e1 fixed tests with multilanguage stuff 2022-04-04 16:01:02 +02:00
Lorenz Padberg be76574eeb added multilanguage config to wagtail 2022-03-31 17:36:12 +02:00
Lorenz Padberg 3c56ba308f added learningpath apps and fist tests 2022-03-30 15:10:02 +02:00
Lorenz Padberg f3a6946002 added wagtail to settings and urls 2022-03-29 09:16:51 +02:00
Daniel Egger ca709c9766 Refactor logging config 2022-02-08 21:37:02 +01:00
Daniel Egger b5a243b141 Configure logging 2022-02-08 18:50:56 +01:00
Daniel Egger e4a04b8bdd Add configuration 2022-02-08 17:03:40 +01:00
Daniel Egger 7549d42e1e Add rate limit libraries 2022-02-08 16:16:12 +01:00
Daniel Egger 8dd3316f8f Prepare django for cypress 2022-02-08 13:45:40 +01:00
Daniel Egger db291b50c0 Add simpletodo htmx example app 2022-02-08 08:37:51 +01:00
Daniel Egger 15bea892e4 Add simpletodo app 2022-02-03 21:37:43 +01:00
Daniel Egger d41e1da419 Add tests 2022-02-03 21:23:30 +01:00
Daniel Egger aa476b4318 Improved logging 2022-02-03 18:38:53 +01:00
Daniel Egger 045391fc59 Code formatting 2022-02-03 17:52:21 +01:00
Daniel Egger 425273c5a3 Move django project to `server` directory 2022-02-03 17:33:59 +01:00