In der Mediathek unter dem Handlungsfeld «{title}» findest du alle relevanten Ressourcen für deine Fachkompetenzen.
" @@ -298,9 +299,14 @@ In diesem Circle lernst du die wichtigsten Grundlagen bezüglich Versicherungswi parent=circle, ) LearningUnitFactory(title="Kompetenznachweis", parent=circle) - LearningContentPlaceholderFactory( + LearningContentTestFactory( title="Wissens- und Verständnisfragen", parent=circle, + description=RichText( + "Folgender Test mit Wissens- und Verständnisfragen ist Teil des Kompetenznachweises. Der Test kann nur einmal durchgeführt werden und ist notenrelevant.
" + ), + checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden habe und den Test durchführen möchte.", + content_url="http://example.com", ) LearningContentFeedbackFactory( parent=circle, diff --git a/server/vbv_lernwelt/learnpath/migrations/0005_learningcontentdocumentlist.py b/server/vbv_lernwelt/learnpath/migrations/0005_learningcontentdocumentlist.py index 0bf83528..406cfc8c 100644 --- a/server/vbv_lernwelt/learnpath/migrations/0005_learningcontentdocumentlist.py +++ b/server/vbv_lernwelt/learnpath/migrations/0005_learningcontentdocumentlist.py @@ -1,31 +1,85 @@ # Generated by Django 3.2.13 on 2023-05-26 10:34 -from django.db import migrations, models import django.db.models.deletion import wagtail.blocks import wagtail.fields +from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('wagtailcore', '0083_workflowcontenttype'), - ('learnpath', '0004_learningcontentassignment_assignment_type'), + ("wagtailcore", "0083_workflowcontenttype"), + ("learnpath", "0004_learningcontentassignment_assignment_type"), ] operations = [ migrations.CreateModel( - name='LearningContentDocumentList', + name="LearningContentDocumentList", fields=[ - ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), - ('minutes', models.PositiveIntegerField(default=15)), - ('description', wagtail.fields.RichTextField(blank=True)), - ('content_url', models.TextField(blank=True)), - ('documents', wagtail.fields.StreamField([('document', wagtail.blocks.StructBlock([('title', wagtail.blocks.TextBlock()), ('description', wagtail.blocks.TextBlock(default='', required=False)), ('icon_url', wagtail.blocks.TextBlock(default='', required=False)), ('link_display_text', wagtail.blocks.CharBlock(default='Link öffnen', max_length=255)), ('url', wagtail.blocks.TextBlock(default='', required=False)), ('open_window', wagtail.blocks.BooleanBlock(default=False))]))], blank=True, use_json_field=True)), + ( + "page_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="wagtailcore.page", + ), + ), + ("minutes", models.PositiveIntegerField(default=15)), + ("description", wagtail.fields.RichTextField(blank=True)), + ("content_url", models.TextField(blank=True)), + ( + "documents", + wagtail.fields.StreamField( + [ + ( + "document", + wagtail.blocks.StructBlock( + [ + ("title", wagtail.blocks.TextBlock()), + ( + "description", + wagtail.blocks.TextBlock( + default="", required=False + ), + ), + ( + "icon_url", + wagtail.blocks.TextBlock( + default="", required=False + ), + ), + ( + "link_display_text", + wagtail.blocks.CharBlock( + default="Link öffnen", max_length=255 + ), + ), + ( + "url", + wagtail.blocks.TextBlock( + default="", required=False + ), + ), + ( + "open_window", + wagtail.blocks.BooleanBlock(default=False), + ), + ] + ), + ) + ], + blank=True, + use_json_field=True, + ), + ), ], options={ - 'abstract': False, + "abstract": False, }, - bases=('wagtailcore.page',), + bases=("wagtailcore.page",), ), ] diff --git a/server/vbv_lernwelt/learnpath/migrations/0006_learningcontenttest_checkbox_text.py b/server/vbv_lernwelt/learnpath/migrations/0006_learningcontenttest_checkbox_text.py new file mode 100644 index 00000000..545416ae --- /dev/null +++ b/server/vbv_lernwelt/learnpath/migrations/0006_learningcontenttest_checkbox_text.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2023-05-26 14:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("learnpath", "0005_learningcontentdocumentlist"), + ] + + operations = [ + migrations.AddField( + model_name="learningcontenttest", + name="checkbox_text", + field=models.TextField(blank=True), + ), + ] diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py index a430457f..24d6e6cb 100644 --- a/server/vbv_lernwelt/learnpath/models.py +++ b/server/vbv_lernwelt/learnpath/models.py @@ -307,9 +307,18 @@ class LearningContentMediaLibrary(LearningContent): class LearningContentTest(LearningContent): + serialize_field_names = LearningContent.serialize_field_names + [ + "checkbox_text", + ] parent_page_types = ["learnpath.Circle"] subpage_types = [] + checkbox_text = models.TextField(blank=True) + + content_panels = LearningContent.content_panels + [ + FieldPanel("checkbox_text", classname="Text"), + ] + class LearningContentRichText(LearningContent): text = RichTextField(blank=True, features=DEFAULT_RICH_TEXT_FEATURES_WITH_HEADER) diff --git a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py index f5428bfd..c1d5be7c 100644 --- a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py +++ b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py @@ -5,6 +5,7 @@ from vbv_lernwelt.learnpath.models import ( Circle, LearningContentAssignment, LearningContentAttendanceCourse, + LearningContentDocumentList, LearningContentFeedback, LearningContentLearningModule, LearningContentMediaLibrary, @@ -16,7 +17,6 @@ from vbv_lernwelt.learnpath.models import ( LearningSequence, LearningUnit, Topic, - LearningContentDocumentList, ) from vbv_lernwelt.media_library.tests.media_library_factories import ( LearnMediaBlockFactory,