Commit Graph

1246 Commits

Author SHA1 Message Date
Lorenz Padberg d856cd9a92 Make username case insensitive 2023-07-12 17:25:31 +02:00
Lorenz Padberg 7d74003d0d Enable login with email, like the form says 2023-07-12 17:24:51 +02:00
Lorenz Padberg c962005286 Increase Test speed 2023-07-12 17:24:51 +02:00
Ramon Wenger 28a23c4d02 Update test with pytest syntax further 2023-05-31 13:34:21 +02:00
Ramon Wenger 8938ec79cf Rewrite a test to use pytest syntax 2023-05-30 21:41:30 +02:00
Ramon Wenger 9d50db59f6 Add pytest dependency to project, also add config
Change deprecated code for importing translations

Change deprecated syntax in tests

Replace deprecated django url methods

Add plugins and change testing script
2023-05-30 16:30:28 +02:00
Ramon Wenger a400df1668 Add new license ISBNs
Resolves MS-724 #complete
2023-05-25 12:08:28 +02:00
Ramon Wenger 3cd3ce7c8e Fix missing variable error 2023-05-24 20:54:14 +02:00
Ramon Wenger 266356b510 Update types and schema 2023-05-24 20:28:01 +02:00
Ramon Wenger d1664592ce Change "invalid_coupon" error into a result 2023-05-24 00:26:29 +02:00
Ramon Wenger 5e78d08c48 Add some QoL scripts for restoring a database and extending a user
license
2023-05-23 12:31:57 +02:00
Ramon Wenger 6f4d50b033 Update command form exporting instruments 2023-05-23 12:30:58 +02:00
Ramon Wenger fc3feb1eb7 Fix wrong color in MyKV admin
Resolves MS-711 #complete
2023-05-17 15:14:30 +02:00
Ramon Wenger 7640db402d Change colors in editor depending on environment theme
Resolves MS-712 #complete
2023-05-11 16:29:03 +02:00
Ramon Wenger dd66bab53a Change secondary link color depending on theme env variable
Resolves MS-711 #complete
2023-05-08 17:49:35 +02:00
Ramon Wenger 10d5a281eb Change ParentalKey relation back to old ForeignKey to prevent deletion 2023-05-04 14:31:09 +02:00
Ramon Wenger db1357fa24 Disable inline panels to prevent unintended deletions 2023-05-01 16:21:30 +02:00
Ramon Wenger 5ed180ad88 Add linked models to module edit page 2023-04-12 16:02:49 +02:00
Ramon Wenger bbcfb98af6 Add an error message when deleting a page with protected foreign keys
Resolves MS-691 #complete
2023-04-11 16:47:18 +02:00
Ramon Wenger 05a7c3fc6f Add superscript and subscript inline text styles
Resolves MS-631 #complete
2023-04-11 16:45:27 +02:00
Ramon Wenger 8bdf17685a Make sentry errors more useful 2023-03-30 13:51:34 +02:00
Ramon Wenger 9ce6f9d48e Refactor some code
Implement suggestions from pull request
2023-03-16 15:30:56 +01:00
Ramon Wenger cb0e23a5ba Fix typo in migration 2023-03-16 14:24:05 +01:00
Ramon Wenger 43ef014cd2 Add dependency to migration 2023-03-16 13:41:46 +01:00
Ramon Wenger 981758a99c Add error handling to migration 2023-03-16 12:07:11 +01:00
Ramon Wenger ec71c66f3c Add another migration for wagtail permissions 2023-03-16 11:38:22 +01:00
Ramon Wenger eb1eb54eba Make migrations reversible 2023-03-16 10:22:21 +01:00
Ramon Wenger c45f0a65c8 Add more missing apps 2023-03-15 18:01:26 +01:00
Ramon Wenger 95fc642e8e Add missing permission 2023-03-15 17:57:33 +01:00
Ramon Wenger 5daea4b3a1 Remove failing tests
Temporarily remove tests, on suspicion of a bug in the framework
2023-03-15 16:10:53 +01:00
Ramon Wenger 41610cc0b6 Handle edge case when the assignment or survey is not set correctly 2023-03-15 15:32:09 +01:00
Ramon Wenger deecef5e5b Add tests and hooks for "after page move" and "after page create" hooks
Relates to MS-666
2023-03-14 17:17:03 +01:00
Ramon Wenger d18b21e466 Add permissions for user groups
Resolves MS-629 #complete
2023-03-14 17:17:03 +01:00
Ramon Wenger 8c74bba204 Add first draft of manual permissions migration
Relates to MS-629 #start_work

Add black to dependencies
2023-03-14 17:16:55 +01:00
Ramon Wenger cc2b4e9809 Clean up imports, reformat code
Remove unnecessary method
2023-03-14 17:16:40 +01:00
Ramon Wenger ba1de78951 Replace query in test 2023-03-14 17:16:40 +01:00
Ramon Wenger 95ad35aecf Add tests for all page types, also implement them 2023-03-14 17:16:40 +01:00
Ramon Wenger 71dbfeb1f4 Add first skeleton of a duplicate method
Add other base ideas for the copy mechanism for content block attached
entities like assignments and surveys

Relates to MS-651

Add test for duplicating entries, also update implementation
2023-03-14 17:16:30 +01:00
Ramon Wenger aad19db4db Refactor support commands
Add todos for the next steps
2023-03-14 17:16:02 +01:00
Ramon Wenger 97e8f076f6 Allow instruments in draft state to be chosen in InstrumentBlocks 2023-03-14 17:16:02 +01:00
Ramon Wenger dee5880565 Update StreamField usage to include JSON 2023-03-14 17:16:02 +01:00
Ramon Wenger 5033668b79 Upgrade wagtail, update paths 2023-03-14 17:16:02 +01:00
Ramon Wenger 7ee322ec20 Fix a bug with adding room entries in module rooms
Resolves MS-656 #complete
2023-02-23 16:50:25 +01:00
Ramon Wenger aa9886be8d Add link to directly go to registration page
Resolves MS-558
2023-02-14 16:26:54 +01:00
Ramon Wenger 6018925361 Add missing migrations 2023-02-14 15:43:37 +01:00
Ramon Wenger 3ab0662a6a Add source to module hero image
Resolves MS-601
2023-02-14 15:25:43 +01:00
Ramon Wenger a629f6a5e6 Add copy link button to chapters, also generate redirect link 2023-02-09 17:48:42 +01:00
Ramon Wenger af4f19720b Add path property to contentblock 2023-02-07 14:23:39 +01:00
Ramon Wenger a8032e1682 Change surveys to not be automatically deleted when their module is deleted 2023-01-31 11:36:30 +01:00
Ramon Wenger a1ac88dbef Exclude bookmarks when copying a page 2023-01-23 12:32:34 +01:00
Ramon Wenger e4dded714c Update sorting of some models in CMS chooser panels 2022-12-15 12:03:19 +01:00
Ramon Wenger e256eac55b Change license duration for mydetailhandel to 260 days 2022-12-13 13:57:25 +01:00
Ramon Wenger 52baf38597 Merge branch 'hotfix/solutions-with-documents' into develop 2022-12-01 17:52:12 +01:00
Ramon Wenger 10394a3829 Fix solution bug 2022-12-01 17:50:48 +01:00
Ramon Wenger ebc4ca50ae Add slugs argument to export instruments command 2022-11-30 16:55:20 +01:00
Ramon Wenger f071e85863 Add new myKV variables, rename app flavor ids 2022-11-30 16:46:54 +01:00
Ramon Wenger d271c81387 Add new licenses for new environments 2022-11-30 15:13:39 +01:00
Ramon Wenger 9c1d647e11 Fix some issues with SurveyJS 2022-10-27 14:47:05 +02:00
Ramon Wenger 043f895810 Fix bug preventing users of adding new list blocks 2022-10-26 16:52:23 +02:00
Ramon Wenger a8bf34102f Fix a bug with nested items 2022-10-19 15:45:37 +02:00
Ramon Wenger bb4c22bee8 Change logging settings 2022-10-13 10:05:01 +02:00
Ramon Wenger ecf01971b0 Merged in feature/duplicate-content-blocks-MS-570-29-09-2022 (pull request #120)
Feature/duplicate content blocks MS-570 29 09 2022

Approved-by: Lorenz Padberg
2022-10-12 15:42:19 +00:00
Ramon Wenger 3d1d749780 Update logging settings 2022-10-12 16:43:28 +02:00
Ramon Wenger ad21cb4588 Disable failing unit test that's difficult to write 2022-10-06 18:25:14 +02:00
Ramon Wenger 5ead2c9af6 Fix some minor issues on instrument overview for myKV 2022-10-06 12:15:45 +02:00
Ramon Wenger 51cfef5e40 Re-add failing tests 2022-10-05 20:12:19 +02:00
Ramon Wenger 35c7da24b2 Disable failing tests temporarily 2022-10-05 15:33:12 +02:00
Ramon Wenger 6c2f414dc0 Add failing test 2022-10-04 17:14:13 +02:00
Ramon Wenger 4489a8dcf8 Handle contents not editable by users on the server
Relates to MS-589
2022-10-04 17:11:03 +02:00
Ramon Wenger a45cdad652 Restore correct order of objectives 2022-10-03 13:46:20 +02:00
Ramon Wenger d844530095 Add copy of content block before the orignal 2022-09-29 16:40:10 +02:00
Ramon Wenger 4693d2c01a Add duplicate action to frontend 2022-09-29 16:40:10 +02:00
Ramon Wenger 6be6ab8092 Add mutation and unit test for duplication 2022-09-29 16:40:10 +02:00
Ramon Wenger d42007a5fc Fix dummy data 2022-09-15 17:52:16 +02:00
Ramon Wenger 6523c11915 Fix unit tests 2022-09-15 17:48:14 +02:00
Ramon Wenger 37e4461a22 Add category information to instrument queries 2022-09-15 16:04:37 +02:00
Ramon Wenger ce5d8603ff Add translations for some models
Relates to MS-479
2022-09-14 16:40:27 +02:00
Ramon Wenger d787367020 Merged in feature/extended-instrument-categories (pull request #118)
Feature/extended instrument categories
2022-09-14 11:33:48 +00:00
Ramon Wenger 8d40c558f0 Fix unit test and cypress test 2022-09-13 20:40:48 +02:00
Ramon Wenger 76ee8bc8a8 Merged in feature/documents-in-solutions (pull request #117)
Feature/documents in solutions

Resolves MS-543 

Approved-by: Lorenz Padberg
2022-09-13 14:42:43 +00:00
Ramon Wenger 759cece268 Refactor code 2022-09-13 16:39:24 +02:00
Ramon Wenger b0a57abaa8 Update the admin view of the new models 2022-09-13 16:34:56 +02:00
Ramon Wenger ac972c7196 Update instrument schema 2022-09-13 16:23:15 +02:00
Ramon Wenger d1c4d63179 Replace category string in instrument type with proper model 2022-09-13 11:23:51 +02:00
Ramon Wenger d172e9a005 Add instrument category model 2022-09-13 10:49:48 +02:00
Ramon Wenger ae3dfdd17f Add todo 2022-09-08 12:29:41 +02:00
Ramon Wenger 7fae655543 Add documents to client view 2022-09-08 12:28:37 +02:00
Ramon Wenger d96a8c7b11 Add document to solution, add more generic document block 2022-09-07 08:41:06 +02:00
Ramon Wenger b244c7349d Increase test license duration for MyKV 2022-09-01 15:44:24 +02:00
Ramon Wenger 113995b520 Fix student submission page error 2022-08-22 21:12:25 +02:00
Lorenz Padberg 2a10debbd0 Remove conflicting migration 2022-08-03 14:44:20 +02:00
Lorenz Padberg c432825aa8 Merge branch 'release/Wagtail-anpassungen' into develop
# Conflicts:
#	server/core/settings.py
#	server/users/migrations/0032_alter_license_isbn.py
2022-08-03 14:34:54 +02:00
Lorenz Padberg 8bba23745a Remove migration 2022-08-03 13:00:21 +02:00
Lorenz Padberg 88a9d98c0a Improve document not found error handling 2022-08-03 11:25:19 +02:00
Lorenz Padberg 21413b183a Merge branch 'feature/MS-540-use-custom-document-model' into release/Wagtail-anpassungen 2022-08-03 11:13:34 +02:00
Lorenz Padberg 78abe81f8f Add migration to custom document model 2022-08-03 11:13:08 +02:00
Lorenz Padberg ea67b8b64c Add migration function for custom document model 2022-08-03 11:03:42 +02:00
Lorenz Padberg cc9efd216b Show display_text property in frontend 2022-08-02 15:54:03 +02:00
Lorenz Padberg 71daea3479 Refactor core/views 2022-07-28 18:01:48 +02:00
Lorenz Padberg 8dd865ae97 Overwrite default sort ordering in CMS Pages overview 2022-07-28 17:57:20 +02:00
Lorenz Padberg bbaa5882e0 Filter out snapshot content blocks from CMS Explore view 2022-07-28 17:46:29 +02:00
Lorenz Padberg 4d13d5e42d Add custom Document Model (No migration) 2022-07-28 15:56:58 +02:00
Ramon Wenger d8fd531cda Merged in feature/refactor-submission-feedback (pull request #112)
Feature/refactor submission feedback

Approved-by: Lorenz Padberg
2022-07-28 13:16:37 +00:00
Lorenz Padberg 9fea218dd3 Add cms_document_block to Basic Knowlege page 2022-07-27 16:30:48 +02:00
Lorenz Padberg dc7c80fbd9 Remove list filter from Assignments and Survey pages 2022-07-27 16:30:13 +02:00
Lorenz Padberg 7a77ae6eb2 Remove user created content blocks from Chapter overview in CMS 2022-07-27 16:09:17 +02:00
Lorenz Padberg 0398c1bfc6 Add Status to Instruments List 2022-07-27 15:58:54 +02:00
Lorenz Padberg 9f7bd8b6b4 Add search to Instruments 2022-07-27 15:44:16 +02:00
Lorenz Padberg 5137955b54 Fix Ordering filter in pages list template 2022-07-27 15:16:52 +02:00
Lorenz Padberg 98393b046f Fix comment 2022-07-26 11:11:10 +02:00
Lorenz Padberg 3b7595db9d Merge branch 'feature/MS-540-Use-wagtail-documents' into release/Wagtail-anpassungen 2022-07-26 11:05:36 +02:00
Lorenz Padberg d7b2c36994 Merge branch 'feature/MS-539-Add-search' into release/Wagtail-anpassungen 2022-07-26 11:05:04 +02:00
Lorenz Padberg c679f84236 Add cms-document-block to api and frontend 2022-07-25 18:24:34 +02:00
Lorenz Padberg 47ff1192b4 Apply comments / recommendations of pullrequest 2022-07-25 16:43:30 +02:00
Lorenz Padberg 08970ff780 Add cms_block to uitls mutations 2022-07-25 16:32:06 +02:00
Lorenz Padberg fde57dd900 added survey menu to cms 2022-07-18 15:16:29 +02:00
Lorenz Padberg c1f8a18c8f removed dead code... added sorting 2022-07-18 14:14:41 +02:00
Ramon Wenger 46c5557fe5 Set the default wagtail search backend explicitly
Resolves MS-544
2022-07-15 17:56:25 +02:00
Ramon Wenger c7cf52c33f Fix faulty default value declaration for ISBN of licenses 2022-07-15 17:52:03 +02:00
Lorenz Padberg aaee137c07 removed page title explore 2022-07-14 17:03:27 +02:00
Lorenz Padberg 25a0f7fc26 refactoring 2022-07-14 17:02:52 +02:00
Lorenz Padberg e9e0e96357 Added inhaltsbloecke to chapter navigation 2022-07-14 17:01:09 +02:00
Lorenz Padberg 2d36f8a131 experiements with admintemplates 2022-07-14 13:53:07 +02:00
Lorenz Padberg 7bb3e06903 added meta_title to display in cms 2022-07-14 11:40:04 +02:00
Lorenz Padberg 7c959fd018 added document chooser block for wagtail documents 2022-07-12 13:51:31 +02:00
Lorenz Padberg 0dbc7ba8c4 added document urls to wagtail. URLS config (fixes 500 error) 2022-07-12 13:38:11 +02:00
Ramon Wenger e296191707 Add missing migrations 2022-07-12 13:11:42 +02:00
Lorenz Padberg 1d4fb2b956 added search to surveys in snippets 2022-07-12 11:20:39 +02:00
Lorenz Padberg f92ddcbc50 added search to assignments 2022-07-12 11:02:13 +02:00
Ramon Wenger 0aa60c5853 Add confirm dialog and custom text to room and room entry delete actions
Resolves MS-524
2022-07-11 16:34:33 +02:00
Ramon Wenger ff7e5ad1f6 Merged in feature/rooms-updated-edit-fields-MS-486-MS-487 (pull request #111)
Feature/rooms updated edit fields MS-486 MS 487

Approved-by: Lorenz Padberg
2022-07-11 13:26:51 +00:00
Ramon Wenger 1780893da2 Refine filters for RoomEntry admin 2022-07-07 16:12:12 +02:00
Ramon Wenger 8a83496307 Refine list filter and search fields for room admin 2022-07-07 16:09:11 +02:00
Ramon Wenger b0591d9c7e Adjust permissions, add unit tests 2022-07-06 17:48:29 +02:00
Ramon Wenger a01efaa558 Add data migration for new category
Resolves MS-537
2022-06-30 14:55:40 +02:00
Ramon Wenger 0eba96fd5e Make the student submissions changeable by any teacher
Resolves MS-520
2022-06-29 16:40:10 +02:00
Ramon Wenger 866e6f718c Update delete mutation signature 2022-06-28 12:30:47 +02:00
Ramon Wenger f2f7d30959 Add subtitle block to room entry contents
Resolves MS-487
2022-06-28 11:22:04 +02:00
Ramon Wenger 1fe1dbe92d Fix unit test 2022-06-27 17:01:09 +02:00
Ramon Wenger a81bb0e1e8 Add new edit page for room entries
Also use slug instead of id to identify room entries
2022-06-27 11:29:01 +02:00
Ramon Wenger cc28a44c6a Update schema 2022-06-23 16:07:02 +02:00
Ramon Wenger a89bf06c53 Update unit test, re-enable cypress tests 2022-06-23 15:42:46 +02:00
Ramon Wenger 14319a0ca8 Update save method to work on new room entry page 2022-06-23 15:35:31 +02:00
Ramon Wenger 0b70537241 Resolve migration conflict, add missing migration 2022-06-23 12:08:34 +02:00
Ramon Wenger d458790117 Move save method from modal to new page 2022-06-23 11:31:56 +02:00
Ramon Wenger 2fbd878387 Merged in feature/cms-improvements-ms-517-ms-518-ms-519 (pull request #108)
Feature/cms improvements ms 517 ms 518 ms 519

Approved-by: Daniel Egger
2022-06-22 15:07:49 +00:00
Ramon Wenger a2b62c4c25 Merge branch 'hotfix/visible-student-submissions' into develop 2022-06-21 17:01:33 +02:00
Ramon Wenger c0806d6b82 Fix query for users in same school class
Now only queries for the active school class instead of all school
classes
2022-06-21 16:42:27 +02:00
Ramon Wenger 34afbbe1be Change assignment text widget to be rich text
Resolves MS-518
2022-06-15 17:41:57 +02:00
Ramon Wenger dddce52150 Add bold style to default rich text editor features 2022-06-15 17:41:21 +02:00
Ramon Wenger 9f86b3c685 Update schema 2022-06-14 14:38:41 +02:00
Ramon Wenger 0d7b948e44 Fix unit tests 2022-06-14 14:33:17 +02:00
Ramon Wenger e5641b7f93 Update unit test and add mutation 2022-06-14 11:27:32 +02:00
Ramon Wenger 14b2905470 Fix failing test 2022-06-13 15:51:53 +02:00
Ramon Wenger 22460fcf28 Update unit tests 2022-06-13 15:37:15 +02:00
Ramon Wenger af7dfad9c1 Add new types file 2022-05-25 21:56:19 +02:00
Ramon Wenger b12d1c1a9f Add mutation to update a snapshot 2022-05-25 21:55:55 +02:00
Ramon Wenger 1f7ff13a13 Add unit tests for new features 2022-05-25 21:55:17 +02:00
Ramon Wenger 2fe7a684c5 Update base client usage 2022-05-25 21:53:49 +02:00
Ramon Wenger 5069c5b5ec Add new field on snapshot, add migration 2022-05-24 22:49:16 +02:00
Ramon Wenger 7da52b03a1 Merged in feature/topic-404 (pull request #106)
Feature/topic 404

Approved-by: Christian Cueni
2022-05-23 18:21:37 +00:00
Ramon Wenger ae4fec5603 Remove unused code 2022-05-23 20:18:29 +02:00
Ramon Wenger 102b341920 Add filter to export 2022-05-23 12:41:18 +02:00
Ramon Wenger ce9d58ad5c Add unit test 2022-05-19 18:33:45 +02:00
Ramon Wenger 775bff5c1b Add new class instead of dict 2022-05-19 15:35:29 +02:00
Ramon Wenger 6e1501f33b Add 404 type response to topic query 2022-05-19 11:19:19 +02:00
Ramon Wenger 3278774876 Add search fields to survey admin 2022-05-19 11:18:38 +02:00
Ramon Wenger 83da3dbfcd Add new instrument sub-categories
Fixes MS-493
2022-05-18 17:09:07 +02:00
Ramon Wenger 7691774426 Fix license bug on test environments 2022-05-18 16:51:48 +02:00
Ramon Wenger 01aa9b6965 Unify platform and app flavor 2022-05-18 15:50:53 +02:00
Ramon Wenger 3caa3638fc Add method for default isbn 2022-05-17 13:56:04 +02:00
Ramon Wenger 5c944c09db Fix missing variable 2022-05-16 22:36:00 +02:00
Ramon Wenger ad34cf50cf Add my-kv licenses and per-platform check for them 2022-05-16 17:47:46 +02:00
Ramon Wenger 26c0ca7792 Remove unused env variables 2022-05-11 15:51:11 +02:00
Ramon Wenger 43bbf45d61 Provide an example for a heroku config 2022-04-21 16:02:22 +02:00
Ramon Wenger 91796f7ec2 Update example env file 2022-04-21 14:00:10 +02:00
Ramon Wenger 83024fa198 Merge branch 'hotfix/snapshots-without-creator' into develop 2022-04-14 16:42:20 +02:00
Ramon Wenger a9c01bd6d9 Fix snapshot bug for cases when the snapshot has no creator 2022-04-14 16:41:10 +02:00
Ramon Wenger 65426fc034 Remove unused packages 2022-04-13 14:12:42 +02:00
Ramon Wenger ddb7bb9dbc Remove instruments from CMS explorer 2022-04-13 14:11:57 +02:00
Ramon Wenger ad9e147ec1 Add export script for instruments 2022-04-12 16:16:28 +02:00
Ramon Wenger c6ddb3b051 Update `create team` mutation signature 2022-04-12 14:57:56 +02:00
Ramon Wenger 861437fcae Fix unit test 2022-04-12 13:39:09 +02:00
Ramon Wenger f6cc6f6a83 Add cypress test for validation case 2022-04-12 12:36:43 +02:00
Ramon Wenger 4973037486 Update error handling in mutation for school class creation 2022-04-08 17:32:10 +02:00
Ramon Wenger d09844a67b Remove content blocks belonging to snapshots from CMS explorer 2022-04-05 13:16:09 +02:00
Ramon Wenger 3c6160a7bb Fix explorer view bug 2022-04-04 17:34:21 +02:00
Ramon Wenger 200553413a Refactor default settings panel 2022-04-04 17:33:54 +02:00
Ramon Wenger e699ea86f9 Update wagtail definitions 2022-04-04 10:58:09 +02:00
Ramon Wenger d50479c04d Make assignments searchable 2022-03-31 00:23:58 +02:00
Ramon Wenger c732a3f6ee Add survey migrations 2022-03-31 00:23:38 +02:00
Ramon Wenger 10637f6f86 Update unit test 2022-03-30 17:11:32 +02:00
Ramon Wenger 61f006e1b3 Upgrade django and wagtail versions 2022-03-30 16:11:31 +02:00
Ramon Wenger a993eeacfc Add new instrument type 2022-03-01 10:57:49 +01:00
Ramon Wenger b5ffb3ee29 Update mutation to pass test 2022-02-24 16:24:42 +01:00
Ramon Wenger 3034f77640 Add test for mutation 2022-02-23 23:46:08 +01:00
Ramon Wenger 1112c6754e Add subtitle block to user content block form 2022-02-03 16:24:46 +01:00
Ramon Wenger b84c9c2d68 Fix unit test 2022-01-30 17:44:47 +01:00
Ramon Wenger 12f16c3971 Update bookmark in module 2022-01-30 00:14:45 +01:00
Ramon Wenger 1f0434376c Fix unit tests 2022-01-29 21:26:18 +01:00