ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Fix factory for assignment

This commit is contained in:
Ramon Wenger 2018-10-01 13:42:10 +02:00
parent f5e163c3cd
commit 23176088f4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/assignments/models.py
View File

@ -21,5 +21,5 @@ class CustomAssignment(Assignment):
class StudentSubmission(TimeStampedModel): class StudentSubmission(TimeStampedModel):
text = models.TextField(blank=True) text = models.TextField(blank=True)
document = models.FilePathField(null=True) document = models.FilePathField(null=True)
assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE) assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE, related_name='submissions')
student = models.ForeignKey(get_user_model(), on_delete=models.CASCADE) student = models.ForeignKey(get_user_model(), on_delete=models.CASCADE)

15
server/book/factories.py
View File

@ -5,7 +5,7 @@ import wagtail_factories
from factory import CREATE_STRATEGY from factory import CREATE_STRATEGY
from wagtail.core.rich_text import RichText from wagtail.core.rich_text import RichText
from book.blocks import BasicKnowledgeBlock, StudentEntryBlock, ImageUrlBlock, LinkBlock from book.blocks import BasicKnowledgeBlock, ImageUrlBlock, LinkBlock, AssignmentBlock
from book.models import Book, Topic, Module, Chapter, ContentBlock, TextBlock from book.models import Book, Topic, Module, Chapter, ContentBlock, TextBlock
from core.factories import BasePageFactory, fake, DummyImageFactory, fake_paragraph, fake_title from core.factories import BasePageFactory, fake, DummyImageFactory, fake_paragraph, fake_title
@ -72,9 +72,9 @@ class LinkBlockFactory(wagtail_factories.StructBlockFactory):
model = LinkBlock model = LinkBlock
class StudentEntryBlockFactory(wagtail_factories.StructBlockFactory): class AssignmentBlockFactory(wagtail_factories.StructBlockFactory):
class Meta: class Meta:
model = StudentEntryBlock model = AssignmentBlock
block_types = ['text_block', 'basic_knowledge', 'student_entry', 'image_block', 'task'] block_types = ['text_block', 'basic_knowledge', 'student_entry', 'image_block', 'task']
@ -89,7 +89,7 @@ class ContentBlockFactory(BasePageFactory):
contents = wagtail_factories.StreamFieldFactory({ contents = wagtail_factories.StreamFieldFactory({
'text_block': TextBlockFactory, 'text_block': TextBlockFactory,
'basic_knowledge': BasicKnowledgeBlockFactory, 'basic_knowledge': BasicKnowledgeBlockFactory,
'student_entry': StudentEntryBlockFactory, 'assignment': AssignmentBlockFactory,
'image_block': wagtail_factories.ImageChooserBlockFactory, 'image_block': wagtail_factories.ImageChooserBlockFactory,
'task': TextBlockFactory 'task': TextBlockFactory
}) })
@ -124,7 +124,8 @@ class ContentBlockFactory(BasePageFactory):
fake_paragraph()) fake_paragraph())
else: else:
kwargs[ kwargs[
'{}__{}__{}__{}'.format(stream_field_name, idx, block_type, field)] = 'https://google.ch' '{}__{}__{}__{}'.format(stream_field_name, idx, block_type,
field)] = 'https://google.ch'
elif block_type == 'image_block': elif block_type == 'image_block':
kwargs['{}__{}__{}__{}'.format(stream_field_name, idx, block_type, kwargs['{}__{}__{}__{}'.format(stream_field_name, idx, block_type,
'image__title')] = fake_paragraph() 'image__title')] = fake_paragraph()
@ -144,8 +145,8 @@ class ContentBlockFactory(BasePageFactory):
kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = RichText( kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = RichText(
fake_paragraph()) fake_paragraph())
# kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = ..url.. # kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'basic_knowledge', 'description')] = ..url..
elif block_type == 'student_entry': elif block_type == 'assignment':
kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'student_entry', 'task_text')] = RichText( kwargs['{}__{}__{}__{}'.format(stream_field_name, i, 'assignment', 'task_text')] = RichText(
fake_paragraph()) fake_paragraph())
elif block_type == 'image_block': elif block_type == 'image_block':
kwargs[ kwargs[