diff --git a/client/src/components/content-block-form/ContentsForm.vue b/client/src/components/content-block-form/ContentsForm.vue index 49ae65d7..858a8dee 100644 --- a/client/src/components/content-block-form/ContentsForm.vue +++ b/client/src/components/content-block-form/ContentsForm.vue @@ -22,12 +22,21 @@ :class="{'contents-form__chooser': type(element) === 'content-block-element-chooser-widget'}" :element="element" v-bind="element" :index="index" v-on:change-type="changeType" + v-on:link-change-url="changeLinkUrl" v-on:link-change-text="changeLinkText" + v-on:text-change-value="changeTextValue" + v-on:document-change-url="changeDocumentUrl" + v-on:image-change-url="changeImageUrl" - v-on:video-change-url="changeVideoUrl"> + + v-on:video-change-url="changeVideoUrl" + + v-on:assignment-change-title="changeAssignmentTitle" + v-on:assignment-change-assignment="changeAssignmentAssignment" + >
- - + +

Ein Eingabefeld für die Antwort wird automatisch hinzugefügt. @@ -13,6 +21,8 @@ import InfoIcon from '@/components/icons/InfoIcon'; export default { + props: ['value', 'index'], + components: { InfoIcon } @@ -44,6 +54,7 @@ height: 40px; } - &__help-description {} + &__help-description { + } } diff --git a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue index 434589af..73f68e00 100644 --- a/client/src/components/content-forms/ContentBlockElementChooserWidget.vue +++ b/client/src/components/content-forms/ContentBlockElementChooserWidget.vue @@ -16,7 +16,7 @@

Text
-
+
Aufgabe & Ergebnis
diff --git a/server/api/graphene_wagtail.py b/server/api/graphene_wagtail.py index e754de48..f4f1de82 100644 --- a/server/api/graphene_wagtail.py +++ b/server/api/graphene_wagtail.py @@ -6,6 +6,8 @@ from graphene_django.converter import convert_django_field from wagtail.core.fields import StreamField from wagtail.images.models import Image +from assignments.models import Assignment + class GenericStreamFieldType(Scalar): @staticmethod @@ -23,6 +25,15 @@ class GenericStreamFieldType(Scalar): 'path': Image.objects.get(id=_value).file.url } d['value'] = value + if _type == 'assignment': + _value = d['value'] + assignment = Assignment.objects.get(pk=_value['assignment_id']) + value = { + 'title' : assignment.title, + 'assignment': assignment.assignment + } + d['value'] = value + # value = dict(d['value']) # if 'document' in value: diff --git a/server/book/blocks.py b/server/book/blocks.py index f52553d8..9a4e444b 100644 --- a/server/book/blocks.py +++ b/server/book/blocks.py @@ -38,12 +38,12 @@ class ImageUrlBlock(blocks.StructBlock): url = blocks.URLBlock() -# 'student_entry' -class StudentEntryBlock(blocks.StructBlock): +# 'assignment' +class AssignmentBlock(blocks.StructBlock): class Meta: icon = 'download' - task_text = blocks.RichTextBlock() + assignment_id = blocks.IntegerBlock() # 'video_block' diff --git a/server/book/models/contentblock.py b/server/book/models/contentblock.py index 0d73be8d..d143a2f5 100644 --- a/server/book/models/contentblock.py +++ b/server/book/models/contentblock.py @@ -5,8 +5,8 @@ from wagtail.admin.edit_handlers import FieldPanel, TabbedInterface, ObjectList, from wagtail.core.fields import StreamField from wagtail.images.blocks import ImageChooserBlock -from book.blocks import TextBlock, BasicKnowledgeBlock, StudentEntryBlock, LinkBlock, VideoBlock, DocumentBlock, \ - ImageUrlBlock +from book.blocks import TextBlock, BasicKnowledgeBlock, LinkBlock, VideoBlock, DocumentBlock, \ + ImageUrlBlock, AssignmentBlock from core.wagtail_utils import StrictHierarchyPage from user.models import UserGroup @@ -35,7 +35,7 @@ class ContentBlock(StrictHierarchyPage): contents = StreamField([ ('text_block', TextBlock()), ('basic_knowledge', BasicKnowledgeBlock()), - ('student_entry', StudentEntryBlock()), + ('assignment', AssignmentBlock()), ('image_block', ImageChooserBlock()), ('image_url_block', ImageUrlBlock()), ('link_block', LinkBlock()), diff --git a/server/book/schema/inputs.py b/server/book/schema/inputs.py index c6be7324..0d96b629 100644 --- a/server/book/schema/inputs.py +++ b/server/book/schema/inputs.py @@ -9,7 +9,6 @@ class InputTypes(graphene.Enum): image_block = 'image_block' image_url_block = 'image_url_block' link_block = 'link_block' - task = 'task' video_block = 'video_block' document_block = 'document_block' @@ -20,8 +19,8 @@ class ContentElementValueInput(InputObjectType): text = graphene.String(description='To be used for link_block, text_block types') url = graphene.String(description='To be used for link, basic_knowledge, image_block types') description = graphene.String(description='To be used for basic_knowledge type') - title = graphene.String(description='To be used for image_block type') - task_text = graphene.String(description='To be used for task type') + title = graphene.String(description='To be used for image_block, assignment type') + assignment = graphene.String(description='To be used for assignment type') class ContentElementInput(InputObjectType): diff --git a/server/book/schema/mutations/contentblock.py b/server/book/schema/mutations/contentblock.py index 6f9060ba..be633f44 100644 --- a/server/book/schema/mutations/contentblock.py +++ b/server/book/schema/mutations/contentblock.py @@ -21,7 +21,7 @@ class MutateContentBlock(relay.ClientIDMutation): content_block = graphene.Field(ContentBlockNode) @classmethod - def mutate_and_get_payload(cls, *args, **kwargs): + def mutate_and_get_payload(cls, root, info, **kwargs): try: id_param = kwargs['id'] content_block_data = kwargs.get('content_block') @@ -44,7 +44,7 @@ class MutateContentBlock(relay.ClientIDMutation): content_block.title = title if contents is not None: - content_block.contents = json.dumps(list(map(handle_content_block, contents))) + content_block.contents = json.dumps([handle_content_block(c, info.context) for c in contents]) content_block.save() @@ -68,7 +68,7 @@ class AddContentBlock(relay.ClientIDMutation): errors = graphene.List(graphene.String) @classmethod - def create_content_block(cls, content_block_data, parent=None, after=None): + def create_content_block(cls, content_block_data, parent=None, after=None, context=None): if after is None and parent is None: raise Exception('Define either a parent or a sibling id') @@ -92,8 +92,8 @@ class AddContentBlock(relay.ClientIDMutation): revision.publish() new_content_block.save() - new_content_block.contents = json.dumps( - list(map(handle_content_block, contents))) # can only do this after the content block has been saved + new_content_block.contents = json.dumps([handle_content_block(c, context) for c in + contents]) # can only do this after the content block has been saved new_content_block.save() return new_content_block @@ -105,7 +105,8 @@ class AddContentBlock(relay.ClientIDMutation): after = args.get('after', None) new_content_block = cls.create_content_block(content_block_data=args.get('content_block'), parent=parent, - after=after) + after=after, + context=info.context) return cls(new_content_block=new_content_block) diff --git a/server/book/schema/mutations/utils.py b/server/book/schema/mutations/utils.py index edba5b5e..4775fb35 100644 --- a/server/book/schema/mutations/utils.py +++ b/server/book/schema/mutations/utils.py @@ -11,6 +11,8 @@ import bleach import re +from assignments.models import Assignment + def newlines_to_paragraphs(text): parts = re.split(r'[\r\n]+', text) @@ -24,11 +26,12 @@ ALLOWED_BLOCKS = ( 'image_url_block', 'link_block', 'video_block', + 'assignment', 'document_block', ) -def handle_content_block(content, allowed_blocks=ALLOWED_BLOCKS): +def handle_content_block(content, context, allowed_blocks=ALLOWED_BLOCKS): # todo: add all the content blocks # todo: sanitize user inputs! if content['type'] not in allowed_blocks: @@ -40,8 +43,18 @@ def handle_content_block(content, allowed_blocks=ALLOWED_BLOCKS): 'value': { 'text': newlines_to_paragraphs(bleach.clean(content['value']['text'], strip=True)) }} - elif content['type'] == 'student_entry': - return + elif content['type'] == 'assignment': + assignment = Assignment.objects.create( + title=content['value']['title'], + assignment=content['value']['assignment'], + owner=context.user + ) + + return { + 'type': 'assignment', + 'value': { + 'assignment_id': assignment.id + }} elif content['type'] == 'image_url_block': return { 'type': 'image_url_block', diff --git a/server/rooms/migrations/0003_auto_20180927_0945.py b/server/rooms/migrations/0003_auto_20180927_0945.py new file mode 100644 index 00000000..4c0ba038 --- /dev/null +++ b/server/rooms/migrations/0003_auto_20180927_0945.py @@ -0,0 +1,20 @@ +# Generated by Django 2.0.6 on 2018-09-27 09:45 + +from django.db import migrations +import wagtail.core.blocks +import wagtail.core.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('rooms', '0002_auto_20180911_1414'), + ] + + operations = [ + migrations.AlterField( + model_name='roomentry', + name='contents', + field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock())])), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.RichTextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True), + ), + ]