From 03f418df382ca4b924db22df7a1b0245a92f3408 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 11 Sep 2019 14:45:31 +0200
Subject: [PATCH 1/6] Fix content list numbering

---
 client/src/components/ContentBlock.vue  |  19 +-
 client/tests/unit/content-block.spec.js | 240 ++++++++++++++++++++++++
 2 files changed, 253 insertions(+), 6 deletions(-)
 create mode 100644 client/tests/unit/content-block.spec.js

diff --git a/client/src/components/ContentBlock.vue b/client/src/components/ContentBlock.vue
index f51c210b..6f85068e 100644
--- a/client/src/components/ContentBlock.vue
+++ b/client/src/components/ContentBlock.vue
@@ -152,8 +152,9 @@
           if (content.type === 'content_list_item') {
             contentList = [...contentList, content]
             if (index === this.contentBlock.contents.length - 1) { // content is last element of contents array
+              let updatedContent = [...newContents, ...this.createContentListOrBlocks(contentList, startingIndex)];
               startingIndex = this.updateStartingIndex(startingIndex, contentList);
-              return [...newContents, ...this.createContentListOrBlocks(contentList, startingIndex)];
+              return updatedContent;
             }
             return newContents;
           } else {
@@ -220,19 +221,25 @@
         }];
       },
       updateStartingIndex(startingIndex, contentList) {
-        return contentList.length > 1 ? startingIndex + contentList.length : startingIndex;
+        return contentList.length > 0 ? startingIndex + contentList.length : startingIndex;
       },
       removeSingleContentListItem(content, index) {
         // just handle the case where we have one contentlistItem ( no index like "a)"" will be shown)
-        if (index > 0) {
+
+        if (index === 0) {
           return content;
         };
 
-        let contentListIndex = content.findIndex(contentItem => contentItem.type === 'content_list');
-        if (contentListIndex < 0) {
+        const contentLists = content.filter(contentItem => contentItem.type === 'content_list');
+        if (contentLists.length !== 1) {
           return content;
         }
-        return [...content.slice(0, contentListIndex), ...content[contentListIndex].contents[0].value, ...content.slice(contentListIndex + 1)];
+
+        const listIndex = content.findIndex(contentItem => contentItem.type === 'content_list');
+        if (content[listIndex].contents.length !== 1) {
+          return content;
+        }
+        return [...content.slice(0, listIndex), ...content[listIndex].contents[0].value, ...content.slice(listIndex + 1)];
       }
     },
     data() {
diff --git a/client/tests/unit/content-block.spec.js b/client/tests/unit/content-block.spec.js
new file mode 100644
index 00000000..dfde5350
--- /dev/null
+++ b/client/tests/unit/content-block.spec.js
@@ -0,0 +1,240 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils'
+import ContentBlock from '@/components/ContentBlock'
+import Vuex from 'vuex'
+
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+
+describe('ContentBlock.vue', () => {
+
+  let actions;
+  let store;
+  let getters;
+
+  beforeEach(() => {
+    actions = {};
+    getters = {
+      editModule: jest.fn()
+    };
+
+    store = new Vuex.Store({
+      state: {},
+      getters,
+      actions: {}
+    })
+  })
+
+  it('should update index if content list has minimal length', () => {
+    const props = {
+      contentBlock: {id: 'asbd', type: 'content', contents: []},
+      parent: null
+    };
+    const wrapper = shallowMount(ContentBlock, {
+      propsData: props,
+      store,
+      localVue
+    });
+
+    let contentList = [1,2,3,4];
+    let index = 0;
+    let updatedIndex = wrapper.vm.updateStartingIndex(index, contentList);
+    expect(updatedIndex).toEqual(contentList.length + index);
+  });
+
+  it('should not update index if content list has not minimal length', () => {
+    const props = {
+      contentBlock: {id: 'asbd', type: 'content', contents: []},
+      parent: null
+    };
+    const wrapper = shallowMount(ContentBlock, {
+      propsData: props,
+      store,
+      localVue
+    });
+
+    let contentList = [];
+    let index = 2;
+    let updatedIndex = wrapper.vm.updateStartingIndex(index, contentList);
+    expect(updatedIndex).toEqual(index);
+  });
+
+
+  it('should use continuos item numbering', () => {
+
+    const contents = [
+      {
+        type: 'text_block'
+      },
+      {
+        type: 'content_list_item',
+        id: 1,
+        contents: []
+      },
+      {
+        type: 'text_block'
+      },
+      {
+        type: 'content_list_item',
+        id: 2,
+        contents: []
+      },
+      {
+        type: 'content_list_item',
+        id: 3,
+        contents: []
+      },
+      {
+        type: 'text_block'
+      },
+      {
+        type: 'content_list_item',
+        id: 4,
+        contents: []
+      },
+    ];
+
+
+    const props = {
+      contentBlock: {
+        id: 'asbd',
+        type: 'content',
+        contents
+      },
+      parent: null
+    };
+    const wrapper = shallowMount(ContentBlock, {
+      propsData: props,
+      store,
+      localVue
+    });
+
+    /*
+    expected output
+      [ { type: 'text_block' },
+        { type: 'content_list',
+          contents: [ [Object] ],
+          id: 1,
+          startingIndex: 0 },
+        { type: 'text_block' },
+        { type: 'content_list',
+          contents: [ [Object], [Object] ],
+          id: 2,
+          startingIndex: 1 },
+        { type: 'text_block' },
+        { type: 'content_list',
+          contents: [ [Object] ],
+          id: 4,
+          startingIndex: 3 } ]
+    */
+
+    const updatedContents = wrapper.vm.contentBlocksWithContentLists.contents;
+
+    // start at 0
+    expect(updatedContents[1].startingIndex).toEqual(0);
+    // 2nd content list
+    expect(updatedContents[3].startingIndex).toEqual(1);
+    // 3rd content list
+    expect(updatedContents[5].startingIndex).toEqual(3);
+  });
+
+  it('should remove single content items', () => {
+
+    const contents = [
+      {
+        type: 'text_block'
+      },
+      {
+        type: 'content_list',
+        id: 1,
+        contents: [
+        {
+          type: 'content_list_item',
+          value: [
+            {
+              type: 'text_block'
+            }
+          ]
+        }]
+      },
+      {
+        type: 'text_block'
+      }
+    ];
+
+    const props = {
+      contentBlock: {
+        id: 'asbd',
+        type: 'content',
+        contents: []
+      },
+      parent: null
+    };
+    const wrapper = shallowMount(ContentBlock, {
+      propsData: props,
+      store,
+      localVue
+    });
+
+    const contents2 = wrapper.vm.removeSingleContentListItem(contents, 1);
+
+    const expectList = [
+      { type: 'text_block' },
+      { type: 'text_block' },
+      { type: 'text_block' }
+    ];
+    // start at 0
+    expect(contents2).toEqual(expectList);
+  });
+
+  it('should not remove multiple content items', () => {
+
+    const contents = [
+      {
+        type: 'text_block'
+      },
+      {
+        type: 'content_list',
+        id: 1,
+        contents: [
+        {
+          type: 'content_list_item',
+          value: [
+            {
+              type: 'text_block'
+            }
+          ]
+        },
+        {
+          type: 'content_list_item',
+          value: [
+            {
+              type: 'text_block'
+            }
+          ]
+        }]
+      },
+      {
+        type: 'text_block'
+      }
+    ];
+
+    const props = {
+      contentBlock: {
+        id: 'asbd',
+        type: 'content',
+        contents: []
+      },
+      parent: null
+    };
+    const wrapper = shallowMount(ContentBlock, {
+      propsData: props,
+      store,
+      localVue
+    });
+
+    const contents3 = wrapper.vm.removeSingleContentListItem(contents, 1);
+    expect(contents3).toEqual(contents);
+  });
+
+})

From 23936ec6ae8b0a8cf4cc015da9a60c2c380709eb Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Thu, 12 Sep 2019 09:07:31 +0200
Subject: [PATCH 2/6] Fix bug where surveys don't retain answers without
 reloading

---
 client/src/pages/survey.vue | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/survey.vue b/client/src/pages/survey.vue
index d8dd32f6..79f0ff45 100644
--- a/client/src/pages/survey.vue
+++ b/client/src/pages/survey.vue
@@ -99,7 +99,34 @@
                   data: JSON.stringify(data)
                 }
               }
-            }
+            },
+            refetchQueries: [{
+              query: SURVEY_QUERY,
+              variables: {id: this.id}
+            }],
+            // fixme: make the update work instead of refetching
+            // update: (store, {data: {updateAnswer: {answer}}}) => {
+            //   // try {
+            //   console.log(answer);
+            //   const query = SURVEY_QUERY;
+            //   const variables = {id: this.id};
+            //   const queryData = store.readQuery({query, variables});
+            //   console.log('queryData', queryData);
+            //   if (queryData.survey) {
+            //     console.log('answer.data', answer.data);
+            //     queryData.survey.answer = {
+            //       data: {
+            //         ...data,
+            //         __typename: 'AnswerNode'
+            //       }
+            //     };
+            //     store.writeQuery({query, variables, data: queryData});
+            //   }
+            //   // } catch (e) {
+            //   //   console.error(e);
+            //   //   // Query did not exist in the cache, and apollo throws a generic Error. Do nothing
+            //   // }
+            // }
           });
         });
 

From 3a19f1a0b5bf1ee593b568a22c5c54b716eb803f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 12 Sep 2019 10:35:49 +0200
Subject: [PATCH 3/6] Remove css numbering, use JS instead

---
 .../content-blocks/ContentListBlock.vue       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/client/src/components/content-blocks/ContentListBlock.vue b/client/src/components/content-blocks/ContentListBlock.vue
index bd865cf5..60cd03f9 100644
--- a/client/src/components/content-blocks/ContentListBlock.vue
+++ b/client/src/components/content-blocks/ContentListBlock.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="content-list-block__container">
     <div class="content-list-wrapper">
-      <ol class="content-list" :style="`counter-reset: list ${startingIndex}`">
-        <li class="content-list__item contentlist-item" :key="contentBlock.id" v-for="contentBlock in contentBlocks">
+      <ol class="content-list">
+        <li class="content-list__item contentlist-item"
+            :key="contentBlock.id"
+            v-for="(contentBlock, index) in contentBlocks">
+          <p class="content-list__numbering">{{alphaIndex(index)}})</p>
           <content-block :contentBlock="contentBlock"></content-block>
         </li>
       </ol>
@@ -12,7 +15,8 @@
 </template>
 
 <script>
-  // import ContentBlock from '@/components/ContentBlock';
+
+  const lowerAsciiA = 97;
 
   export default {
     props: ['contents', 'parent', 'startingIndex'],
@@ -23,6 +27,12 @@
       ContentBlock: () => import('@/components/ContentBlock')
     },
 
+    methods: {
+      alphaIndex(index) {
+        return String.fromCharCode(lowerAsciiA + this.startingIndex + index);
+      }
+    },
+
     computed: {
       contentBlocks() {
         return this.contents.map(contentBlock => {
@@ -48,16 +58,14 @@
         list-style: none;
         position: relative;
         padding: 0 2*15px;
+      }
 
-        &::before {
+      &__numbering {
           position: absolute;
           font-weight: 600;
           left: 0;
           color: $color-brand;
-          content: counter(list, lower-alpha) ") ";
-          counter-increment: list;
           line-height: 27px;
-        }
       }
     }
   }

From 8045e01ffd78bc4c517237262d9f90b653e06ead Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Thu, 12 Sep 2019 14:28:57 +0200
Subject: [PATCH 4/6] Update naming to be more consistent

---
 server/assignments/wagtail_hooks.py            |  2 +-
 .../migrations/0003_auto_20190912_1228.py      | 17 +++++++++++++++++
 server/basicknowledge/models.py                |  3 +++
 server/basicknowledge/wagtail_hooks.py         |  2 +-
 .../migrations/0014_auto_20190912_1228.py      | 18 ++++++++++++++++++
 server/books/models/contentblock.py            |  2 +-
 server/core/templates/wagtailadmin/base.html   |  4 ++--
 7 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 server/basicknowledge/migrations/0003_auto_20190912_1228.py
 create mode 100644 server/books/migrations/0014_auto_20190912_1228.py

diff --git a/server/assignments/wagtail_hooks.py b/server/assignments/wagtail_hooks.py
index 1f47534e..705ac5d9 100644
--- a/server/assignments/wagtail_hooks.py
+++ b/server/assignments/wagtail_hooks.py
@@ -4,7 +4,7 @@ from .models import Assignment
 
 class AssignmentAdmin(ModelAdmin):
     model = Assignment
-    menu_label = 'Aufgaben'
+    menu_label = 'Assignments'
     list_display = ('title', 'module', 'pk',)
 
 
diff --git a/server/basicknowledge/migrations/0003_auto_20190912_1228.py b/server/basicknowledge/migrations/0003_auto_20190912_1228.py
new file mode 100644
index 00000000..0146d56b
--- /dev/null
+++ b/server/basicknowledge/migrations/0003_auto_20190912_1228.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.6 on 2019-09-12 12:28
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('basicknowledge', '0002_auto_20190722_0932'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='basicknowledge',
+            options={'verbose_name': 'Instrument'},
+        ),
+    ]
diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py
index af508c9a..d7158ae0 100644
--- a/server/basicknowledge/models.py
+++ b/server/basicknowledge/models.py
@@ -41,3 +41,6 @@ class BasicKnowledge(StrictHierarchyPage):
         FieldPanel('type'),
         StreamFieldPanel('contents')
     ]
+
+    class Meta:
+        verbose_name = 'Instrument'
diff --git a/server/basicknowledge/wagtail_hooks.py b/server/basicknowledge/wagtail_hooks.py
index 9081f587..7071380e 100644
--- a/server/basicknowledge/wagtail_hooks.py
+++ b/server/basicknowledge/wagtail_hooks.py
@@ -4,7 +4,7 @@ from .models import BasicKnowledge
 
 class InstrumentAdmin(ModelAdmin):
     model = BasicKnowledge
-    menu_label = 'Instrument'
+    menu_label = 'Instruments'
     list_display = ('title',)
 
 
diff --git a/server/books/migrations/0014_auto_20190912_1228.py b/server/books/migrations/0014_auto_20190912_1228.py
new file mode 100644
index 00000000..a0a915b4
--- /dev/null
+++ b/server/books/migrations/0014_auto_20190912_1228.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.6 on 2019-09-12 12:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('books', '0013_auto_20190808_0649'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='contentblock',
+            name='type',
+            field=models.CharField(choices=[('normal', 'Normal'), ('base_communication', 'Instrument Sprache & Kommunikation'), ('task', 'Auftrag'), ('base_society', 'Instrument Gesellschaft')], default='normal', max_length=100),
+        ),
+    ]
diff --git a/server/books/models/contentblock.py b/server/books/models/contentblock.py
index 5a74bb72..f8e1ca3f 100644
--- a/server/books/models/contentblock.py
+++ b/server/books/models/contentblock.py
@@ -29,7 +29,7 @@ class ContentBlock(StrictHierarchyPage):
     TYPE_CHOICES = (
         (NORMAL, 'Normal'),
         (BASE_COMMUNICATION, 'Instrument Sprache & Kommunikation'),
-        (TASK, 'Aufgabe'),
+        (TASK, 'Auftrag'),
         (BASE_SOCIETY, 'Instrument Gesellschaft'),
     )
 
diff --git a/server/core/templates/wagtailadmin/base.html b/server/core/templates/wagtailadmin/base.html
index 60be69da..d26a353f 100644
--- a/server/core/templates/wagtailadmin/base.html
+++ b/server/core/templates/wagtailadmin/base.html
@@ -2,5 +2,5 @@
 {% load staticfiles %}
 
 {% block branding_logo %}
-    skillBox
-{% endblock %}
\ No newline at end of file
+    Myskillbox
+{% endblock %}

From bfbe0b38ff3cdc034ac7ef72edc13520d223b9d9 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Mon, 16 Sep 2019 10:19:21 +0200
Subject: [PATCH 5/6] Add iPython to requirements

---
 Pipfile      |   1 +
 Pipfile.lock | 391 ++++++++++++++++++++++++++++++++-------------------
 2 files changed, 248 insertions(+), 144 deletions(-)

diff --git a/Pipfile b/Pipfile
index 9ae6019c..44f2c4ea 100644
--- a/Pipfile
+++ b/Pipfile
@@ -38,3 +38,4 @@ sentry-sdk = "==0.7.2"
 "django-sendgrid-v5" = "*"
 coverage = "*"
 graphql-relay = "*"
+ipython = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 93caf67e..83142970 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "fbc2ac2873ef368c184a9235a7e1b7a1fd68c9371e84e9b48041bf8af4148406"
+            "sha256": "85020e50720b4f71b864719a7c4fae8a0cb4e80352d3bc7eb1e4726bf2405f6d"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -18,10 +18,17 @@
     "default": {
         "aniso8601": {
             "hashes": [
-                "sha256:b8a6a9b24611fc50cf2d9b45d371bfdc4fd0581d1cc52254f5502130a776d4af",
-                "sha256:bb167645c79f7a438f9dfab6161af9bed75508c645b1f07d1158240841d22673"
+                "sha256:513d2b6637b7853806ae79ffaca6f3e8754bdd547048f5ccc1420aec4b714f1e",
+                "sha256:d10a4bf949f619f719b227ef5386e31f49a2b6d453004b21f02661ccc8670c7b"
             ],
-            "version": "==6.0.0"
+            "version": "==7.0.0"
+        },
+        "backcall": {
+            "hashes": [
+                "sha256:38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4",
+                "sha256:bbbf4b1e5cd2bdb08f915895b51081c041bac22394fdfcfdfbe9f14b77c08bf2"
+            ],
+            "version": "==0.1.0"
         },
         "beautifulsoup4": {
             "hashes": [
@@ -41,25 +48,25 @@
         },
         "boto3": {
             "hashes": [
-                "sha256:6be71f5f43882915ea2cd6ca4c6c14472418531ac585a060a0c5ca7afc13e1c7",
-                "sha256:d02144562aabc3ffdb74830b8d71167c012e9c4d6523912ec6e55c6181662d37"
+                "sha256:778e66711d7de9352b6330692ae44c0ba012559dabb4c39d7416b0135fb335a6",
+                "sha256:c8371f1f9c52f64cef1f14a773629fc8434ecca6195b2ef2a429a7bbbf8ecf23"
             ],
             "index": "pypi",
-            "version": "==1.9.188"
+            "version": "==1.9.228"
         },
         "botocore": {
             "hashes": [
-                "sha256:140ab03867d912b9cf44421861e6191681cbc065e36ccb51ece865b0ee30b5f3",
-                "sha256:f9c54673beb91ea21c718f1c1fef64862851c561a3810a18b39d3fdbd62ce32c"
+                "sha256:7c391c46cf1f8d6c04758f84b51337a64136077e4a160eced87551fdcc051669",
+                "sha256:c9148df92ba21a90ea32f2c7f185c31b1c8b8e48417d0ba8cad02b9b3336c09a"
             ],
-            "version": "==1.12.188"
+            "version": "==1.12.228"
         },
         "certifi": {
             "hashes": [
-                "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
-                "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
+                "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50",
+                "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef"
             ],
-            "version": "==2019.6.16"
+            "version": "==2019.9.11"
         },
         "chardet": {
             "hashes": [
@@ -77,40 +84,48 @@
         },
         "coverage": {
             "hashes": [
-                "sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9",
-                "sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74",
-                "sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390",
-                "sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8",
-                "sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe",
-                "sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf",
-                "sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e",
-                "sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741",
-                "sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09",
-                "sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd",
-                "sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034",
-                "sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420",
-                "sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c",
-                "sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab",
-                "sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba",
-                "sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e",
-                "sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609",
-                "sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2",
-                "sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49",
-                "sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b",
-                "sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d",
-                "sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce",
-                "sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9",
-                "sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4",
-                "sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773",
-                "sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723",
-                "sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c",
-                "sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f",
-                "sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1",
-                "sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260",
-                "sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a"
+                "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6",
+                "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650",
+                "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5",
+                "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d",
+                "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351",
+                "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755",
+                "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef",
+                "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca",
+                "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca",
+                "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9",
+                "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc",
+                "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5",
+                "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f",
+                "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe",
+                "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888",
+                "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5",
+                "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce",
+                "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5",
+                "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e",
+                "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e",
+                "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9",
+                "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437",
+                "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1",
+                "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c",
+                "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24",
+                "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47",
+                "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2",
+                "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28",
+                "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c",
+                "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7",
+                "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0",
+                "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"
             ],
             "index": "pypi",
-            "version": "==4.5.3"
+            "version": "==4.5.4"
+        },
+        "decorator": {
+            "hashes": [
+                "sha256:86156361c50488b84a3f148056ea716ca587df2f0de1d34750d35c21312725de",
+                "sha256:f069f3a01830ca754ba5258fde2278454a0b5b79e0d7f5c13b3b97e57d4acff6"
+            ],
+            "version": "==4.4.0"
         },
         "dj-database-url": {
             "hashes": [
@@ -190,11 +205,11 @@
         },
         "django-storages": {
             "hashes": [
-                "sha256:8e35d2c7baeda5dc6f0b4f9a0fc142d25f9a1bf72b8cebfcbc5db4863abc552d",
-                "sha256:b1a63cd5ea286ee5a9fb45de6c3c5c0ae132d58308d06f1ce9865cfcd5e470a7"
+                "sha256:87287b7ad2e789cd603373439994e1ac6f94d9dc2e5f8173d2a87aa3ed458bd9",
+                "sha256:f3b3def96493d3ccde37b864cea376472baf6e8a596504b209278801c510b807"
             ],
             "index": "pypi",
-            "version": "==1.7.1"
+            "version": "==1.7.2"
         },
         "django-taggit": {
             "hashes": [
@@ -219,11 +234,11 @@
         },
         "docutils": {
             "hashes": [
-                "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
-                "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
-                "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
+                "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0",
+                "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827",
+                "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
             ],
-            "version": "==0.14"
+            "version": "==0.15.2"
         },
         "draftjs-exporter": {
             "hashes": [
@@ -241,10 +256,10 @@
         },
         "faker": {
             "hashes": [
-                "sha256:1c0a5e7bb54d2c54569986a27124715c83899e592d8d61d4e372dbff6c699573",
-                "sha256:60477f757a80f665bbe1fb3d1cfe5d205ec7b99d5240114de7b27b4c25d236ca"
+                "sha256:1d3f700e8dfcefd6e657118d71405d53e86974448aba78884f119bbd84c0cddf",
+                "sha256:d5366e120191c5610fceeebfe1c298dc46da0277096f639c6dd7e2eaee0fa547"
             ],
-            "version": "==1.0.7"
+            "version": "==2.0.1"
         },
         "future": {
             "hashes": [
@@ -254,10 +269,10 @@
         },
         "graphene": {
             "hashes": [
-                "sha256:2ac16d6bb3bdba4da3daa0f6d15b74ac585ed6a016980f502c77c3e687c763bb",
-                "sha256:fcbcb24ee960b2c768de4285fbd025aa98eed4ecb6a679bbd41985b05b4008c5"
+                "sha256:09165f03e1591b76bf57b133482db9be6dac72c74b0a628d3c93182af9c5a896",
+                "sha256:2cbe6d4ef15cfc7b7805e0760a0e5b80747161ce1b0f990dfdc0d2cf497c12f9"
             ],
-            "version": "==2.1.6"
+            "version": "==2.1.8"
         },
         "graphene-django": {
             "hashes": [
@@ -269,18 +284,19 @@
         },
         "graphql-core": {
             "hashes": [
-                "sha256:60ef8277b82aaad49e87154a0288a9542a82a63909568375712f826b1c280ef5",
-                "sha256:6288fe97c32d2f868a2dfe62e766dc85d48c96c1d085294edf44714190f2e4f3"
+                "sha256:1488f2a5c2272dc9ba66e3042a6d1c30cea0db4c80bd1e911c6791ad6187d91b",
+                "sha256:da64c472d720da4537a2e8de8ba859210b62841bd47a9be65ca35177f62fe0e4"
             ],
-            "version": "==2.2"
+            "version": "==2.2.1"
         },
         "graphql-relay": {
             "hashes": [
-                "sha256:2716b7245d97091af21abf096fabafac576905096d21ba7118fba722596f65db",
-                "sha256:80750a57f8d9b7dc548195c7b5b9a2ae7f5d006f11963181ed768e3709952513"
+                "sha256:0e94201af4089e1f81f07d7bd8f84799768e39d70fa1ea16d1df505b46cc6335",
+                "sha256:75aa0758971e252964cb94068a4decd472d2a8295229f02189e3cbca1f10dbb5",
+                "sha256:7fa74661246e826ef939ee92e768f698df167a7617361ab399901eaebf80dce6"
             ],
             "index": "pypi",
-            "version": "==0.4.5"
+            "version": "==2.0.0"
         },
         "gunicorn": {
             "hashes": [
@@ -304,6 +320,28 @@
             ],
             "version": "==2.8"
         },
+        "ipython": {
+            "hashes": [
+                "sha256:c4ab005921641e40a68e405e286e7a1fcc464497e14d81b6914b4fd95e5dee9b",
+                "sha256:dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1"
+            ],
+            "index": "pypi",
+            "version": "==7.8.0"
+        },
+        "ipython-genutils": {
+            "hashes": [
+                "sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8",
+                "sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"
+            ],
+            "version": "==0.2.0"
+        },
+        "jedi": {
+            "hashes": [
+                "sha256:786b6c3d80e2f06fd77162a07fed81b8baa22dde5d62896a790a331d6ac21a27",
+                "sha256:ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"
+            ],
+            "version": "==0.15.1"
+        },
         "jmespath": {
             "hashes": [
                 "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6",
@@ -333,10 +371,32 @@
         },
         "newrelic": {
             "hashes": [
-                "sha256:708ac6a75c76a59e3d6c0d714e2fbb1e4ec7d540f7d34bddd81e61bdb636e895"
+                "sha256:9d6d3bf2e125410d485fd91279e1b0f50e8f0f5887284b345aed4ec81db33c0a"
             ],
             "index": "pypi",
-            "version": "==4.20.1.121"
+            "version": "==5.0.2.126"
+        },
+        "parso": {
+            "hashes": [
+                "sha256:63854233e1fadb5da97f2744b6b24346d2750b85965e7e399bec1620232797dc",
+                "sha256:666b0ee4a7a1220f65d367617f2cd3ffddff3e205f3f16a0284df30e774c2a9c"
+            ],
+            "version": "==0.5.1"
+        },
+        "pexpect": {
+            "hashes": [
+                "sha256:2094eefdfcf37a1fdbfb9aa090862c1a4878e5c7e0e7e7088bdb511c558e5cd1",
+                "sha256:9e2c1fd0e6ee3a49b28f95d4b33bc389c89b20af6a1255906e90ff1262ce62eb"
+            ],
+            "markers": "sys_platform != 'win32'",
+            "version": "==4.7.0"
+        },
+        "pickleshare": {
+            "hashes": [
+                "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca",
+                "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"
+            ],
+            "version": "==0.7.5"
         },
         "pillow": {
             "hashes": [
@@ -376,6 +436,14 @@
             ],
             "version": "==2.2.1"
         },
+        "prompt-toolkit": {
+            "hashes": [
+                "sha256:11adf3389a996a6d45cc277580d0d53e8a5afd281d0c9ec71b28e6f121463780",
+                "sha256:2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1",
+                "sha256:977c6583ae813a37dc1c2e1b715892461fcbdaa57f6fc62f33a528c4886c8f55"
+            ],
+            "version": "==2.0.9"
+        },
         "psycopg2": {
             "hashes": [
                 "sha256:009e0bc09a57dbef4b601cb8b46a2abad51f5274c8be4bba276ff2884cd4cc53",
@@ -413,6 +481,20 @@
             "index": "pypi",
             "version": "==2.7.3.2"
         },
+        "ptyprocess": {
+            "hashes": [
+                "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0",
+                "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f"
+            ],
+            "version": "==0.6.0"
+        },
+        "pygments": {
+            "hashes": [
+                "sha256:71e430bc85c88a430f000ac1d9b331d2407f681d6f6aec95e8bcfbc3df5b0127",
+                "sha256:881c4c157e45f30af185c1ffe8d549d48ac9127433f2c380c24b84572ad66297"
+            ],
+            "version": "==2.4.2"
+        },
         "python-dateutil": {
             "hashes": [
                 "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb",
@@ -431,16 +513,18 @@
         },
         "python-http-client": {
             "hashes": [
-                "sha256:7e430f4b9dd2b621b0051f6a362f103447ea8e267594c602a5c502a0c694ee38"
+                "sha256:01f58f1871612fdce6a4545df7c867a6d1457695652a7ca48d5c22e5bf57628d",
+                "sha256:c2776054245db376ea26c859b80e9280b1a470b96ed998d60d35951f89bbbe79",
+                "sha256:e455ae0dfd5819ac483f7fecf08ab8693048d9dc47a0a6fe0d4aebf86d9d1d17"
             ],
-            "version": "==3.1.0"
+            "version": "==3.2.1"
         },
         "pytz": {
             "hashes": [
-                "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda",
-                "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"
+                "sha256:26c0b32e437e54a18161324a2fca3c4b9846b74a8dccddd843113109e1116b32",
+                "sha256:c894d57500a4cd2d5c71114aaab77dbab5eabd9022308ce5ac9bb93a60a6f0c7"
             ],
-            "version": "==2019.1"
+            "version": "==2019.2"
         },
         "raven": {
             "hashes": [
@@ -497,10 +581,11 @@
         },
         "sendgrid": {
             "hashes": [
-                "sha256:297d33363a70df9b39419210e1273b165d487730e85c495695e0015bc626db71",
-                "sha256:8b82c8c801dde8180a567913a9f80d8a63f38e39f209edde302b6df899b4bca1"
+                "sha256:a9999878aad90e32d7b62464454adc70bcef40085c729355ea58717bb0ea0dbd",
+                "sha256:cb0b21a83a54bc99d9befda1ea7b4f15fe8db362a152458e58abc5ce23d6d828",
+                "sha256:f04fee009c750b47ab984f3c4a735facacc7fba902052d597f7e60b601e56bcc"
             ],
-            "version": "==6.0.5"
+            "version": "==6.1.0"
         },
         "sentry-sdk": {
             "hashes": [
@@ -531,13 +616,20 @@
             ],
             "version": "==1.2"
         },
+        "traitlets": {
+            "hashes": [
+                "sha256:9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835",
+                "sha256:c6cb5e6f57c5a9bdaa40fa71ce7b4af30298fbab9ece9815b5d995ab6217c7d9"
+            ],
+            "version": "==4.3.2"
+        },
         "typing": {
             "hashes": [
-                "sha256:38566c558a0a94d6531012c8e917b1b8518a41e418f7f15f00e129cc80162ad3",
-                "sha256:53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce",
-                "sha256:84698954b4e6719e912ef9a42a2431407fe3755590831699debda6fba92aac55"
+                "sha256:91dfe6f3f706ee8cc32d38edbbf304e9b7583fb37108fef38229617f8b3eba23",
+                "sha256:c8cabb5ab8945cd2f54917be357d134db9cc1eb039e59d1606dc1e60cb1d9d36",
+                "sha256:f38d83c5a7a7086543a0f649564d661859c5146a85775ab90c0d2f93ffaa9714"
             ],
-            "version": "==3.7.4"
+            "version": "==3.7.4.1"
         },
         "unidecode": {
             "hashes": [
@@ -564,7 +656,14 @@
         },
         "wagtail-factories": {
             "git": "https://github.com/mvantellingen/wagtail-factories.git",
-            "ref": "2e5648fef9ad80e205d03dea846105493b116886"
+            "ref": "819666151f8c83317bdd0019074173ba2ade85eb"
+        },
+        "wcwidth": {
+            "hashes": [
+                "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
+                "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
+            ],
+            "version": "==0.1.7"
         },
         "webencodings": {
             "hashes": [
@@ -592,11 +691,11 @@
     "develop": {
         "awscli": {
             "hashes": [
-                "sha256:2480a14ff3dfcfa757546b27fd2cffc6143d377c7728cee75417ef843157b269",
-                "sha256:f6797733dfb1ce063c824631661411a0ddf49d1850980c2b2ee4ed80b3bc6547"
+                "sha256:5c36a818130c8393b778e5b98b9bf38985522b62a684782512a2d57340697582",
+                "sha256:a022dfb7e6cc9ee8540c382b9bdc4637070dbbe2b09f3a74ad4f30719414c0b7"
             ],
             "index": "pypi",
-            "version": "==1.16.198"
+            "version": "==1.16.238"
         },
         "backcall": {
             "hashes": [
@@ -607,10 +706,10 @@
         },
         "botocore": {
             "hashes": [
-                "sha256:140ab03867d912b9cf44421861e6191681cbc065e36ccb51ece865b0ee30b5f3",
-                "sha256:f9c54673beb91ea21c718f1c1fef64862851c561a3810a18b39d3fdbd62ce32c"
+                "sha256:7c391c46cf1f8d6c04758f84b51337a64136077e4a160eced87551fdcc051669",
+                "sha256:c9148df92ba21a90ea32f2c7f185c31b1c8b8e48417d0ba8cad02b9b3336c09a"
             ],
-            "version": "==1.12.188"
+            "version": "==1.12.228"
         },
         "colorama": {
             "hashes": [
@@ -621,40 +720,41 @@
         },
         "coverage": {
             "hashes": [
-                "sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9",
-                "sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74",
-                "sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390",
-                "sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8",
-                "sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe",
-                "sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf",
-                "sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e",
-                "sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741",
-                "sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09",
-                "sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd",
-                "sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034",
-                "sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420",
-                "sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c",
-                "sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab",
-                "sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba",
-                "sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e",
-                "sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609",
-                "sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2",
-                "sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49",
-                "sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b",
-                "sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d",
-                "sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce",
-                "sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9",
-                "sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4",
-                "sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773",
-                "sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723",
-                "sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c",
-                "sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f",
-                "sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1",
-                "sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260",
-                "sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a"
+                "sha256:08907593569fe59baca0bf152c43f3863201efb6113ecb38ce7e97ce339805a6",
+                "sha256:0be0f1ed45fc0c185cfd4ecc19a1d6532d72f86a2bac9de7e24541febad72650",
+                "sha256:141f08ed3c4b1847015e2cd62ec06d35e67a3ac185c26f7635f4406b90afa9c5",
+                "sha256:19e4df788a0581238e9390c85a7a09af39c7b539b29f25c89209e6c3e371270d",
+                "sha256:23cc09ed395b03424d1ae30dcc292615c1372bfba7141eb85e11e50efaa6b351",
+                "sha256:245388cda02af78276b479f299bbf3783ef0a6a6273037d7c60dc73b8d8d7755",
+                "sha256:331cb5115673a20fb131dadd22f5bcaf7677ef758741312bee4937d71a14b2ef",
+                "sha256:386e2e4090f0bc5df274e720105c342263423e77ee8826002dcffe0c9533dbca",
+                "sha256:3a794ce50daee01c74a494919d5ebdc23d58873747fa0e288318728533a3e1ca",
+                "sha256:60851187677b24c6085248f0a0b9b98d49cba7ecc7ec60ba6b9d2e5574ac1ee9",
+                "sha256:63a9a5fc43b58735f65ed63d2cf43508f462dc49857da70b8980ad78d41d52fc",
+                "sha256:6b62544bb68106e3f00b21c8930e83e584fdca005d4fffd29bb39fb3ffa03cb5",
+                "sha256:6ba744056423ef8d450cf627289166da65903885272055fb4b5e113137cfa14f",
+                "sha256:7494b0b0274c5072bddbfd5b4a6c6f18fbbe1ab1d22a41e99cd2d00c8f96ecfe",
+                "sha256:826f32b9547c8091679ff292a82aca9c7b9650f9fda3e2ca6bf2ac905b7ce888",
+                "sha256:93715dffbcd0678057f947f496484e906bf9509f5c1c38fc9ba3922893cda5f5",
+                "sha256:9a334d6c83dfeadae576b4d633a71620d40d1c379129d587faa42ee3e2a85cce",
+                "sha256:af7ed8a8aa6957aac47b4268631fa1df984643f07ef00acd374e456364b373f5",
+                "sha256:bf0a7aed7f5521c7ca67febd57db473af4762b9622254291fbcbb8cd0ba5e33e",
+                "sha256:bf1ef9eb901113a9805287e090452c05547578eaab1b62e4ad456fcc049a9b7e",
+                "sha256:c0afd27bc0e307a1ffc04ca5ec010a290e49e3afbe841c5cafc5c5a80ecd81c9",
+                "sha256:dd579709a87092c6dbee09d1b7cfa81831040705ffa12a1b248935274aee0437",
+                "sha256:df6712284b2e44a065097846488f66840445eb987eb81b3cc6e4149e7b6982e1",
+                "sha256:e07d9f1a23e9e93ab5c62902833bf3e4b1f65502927379148b6622686223125c",
+                "sha256:e2ede7c1d45e65e209d6093b762e98e8318ddeff95317d07a27a2140b80cfd24",
+                "sha256:e4ef9c164eb55123c62411f5936b5c2e521b12356037b6e1c2617cef45523d47",
+                "sha256:eca2b7343524e7ba246cab8ff00cab47a2d6d54ada3b02772e908a45675722e2",
+                "sha256:eee64c616adeff7db37cc37da4180a3a5b6177f5c46b187894e633f088fb5b28",
+                "sha256:ef824cad1f980d27f26166f86856efe11eff9912c4fed97d3804820d43fa550c",
+                "sha256:efc89291bd5a08855829a3c522df16d856455297cf35ae827a37edac45f466a7",
+                "sha256:fa964bae817babece5aa2e8c1af841bebb6d0b9add8e637548809d040443fee0",
+                "sha256:ff37757e068ae606659c28c3bd0d923f9d29a85de79bf25b2b34b148473b5025"
             ],
             "index": "pypi",
-            "version": "==4.5.3"
+            "version": "==4.5.4"
         },
         "decorator": {
             "hashes": [
@@ -665,25 +765,26 @@
         },
         "docutils": {
             "hashes": [
-                "sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6",
-                "sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274",
-                "sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6"
+                "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0",
+                "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827",
+                "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99"
             ],
-            "version": "==0.14"
+            "version": "==0.15.2"
         },
         "ipdb": {
             "hashes": [
-                "sha256:dce2112557edfe759742ca2d0fee35c59c97b0cc7a05398b791079d78f1519ce"
+                "sha256:473fdd798a099765f093231a8b1fabfa95b0b682fce12de0c74b61a4b4d8ee57"
             ],
             "index": "pypi",
-            "version": "==0.12"
+            "version": "==0.12.2"
         },
         "ipython": {
             "hashes": [
-                "sha256:11067ab11d98b1e6c7f0993506f7a5f8a91af420f7e82be6575fcb7a6ca372a0",
-                "sha256:60bc55c2c1d287161191cc2469e73c116d9b634cff25fe214a43cba7cec94c79"
+                "sha256:c4ab005921641e40a68e405e286e7a1fcc464497e14d81b6914b4fd95e5dee9b",
+                "sha256:dd76831f065f17bddd7eaa5c781f5ea32de5ef217592cf019e34043b56895aa1"
             ],
-            "version": "==7.6.1"
+            "index": "pypi",
+            "version": "==7.8.0"
         },
         "ipython-genutils": {
             "hashes": [
@@ -694,10 +795,10 @@
         },
         "jedi": {
             "hashes": [
-                "sha256:53c850f1a7d3cfcd306cc513e2450a54bdf5cacd7604b74e42dd1f0758eaaf36",
-                "sha256:e07457174ef7cb2342ff94fa56484fe41cec7ef69b0059f01d3f812379cb6f7c"
+                "sha256:786b6c3d80e2f06fd77162a07fed81b8baa22dde5d62896a790a331d6ac21a27",
+                "sha256:ba859c74fa3c966a22f2aeebe1b74ee27e2a462f56d3f5f7ca4a59af61bfe42e"
             ],
-            "version": "==0.14.1"
+            "version": "==0.15.1"
         },
         "jmespath": {
             "hashes": [
@@ -745,10 +846,10 @@
         },
         "pyasn1": {
             "hashes": [
-                "sha256:da2420fe13a9452d8ae97a0e478adde1dee153b11ba832a95b223a2ba01c10f7",
-                "sha256:da6b43a8c9ae93bc80e2739efb38cc776ba74a886e3e9318d65fe81a8b8a2c6e"
+                "sha256:62cdade8b5530f0b185e09855dd422bc05c0bbff6b72ff61381c09dac7befd8c",
+                "sha256:a9495356ca1d66ed197a0f72b41eb1823cf7ea8b5bd07191673e8147aecf8604"
             ],
-            "version": "==0.4.5"
+            "version": "==0.4.7"
         },
         "pygments": {
             "hashes": [
@@ -767,20 +868,22 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c",
-                "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95",
-                "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2",
-                "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4",
-                "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad",
-                "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba",
-                "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1",
-                "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e",
-                "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673",
-                "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13",
-                "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"
+                "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9",
+                "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4",
+                "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8",
+                "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696",
+                "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34",
+                "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9",
+                "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73",
+                "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299",
+                "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b",
+                "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae",
+                "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681",
+                "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41",
+                "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8"
             ],
             "markers": "python_version != '2.6'",
-            "version": "==5.1"
+            "version": "==5.1.2"
         },
         "rsa": {
             "hashes": [

From e940066db8d47df90aeb1c26992c8659e00ac444 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <donramonloco+github@gmail.com>
Date: Mon, 16 Sep 2019 14:02:28 +0200
Subject: [PATCH 6/6] Display solutions for teachers always

---
 client/src/helpers/is-teacher.js |  3 +++
 client/src/pages/survey.vue      | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 client/src/helpers/is-teacher.js

diff --git a/client/src/helpers/is-teacher.js b/client/src/helpers/is-teacher.js
new file mode 100644
index 00000000..5506d608
--- /dev/null
+++ b/client/src/helpers/is-teacher.js
@@ -0,0 +1,3 @@
+export const isTeacher = (self) => {
+  return self.me.permissions.includes('users.can_manage_school_class_content')
+};
diff --git a/client/src/pages/survey.vue b/client/src/pages/survey.vue
index 79f0ff45..43252447 100644
--- a/client/src/pages/survey.vue
+++ b/client/src/pages/survey.vue
@@ -3,7 +3,7 @@
     <h1 class="survey-page__title">{{title}}</h1>
     <survey :survey='survey'></survey>
 
-    <solution :value="solution" v-if="module.solutionsEnabled"></solution>
+    <solution :value="solution" v-if="module.solutionsEnabled || isTeacher"></solution>
     <div v-if="surveyComplete">
       <a class="button button--primary" @click="reopen">Übung bearbeiten</a>
     </div>
@@ -20,6 +20,9 @@
   import Solution from '@/components/content-blocks/Solution';
 
   import {extractSurveySolutions} from '@/helpers/survey-solutions';
+  import {isTeacher} from '@/helpers/is-teacher';
+
+  import {meQuery} from '@/graphql/queries';
 
   const Survey = SurveyVue.Survey;
 
@@ -35,7 +38,10 @@
       return {
         survey: this.initSurvey(),
         title: '',
-        module: {}
+        module: {},
+        me: {
+          permissions: []
+        },
       }
     },
 
@@ -61,6 +67,9 @@
         return this.survey.currentPage && this.survey.currentPage.elements
           ? this.survey.currentPage.elements.reduce(extractSurveySolutions, [])
           : []
+      },
+      isTeacher() {
+        return isTeacher(this);
       }
     },
 
@@ -173,7 +182,8 @@
             });
           }
         },
-      }
+      },
+      me: meQuery
     }
   }
 </script>