ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
3,416 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

333 Commits

Author SHA1 Message Date
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 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 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
Lorenz Padberg 8bba23745a Remove migration 2022-08-03 13:00:21 +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 4d13d5e42d Add custom Document Model (No migration) 2022-07-28 15:56:58 +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 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 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
Ramon Wenger 0b70537241 Resolve migration conflict, add missing migration 2022-06-23 12:08:34 +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 dddce52150 Add bold style to default rich text editor features 2022-06-15 17:41:21 +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 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 ae4fec5603 Remove unused code 2022-05-23 20:18:29 +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 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 ddb7bb9dbc Remove instruments from CMS explorer 2022-04-13 14:11:57 +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 61f006e1b3 Upgrade django and wagtail versions 2022-03-30 16:11:31 +02: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 04c850753f Fix unit tests, change some properties 2022-01-27 17:58:02 +01:00
Ramon Wenger 5b105958e2 Backport more wagtail code 2022-01-25 16:18:25 +01:00
Ramon Wenger a1f6bfc373 Backport more code 2022-01-25 15:31:55 +01:00
Ramon Wenger b51d992546 Add server handling of content list items 2022-01-24 17:52:36 +01:00
Ramon Wenger dc8ec86610 Fix bug in room contents 2021-12-13 16:34:11 +01:00
Ramon Wenger 41bbfd7177 Replace deprecated stream_data with raw_data 2021-12-13 15:53:38 +01:00
Ramon Wenger 87c477d0c4 Update visited field to be timezone-aware 2021-12-13 14:42:49 +01:00
Christian Cueni 98dc5ffda7 Fix bug in exception 2021-11-11 09:13:08 +01:00
Ramon Wenger 812021cb54 Fix unit tests 2021-10-31 22:12:57 +01:00
Ramon Wenger d071afbd67 Add new test for school class read only 
Also clean up some code
 2021-07-28 16:19:42 +02:00
Ramon Wenger 9ea9b9be1b Re-add leave button and inactive members to group list 2021-06-30 15:52:57 +02:00
Ramon Wenger 5202ecdc8e Fix chapter and content block querysets for snapshots 2021-06-29 16:43:07 +02:00
Ramon Wenger e86d67ae35 Change string representation of snapshots 2021-06-22 08:33:30 +02:00
Ramon Wenger e2c989f4a2 Fix chapter visibility properties 2021-06-14 16:01:29 +02:00
Ramon Wenger 01117b5880 Add logging to snapshot 2021-06-14 15:45:54 +02:00
Ramon Wenger ab13b9b8f7 Update variable names 2021-06-14 14:55:15 +02:00
Ramon Wenger 45b3414226 Reset chapter visibilities 2021-06-14 11:30:14 +02:00
Ramon Wenger 9c82dc2bf4 Fix content blocks created by applying a snapshot 2021-06-07 17:45:24 +02:00
Ramon Wenger b26c9c07f5 Clean up code 2021-06-07 16:29:47 +02:00
Ramon Wenger 6646b328b7 Add original creator to custom content blocks 2021-06-03 17:52:29 +02:00
Ramon Wenger a43dffc7f7 Add team admin 2021-05-25 19:17:00 +02:00
Ramon Wenger 3c85ab6520 Fix custom content blocks in snapshot preview 2021-05-25 15:46:43 +02:00
Ramon Wenger c257447748 Add objective change count 2021-05-25 13:46:23 +02:00
Ramon Wenger 7c86338191 Add failing frontend test 2021-05-18 22:40:04 +02:00
Ramon Wenger e1e3b62807 Hide hidden custom entities in snapshot 2021-05-18 22:38:47 +02:00
Ramon Wenger ef15a655b8 Add objectives to snapshot preview 2021-05-18 17:32:38 +02:00
Ramon Wenger a168b3141e Fix unit tests 2021-05-12 15:25:42 +02:00
Ramon Wenger de26a9f8ac Add objectives to snapshots 2021-05-11 23:54:08 +02:00
Ramon Wenger 24c88e84ff Add ability to share a snapshot 2021-05-10 14:05:14 +02:00
Ramon Wenger 4bdcdd8774 Add share snapshot mutation, including unit tests 2021-05-08 23:19:58 +02:00
Ramon Wenger e990596af5 Update snapshot node and mutation 2021-05-06 23:17:48 +02:00
Ramon Wenger 3d78761e20 Add snapshot module header 
Also refactor some queries and other code
 2021-05-06 23:13:57 +02:00
Ramon Wenger da85d3dbc2 Fix frontend tests 2021-05-06 10:59:32 +02:00
Ramon Wenger 45f99385d3 Fix unit tests 2021-05-05 19:47:06 +02:00
Ramon Wenger 70e7dc39a9 Display snapshot module detail 2021-05-05 00:18:53 +02:00
Ramon Wenger 29f3726993 Refactor content block type 2021-05-04 22:52:03 +02:00
Ramon Wenger 85a3131680 Add snapshot module detail query 2021-05-04 15:25:28 +02:00
Ramon Wenger cde5e8d964 Add snapshot creator and created date 2021-04-29 16:46:32 +02:00
Ramon Wenger ead7879787 Add snapshot queries and mutations to server 2021-04-28 00:46:37 +02:00
Ramon Wenger d4a1c201f2 Clean up code, add some todos 2021-04-26 19:26:47 +02:00
Ramon Wenger 8d6f30b2d2 Add mutation to apply a snapshot 
Also add unit test
 2021-04-24 19:59:04 +02:00
Ramon Wenger 1c91ac93a7 Remove unused connection 2021-04-14 23:27:31 +02:00
Ramon Wenger a77d8ceee4 Refactor schema 2021-04-14 23:27:13 +02:00
Ramon Wenger 0bef8fe570 Fix unit test 2021-04-14 23:25:08 +02:00
Ramon Wenger 15aff9054c Add unit test, model and mutation for snapshots 2021-04-14 23:17:50 +02:00
Ramon Wenger 85706d73d1 Refactor module server code 2021-04-12 17:18:12 +02:00
Ramon Wenger be7e280ebc Add first unit test 2021-04-07 10:58:52 +02:00
Ramon Wenger 5e5b413afb Add tests to cover more use cases 2021-03-23 14:09:08 +01:00
Ramon Wenger 4185dc3ea8 Remove unused code 2021-03-22 17:27:22 +01:00
Ramon Wenger 8f6b2e3847 Add rich text editor to assignment solution 2021-03-15 22:47:27 +01:00
Ramon Wenger 9490ffd443 Add module visibility sync mutation 2021-03-12 11:19:56 +01:00
Ramon Wenger 209838dadb Add method for syncing school classes 2021-03-12 11:19:56 +01:00
Ramon Wenger a1490c6049 Add basic test for new visibility feature 2021-03-12 11:19:56 +01:00
Ramon Wenger e10481ce49 Add visibility actions to objective group 2021-02-22 17:04:45 +01:00
Ramon Wenger 8d9761b3ef Add new chapter visibility properties to model and schema 2021-02-18 17:54:02 +01:00
Ramon Wenger 1b19d8e6eb Fix unit test 2021-01-28 13:57:25 +01:00
Ramon Wenger a47a41d351 Always show solutions for teachers 2021-01-27 17:16:42 +01:00
Ramon Wenger 05c43b80fc Add unit test, fix multiple custom content block bug 2020-08-10 19:09:52 +02:00
Ramon Wenger d0af9cfcfc Merge branch 'feature/onboarding' into develop 2020-07-20 11:04:54 +02:00
Ramon Wenger 8765e849e3 Add unit test 2020-07-15 12:02:56 +02:00
Ramon Wenger 6f77603e11 Let teachers see all the contents their classes can see 2020-07-15 11:42:17 +02:00
Ramon Wenger f588abee43 Add onboarding visited flag to user 2020-07-07 22:31:25 +02:00
Ramon Wenger dc0d6523cd Add unit tests for recent modules 2020-06-30 11:33:14 +02:00
Ramon Wenger e899bbe21b Add recently visited modules to user 2020-06-25 15:12:59 +02:00
Ramon Wenger da5bd1e439 Merged in feature/save-last-topic (pull request #67) 
Save last topic and go there on topic navigation

Approved-by: Christian Cueni
 2020-06-18 14:08:18 +00:00
Ramon Wenger 5339ede9aa Remove duplicate migrations 2020-06-17 14:29:15 +02:00
Christian Cueni 1b4a0da2e1 Merged in feature/news (pull request #65) 
Feature/news

Approved-by: Ramon Wenger
 2020-06-17 11:53:45 +00:00
Ramon Wenger c6bdae3fd3 Save last topic and go there on topic navigation 2020-06-16 16:29:41 +02:00
Ramon Wenger 7ef761cf58 Generate missing migrations 2020-05-26 16:05:21 +02:00
Ramon Wenger 09153782d5 Fix dummy data 2020-05-26 11:19:06 +02:00
Christian Cueni 5a042bb115 Add models and graphql 2020-05-20 11:55:06 +02:00
Ramon Wenger cd2e5c953e Update instrument dummy data 2020-05-07 12:22:43 +02:00
Ramon Wenger dcd9f0a92c Add instruction block inside content block 2020-04-12 23:06:49 +02:00
Ramon Wenger 8774b8d324 Add instructions property to topic model 2020-04-10 21:24:15 +02:00
Ramon Wenger dc66293684 Add interdisciplinary instrument 2020-04-08 10:50:06 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger 6205846b80 Clean up code, change some minor things 2020-03-10 11:40:24 +01:00
Ramon Wenger ab9da652cf Allow multiple teachers per school class 
For that purpose, now the enabled solutions are stored on a per school class
basis instead of a per teacher basis
 2020-03-02 17:37:29 +01:00
Ramon Wenger 12f3b2d9a7 Simplify the logic of visible content blocks for students 2020-02-10 09:27:43 +01:00
Ramon Wenger c9222adf60 Update cypress tests to mock the server 2020-01-20 17:14:20 +01:00
Ramon Wenger 17e061892a Fix assignment creation in dummy data 2020-01-20 12:53:49 +01:00
Ramon Wenger 90bc6139d3 Fix prefetch statements 2020-01-16 16:46:43 +01:00
Ramon Wenger 53b0594207 Fix unit tests 2020-01-16 16:36:27 +01:00
Ramon Wenger 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger 66ed01c1d7 Fix bug in objectives 2020-01-16 11:38:00 +01:00
Ramon Wenger ef6711965f Optimize some queries to be easier on the database 2020-01-15 11:30:40 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger 1549cde151 Update MyActivity query to include more activities 2019-12-18 13:11:32 +01:00
Ramon Wenger 3081cb4cd2 Clean up migration conflicts 2019-12-10 15:30:23 +01:00
Ramon Wenger 388c1f63d7 Merged in feature/bookmarks-for-modules-and-chapters (pull request #42) 
Feature/bookmarks for modules and chapters
 2019-12-10 14:09:13 +00:00
Ramon Wenger 44ad1e6a8a Add unit tests 2019-12-09 10:20:41 +01:00
Christian Cueni 84a69b24f1 Incoorperate feedback 2019-12-02 17:12:19 +01:00
Ramon Wenger 7c534cbe5c Add first raw implementation for adtl. bookmark types 2019-12-02 13:56:52 +01:00
Christian Cueni f84efc7f1c Add mutations and tests 2019-11-13 16:29:53 +01:00
Christian Cueni add2c21815 Add feedback model, add migrations 2019-11-12 15:15:09 +01:00
Christian Cueni 95d1c4708a Merge branch 'develop' into feature/highlight-proof-of-concept 
# Conflicts:
#	client/src/components/ContentBlock.vue
 2019-11-06 08:17:40 +01:00
Christian Cueni 81fb4f23cd Change label for basic knowledge block 2019-11-05 10:40:19 +01:00
Ramon Wenger 1c2e0fc88b Add Thinglink block 2019-10-22 17:06:46 +02:00
Ramon Wenger 1d5603ed5f Add note update mutation 2019-10-12 08:54:20 +02:00
Ramon Wenger 62460d58ab Add node for notes 2019-10-12 08:52:23 +02:00
Ramon Wenger a8a6abb2d8 Add model and mutation for adding notes 2019-10-10 09:48:38 +02:00
Ramon Wenger 5fd81a2bd6 Rename Highlight to Bookmark 2019-10-07 17:10:39 +02:00
Ramon Wenger 4247164067 Add highlight mutation 2019-10-02 11:39:40 +02:00
Ramon Wenger 584b48a6a6 Add notes app and a PoC for highlights 2019-10-02 11:38:53 +02:00