Commit Graph

212 Commits

Author SHA1 Message Date
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
Ramon Wenger 8045e01ffd Update naming to be more consistent 2019-09-12 14:28:57 +02:00
Ramon Wenger 3fd9aa1f31 Add helper function 2019-09-11 11:41:34 +02:00
Ramon Wenger b1a87cb08b Fix unit tests 2019-09-09 15:34:13 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 2af5749311 Add module reference to survey 2019-09-09 14:03:04 +02:00
Ramon Wenger 76b3f70a87 Hide single objectives instead of whole groups 2019-08-21 16:26:51 +02:00
Christian Cueni a81e211789 Fix nested modlue slug 2019-08-15 14:27:58 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni b0ae5a7cf1 Use titleslug model for admin slug 2019-08-14 11:52:44 +02:00
Christian Cueni 083a8b03a8 Add admin slug model 2019-08-14 11:52:44 +02:00
Ramon Wenger bdfd6ee510 Change the content block type only if the user specifies a type 2019-07-29 11:22:00 +02:00
Ramon Wenger c81bcbd26b Add survey block to content block in back- and frontend 2019-07-24 14:23:27 +02:00
Ramon Wenger bc76882318 Add missing migrations 2019-07-22 11:33:41 +02:00
Christian Cueni a1234f6688 Merged in feature/nested-block (pull request #26)
Feature/nested block

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-17 15:14:57 +00:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Christian Cueni 2905486c2f Remove content list in wagtail, add content list in frontend 2019-07-16 09:36:43 +02:00
Christian Cueni 036c53dd9f Add content list block 2019-07-15 12:59:00 +02:00
Christian Cueni fd4a9d2e18 Add content list 2019-07-15 12:56:47 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 03d8ed6712 Add subtitle block, update font sizes 2019-07-11 10:41:55 +02:00
Ramon Wenger 4696ed239e Remove required description on instrument block 2019-06-24 16:12:31 +02:00