From 18f5438153ca2c2936226283a9bb5ab14e05fd97 Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Wed, 7 Dec 2016 12:57:46 +0100 Subject: [PATCH 01/51] add options xml-export --- apps/options/renderers.py | 78 +++++++++++++++++++++ apps/options/serializers.py | 34 +++++++++ apps/options/templates/options/options.html | 8 +++ apps/options/urls.py | 1 + apps/options/views.py | 15 +++- 5 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 apps/options/renderers.py diff --git a/apps/options/renderers.py b/apps/options/renderers.py new file mode 100644 index 000000000..37fddacef --- /dev/null +++ b/apps/options/renderers.py @@ -0,0 +1,78 @@ +from __future__ import unicode_literals + +from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO +from django.utils.encoding import smart_text +from rest_framework.renderers import BaseRenderer + + +class XMLRenderer(BaseRenderer): + """ + Renderer which serializes to XML. + """ + + media_type = 'application/xml' + format = 'xml' + + def render(self, data): + """ + Renders 'data' into serialized XML. + """ + if data is None: + return '' + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement('OptionSets', {}) + + for optionset in data: + self._optionset(xml, optionset) + + xml.endElement('OptionSets') + xml.endDocument() + return stream.getvalue() + + def _option(self, xml, option): + xml.startElement('Option', {}) + self._text_element(xml, 'title', {}, option["title"]) + self._text_element(xml, 'order', {}, option["order"]) + self._text_element(xml, 'text_en', {}, option["text_en"]) + self._text_element(xml, 'text_de', {}, option["text_de"]) + self._text_element(xml, 'additional_input', {}, option["additional_input"]) + xml.endElement('Option') + + def _optionset(self, xml, optionset): + xml.startElement('OptionSet', {}) + self._text_element(xml, 'title', {}, optionset["title"]) + self._text_element(xml, 'order', {}, optionset["order"]) + + if 'options' in optionset and optionset['options']: + xml.startElement('Options', {}) + + for option in optionset['options']: + self._option(xml, option) + + xml.endElement('Options') + + if 'conditions' in optionset and optionset['conditions']: + xml.startElement('Conditions', {}) + + for conditions in optionset['conditions']: + self._conditions(xml, conditions) + + xml.endElement('Conditions') + + xml.endElement('OptionSet') + + def _conditions(self, xml, conditions): + xml.startElement('Condition', {}) + self._text_element(xml, 'title', {}, conditions["title"]) + xml.endElement('Condition') + + def _text_element(self, xml, tag, option, text): + xml.startElement(tag, option) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) diff --git a/apps/options/serializers.py b/apps/options/serializers.py index 0047c7327..7d0fd8b60 100644 --- a/apps/options/serializers.py +++ b/apps/options/serializers.py @@ -62,3 +62,37 @@ class Meta: 'id', 'title' ) + +class ExportOptionSerializer(serializers.ModelSerializer): + + class Meta: + model = Option + fields = ( + 'title', + 'order', + 'text_en', + 'text_de', + 'additional_input' + ) + +class ExportConditionSerializer(serializers.ModelSerializer): + + class Meta: + model = Condition + fields = ( + 'title', + ) + +class ExportSerializer(serializers.ModelSerializer): + + options = ExportOptionSerializer(many=True) + conditions = ExportConditionSerializer(many=True) + + class Meta: + model = OptionSet + fields = ( + 'title', + 'order', + 'options', + 'conditions' + ) diff --git a/apps/options/templates/options/options.html b/apps/options/templates/options/options.html index bffb5c73a..c9ca24fc5 100644 --- a/apps/options/templates/options/options.html +++ b/apps/options/templates/options/options.html @@ -56,6 +56,14 @@

{% trans 'Export' %}

{% endfor %} + + {% endblock %} {% block page %} diff --git a/apps/options/urls.py b/apps/options/urls.py index 002af4149..06ff83b66 100644 --- a/apps/options/urls.py +++ b/apps/options/urls.py @@ -4,5 +4,6 @@ urlpatterns = [ url(r'^$', options, name='options'), + url(r'^export/xml/$', options_export_xml, name='options_export_xml'), url(r'^export/(?P[a-z]+)/$', options_export, name='options_export'), ] diff --git a/apps/options/views.py b/apps/options/views.py index 66d459442..f1728c781 100644 --- a/apps/options/views.py +++ b/apps/options/views.py @@ -1,19 +1,23 @@ from django.conf import settings -from django.contrib.admin.views.decorators import staff_member_required +from django.http import HttpResponse from django.shortcuts import render +from django.contrib.admin.views.decorators import staff_member_required from django.utils.translation import ugettext_lazy as _ -from rest_framework import viewsets +from rest_framework import viewsets, mixins, filters from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated from rest_framework.decorators import list_route from rest_framework.response import Response +from apps.core.serializers import ChoicesSerializer from apps.core.utils import render_to_format +from apps.options.models import OptionSet from apps.conditions.models import Condition from .models import * from .serializers import * +from .renderers import * @staff_member_required @@ -30,6 +34,13 @@ def options_export(request, format): }) +@staff_member_required +def options_export_xml(request): + queryset = OptionSet.objects.all() + serializer = ExportSerializer(queryset, many=True) + return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + + class OptionSetViewSet(viewsets.ModelViewSet): permission_classes = (DjangoModelPermissions, IsAuthenticated) From 537f924b3535f3b3ca811ff511ceaa3964737a46 Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Wed, 7 Dec 2016 13:15:27 +0100 Subject: [PATCH 02/51] update renderers.py --- apps/options/renderers.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/options/renderers.py b/apps/options/renderers.py index 37fddacef..974dd17bd 100644 --- a/apps/options/renderers.py +++ b/apps/options/renderers.py @@ -59,16 +59,16 @@ def _optionset(self, xml, optionset): if 'conditions' in optionset and optionset['conditions']: xml.startElement('Conditions', {}) - for conditions in optionset['conditions']: - self._conditions(xml, conditions) + for condition in optionset['conditions']: + self._condition(xml, condition) xml.endElement('Conditions') xml.endElement('OptionSet') - def _conditions(self, xml, conditions): + def _condition(self, xml, condition): xml.startElement('Condition', {}) - self._text_element(xml, 'title', {}, conditions["title"]) + self._text_element(xml, 'title', {}, condition["title"]) xml.endElement('Condition') def _text_element(self, xml, tag, option, text): From 00daed0506199f770db6053019720c14d7a77f4b Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Wed, 7 Dec 2016 15:45:48 +0100 Subject: [PATCH 03/51] update serializers.py --- apps/options/serializers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/options/serializers.py b/apps/options/serializers.py index 7d0fd8b60..32e49be13 100644 --- a/apps/options/serializers.py +++ b/apps/options/serializers.py @@ -63,6 +63,7 @@ class Meta: 'title' ) + class ExportOptionSerializer(serializers.ModelSerializer): class Meta: @@ -75,6 +76,7 @@ class Meta: 'additional_input' ) + class ExportConditionSerializer(serializers.ModelSerializer): class Meta: @@ -83,6 +85,7 @@ class Meta: 'title', ) + class ExportSerializer(serializers.ModelSerializer): options = ExportOptionSerializer(many=True) From e12737d02a12d19cbf48ae9d55f93f302d8781c2 Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Thu, 8 Dec 2016 13:52:43 +0100 Subject: [PATCH 04/51] add conditions xml-export, update renderers --- apps/conditions/renderers.py | 46 +++++++++++++++++++ apps/conditions/serializers.py | 18 +++++++- .../templates/conditions/conditions.html | 8 ++++ apps/conditions/urls.py | 1 + apps/conditions/views.py | 14 +++++- apps/domain/renderers.py | 7 +-- apps/options/renderers.py | 7 +-- 7 files changed, 86 insertions(+), 15 deletions(-) create mode 100644 apps/conditions/renderers.py diff --git a/apps/conditions/renderers.py b/apps/conditions/renderers.py new file mode 100644 index 000000000..deb91e9fc --- /dev/null +++ b/apps/conditions/renderers.py @@ -0,0 +1,46 @@ +from __future__ import unicode_literals + +from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO +from django.utils.encoding import smart_text +from rest_framework.renderers import BaseRenderer + + +class XMLRenderer(BaseRenderer): + + media_type = 'application/xml' + format = 'xml' + + def render(self, data): + + if data is None: + return '' + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement('Conditions', {}) + + for condition in data: + self._condition(xml, condition) + + xml.endElement('Conditions') + xml.endDocument() + return stream.getvalue() + + def _condition(self, xml, condition): + xml.startElement('Condition', {}) + self._text_element(xml, 'title', {}, condition["title"]) + self._text_element(xml, 'description', {}, condition["description"]) + self._text_element(xml, 'source', {}, condition["source"]) + self._text_element(xml, 'relation', {}, condition["relation"]) + self._text_element(xml, 'target_text', {}, condition["target_text"]) + self._text_element(xml, 'target_option', {}, condition["target_option"]) + xml.endElement('Condition') + + def _text_element(self, xml, tag, condition, text): + xml.startElement(tag, condition) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) diff --git a/apps/conditions/serializers.py b/apps/conditions/serializers.py index 40277c43e..4d04dd26b 100644 --- a/apps/conditions/serializers.py +++ b/apps/conditions/serializers.py @@ -72,7 +72,7 @@ class Meta: class OptionSetSerializer(serializers.ModelSerializer): - options = OptionSetOptionSerializer(many=True) + conditions = OptionSetOptionSerializer(many=True) class Meta: model = OptionSet @@ -81,3 +81,19 @@ class Meta: 'order', 'options' ) + + +class ExportSerializer(serializers.ModelSerializer): + + target_option = serializers.CharField(source='target_option.title') + + class Meta: + model = Condition + fields = ( + 'title', + 'description', + 'source', + 'relation', + 'target_text', + 'target_option' + ) diff --git a/apps/conditions/templates/conditions/conditions.html b/apps/conditions/templates/conditions/conditions.html index 228d2a05f..a9ad8c490 100644 --- a/apps/conditions/templates/conditions/conditions.html +++ b/apps/conditions/templates/conditions/conditions.html @@ -51,6 +51,14 @@

{% trans 'Export' %}

{% endfor %} + + {% endblock %} {% block page %} diff --git a/apps/conditions/urls.py b/apps/conditions/urls.py index 7db8413d0..483dcaeb5 100644 --- a/apps/conditions/urls.py +++ b/apps/conditions/urls.py @@ -4,5 +4,6 @@ urlpatterns = [ url(r'^$', conditions, name='conditions'), + url(r'^export/xml/$', conditions_export_xml, name='conditions_export_xml'), url(r'^export/(?P[a-z]+)/$', conditions_export, name='conditions_export'), ] diff --git a/apps/conditions/views.py b/apps/conditions/views.py index a0437f15a..5efa2614e 100644 --- a/apps/conditions/views.py +++ b/apps/conditions/views.py @@ -1,9 +1,10 @@ from django.conf import settings -from django.contrib.admin.views.decorators import staff_member_required +from django.http import HttpResponse from django.shortcuts import render +from django.contrib.admin.views.decorators import staff_member_required from django.utils.translation import ugettext_lazy as _ -from rest_framework import viewsets, mixins +from rest_framework import viewsets, mixins, filters from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated from rest_framework.decorators import list_route, detail_route from rest_framework.response import Response @@ -14,10 +15,12 @@ from apps.core.serializers import ChoicesSerializer from apps.domain.models import Attribute from apps.options.models import OptionSet +from apps.conditions.models import Condition from apps.projects.models import Snapshot from .models import * from .serializers import * +from .renderers import * @staff_member_required @@ -34,6 +37,13 @@ def conditions_export(request, format): }) +@staff_member_required +def conditions_export_xml(request): + queryset = Condition.objects.all() + serializer = ExportSerializer(queryset, many=True) + return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + + class ConditionViewSet(viewsets.ModelViewSet): permission_classes = (DjangoModelPermissions, ) diff --git a/apps/domain/renderers.py b/apps/domain/renderers.py index 38cb6bac7..34f608e06 100644 --- a/apps/domain/renderers.py +++ b/apps/domain/renderers.py @@ -7,17 +7,12 @@ class XMLRenderer(BaseRenderer): - """ - Renderer which serializes to XML. - """ media_type = 'application/xml' format = 'xml' def render(self, data): - """ - Renders 'data' into serialized XML. - """ + if data is None: return '' diff --git a/apps/options/renderers.py b/apps/options/renderers.py index 974dd17bd..a1fcc4026 100644 --- a/apps/options/renderers.py +++ b/apps/options/renderers.py @@ -7,17 +7,12 @@ class XMLRenderer(BaseRenderer): - """ - Renderer which serializes to XML. - """ media_type = 'application/xml' format = 'xml' def render(self, data): - """ - Renders 'data' into serialized XML. - """ + if data is None: return '' From 887d16c1e6093906c0c263d5184f947be9885ad0 Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Fri, 16 Dec 2016 16:07:16 +0100 Subject: [PATCH 05/51] add questions xml-export --- apps/questions/renderers.py | 106 ++++++++++++++++++ apps/questions/serializers.py | 99 ++++++++++++++++ .../templates/questions/catalogs_sidebar.html | 8 ++ apps/questions/urls.py | 3 +- apps/questions/views.py | 12 +- 5 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 apps/questions/renderers.py diff --git a/apps/questions/renderers.py b/apps/questions/renderers.py new file mode 100644 index 000000000..5c65df04e --- /dev/null +++ b/apps/questions/renderers.py @@ -0,0 +1,106 @@ +from __future__ import unicode_literals + +from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO +from django.utils.encoding import smart_text +from rest_framework.renderers import BaseRenderer + + +class XMLRenderer(BaseRenderer): + + media_type = 'application/xml' + format = 'xml' + + def render(self, data): + + if data is None: + return '' + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement('Catalogs', {}) + + for catalog in data: + self._catalog(xml, catalog) + + xml.endElement('Catalogs') + xml.endDocument() + return stream.getvalue() + + def _catalog(self, xml, catalog): + xml.startElement('Catalog', {}) + self._text_element(xml, 'title', {}, catalog["title"]) + self._text_element(xml, 'order', {}, catalog["order"]) + + if 'sections' in catalog and catalog['sections']: + xml.startElement('Sections', {}) + + for section in catalog['sections']: + self._section(xml, section) + + xml.endElement('Sections') + + xml.endElement('Catalog') + + def _section(self, xml, section): + xml.startElement('Section', {}) + self._text_element(xml, 'order', {}, section["order"]) + self._text_element(xml, 'title_en', {}, section["title_en"]) + self._text_element(xml, 'title_de', {}, section["title_de"]) + + if 'subsections' in section and section['subsections']: + xml.startElement('Subsections', {}) + + for subsection in section['subsections']: + self._subsection(xml, subsection) + + xml.endElement('Subsections') + + xml.endElement('Section') + + def _subsection(self, xml, subsection): + xml.startElement('Subsection', {}) + self._text_element(xml, 'order', {}, subsection["order"]) + self._text_element(xml, 'title_en', {}, subsection["title_en"]) + self._text_element(xml, 'title_de', {}, subsection["title_de"]) + + if 'entities' in subsection and subsection['entities']: + xml.startElement('QuestionEntities', {}) + + for questionentity in subsection['entities']: + if 'is_set' in questionentity and questionentity['is_set']: + self._questionset(xml, questionentity) + else: + self._question(xml, questionentity) + + xml.endElement('QuestionEntities') + + xml.endElement('Subsection') + + def _question(self, xml, question): + xml.startElement('Question', {}) + self._text_element(xml, 'text_en', {}, question["text_en"]) + self._text_element(xml, 'text_de', {}, question["text_de"]) + self._text_element(xml, 'attribute_entity', {}, question["attribute_entity"]['label']) + xml.endElement('Question') + + def _questionset(self, xml, questionset): + xml.startElement('QuestionSet', {}) + self._text_element(xml, 'order', {}, questionset["order"]) + self._text_element(xml, 'help_en', {}, questionset["help_en"]) + self._text_element(xml, 'help_de', {}, questionset["help_de"]) + xml.startElement('Questions', {}) + + for question in questionset['questions']: + self._question(xml, question) + + xml.endElement('Questions') + xml.endElement('QuestionSet') + + def _text_element(self, xml, tag, questionentity, text): + xml.startElement(tag, questionentity) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) diff --git a/apps/questions/serializers.py b/apps/questions/serializers.py index 97337ceb5..c08d02307 100644 --- a/apps/questions/serializers.py +++ b/apps/questions/serializers.py @@ -269,3 +269,102 @@ def get_urls(self, obj): for format in settings.EXPORT_FORMATS: urls[format] = reverse('questions_catalog_export', args=[obj.pk, format]) return urls + + +class ExportAttributeEntitySerializer(serializers.ModelSerializer): + + class Meta: + model = AttributeEntity + fields = ( + 'id', + 'label' + ) + + +class ExportQuestionSerializer(serializers.ModelSerializer): + + attribute_entity = ExportAttributeEntitySerializer() + + class Meta: + model = Question + fields = ( + 'parent', + 'attribute_entity', + 'order', + 'help_en', + 'help_de', + 'text_en', + 'text_de', + 'widget_type' + ) + + +class ExportQuestionEntitySerializer(serializers.ModelSerializer): + + questions = ExportQuestionSerializer(many=True, read_only=True) + text_en = serializers.CharField(source='question.text_en') + text_de = serializers.CharField(source='question.text_de') + + attribute_entity = ExportAttributeEntitySerializer(read_only=True) + + class Meta: + model = QuestionEntity + fields = ( + 'text_en', + 'text_de', + 'is_set', + 'attribute_entity', + 'order', + 'help_en', + 'help_de', + 'questions' + ) + + +class ExportSubsectionSerializer(serializers.ModelSerializer): + + entities = serializers.SerializerMethodField() + + class Meta: + model = Subsection + fields = ( + 'order', + 'title_en', + 'title_de', + 'entities' + ) + + def get_entities(self, obj): + entities = QuestionEntity.objects.filter(subsection=obj, question__parent=None) + serializer = ExportQuestionEntitySerializer(instance=entities, many=True) + return serializer.data + + +class ExportSectionSerializer(serializers.ModelSerializer): + + subsections = ExportSubsectionSerializer(many=True) + + class Meta: + model = Catalog + fields = ( + 'order', + 'title', + 'title_en', + 'title_de', + 'subsections' + ) + + +class ExportSerializer(serializers.ModelSerializer): + + sections = ExportSectionSerializer(many=True) + + class Meta: + model = Catalog + fields = ( + 'order', + 'title', + 'title_en', + 'title_de', + 'sections' + ) diff --git a/apps/questions/templates/questions/catalogs_sidebar.html b/apps/questions/templates/questions/catalogs_sidebar.html index 2daa11969..dcf02ecf1 100644 --- a/apps/questions/templates/questions/catalogs_sidebar.html +++ b/apps/questions/templates/questions/catalogs_sidebar.html @@ -71,3 +71,11 @@

{% trans 'Export' %}

{% endfor %} + + diff --git a/apps/questions/urls.py b/apps/questions/urls.py index 827fe3587..ec2dc385a 100644 --- a/apps/questions/urls.py +++ b/apps/questions/urls.py @@ -3,7 +3,8 @@ from .views import * urlpatterns = [ + url(r'^catalogs/', catalogs, name='catalogs'), + url(r'^export/xml/$', questions_catalog_export_xml, name='questions_catalog_export_xml'), url(r'^catalogs/(?P[0-9]+)/export/(?P[a-z]+)/$', catalog_export, name='questions_catalog_export'), - url(r'^catalogs/', catalogs, name='catalogs'), ] diff --git a/apps/questions/views.py b/apps/questions/views.py index 8753e5156..4ce102a79 100644 --- a/apps/questions/views.py +++ b/apps/questions/views.py @@ -1,8 +1,10 @@ from django.conf import settings +from django.http import HttpResponse +from django.shortcuts import render from django.contrib.admin.views.decorators import staff_member_required from django.shortcuts import render, get_object_or_404 -from rest_framework import viewsets, mixins +from rest_framework import viewsets, mixins, filters from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated from rest_framework.decorators import list_route, detail_route from rest_framework.response import Response @@ -12,6 +14,7 @@ from .models import * from .serializers import * +from .renderers import * @staff_member_required @@ -30,6 +33,13 @@ def catalog_export(request, catalog_id, format): }) +@staff_member_required +def questions_catalog_export_xml(request): + queryset = Catalog.objects.all() + serializer = ExportSerializer(queryset, many=True) + return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + + class CatalogViewSet(viewsets.ModelViewSet): permission_classes = (DjangoModelPermissions, ) From 4edefb680ab781dd6378e362853e393a49d86bd1 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Wed, 25 Jan 2017 14:11:53 +0100 Subject: [PATCH 06/51] refactor options app --- apps/core/management/commands/import.py | 16 +++ apps/core/utils.py | 25 ++++ apps/options/admin.py | 15 ++- apps/options/migrations/0005_refactoring.py | 29 +++++ apps/options/migrations/0006_refactoring.py | 95 ++++++++++++++ apps/options/models.py | 118 ++++++++++++++---- apps/options/renderers.py | 72 +++++------ apps/options/serializers.py | 24 ++-- apps/options/templates/options/options.html | 4 +- .../options/options_modal_form_options.html | 23 +++- .../options_modal_form_optionsets.html | 22 +++- apps/options/urls.py | 2 +- apps/options/utils.py | 43 +++++++ apps/options/views.py | 19 +-- fixtures/options.json | 59 +-------- 15 files changed, 425 insertions(+), 141 deletions(-) create mode 100644 apps/core/management/commands/import.py create mode 100644 apps/options/migrations/0005_refactoring.py create mode 100644 apps/options/migrations/0006_refactoring.py create mode 100644 apps/options/utils.py diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py new file mode 100644 index 000000000..7784d573e --- /dev/null +++ b/apps/core/management/commands/import.py @@ -0,0 +1,16 @@ +from django.core.management.base import BaseCommand + +from apps.core.utils import import_xml + + +class Command(BaseCommand): + + def add_arguments(self, parser): + parser.add_argument('xmlfile', action='store', default=False, help='RDMO XML export file') + + def handle(self, *args, **options): + print options['xmlfile'] + + with open(options['xmlfile']) as f: + xml_string = f.read() + import_xml(xml_string) diff --git a/apps/core/utils.py b/apps/core/utils.py index 372bc816d..692b4fcab 100644 --- a/apps/core/utils.py +++ b/apps/core/utils.py @@ -2,6 +2,7 @@ import csv from tempfile import mkstemp +from lxml import objectify import pypandoc from django.conf import settings @@ -10,6 +11,11 @@ from django.utils.six.moves.urllib.parse import urlparse from django.utils.translation import ugettext_lazy as _ +#from apps.conditions.utils import import_xml as import_conditions +from apps.options.utils import import_xml as import_options +#from apps.domain.utils import import_xml as import_domain +#from apps.questions.utils import import_xml as import_questions + def get_script_alias(request): return request.path[:-len(request.path_info)] @@ -101,3 +107,22 @@ def render_to_csv(request, title, rows): writer.writerow(tuple(row)) return response + + +def import_xml(xml_string): + xml_root = objectify.fromstring(xml_string) + + if xml_root.tag == 'conditions': + import_conditions(xml_root) + + elif xml_root.tag == 'options': + import_options(xml_root) + + elif xml_root.tag == 'domain': + import_domain(xml_root) + + elif xml_root.tag == 'catalogs': + import_questions(xml_root) + + else: + raise Exception('This is not a proper RDMO XML Export.') diff --git a/apps/options/admin.py b/apps/options/admin.py index 9bd105ebc..5fb7f7227 100644 --- a/apps/options/admin.py +++ b/apps/options/admin.py @@ -1,6 +1,15 @@ from django.contrib import admin -from .models import * +from .models import OptionSet, Option -admin.site.register(OptionSet) -admin.site.register(Option) + +class OptionSetAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) + + +class OptionAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) + + +admin.site.register(OptionSet, OptionSetAdmin) +admin.site.register(Option, OptionAdmin) diff --git a/apps/options/migrations/0005_refactoring.py b/apps/options/migrations/0005_refactoring.py new file mode 100644 index 000000000..a488aea7f --- /dev/null +++ b/apps/options/migrations/0005_refactoring.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 11:06 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('options', '0004_conditions'), + ] + + operations = [ + migrations.AlterModelOptions( + name='optionset', + options={'ordering': ('key',), 'verbose_name': 'OptionSet', 'verbose_name_plural': 'OptionSets'}, + ), + migrations.RenameField( + model_name='option', + old_name='title', + new_name='key', + ), + migrations.RenameField( + model_name='optionset', + old_name='title', + new_name='key', + ), + ] diff --git a/apps/options/migrations/0006_refactoring.py b/apps/options/migrations/0006_refactoring.py new file mode 100644 index 000000000..e326d5aac --- /dev/null +++ b/apps/options/migrations/0006_refactoring.py @@ -0,0 +1,95 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 11:34 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('options', '0005_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='optionset', + options={'ordering': ('uri',), 'verbose_name': 'OptionSet', 'verbose_name_plural': 'OptionSets'}, + ), + migrations.AddField( + model_name='option', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this option.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='option', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this option (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='option', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this option.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AddField( + model_name='optionset', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this option set.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='optionset', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this option set (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='optionset', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this option set.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='option', + name='additional_input', + field=models.BooleanField(default=False, help_text='Designates whether an additional input is possible for this option.', verbose_name='Additional input'), + ), + migrations.AlterField( + model_name='option', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this option. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='option', + name='optionset', + field=models.ForeignKey(blank=True, help_text='The option set this option belongs to.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='options', to='options.OptionSet', verbose_name='Option set'), + ), + migrations.AlterField( + model_name='option', + name='order', + field=models.IntegerField(default=0, help_text='The position of this option in lists.', verbose_name='Order'), + ), + migrations.AlterField( + model_name='option', + name='text_de', + field=models.CharField(help_text='The German text displayed for this option.', max_length=256, verbose_name='Text (de)'), + ), + migrations.AlterField( + model_name='option', + name='text_en', + field=models.CharField(help_text='The English text displayed for this option.', max_length=256, verbose_name='Text (en)'), + ), + migrations.AlterField( + model_name='optionset', + name='conditions', + field=models.ManyToManyField(blank=True, help_text='The list of conditions evaluated for this option set.', to='conditions.Condition', verbose_name='Conditions'), + ), + migrations.AlterField( + model_name='optionset', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this option set. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='optionset', + name='order', + field=models.IntegerField(default=0, help_text='The position of this option set in lists.', verbose_name='Order'), + ), + ] diff --git a/apps/options/models.py b/apps/options/models.py index dcfa10491..95be823ac 100644 --- a/apps/options/models.py +++ b/apps/options/models.py @@ -2,6 +2,8 @@ from django.core.validators import RegexValidator from django.db import models +from django.db.models.signals import pre_save +from django.dispatch import receiver from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ @@ -12,47 +14,121 @@ @python_2_unicode_compatible class OptionSet(models.Model): - title = models.CharField(max_length=256, validators=[ - RegexValidator('^[a-zA-z0-9_]*$', _('Only letters, numbers, or underscores are allowed.')) - ]) - - order = models.IntegerField(default=0) - - conditions = models.ManyToManyField(Condition, blank=True) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this option set.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this option set. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this option set.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this option set in lists.') + ) + conditions = models.ManyToManyField( + Condition, blank=True, + verbose_name=_('Conditions'), + help_text=_('The list of conditions evaluated for this option set.') + ) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this option set (auto-generated).') + ) class Meta: - ordering = ('title', ) + ordering = ('uri', ) verbose_name = _('OptionSet') verbose_name_plural = _('OptionSets') def __str__(self): - return self.title - + return self.uri -@python_2_unicode_compatible -class Option(models.Model, TranslationMixin): + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(OptionSet, self).save(*args, **kwargs) - optionset = models.ForeignKey('OptionSet', null=True, blank=True, related_name='options') + for option in self.options.all(): + option.save() - title = models.CharField(max_length=256, validators=[ - RegexValidator('^[a-zA-z0-9_]*$', _('Only letters, numbers, or underscores are allowed.')) - ]) + def build_uri(self): + return self.uri_prefix.rstrip('/') + '/options/' + self.key - order = models.IntegerField(default=0) - text_en = models.CharField(max_length=256) - text_de = models.CharField(max_length=256) +@python_2_unicode_compatible +class Option(models.Model, TranslationMixin): - additional_input = models.BooleanField(default=False) + optionset = models.ForeignKey( + 'OptionSet', null=True, blank=True, related_name='options', + verbose_name=_('Option set'), + help_text=_('The option set this option belongs to.') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this option.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this option. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this option.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this option in lists.') + ) + text_en = models.CharField( + max_length=256, + verbose_name=_('Text (en)'), + help_text=_('The English text displayed for this option.') + ) + text_de = models.CharField( + max_length=256, + verbose_name=_('Text (de)'), + help_text=_('The German text displayed for this option.') + ) + additional_input = models.BooleanField( + default=False, + verbose_name=_('Additional input'), + help_text=_('Designates whether an additional input is possible for this option.') + ) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this option (auto-generated).') + ) class Meta: + ordering = ('uri', ) ordering = ('optionset', 'order', ) verbose_name = _('Option') verbose_name_plural = _('Options') def __str__(self): - return self.title + return self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(Option, self).save(*args, **kwargs) @property def text(self): return self.trans('text') + + def build_uri(self): + return self.uri_prefix.rstrip('/') + '/options/' + self.optionset.key + '/' + self.key diff --git a/apps/options/renderers.py b/apps/options/renderers.py index a1fcc4026..395c6a544 100644 --- a/apps/options/renderers.py +++ b/apps/options/renderers.py @@ -20,54 +20,56 @@ def render(self, data): xml = SimplerXMLGenerator(stream, "utf-8") xml.startDocument() - xml.startElement('OptionSets', {}) - - for optionset in data: - self._optionset(xml, optionset) - - xml.endElement('OptionSets') + self.render_document(xml, data) xml.endDocument() return stream.getvalue() - def _option(self, xml, option): - xml.startElement('Option', {}) - self._text_element(xml, 'title', {}, option["title"]) - self._text_element(xml, 'order', {}, option["order"]) - self._text_element(xml, 'text_en', {}, option["text_en"]) - self._text_element(xml, 'text_de', {}, option["text_de"]) - self._text_element(xml, 'additional_input', {}, option["additional_input"]) - xml.endElement('Option') + def render_text_element(self, xml, tag, attrs, text): + xml.startElement(tag, attrs) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) + + def render_document(self, xml, optionsets): + xml.startElement('options', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) - def _optionset(self, xml, optionset): - xml.startElement('OptionSet', {}) - self._text_element(xml, 'title', {}, optionset["title"]) - self._text_element(xml, 'order', {}, optionset["order"]) + for optionset in optionsets: + self.render_optionset(xml, optionset) + + xml.endElement('options') + + def render_optionset(self, xml, optionset): + xml.startElement('optionset', {}) + self.render_text_element(xml, 'dc:uri', {}, optionset["uri"]) + self.render_text_element(xml, 'dc:comment', {}, optionset["comment"]) + self.render_text_element(xml, 'order', {}, optionset["order"]) if 'options' in optionset and optionset['options']: - xml.startElement('Options', {}) + xml.startElement('options', {}) for option in optionset['options']: - self._option(xml, option) + self.render_option(xml, option) - xml.endElement('Options') + xml.endElement('options') if 'conditions' in optionset and optionset['conditions']: - xml.startElement('Conditions', {}) + xml.startElement('conditions', {}) for condition in optionset['conditions']: - self._condition(xml, condition) - - xml.endElement('Conditions') + self.render_text_element(xml, 'condition', condition, None) - xml.endElement('OptionSet') + xml.endElement('conditions') - def _condition(self, xml, condition): - xml.startElement('Condition', {}) - self._text_element(xml, 'title', {}, condition["title"]) - xml.endElement('Condition') + xml.endElement('optionset') - def _text_element(self, xml, tag, option, text): - xml.startElement(tag, option) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) + def render_option(self, xml, option): + xml.startElement('option', {}) + self.render_text_element(xml, 'dc:uri', {}, option["uri"]) + self.render_text_element(xml, 'dc:comment', {}, option["comment"]) + self.render_text_element(xml, 'order', {}, option["order"]) + self.render_text_element(xml, 'text', {'lang': 'en'}, option["text_en"]) + self.render_text_element(xml, 'text', {'lang': 'de'}, option["text_de"]) + self.render_text_element(xml, 'additional_input', {}, option["additional_input"]) + xml.endElement('option') diff --git a/apps/options/serializers.py b/apps/options/serializers.py index 32e49be13..151092500 100644 --- a/apps/options/serializers.py +++ b/apps/options/serializers.py @@ -1,6 +1,8 @@ from rest_framework import serializers -from .models import * +from apps.conditions.models import Condition + +from .models import OptionSet, Option class OptionSetIndexOptionsSerializer(serializers.ModelSerializer): @@ -9,7 +11,7 @@ class Meta: model = Option fields = ( 'id', - 'title', + 'uri', 'text' ) @@ -22,7 +24,7 @@ class Meta: model = OptionSet fields = ( 'id', - 'title', + 'uri', 'options' ) @@ -33,7 +35,9 @@ class Meta: model = OptionSet fields = ( 'id', - 'title', + 'uri_prefix', + 'key', + 'comment', 'order', 'conditions' ) @@ -46,7 +50,9 @@ class Meta: fields = ( 'id', 'optionset', - 'title', + 'uri_prefix', + 'key', + 'comment', 'order', 'text_en', 'text_de', @@ -69,7 +75,8 @@ class ExportOptionSerializer(serializers.ModelSerializer): class Meta: model = Option fields = ( - 'title', + 'uri', + 'comment', 'order', 'text_en', 'text_de', @@ -82,7 +89,7 @@ class ExportConditionSerializer(serializers.ModelSerializer): class Meta: model = Condition fields = ( - 'title', + 'uri', ) @@ -94,7 +101,8 @@ class ExportSerializer(serializers.ModelSerializer): class Meta: model = OptionSet fields = ( - 'title', + 'uri', + 'comment', 'order', 'options', 'conditions' diff --git a/apps/options/templates/options/options.html b/apps/options/templates/options/options.html index c9ca24fc5..e6eb27226 100644 --- a/apps/options/templates/options/options.html +++ b/apps/options/templates/options/options.html @@ -103,7 +103,7 @@

{% trans 'Options' %}

{% trans 'Option set' %} - {$ optionset.title $} + {$ optionset.uri $}
    @@ -119,8 +119,8 @@

    {% trans 'Options' %}

    {% trans 'Option' %} - {$ option.title $} {$ option.text $} + {$ option.uri $}
diff --git a/apps/options/templates/options/options_modal_form_options.html b/apps/options/templates/options/options_modal_form_options.html index f86d7d656..d139f98c9 100644 --- a/apps/options/templates/options/options_modal_form_options.html +++ b/apps/options/templates/options/options_modal_form_options.html @@ -13,6 +13,27 @@

+ + + + + + data-model="service.values.optionset" data-errors="service.errors.optionset" data-options="service.optionsets" - data-options-label="title" + data-options-label="uri" data-options-null="1">
+ data-label="{% trans 'Prefix' %}" + data-model="service.values.uri_prefix" + data-errors="service.errors.uri_prefix"> + + + + Date: Wed, 25 Jan 2017 14:43:32 +0100 Subject: [PATCH 07/51] fixtures updated --- fixtures/conditions.json | 171 +++++- fixtures/domain.json | 1206 ++++++++++++++++++++++---------------- fixtures/options.json | 132 ++++- fixtures/questions.json | 589 ++++++++++++++++++- fixtures/tasks.json | 28 + fixtures/views.json | 21 +- 6 files changed, 1646 insertions(+), 501 deletions(-) create mode 100644 fixtures/tasks.json diff --git a/fixtures/conditions.json b/fixtures/conditions.json index 165ba0eb1..b9058995c 100644 --- a/fixtures/conditions.json +++ b/fixtures/conditions.json @@ -1 +1,170 @@ -[{"model": "conditions.condition", "pk": 1, "fields": {"title": "contains", "description": null, "source": 16, "relation": "contains", "target_text": "test", "target_option": null}}, {"model": "conditions.condition", "pk": 2, "fields": {"title": "empty", "description": null, "source": 17, "relation": "empty", "target_text": null, "target_option": null}}, {"model": "conditions.condition", "pk": 3, "fields": {"title": "equal", "description": null, "source": 18, "relation": "eq", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 4, "fields": {"title": "greater_than", "description": null, "source": 19, "relation": "gt", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 5, "fields": {"title": "greater_than_equal", "description": null, "source": 20, "relation": "gte", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 6, "fields": {"title": "lesser_than", "description": null, "source": 21, "relation": "lt", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 7, "fields": {"title": "lesser_than_equal", "description": null, "source": 22, "relation": "lte", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 8, "fields": {"title": "not_empty", "description": null, "source": 23, "relation": "notempty", "target_text": "", "target_option": null}}, {"model": "conditions.condition", "pk": 9, "fields": {"title": "not_equal", "description": null, "source": 24, "relation": "neq", "target_text": "0", "target_option": null}}] \ No newline at end of file +[ + { + "model": "conditions.condition", + "pk": 1, + "fields": { + "title": "text_equal", + "description": null, + "source": 25, + "relation": "eq", + "target_text": "test", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 2, + "fields": { + "title": "text_not_equal", + "description": null, + "source": 25, + "relation": "neq", + "target_text": "test", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 3, + "fields": { + "title": "text_contains", + "description": null, + "source": 25, + "relation": "contains", + "target_text": "test", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 4, + "fields": { + "title": "text_greater_than", + "description": null, + "source": 25, + "relation": "gt", + "target_text": "0", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 5, + "fields": { + "title": "text_greater_than_equal", + "description": null, + "source": 25, + "relation": "gte", + "target_text": "0", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 6, + "fields": { + "title": "text_lesser_than", + "description": null, + "source": 25, + "relation": "lt", + "target_text": "0", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 7, + "fields": { + "title": "text_lesser_than_equal", + "description": null, + "source": 25, + "relation": "lte", + "target_text": "0", + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 8, + "fields": { + "title": "text_empty", + "description": null, + "source": 25, + "relation": "empty", + "target_text": null, + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 9, + "fields": { + "title": "text_not_empty", + "description": null, + "source": 25, + "relation": "notempty", + "target_text": null, + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 10, + "fields": { + "title": "options_equal", + "description": null, + "source": 26, + "relation": "eq", + "target_text": null, + "target_option": 1 + } + }, + { + "model": "conditions.condition", + "pk": 11, + "fields": { + "title": "options_not_equal", + "description": null, + "source": 26, + "relation": "neq", + "target_text": null, + "target_option": 1 + } + }, + { + "model": "conditions.condition", + "pk": 12, + "fields": { + "title": "options_contains", + "description": null, + "source": 26, + "relation": "contains", + "target_text": null, + "target_option": 1 + } + }, + { + "model": "conditions.condition", + "pk": 13, + "fields": { + "title": "options_empty", + "description": null, + "source": 26, + "relation": "empty", + "target_text": null, + "target_option": null + } + }, + { + "model": "conditions.condition", + "pk": 14, + "fields": { + "title": "options_not_empty", + "description": null, + "source": 26, + "relation": "notempty", + "target_text": null, + "target_option": null + } + } +] \ No newline at end of file diff --git a/fixtures/domain.json b/fixtures/domain.json index 38550c11b..3bb75bffb 100644 --- a/fixtures/domain.json +++ b/fixtures/domain.json @@ -4,16 +4,16 @@ "pk": 1, "fields": { "parent": null, - "title": "widgets", - "label": "widgets", + "title": "individual", + "uri": "http://example.com/elements/domain/individual", "description": null, - "uri": null, + "label": "individual", "is_collection": false, "is_attribute": false, "parent_collection": null, "lft": 1, "rght": 22, - "tree_id": 7, + "tree_id": 3, "level": 0, "conditions": [] } @@ -22,18 +22,18 @@ "model": "domain.attributeentity", "pk": 2, "fields": { - "parent": 1, - "title": "single", - "label": "widgets.single", + "parent": null, + "title": "collection", + "uri": "http://example.com/elements/domain/collection", "description": null, - "uri": null, + "label": "collection", "is_collection": false, "is_attribute": false, "parent_collection": null, - "lft": 18, - "rght": 21, - "tree_id": 7, - "level": 1, + "lft": 1, + "rght": 24, + "tree_id": 1, + "level": 0, "conditions": [] } }, @@ -42,16 +42,16 @@ "pk": 3, "fields": { "parent": 1, - "title": "collection", - "label": "widgets.collection", + "title": "text", + "uri": "http://example.com/elements/domain/individual/text", "description": null, - "uri": null, + "label": "individual.text", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 2, - "rght": 5, - "tree_id": 7, + "lft": 16, + "rght": 17, + "tree_id": 3, "level": 1, "conditions": [] } @@ -61,16 +61,16 @@ "pk": 4, "fields": { "parent": 1, - "title": "set", - "label": "widgets.set", + "title": "textarea", + "uri": "http://example.com/elements/domain/individual/textarea", "description": null, - "uri": null, + "label": "individual.textarea", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 6, - "rght": 7, - "tree_id": 7, + "lft": 18, + "rght": 19, + "tree_id": 3, "level": 1, "conditions": [] } @@ -80,16 +80,16 @@ "pk": 5, "fields": { "parent": 1, - "title": "set_collection", - "label": "widgets.set_collection", + "title": "integer", + "uri": "http://example.com/elements/domain/individual/integer", "description": null, - "uri": null, - "is_collection": true, - "is_attribute": false, - "parent_collection": 5, + "label": "individual.integer", + "is_collection": false, + "is_attribute": true, + "parent_collection": null, "lft": 8, - "rght": 17, - "tree_id": 7, + "rght": 9, + "tree_id": 3, "level": 1, "conditions": [] } @@ -98,18 +98,18 @@ "model": "domain.attributeentity", "pk": 6, "fields": { - "parent": null, - "title": "conditions", - "label": "conditions", + "parent": 1, + "title": "float", + "uri": "http://example.com/elements/domain/individual/float", "description": null, - "uri": null, + "label": "individual.float", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 1, - "rght": 56, + "lft": 6, + "rght": 7, "tree_id": 3, - "level": 0, + "level": 1, "conditions": [] } }, @@ -117,16 +117,16 @@ "model": "domain.attributeentity", "pk": 7, "fields": { - "parent": 6, - "title": "equal", - "label": "conditions.equal", + "parent": 1, + "title": "range", + "uri": "http://example.com/elements/domain/individual/range", "description": null, - "uri": null, + "label": "individual.range", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 14, - "rght": 19, + "lft": 12, + "rght": 13, "tree_id": 3, "level": 1, "conditions": [] @@ -136,16 +136,16 @@ "model": "domain.attributeentity", "pk": 8, "fields": { - "parent": 6, - "title": "not_equal", - "label": "conditions.not_equal", + "parent": 1, + "title": "bool", + "uri": "http://example.com/elements/domain/individual/bool", "description": null, - "uri": null, + "label": "individual.bool", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 50, - "rght": 55, + "lft": 2, + "rght": 3, "tree_id": 3, "level": 1, "conditions": [] @@ -155,16 +155,16 @@ "model": "domain.attributeentity", "pk": 9, "fields": { - "parent": 6, - "title": "contains", - "label": "conditions.contains", + "parent": 1, + "title": "datetime", + "uri": "http://example.com/elements/domain/individual/datetime", "description": null, - "uri": null, + "label": "individual.datetime", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 2, - "rght": 7, + "lft": 4, + "rght": 5, "tree_id": 3, "level": 1, "conditions": [] @@ -174,16 +174,16 @@ "model": "domain.attributeentity", "pk": 10, "fields": { - "parent": 6, - "title": "greater_than", - "label": "conditions.greater_than", + "parent": 1, + "title": "url", + "uri": "http://example.com/elements/domain/individual/url", "description": null, - "uri": null, + "label": "individual.url", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, "lft": 20, - "rght": 25, + "rght": 21, "tree_id": 3, "level": 1, "conditions": [] @@ -193,16 +193,16 @@ "model": "domain.attributeentity", "pk": 11, "fields": { - "parent": 6, - "title": "greater_than_equal", - "label": "conditions.greater_than_equal", + "parent": 1, + "title": "radio", + "uri": "http://example.com/elements/domain/individual/checkbox", "description": null, - "uri": null, + "label": "individual.radio", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 26, - "rght": 31, + "lft": 10, + "rght": 11, "tree_id": 3, "level": 1, "conditions": [] @@ -212,16 +212,16 @@ "model": "domain.attributeentity", "pk": 12, "fields": { - "parent": 6, - "title": "lesser_than_equal", - "label": "conditions.lesser_than_equal", + "parent": 1, + "title": "select", + "uri": "http://example.com/elements/domain/individual/select", "description": null, - "uri": null, + "label": "individual.select", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 38, - "rght": 43, + "lft": 14, + "rght": 15, "tree_id": 3, "level": 1, "conditions": [] @@ -231,17 +231,17 @@ "model": "domain.attributeentity", "pk": 13, "fields": { - "parent": 6, - "title": "lesser_than", - "label": "conditions.lesser_than", + "parent": 2, + "title": "bool", + "uri": "http://example.com/elements/domain/collection/bool", "description": null, - "uri": null, - "is_collection": false, - "is_attribute": false, + "label": "collection.bool", + "is_collection": true, + "is_attribute": true, "parent_collection": null, - "lft": 32, - "rght": 37, - "tree_id": 3, + "lft": 2, + "rght": 3, + "tree_id": 1, "level": 1, "conditions": [] } @@ -250,17 +250,17 @@ "model": "domain.attributeentity", "pk": 14, "fields": { - "parent": 6, - "title": "not_empty", - "label": "conditions.not_empty", + "parent": 2, + "title": "checkbox", + "uri": "http://example.com/elements/domain/collection/checkbox", "description": null, - "uri": null, - "is_collection": false, - "is_attribute": false, + "label": "collection.checkbox", + "is_collection": true, + "is_attribute": true, "parent_collection": null, - "lft": 44, - "rght": 49, - "tree_id": 3, + "lft": 4, + "rght": 5, + "tree_id": 1, "level": 1, "conditions": [] } @@ -269,17 +269,17 @@ "model": "domain.attributeentity", "pk": 15, "fields": { - "parent": 6, - "title": "empty", - "label": "conditions.empty", + "parent": 2, + "title": "radio", + "uri": "http://example.com/elements/domain/collection/radio", "description": null, - "uri": null, - "is_collection": false, - "is_attribute": false, + "label": "collection.radio", + "is_collection": true, + "is_attribute": true, "parent_collection": null, - "lft": 8, + "lft": 12, "rght": 13, - "tree_id": 3, + "tree_id": 1, "level": 1, "conditions": [] } @@ -288,18 +288,18 @@ "model": "domain.attributeentity", "pk": 16, "fields": { - "parent": 9, - "title": "source", - "label": "conditions.contains.source", + "parent": 2, + "title": "datetime", + "uri": "http://example.com/elements/domain/collection/datetime", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.datetime", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 5, - "rght": 6, - "tree_id": 3, - "level": 2, + "lft": 6, + "rght": 7, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -307,18 +307,18 @@ "model": "domain.attributeentity", "pk": 17, "fields": { - "parent": 15, - "title": "source", - "label": "conditions.empty.source", + "parent": 2, + "title": "float", + "uri": "http://example.com/elements/domain/collection/float", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.float", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 11, - "rght": 12, - "tree_id": 3, - "level": 2, + "lft": 8, + "rght": 9, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -326,18 +326,18 @@ "model": "domain.attributeentity", "pk": 18, "fields": { - "parent": 7, - "title": "source", - "label": "conditions.equal.source", + "parent": 2, + "title": "integer", + "uri": "http://example.com/elements/domain/collection/integer", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.integer", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 17, - "rght": 18, - "tree_id": 3, - "level": 2, + "lft": 10, + "rght": 11, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -345,18 +345,18 @@ "model": "domain.attributeentity", "pk": 19, "fields": { - "parent": 10, - "title": "source", - "label": "conditions.greater_than.source", + "parent": 2, + "title": "range", + "uri": "http://example.com/elements/domain/collection/range", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.range", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 23, - "rght": 24, - "tree_id": 3, - "level": 2, + "lft": 14, + "rght": 15, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -364,18 +364,18 @@ "model": "domain.attributeentity", "pk": 20, "fields": { - "parent": 11, - "title": "source", - "label": "conditions.greater_than_equal.source", + "parent": 2, + "title": "select", + "uri": "http://example.com/elements/domain/collection/select", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.select", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 29, - "rght": 30, - "tree_id": 3, - "level": 2, + "lft": 16, + "rght": 17, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -383,18 +383,18 @@ "model": "domain.attributeentity", "pk": 21, "fields": { - "parent": 13, - "title": "source", - "label": "conditions.lesser_than.source", + "parent": 2, + "title": "text", + "uri": "http://example.com/elements/domain/collection/text", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.text", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 35, - "rght": 36, - "tree_id": 3, - "level": 2, + "lft": 18, + "rght": 19, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -402,18 +402,18 @@ "model": "domain.attributeentity", "pk": 22, "fields": { - "parent": 12, - "title": "source", - "label": "conditions.lesser_than_equal.source", + "parent": 2, + "title": "textarea", + "uri": "http://example.com/elements/domain/collection/textarea", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.textarea", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 41, - "rght": 42, - "tree_id": 3, - "level": 2, + "lft": 20, + "rght": 21, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -421,18 +421,18 @@ "model": "domain.attributeentity", "pk": 23, "fields": { - "parent": 14, - "title": "source", - "label": "conditions.not_empty.source", + "parent": 2, + "title": "url", + "uri": "http://example.com/elements/domain/collection/url", "description": null, - "uri": null, - "is_collection": false, + "label": "collection.url", + "is_collection": true, "is_attribute": true, "parent_collection": null, - "lft": 47, - "rght": 48, - "tree_id": 3, - "level": 2, + "lft": 22, + "rght": 23, + "tree_id": 1, + "level": 1, "conditions": [] } }, @@ -440,18 +440,18 @@ "model": "domain.attributeentity", "pk": 24, "fields": { - "parent": 8, - "title": "source", - "label": "conditions.not_equal.source", + "parent": null, + "title": "conditions", + "uri": "http://example.com/elements/domain/conditions", "description": null, - "uri": null, + "label": "conditions", "is_collection": false, - "is_attribute": true, + "is_attribute": false, "parent_collection": null, - "lft": 53, - "rght": 54, - "tree_id": 3, - "level": 2, + "lft": 1, + "rght": 38, + "tree_id": 2, + "level": 0, "conditions": [] } }, @@ -459,38 +459,36 @@ "model": "domain.attributeentity", "pk": 25, "fields": { - "parent": 9, - "title": "attribute", - "label": "conditions.contains.attribute", + "parent": 28, + "title": "text", + "uri": "http://example.com/elements/domain/conditions/source/text", "description": null, - "uri": null, - "is_collection": true, + "label": "conditions.source.text", + "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 3, - "rght": 4, - "tree_id": 3, + "lft": 5, + "rght": 6, + "tree_id": 2, "level": 2, - "conditions": [ - 1 - ] + "conditions": [] } }, { "model": "domain.attributeentity", "pk": 26, "fields": { - "parent": 15, - "title": "attribute", - "label": "conditions.empty.attribute", + "parent": 28, + "title": "options", + "uri": "http://example.com/elements/domain/conditions/source/options", "description": null, - "uri": null, + "label": "conditions.source.options", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 9, - "rght": 10, - "tree_id": 3, + "lft": 3, + "rght": 4, + "tree_id": 2, "level": 2, "conditions": [] } @@ -499,37 +497,39 @@ "model": "domain.attributeentity", "pk": 27, "fields": { - "parent": 7, - "title": "attribute", - "label": "conditions.equal.attribute", - "description": null, + "parent": 31, + "title": "text_equal", "uri": null, + "description": null, + "label": "conditions.attribute.text_equal", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 15, - "rght": 16, - "tree_id": 3, + "lft": 23, + "rght": 24, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 1 + ] } }, { "model": "domain.attributeentity", "pk": 28, "fields": { - "parent": 10, - "title": "attribute", - "label": "conditions.greater_than.attribute", + "parent": 24, + "title": "source", + "uri": "http://example.com/elements/domain/conditions/source", "description": null, - "uri": null, + "label": "conditions.source", "is_collection": false, - "is_attribute": true, + "is_attribute": false, "parent_collection": null, - "lft": 21, - "rght": 22, - "tree_id": 3, - "level": 2, + "lft": 2, + "rght": 7, + "tree_id": 2, + "level": 1, "conditions": [] } }, @@ -537,56 +537,60 @@ "model": "domain.attributeentity", "pk": 29, "fields": { - "parent": 11, - "title": "attribute", - "label": "conditions.greater_than_equal.attribute", - "description": null, + "parent": 31, + "title": "text_not_equal", "uri": null, + "description": null, + "label": "conditions.attribute.text_not_equal", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 27, - "rght": 28, - "tree_id": 3, + "lft": 35, + "rght": 36, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 2 + ] } }, { "model": "domain.attributeentity", "pk": 30, "fields": { - "parent": 13, - "title": "attribute", - "label": "conditions.lesser_than.attribute", - "description": null, + "parent": 31, + "title": "options_contains", "uri": null, + "description": null, + "label": "conditions.attribute.options_contains", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 33, - "rght": 34, - "tree_id": 3, + "lft": 9, + "rght": 10, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 12 + ] } }, { "model": "domain.attributeentity", "pk": 31, "fields": { - "parent": 12, + "parent": 24, "title": "attribute", - "label": "conditions.lesser_than_equal.attribute", - "description": null, "uri": null, + "description": null, + "label": "conditions.attribute", "is_collection": false, - "is_attribute": true, + "is_attribute": false, "parent_collection": null, - "lft": 39, - "rght": 40, - "tree_id": 3, - "level": 2, + "lft": 8, + "rght": 37, + "tree_id": 2, + "level": 1, "conditions": [] } }, @@ -594,208 +598,249 @@ "model": "domain.attributeentity", "pk": 32, "fields": { - "parent": 14, - "title": "attribute", - "label": "conditions.not_empty.attribute", - "description": null, + "parent": 31, + "title": "options_empty", "uri": null, + "description": null, + "label": "conditions.attribute.options_empty", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 45, - "rght": 46, - "tree_id": 3, + "lft": 11, + "rght": 12, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 13 + ] } }, { "model": "domain.attributeentity", "pk": 33, "fields": { - "parent": 8, - "title": "attribute", - "label": "conditions.not_equal.attribute", - "description": null, + "parent": 31, + "title": "options_equal", "uri": null, + "description": null, + "label": "conditions.attribute.options_equal", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 51, - "rght": 52, - "tree_id": 3, + "lft": 13, + "rght": 14, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 10 + ] } }, { "model": "domain.attributeentity", "pk": 34, "fields": { - "parent": null, - "title": "views", - "label": "views", - "description": null, + "parent": 31, + "title": "options_not_empty", "uri": null, + "description": null, + "label": "conditions.attribute.options_not_empty", "is_collection": false, - "is_attribute": false, + "is_attribute": true, "parent_collection": null, - "lft": 1, - "rght": 20, - "tree_id": 6, - "level": 0, - "conditions": [] + "lft": 15, + "rght": 16, + "tree_id": 2, + "level": 2, + "conditions": [ + 14 + ] } }, { "model": "domain.attributeentity", "pk": 35, "fields": { - "parent": 34, - "title": "single", - "label": "views.single", - "description": null, + "parent": 31, + "title": "options_not_equal", "uri": null, + "description": null, + "label": "conditions.attribute.options_not_equal", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 18, - "rght": 19, - "tree_id": 6, - "level": 1, - "conditions": [] + "lft": 17, + "rght": 18, + "tree_id": 2, + "level": 2, + "conditions": [ + 11 + ] } }, { "model": "domain.attributeentity", "pk": 36, "fields": { - "parent": 34, - "title": "collection", - "label": "views.collection", - "description": null, + "parent": 31, + "title": "text_contains", "uri": null, - "is_collection": true, + "description": null, + "label": "conditions.attribute.text_contains", + "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 2, - "rght": 3, - "tree_id": 6, - "level": 1, - "conditions": [] + "lft": 19, + "rght": 20, + "tree_id": 2, + "level": 2, + "conditions": [ + 3 + ] } }, { "model": "domain.attributeentity", "pk": 37, "fields": { - "parent": 34, - "title": "options", - "label": "views.options", - "description": null, + "parent": 31, + "title": "text_empty", "uri": null, - "is_collection": true, + "description": null, + "label": "conditions.attribute.text_empty", + "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 4, - "rght": 5, - "tree_id": 6, - "level": 1, - "conditions": [] + "lft": 21, + "rght": 22, + "tree_id": 2, + "level": 2, + "conditions": [ + 8 + ] } }, { "model": "domain.attributeentity", "pk": 38, "fields": { - "parent": 34, - "title": "set", - "label": "views.set", - "description": null, + "parent": 31, + "title": "text_greater_than", "uri": null, - "is_collection": true, - "is_attribute": false, - "parent_collection": 38, - "lft": 6, - "rght": 17, - "tree_id": 6, - "level": 1, - "conditions": [] + "description": null, + "label": "conditions.attribute.text_greater_than", + "is_collection": false, + "is_attribute": true, + "parent_collection": null, + "lft": 25, + "rght": 26, + "tree_id": 2, + "level": 2, + "conditions": [ + 4 + ] } }, { "model": "domain.attributeentity", "pk": 39, "fields": { - "parent": 38, - "title": "single", - "label": "views.set.single", - "description": null, + "parent": 31, + "title": "text_greater_than_equal", "uri": null, + "description": null, + "label": "conditions.attribute.text_greater_than_equal", "is_collection": false, "is_attribute": true, - "parent_collection": 38, - "lft": 11, - "rght": 12, - "tree_id": 6, + "parent_collection": null, + "lft": 27, + "rght": 28, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 5 + ] } }, { "model": "domain.attributeentity", "pk": 40, "fields": { - "parent": 38, - "title": "collection", - "label": "views.set.collection", - "description": null, + "parent": 31, + "title": "text_lesser_than", "uri": null, - "is_collection": true, + "description": null, + "label": "conditions.attribute.text_lesser_than", + "is_collection": false, "is_attribute": true, - "parent_collection": 38, - "lft": 7, - "rght": 8, - "tree_id": 6, + "parent_collection": null, + "lft": 29, + "rght": 30, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 6 + ] } }, { "model": "domain.attributeentity", "pk": 41, "fields": { - "parent": 38, - "title": "id", - "label": "views.set.id", - "description": null, + "parent": 31, + "title": "text_lesser_than_equal", "uri": null, + "description": null, + "label": "conditions.attribute.text_lesser_than_equal", "is_collection": false, "is_attribute": true, - "parent_collection": 38, - "lft": 9, - "rght": 10, - "tree_id": 6, + "parent_collection": null, + "lft": 31, + "rght": 32, + "tree_id": 2, "level": 2, - "conditions": [] + "conditions": [ + 7 + ] } }, { "model": "domain.attributeentity", - "pk": 43, + "pk": 42, "fields": { - "parent": 2, - "title": "date", - "label": "widgets.single.date", - "description": null, + "parent": 31, + "title": "text_not_empty", "uri": null, + "description": null, + "label": "conditions.attribute.text_not_empty", "is_collection": false, "is_attribute": true, "parent_collection": null, - "lft": 19, - "rght": 20, - "tree_id": 7, + "lft": 33, + "rght": 34, + "tree_id": 2, "level": 2, + "conditions": [ + 9 + ] + } + }, + { + "model": "domain.attributeentity", + "pk": 43, + "fields": { + "parent": null, + "title": "set", + "uri": null, + "description": null, + "label": "set", + "is_collection": false, + "is_attribute": false, + "parent_collection": null, + "lft": 1, + "rght": 16, + "tree_id": 4, + "level": 0, "conditions": [] } }, @@ -803,18 +848,18 @@ "model": "domain.attributeentity", "pk": 44, "fields": { - "parent": 3, - "title": "date", - "label": "widgets.collection.date", - "description": null, + "parent": 43, + "title": "individual", "uri": null, - "is_collection": true, - "is_attribute": true, + "description": null, + "label": "set.individual", + "is_collection": false, + "is_attribute": false, "parent_collection": null, - "lft": 3, - "rght": 4, - "tree_id": 7, - "level": 2, + "lft": 10, + "rght": 15, + "tree_id": 4, + "level": 1, "conditions": [] } }, @@ -822,18 +867,18 @@ "model": "domain.attributeentity", "pk": 45, "fields": { - "parent": 5, - "title": "text", - "label": "widgets.set_collection.text", - "description": null, + "parent": 43, + "title": "collection", "uri": null, - "is_collection": false, - "is_attribute": true, - "parent_collection": 5, - "lft": 11, - "rght": 12, - "tree_id": 7, - "level": 2, + "description": null, + "label": "set.collection", + "is_collection": true, + "is_attribute": false, + "parent_collection": 45, + "lft": 2, + "rght": 9, + "tree_id": 4, + "level": 1, "conditions": [] } }, @@ -841,17 +886,17 @@ "model": "domain.attributeentity", "pk": 46, "fields": { - "parent": 5, - "title": "textarea", - "label": "widgets.set_collection.textarea", - "description": null, + "parent": 45, + "title": "id", "uri": null, + "description": null, + "label": "set.collection.id", "is_collection": false, "is_attribute": true, - "parent_collection": 5, - "lft": 13, - "rght": 14, - "tree_id": 7, + "parent_collection": 45, + "lft": 3, + "rght": 4, + "tree_id": 4, "level": 2, "conditions": [] } @@ -860,17 +905,17 @@ "model": "domain.attributeentity", "pk": 47, "fields": { - "parent": 5, - "title": "id", - "label": "widgets.set_collection.id", - "description": null, + "parent": 45, + "title": "text", "uri": null, + "description": null, + "label": "set.collection.text", "is_collection": false, "is_attribute": true, - "parent_collection": 5, - "lft": 9, - "rght": 10, - "tree_id": 7, + "parent_collection": 45, + "lft": 5, + "rght": 6, + "tree_id": 4, "level": 2, "conditions": [] } @@ -879,67 +924,78 @@ "model": "domain.attributeentity", "pk": 48, "fields": { - "parent": 5, - "title": "text_collection", - "label": "widgets.set_collection.text_collection", - "description": null, + "parent": 45, + "title": "textarea", "uri": null, - "is_collection": true, + "description": null, + "label": "set.collection.textarea", + "is_collection": false, "is_attribute": true, - "parent_collection": 5, - "lft": 15, - "rght": 16, - "tree_id": 7, + "parent_collection": 45, + "lft": 7, + "rght": 8, + "tree_id": 4, "level": 2, "conditions": [] } }, { "model": "domain.attributeentity", - "pk": 51, + "pk": 49, "fields": { - "parent": 38, - "title": "sub", - "label": "views.set.sub", - "description": null, + "parent": 44, + "title": "text", "uri": null, + "description": null, + "label": "set.individual.text", "is_collection": false, - "is_attribute": false, - "parent_collection": 38, - "lft": 13, - "rght": 16, - "tree_id": 6, + "is_attribute": true, + "parent_collection": null, + "lft": 11, + "rght": 12, + "tree_id": 4, "level": 2, "conditions": [] } }, { "model": "domain.attributeentity", - "pk": 52, + "pk": 50, "fields": { - "parent": 51, - "title": "single", - "label": "views.set.sub.single", - "description": null, + "parent": 44, + "title": "textarea", "uri": null, + "description": null, + "label": "set.individual.textarea", "is_collection": false, "is_attribute": true, - "parent_collection": 38, - "lft": 14, - "rght": 15, - "tree_id": 6, - "level": 3, + "parent_collection": null, + "lft": 13, + "rght": 14, + "tree_id": 4, + "level": 2, "conditions": [] } }, { "model": "domain.attribute", - "pk": 25, + "pk": 13, "fields": { - "value_type": "text", + "value_type": "boolean", "unit": null, - "conditions": [ - 1 + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 14, + "fields": { + "value_type": "options", + "unit": null, + "conditions": [], + "optionsets": [ + 2 ] } }, @@ -947,81 +1003,94 @@ "model": "domain.attribute", "pk": 16, "fields": { - "value_type": "text", + "value_type": "datetime", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 26, + "pk": 17, "fields": { - "value_type": "text", + "value_type": "float", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 17, + "pk": 18, "fields": { - "value_type": "text", + "value_type": "integer", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 27, + "pk": 15, "fields": { - "value_type": "text", + "value_type": "options", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [ + 2 + ] } }, { "model": "domain.attribute", - "pk": 18, + "pk": 19, "fields": { - "value_type": "boolean", + "value_type": "float", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 28, + "pk": 20, "fields": { - "value_type": "text", + "value_type": "options", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [ + 1 + ] } }, { "model": "domain.attribute", - "pk": 29, + "pk": 21, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 20, + "pk": 22, "fields": { - "value_type": "integer", + "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 19, + "pk": 23, "fields": { - "value_type": "integer", + "value_type": "url", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { @@ -1030,89 +1099,118 @@ "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 12 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 31, + "pk": 32, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 13 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 22, + "pk": 33, "fields": { - "value_type": "integer", + "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 10 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 21, + "pk": 34, "fields": { - "value_type": "integer", + "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 14 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 32, + "pk": 35, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 11 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 23, + "pk": 36, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 3 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 33, + "pk": 37, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 8 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 24, + "pk": 27, "fields": { - "value_type": "boolean", + "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 1 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 36, + "pk": 38, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 4 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 37, + "pk": 39, "fields": { - "value_type": "options", + "value_type": "text", "unit": null, - "optionsets": [1], - "conditions": [] + "conditions": [ + 5 + ], + "optionsets": [] } }, { @@ -1121,7 +1219,10 @@ "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 6 + ], + "optionsets": [] } }, { @@ -1130,61 +1231,160 @@ "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 7 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 39, + "pk": 42, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 9 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 52, + "pk": 29, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [ + 2 + ], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 35, + "pk": 26, + "fields": { + "value_type": "options", + "unit": null, + "conditions": [], + "optionsets": [ + 1 + ] + } + }, + { + "model": "domain.attribute", + "pk": 25, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 44, + "pk": 8, + "fields": { + "value_type": "boolean", + "unit": null, + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 9, "fields": { "value_type": "datetime", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 47, + "pk": 6, + "fields": { + "value_type": "float", + "unit": null, + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 5, + "fields": { + "value_type": "integer", + "unit": null, + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 11, + "fields": { + "value_type": "options", + "unit": null, + "conditions": [], + "optionsets": [ + 2 + ] + } + }, + { + "model": "domain.attribute", + "pk": 7, + "fields": { + "value_type": "float", + "unit": null, + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 12, + "fields": { + "value_type": "options", + "unit": null, + "conditions": [], + "optionsets": [ + 1 + ] + } + }, + { + "model": "domain.attribute", + "pk": 3, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 45, + "pk": 4, "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 10, + "fields": { + "value_type": "url", + "unit": null, + "conditions": [], + "optionsets": [] } }, { @@ -1193,7 +1393,18 @@ "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] + } + }, + { + "model": "domain.attribute", + "pk": 47, + "fields": { + "value_type": "text", + "unit": null, + "conditions": [], + "optionsets": [] } }, { @@ -1202,27 +1413,28 @@ "fields": { "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { "model": "domain.attribute", - "pk": 43, + "pk": 49, "fields": { - "value_type": "datetime", + "value_type": "text", "unit": null, - "conditions": [] + "conditions": [], + "optionsets": [] } }, { - "model": "domain.verbosename", - "pk": 1, + "model": "domain.attribute", + "pk": 50, "fields": { - "attribute_entity": 5, - "name_en": "Thing", - "name_de": "Ding", - "name_plural_en": "Things", - "name_plural_de": "Dinge" + "value_type": "text", + "unit": null, + "conditions": [], + "optionsets": [] } } ] \ No newline at end of file diff --git a/fixtures/options.json b/fixtures/options.json index 8e2f0bef1..805c4ee4d 100644 --- a/fixtures/options.json +++ b/fixtures/options.json @@ -1 +1,131 @@ -[ \ No newline at end of file +[ + { + "model": "options.optionset", + "pk": 1, + "fields": { + "uri_prefix": null, + "key": "one_two_three", + "comment": null, + "order": 0, + "uri": "http://example.com/elements/options/one_two_three/", + "conditions": [] + } + }, + { + "model": "options.optionset", + "pk": 2, + "fields": { + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "one_two_three_other", + "comment": null, + "order": 1, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other", + "conditions": [] + } + }, + { + "model": "options.option", + "pk": 1, + "fields": { + "optionset": 1, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "one", + "comment": null, + "order": 1, + "text_en": "One", + "text_de": "Eins", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/one" + } + }, + { + "model": "options.option", + "pk": 2, + "fields": { + "optionset": 1, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "two", + "comment": null, + "order": 2, + "text_en": "Two", + "text_de": "Zwei", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/two" + } + }, + { + "model": "options.option", + "pk": 3, + "fields": { + "optionset": 1, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "three", + "comment": null, + "order": 3, + "text_en": "Three", + "text_de": "Drei", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/three" + } + }, + { + "model": "options.option", + "pk": 4, + "fields": { + "optionset": 2, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "one", + "comment": null, + "order": 1, + "text_en": "One", + "text_de": "Eins", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/one" + } + }, + { + "model": "options.option", + "pk": 5, + "fields": { + "optionset": 2, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "two", + "comment": null, + "order": 2, + "text_en": "Two", + "text_de": "Zwei", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/two" + } + }, + { + "model": "options.option", + "pk": 6, + "fields": { + "optionset": 2, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "three", + "comment": null, + "order": 3, + "text_en": "Three", + "text_de": "Drei", + "additional_input": false, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/three" + } + }, + { + "model": "options.option", + "pk": 7, + "fields": { + "optionset": 2, + "uri_prefix": "https://rdmorganiser.github.io/elements", + "key": "other", + "comment": null, + "order": 4, + "text_en": "Other", + "text_de": "Sonstige", + "additional_input": true, + "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/other" + } + } +] \ No newline at end of file diff --git a/fixtures/questions.json b/fixtures/questions.json index aa897d68e..2b072c972 100644 --- a/fixtures/questions.json +++ b/fixtures/questions.json @@ -1 +1,588 @@ -[{"model": "questions.catalog", "pk": 1, "fields": {"created": "2016-08-11T11:50:29.296Z", "updated": "2016-09-20T14:27:12.593Z", "order": 1, "title_en": "Conditions", "title_de": "Bedingungen"}}, {"model": "questions.catalog", "pk": 2, "fields": {"created": "2016-08-12T11:20:12.215Z", "updated": "2016-09-20T14:27:21.006Z", "order": 2, "title_en": "Views", "title_de": "Ansichten"}}, {"model": "questions.catalog", "pk": 3, "fields": {"created": "2016-09-08T13:51:11.927Z", "updated": "2016-09-08T13:51:11.927Z", "order": 0, "title_en": "Widgets", "title_de": "Widgets"}}, {"model": "questions.section", "pk": 1, "fields": {"created": "2016-08-11T11:50:50.531Z", "updated": "2016-09-20T14:27:12.622Z", "catalog": 1, "order": 0, "title_en": "Test", "title_de": "Test", "label_de": "Bedingungen / Test", "label_en": "Conditions / Test"}}, {"model": "questions.section", "pk": 2, "fields": {"created": "2016-08-12T11:20:23.236Z", "updated": "2016-09-20T14:27:21.036Z", "catalog": 2, "order": 0, "title_en": "Lorem ipsum", "title_de": "Lorem ipsum", "label_de": "Ansichten / Lorem ipsum", "label_en": "Views / Lorem ipsum"}}, {"model": "questions.section", "pk": 3, "fields": {"created": "2016-09-08T13:51:23.383Z", "updated": "2016-09-08T14:59:55.697Z", "catalog": 3, "order": 1, "title_en": "Single", "title_de": "Single", "label_de": "Widgets / Single", "label_en": "Widgets / Single"}}, {"model": "questions.section", "pk": 4, "fields": {"created": "2016-09-08T14:59:16.288Z", "updated": "2016-09-08T14:59:49.384Z", "catalog": 3, "order": 2, "title_en": "Collection", "title_de": "Sammlung", "label_de": "Widgets / Sammlung", "label_en": "Widgets / Collection"}}, {"model": "questions.section", "pk": 5, "fields": {"created": "2016-09-20T10:35:46.808Z", "updated": "2016-09-20T10:35:46.827Z", "catalog": 3, "order": 3, "title_en": "Set", "title_de": "Set", "label_de": "Widgets / Set", "label_en": "Widgets / Set"}}, {"model": "questions.subsection", "pk": 1, "fields": {"created": "2016-08-11T11:51:22.390Z", "updated": "2016-09-20T14:27:12.657Z", "section": 1, "order": 0, "title_en": "Contains", "title_de": "Enth\u00e4lt", "label_de": "Bedingungen / Test / Enth\u00e4lt", "label_en": "Conditions / Test / Contains"}}, {"model": "questions.subsection", "pk": 2, "fields": {"created": "2016-08-12T11:20:38.215Z", "updated": "2016-09-20T14:27:21.069Z", "section": 2, "order": 0, "title_en": "Lorem ipsum dolor sit amet", "title_de": "Lorem ipsum dolor sit amet", "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet"}}, {"model": "questions.subsection", "pk": 3, "fields": {"created": "2016-09-08T13:51:44.147Z", "updated": "2016-09-08T14:59:55.727Z", "section": 3, "order": 0, "title_en": "Date", "title_de": "Datum", "label_de": "Widgets / Single / Datum", "label_en": "Widgets / Single / Date"}}, {"model": "questions.subsection", "pk": 4, "fields": {"created": "2016-09-08T14:59:27.116Z", "updated": "2016-09-08T14:59:49.415Z", "section": 4, "order": 0, "title_en": "Date", "title_de": "Datum", "label_de": "Widgets / Sammlung / Datum", "label_en": "Widgets / Collection / Date"}}, {"model": "questions.subsection", "pk": 5, "fields": {"created": "2016-09-20T10:35:59.705Z", "updated": "2016-09-20T10:37:52.927Z", "section": 5, "order": 1, "title_en": "Collection", "title_de": "Sammlung", "label_de": "Widgets / Set / Sammlung", "label_en": "Widgets / Set / Collection"}}, {"model": "questions.subsection", "pk": 6, "fields": {"created": "2016-09-21T12:36:04.562Z", "updated": "2016-09-21T12:36:07.773Z", "section": 1, "order": 2, "title_en": "Empty", "title_de": "Empty", "label_de": "Bedingungen / Test / Empty", "label_en": "Conditions / Test / Empty"}}, {"model": "questions.questionentity", "pk": 1, "fields": {"created": "2016-08-11T11:52:17.007Z", "updated": "2016-09-20T14:27:12.716Z", "attribute_entity": 16, "subsection": 1, "order": 0, "label_de": "Bedingungen / Test / Enth\u00e4lt / source", "label_en": "Conditions / Test / Contains / source", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?"}}, {"model": "questions.questionentity", "pk": 2, "fields": {"created": "2016-08-11T11:53:03.471Z", "updated": "2016-09-20T14:27:12.747Z", "attribute_entity": 25, "subsection": 1, "order": 1, "label_de": "Bedingungen / Test / Enth\u00e4lt / attribute", "label_en": "Conditions / Test / Contains / attribute", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet."}}, {"model": "questions.questionentity", "pk": 3, "fields": {"created": "2016-08-12T11:21:08.547Z", "updated": "2016-09-20T14:27:21.134Z", "attribute_entity": 35, "subsection": 2, "order": 0, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / single", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / single", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."}}, {"model": "questions.questionentity", "pk": 4, "fields": {"created": "2016-08-12T11:21:29.563Z", "updated": "2016-09-20T14:27:21.193Z", "attribute_entity": 36, "subsection": 2, "order": 1, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / collection", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / collection", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."}}, {"model": "questions.questionentity", "pk": 5, "fields": {"created": "2016-08-12T11:22:05.165Z", "updated": "2016-09-20T14:27:21.222Z", "attribute_entity": 37, "subsection": 2, "order": 2, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / options", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / options", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."}}, {"model": "questions.questionentity", "pk": 6, "fields": {"created": "2016-08-12T14:40:31.008Z", "updated": "2016-09-20T14:27:21.251Z", "attribute_entity": 38, "subsection": 2, "order": 4, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / set", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / set", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet."}}, {"model": "questions.questionentity", "pk": 7, "fields": {"created": "2016-08-12T14:41:15.983Z", "updated": "2016-09-20T14:27:21.104Z", "attribute_entity": 39, "subsection": 2, "order": 0, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / single", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / single", "help_en": "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.", "help_de": "At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet."}}, {"model": "questions.questionentity", "pk": 8, "fields": {"created": "2016-08-12T14:52:06.699Z", "updated": "2016-09-22T12:21:48.524Z", "attribute_entity": 40, "subsection": 2, "order": 1, "label_de": "Ansichten / Lorem ipsum / Lorem ipsum dolor sit amet / collection", "label_en": "Views / Lorem ipsum / Lorem ipsum dolor sit amet / collection", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet."}}, {"model": "questions.questionentity", "pk": 11, "fields": {"created": "2016-09-08T13:52:03.175Z", "updated": "2016-09-08T14:59:55.763Z", "attribute_entity": 43, "subsection": 3, "order": 0, "label_de": "Widgets / Single / Datum / date", "label_en": "Widgets / Single / Date / date", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 12, "fields": {"created": "2016-09-08T14:59:44.343Z", "updated": "2016-09-21T11:16:45.691Z", "attribute_entity": 43, "subsection": 4, "order": 0, "label_de": "Widgets / Sammlung / Datum / date", "label_en": "Widgets / Collection / Date / date", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 13, "fields": {"created": "2016-09-20T10:36:17.719Z", "updated": "2016-09-20T15:02:48.468Z", "attribute_entity": 5, "subsection": 5, "order": 0, "label_de": "Widgets / Set / Sammlung / set_collection", "label_en": "Widgets / Set / Collection / set_collection", "help_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet.", "help_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est. Lorem ipsum dolor sit amet."}}, {"model": "questions.questionentity", "pk": 14, "fields": {"created": "2016-09-20T10:36:36.139Z", "updated": "2016-09-20T15:02:42.271Z", "attribute_entity": 45, "subsection": 5, "order": 0, "label_de": "Widgets / Set / Sammlung / text", "label_en": "Widgets / Set / Collection / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 15, "fields": {"created": "2016-09-20T10:37:03.884Z", "updated": "2016-09-20T10:37:53.022Z", "attribute_entity": 46, "subsection": 5, "order": 1, "label_de": "Widgets / Set / Sammlung / textarea", "label_en": "Widgets / Set / Collection / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 16, "fields": {"created": "2016-09-20T11:02:37.568Z", "updated": "2016-09-20T11:02:37.568Z", "attribute_entity": 48, "subsection": 5, "order": 3, "label_de": "", "label_en": "", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 18, "fields": {"created": "2016-09-21T12:36:33.403Z", "updated": "2016-09-21T12:36:33.403Z", "attribute_entity": 17, "subsection": 6, "order": 0, "label_de": "", "label_en": "", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 19, "fields": {"created": "2016-09-22T12:21:25.824Z", "updated": "2016-09-22T12:51:19.769Z", "attribute_entity": 52, "subsection": 2, "order": 4, "label_de": "", "label_en": "", "help_en": null, "help_de": null}}, {"model": "questions.question", "pk": 11, "fields": {"parent": null, "text_en": "Date", "text_de": "Datum", "widget_type": "date"}}, {"model": "questions.question", "pk": 12, "fields": {"parent": null, "text_en": "Date", "text_de": "Datum", "widget_type": "date"}}, {"model": "questions.question", "pk": 14, "fields": {"parent": 13, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 15, "fields": {"parent": 13, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 16, "fields": {"parent": 13, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 1, "fields": {"parent": null, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "text"}}, {"model": "questions.question", "pk": 2, "fields": {"parent": null, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 18, "fields": {"parent": null, "text_en": "Empty?", "text_de": "Empty?", "widget_type": "text"}}, {"model": "questions.question", "pk": 3, "fields": {"parent": null, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "text"}}, {"model": "questions.question", "pk": 7, "fields": {"parent": 6, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 8, "fields": {"parent": 6, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "text"}}, {"model": "questions.question", "pk": 4, "fields": {"parent": null, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "text"}}, {"model": "questions.question", "pk": 5, "fields": {"parent": null, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "checkbox"}}, {"model": "questions.question", "pk": 19, "fields": {"parent": 6, "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr?", "widget_type": "text"}}] \ No newline at end of file +[ + { + "model": "questions.catalog", + "pk": 1, + "fields": { + "created": "2016-12-15T12:00:09.331Z", + "updated": "2017-01-24T15:45:28.084Z", + "order": 0, + "title_en": "Catalog", + "title_de": "Katalog" + } + }, + { + "model": "questions.section", + "pk": 1, + "fields": { + "created": "2016-12-15T12:00:31.550Z", + "updated": "2017-01-24T15:45:28.715Z", + "catalog": 1, + "order": 1, + "title_en": "Widgets", + "title_de": "Widgets", + "label_en": "Catalog / Widgets", + "label_de": "Katalog / Widgets" + } + }, + { + "model": "questions.section", + "pk": 2, + "fields": { + "created": "2016-12-15T12:02:01.898Z", + "updated": "2017-01-24T15:45:28.680Z", + "catalog": 1, + "order": 2, + "title_en": "Conditions", + "title_de": "Bedingungen", + "label_en": "Catalog / Conditions", + "label_de": "Katalog / Bedingungen" + } + }, + { + "model": "questions.subsection", + "pk": 1, + "fields": { + "created": "2016-12-15T12:01:03.104Z", + "updated": "2017-01-24T15:45:28.744Z", + "section": 1, + "order": 1, + "title_en": "Individual questions", + "title_de": "Einzelne Fragen", + "label_en": "Catalog / Widgets / Individual questions", + "label_de": "Katalog / Widgets / Einzelne Fragen" + } + }, + { + "model": "questions.subsection", + "pk": 2, + "fields": { + "created": "2016-12-15T12:01:28.560Z", + "updated": "2017-01-24T15:45:28.989Z", + "section": 1, + "order": 2, + "title_en": "Collection questions", + "title_de": "Fragensammlungen", + "label_en": "Catalog / Widgets / Collection questions", + "label_de": "Katalog / Widgets / Fragensammlungen" + } + }, + { + "model": "questions.subsection", + "pk": 3, + "fields": { + "created": "2016-12-15T12:01:47.090Z", + "updated": "2017-01-24T15:45:28.647Z", + "section": 1, + "order": 3, + "title_en": "Question sets", + "title_de": "Fragensets", + "label_en": "Catalog / Widgets / Question sets", + "label_de": "Katalog / Widgets / Fragensets" + } + }, + { + "model": "questions.questionentity", + "pk": 1, + "fields": { + "created": "2016-12-15T13:28:15.582Z", + "updated": "2017-01-24T15:45:28.779Z", + "attribute_entity": 3, + "subsection": 1, + "order": 1, + "label_en": "Catalog / Widgets / Individual questions / individual.text", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.text", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 2, + "fields": { + "created": "2016-12-15T13:28:41.406Z", + "updated": "2017-01-24T15:45:28.813Z", + "attribute_entity": 4, + "subsection": 1, + "order": 2, + "label_en": "Catalog / Widgets / Individual questions / individual.textarea", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.textarea", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 3, + "fields": { + "created": "2016-12-15T13:29:05.951Z", + "updated": "2017-01-24T15:45:28.842Z", + "attribute_entity": 8, + "subsection": 1, + "order": 3, + "label_en": "Catalog / Widgets / Individual questions / individual.bool", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.bool", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 4, + "fields": { + "created": "2016-12-15T13:30:22.772Z", + "updated": "2017-01-24T15:45:28.871Z", + "attribute_entity": 11, + "subsection": 1, + "order": 4, + "label_en": "Catalog / Widgets / Individual questions / individual.radio", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.radio", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 5, + "fields": { + "created": "2016-12-15T13:31:22.093Z", + "updated": "2017-01-24T15:45:28.900Z", + "attribute_entity": 12, + "subsection": 1, + "order": 5, + "label_en": "Catalog / Widgets / Individual questions / individual.select", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.select", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 6, + "fields": { + "created": "2016-12-15T13:32:11.267Z", + "updated": "2017-01-24T15:45:28.930Z", + "attribute_entity": 7, + "subsection": 1, + "order": 6, + "label_en": "Catalog / Widgets / Individual questions / individual.range", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.range", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 7, + "fields": { + "created": "2016-12-15T13:32:41.210Z", + "updated": "2017-01-24T15:45:28.961Z", + "attribute_entity": 9, + "subsection": 1, + "order": 7, + "label_en": "Catalog / Widgets / Individual questions / individual.datetime", + "label_de": "Katalog / Widgets / Einzelne Fragen / individual.datetime", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 8, + "fields": { + "created": "2016-12-15T13:33:08.787Z", + "updated": "2017-01-24T15:45:29.026Z", + "attribute_entity": 21, + "subsection": 2, + "order": 1, + "label_en": "Catalog / Widgets / Collection questions / collection.text", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.text", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 9, + "fields": { + "created": "2016-12-15T13:33:20.995Z", + "updated": "2017-01-24T15:45:29.054Z", + "attribute_entity": 22, + "subsection": 2, + "order": 2, + "label_en": "Catalog / Widgets / Collection questions / collection.textarea", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.textarea", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 10, + "fields": { + "created": "2016-12-15T13:33:34.934Z", + "updated": "2017-01-24T15:45:29.083Z", + "attribute_entity": 13, + "subsection": 2, + "order": 3, + "label_en": "Catalog / Widgets / Collection questions / collection.bool", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.bool", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 11, + "fields": { + "created": "2016-12-15T13:33:54.082Z", + "updated": "2017-01-24T15:45:29.112Z", + "attribute_entity": 15, + "subsection": 2, + "order": 4, + "label_en": "Catalog / Widgets / Collection questions / collection.radio", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.radio", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 12, + "fields": { + "created": "2016-12-15T13:34:08.899Z", + "updated": "2017-01-24T15:45:29.142Z", + "attribute_entity": 20, + "subsection": 2, + "order": 5, + "label_en": "Catalog / Widgets / Collection questions / collection.select", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.select", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 13, + "fields": { + "created": "2016-12-15T13:34:28.895Z", + "updated": "2017-01-24T15:45:29.171Z", + "attribute_entity": 19, + "subsection": 2, + "order": 6, + "label_en": "Catalog / Widgets / Collection questions / collection.range", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.range", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 14, + "fields": { + "created": "2016-12-15T13:34:39.608Z", + "updated": "2017-01-24T15:45:29.200Z", + "attribute_entity": 16, + "subsection": 2, + "order": 7, + "label_en": "Catalog / Widgets / Collection questions / collection.datetime", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.datetime", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 15, + "fields": { + "created": "2016-12-15T13:35:32.219Z", + "updated": "2017-01-24T15:45:28.620Z", + "attribute_entity": 14, + "subsection": 2, + "order": 8, + "label_en": "Catalog / Widgets / Collection questions / collection.checkbox", + "label_de": "Katalog / Widgets / Fragensammlungen / collection.checkbox", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 16, + "fields": { + "created": "2017-01-24T15:54:14.908Z", + "updated": "2017-01-24T15:58:23.613Z", + "attribute_entity": 44, + "subsection": 3, + "order": 0, + "label_en": "Catalog / Widgets / Question sets / set.individual", + "label_de": "Katalog / Widgets / Fragensets / set.individual", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 17, + "fields": { + "created": "2017-01-24T15:54:23.537Z", + "updated": "2017-01-24T15:58:52.350Z", + "attribute_entity": 45, + "subsection": 3, + "order": 1, + "label_en": "Catalog / Widgets / Question sets / set.collection", + "label_de": "Katalog / Widgets / Fragensets / set.collection", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 18, + "fields": { + "created": "2017-01-24T15:56:13.523Z", + "updated": "2017-01-24T15:58:36.602Z", + "attribute_entity": 49, + "subsection": 3, + "order": 0, + "label_en": "", + "label_de": "", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 19, + "fields": { + "created": "2017-01-24T15:56:34.387Z", + "updated": "2017-01-24T15:58:43.609Z", + "attribute_entity": 50, + "subsection": 3, + "order": 1, + "label_en": "", + "label_de": "", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 20, + "fields": { + "created": "2017-01-24T15:59:11.461Z", + "updated": "2017-01-24T15:59:20.692Z", + "attribute_entity": 47, + "subsection": 3, + "order": 0, + "label_en": "", + "label_de": "", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.questionentity", + "pk": 21, + "fields": { + "created": "2017-01-24T15:59:43.213Z", + "updated": "2017-01-24T15:59:43.213Z", + "attribute_entity": 48, + "subsection": 3, + "order": 1, + "label_en": "", + "label_de": "", + "help_en": null, + "help_de": null + } + }, + { + "model": "questions.question", + "pk": 1, + "fields": { + "parent": null, + "text_en": "Text?", + "text_de": "Text?", + "widget_type": "text" + } + }, + { + "model": "questions.question", + "pk": 2, + "fields": { + "parent": null, + "text_en": "Textarea?", + "text_de": "Textarea?", + "widget_type": "textarea" + } + }, + { + "model": "questions.question", + "pk": 3, + "fields": { + "parent": null, + "text_en": "Yes or no?", + "text_de": "Ja oder Nein?", + "widget_type": "yesno" + } + }, + { + "model": "questions.question", + "pk": 4, + "fields": { + "parent": null, + "text_en": "Radio buttons?", + "text_de": "Radio-Buttons?", + "widget_type": "radio" + } + }, + { + "model": "questions.question", + "pk": 5, + "fields": { + "parent": null, + "text_en": "Select drop-down?", + "text_de": "Select-Aufklappmenü?", + "widget_type": "select" + } + }, + { + "model": "questions.question", + "pk": 6, + "fields": { + "parent": null, + "text_en": "Range slider?", + "text_de": "Bereichs-Schieber?", + "widget_type": "range" + } + }, + { + "model": "questions.question", + "pk": 7, + "fields": { + "parent": null, + "text_en": "Date picker?", + "text_de": "Datumsauswahl?", + "widget_type": "date" + } + }, + { + "model": "questions.question", + "pk": 8, + "fields": { + "parent": null, + "text_en": "Text?", + "text_de": "Text?", + "widget_type": "text" + } + }, + { + "model": "questions.question", + "pk": 9, + "fields": { + "parent": null, + "text_en": "Textarea?", + "text_de": "Textarea?", + "widget_type": "textarea" + } + }, + { + "model": "questions.question", + "pk": 10, + "fields": { + "parent": null, + "text_en": "Yes or no?", + "text_de": "Ja oder Nein?", + "widget_type": "yesno" + } + }, + { + "model": "questions.question", + "pk": 11, + "fields": { + "parent": null, + "text_en": "Radio buttons?", + "text_de": "Radio-Buttons?", + "widget_type": "radio" + } + }, + { + "model": "questions.question", + "pk": 12, + "fields": { + "parent": null, + "text_en": "Select drop-down?", + "text_de": "Select-Aufklappmenü?", + "widget_type": "select" + } + }, + { + "model": "questions.question", + "pk": 13, + "fields": { + "parent": null, + "text_en": "Range slider?", + "text_de": "Bereichs-Schieber?", + "widget_type": "range" + } + }, + { + "model": "questions.question", + "pk": 14, + "fields": { + "parent": null, + "text_en": "Date picker?", + "text_de": "Datumsauswahl?", + "widget_type": "date" + } + }, + { + "model": "questions.question", + "pk": 15, + "fields": { + "parent": null, + "text_en": "Checkbox?", + "text_de": "Ankreuzfelder?", + "widget_type": "checkbox" + } + }, + { + "model": "questions.question", + "pk": 18, + "fields": { + "parent": 16, + "text_en": "Text?", + "text_de": "Text?", + "widget_type": "text" + } + }, + { + "model": "questions.question", + "pk": 20, + "fields": { + "parent": 17, + "text_en": "Text?", + "text_de": "Text?", + "widget_type": "text" + } + }, + { + "model": "questions.question", + "pk": 19, + "fields": { + "parent": 16, + "text_en": "Textarea?", + "text_de": "Textarea?", + "widget_type": "textarea" + } + }, + { + "model": "questions.question", + "pk": 21, + "fields": { + "parent": 17, + "text_en": "Textarea?", + "text_de": "Textarea?", + "widget_type": "textarea" + } + } +] \ No newline at end of file diff --git a/fixtures/tasks.json b/fixtures/tasks.json new file mode 100644 index 000000000..0550f831f --- /dev/null +++ b/fixtures/tasks.json @@ -0,0 +1,28 @@ +[ + { + "model": "tasks.task", + "pk": 1, + "fields": { + "attribute": null, + "time_period": "30 00:00:00", + "title_en": "A task", + "title_de": "Eine Aufgabe", + "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", + "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", + "conditions": [] + } + }, + { + "model": "tasks.task", + "pk": 2, + "fields": { + "attribute": null, + "time_period": "365 00:00:00", + "title_en": "Another Task", + "title_de": "Eine andere Aufgabe", + "text_en": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", + "text_de": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.", + "conditions": [] + } + } +] \ No newline at end of file diff --git a/fixtures/views.json b/fixtures/views.json index ea5e4153c..e0da92b45 100644 --- a/fixtures/views.json +++ b/fixtures/views.json @@ -1 +1,20 @@ -[{"model": "views.view", "pk": 1, "fields": {"title": "Lorem ipsum dolor sit amet", "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.", "template": "

A view

\r\n\r\n

Single

\r\n\r\n

\r\n{% if conditions.empty %}\r\n\tIt is empty!\r\n{% else %}\r\n\tIt is not empty!\r\n{% endif %}\r\n

\r\n\r\n{{ values.views.single }}\r\n\r\n

Collection

\r\n\r\n

{{ values.views.collection | join:', '}}

\r\n\r\n
    \r\n{% for value in values.views.collection %}\r\n
  • {{ value }}
    • \r\n{% endfor %}\r\n
\r\n\r\n

Options

\r\n\r\n{{ values.views.options | join:', '}}\r\n\r\n
    \r\n{% for value in values.views.options %}\r\n
  • {{ value }}
    • \r\n{% endfor %}\r\n
\r\n\r\n

Set

\r\n\r\n{% for set in values.views.set %}\r\n

{{ set.id }}

\r\n\r\n

{{ values.set.single }}

\r\n\r\n
    \r\n{% for element in values.set.collection %}\r\n
  • {{ element }}
    • \r\n{% endfor %}\r\n
\r\n\r\n{% endfor %}"}}] \ No newline at end of file +[ + { + "model": "views.view", + "pk": 1, + "fields": { + "title": "test_view_1", + "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.", + "template": "

Individual attributes

\n\n
    \n{% for key, value in values.individual.items %}\n
  • {{ key }} {{ value }}
    • \n{% endfor%}\n
\n\n

Collection attributes

\n\n
    \n{% for key, value in values.collection.items %}\n
  • {{ key }} {{ value | join:',' }}
    • \n{% endfor%}\n
" + } + }, + { + "model": "views.view", + "pk": 4, + "fields": { + "title": "test_view_2", + "description": null, + "template": "

not yet implemented

" + } + } +] \ No newline at end of file From 7d174367571baf4ec1ad6977cfe76250a580965d Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Wed, 25 Jan 2017 16:05:12 +0100 Subject: [PATCH 08/51] refactor conditions app --- apps/conditions/admin.py | 9 ++- .../conditions/migrations/0010_refactoring.py | 30 +++++++++ .../conditions/migrations/0011_refactoring.py | 60 ++++++++++++++++++ apps/conditions/models.py | 61 +++++++++++++++---- apps/conditions/renderers.py | 61 +++++++------------ apps/conditions/serializers.py | 20 +++--- .../templates/conditions/conditions.html | 2 +- .../conditions_modal_form_conditions.html | 23 ++++--- apps/conditions/urls.py | 2 +- apps/conditions/utils.py | 45 ++++++++++++++ apps/conditions/views.py | 17 +++--- apps/core/management/commands/import.py | 26 ++++++-- apps/core/renderers.py | 34 +++++++++++ apps/core/utils.py | 25 -------- apps/domain/serializers.py | 2 +- .../domain/domain_modal_form_attributes.html | 2 +- .../domain/domain_modal_form_optionsets.html | 2 +- apps/options/models.py | 4 +- apps/options/renderers.py | 31 +--------- fixtures/accounts.json | 56 ----------------- 20 files changed, 313 insertions(+), 199 deletions(-) create mode 100644 apps/conditions/migrations/0010_refactoring.py create mode 100644 apps/conditions/migrations/0011_refactoring.py create mode 100644 apps/conditions/utils.py create mode 100644 apps/core/renderers.py delete mode 100644 fixtures/accounts.json diff --git a/apps/conditions/admin.py b/apps/conditions/admin.py index 243229485..dae51b9b8 100644 --- a/apps/conditions/admin.py +++ b/apps/conditions/admin.py @@ -1,5 +1,10 @@ from django.contrib import admin -from .models import * +from .models import Condition -admin.site.register(Condition) + +class ConditionAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) + + +admin.site.register(Condition, ConditionAdmin) diff --git a/apps/conditions/migrations/0010_refactoring.py b/apps/conditions/migrations/0010_refactoring.py new file mode 100644 index 000000000..e2778fb44 --- /dev/null +++ b/apps/conditions/migrations/0010_refactoring.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 13:48 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('conditions', '0009_options'), + ('options', '0006_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='condition', + options={'ordering': ('key',), 'verbose_name': 'Condition', 'verbose_name_plural': 'Conditions'}, + ), + migrations.RenameField( + model_name='condition', + old_name='description', + new_name='comment', + ), + migrations.RenameField( + model_name='condition', + old_name='title', + new_name='key', + ), + ] diff --git a/apps/conditions/migrations/0011_refactoring.py b/apps/conditions/migrations/0011_refactoring.py new file mode 100644 index 000000000..4f133e9e5 --- /dev/null +++ b/apps/conditions/migrations/0011_refactoring.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 13:56 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('conditions', '0010_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='condition', + options={'ordering': ('uri',), 'verbose_name': 'Condition', 'verbose_name_plural': 'Conditions'}, + ), + migrations.AddField( + model_name='condition', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this option set (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='condition', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this condition.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='condition', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this condition.', null=True, verbose_name='Comment'), + ), + migrations.AlterField( + model_name='condition', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this condition. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='condition', + name='relation', + field=models.CharField(choices=[('eq', 'is equal to (==)'), ('neq', 'is not equal to (!=)'), ('contains', 'contains'), ('gt', 'is greater than (>)'), ('gte', 'is greater than or equal (>=)'), ('lt', 'is lesser than (<)'), ('lte', 'is lesser than or equal (<=)'), ('empty', 'is empty'), ('notempty', 'is not empty')], help_text='Relation this condition is using.', max_length=8, verbose_name='Relation'), + ), + migrations.AlterField( + model_name='condition', + name='source', + field=models.ForeignKey(blank=True, db_constraint=False, help_text='Attribute this condition is evaluating.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='domain.Attribute', verbose_name='Source'), + ), + migrations.AlterField( + model_name='condition', + name='target_option', + field=models.ForeignKey(blank=True, db_constraint=False, help_text='Option this condition is checking against.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='options.Option', verbose_name='Target (Option)'), + ), + migrations.AlterField( + model_name='condition', + name='target_text', + field=models.CharField(blank=True, help_text='Raw text value this condition is checking against.', max_length=256, null=True, verbose_name='Target (Text)'), + ), + ] diff --git a/apps/conditions/models.py b/apps/conditions/models.py index b9e83d86b..0410b30f0 100644 --- a/apps/conditions/models.py +++ b/apps/conditions/models.py @@ -30,24 +30,54 @@ class Condition(models.Model): (RELATION_NOT_EMPTY, 'is not empty'), ) - title = models.CharField(max_length=256, validators=[ - RegexValidator('^[a-zA-z0-9_]*$', _('Only letters, numbers, or underscores are allowed.')) - ]) - description = models.TextField(blank=True, null=True) - - source = models.ForeignKey('domain.Attribute', db_constraint=False, blank=True, null=True, on_delete=models.SET_NULL, related_name='+') - relation = models.CharField(max_length=8, choices=RELATION_CHOICES) - - target_text = models.CharField(max_length=256, blank=True, null=True) - target_option = models.ForeignKey('options.Option', db_constraint=False, blank=True, null=True, on_delete=models.SET_NULL, related_name='+') + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this condition.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this condition. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this condition.') + ) + source = models.ForeignKey( + 'domain.Attribute', db_constraint=False, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', + verbose_name=_('Source'), + help_text=_('Attribute this condition is evaluating.') + ) + relation = models.CharField( + max_length=8, choices=RELATION_CHOICES, + verbose_name=_('Relation'), + help_text=_('Relation this condition is using.') + ) + target_text = models.CharField( + max_length=256, blank=True, null=True, + verbose_name=_('Target (Text)'), + help_text=_('Raw text value this condition is checking against.') + ) + target_option = models.ForeignKey( + 'options.Option', db_constraint=False, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', + verbose_name=_('Target (Option)'), + help_text=_('Option this condition is checking against.') + ) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this option set (auto-generated).') + ) class Meta: - ordering = ('title', ) + ordering = ('uri', ) verbose_name = _('Condition') verbose_name_plural = _('Conditions') def __str__(self): - return self.title + return self.uri or self.key @property def source_label(self): @@ -64,6 +94,13 @@ def target_label(self): else: return self.target_text + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(Condition, self).save(*args, **kwargs) + + def build_uri(self): + return self.uri_prefix.rstrip('/') + '/conditions/' + self.key + def resolve(self, project, snapshot=None): # get the values for the given project, the given snapshot and the condition's attribute values = project.values.filter(snapshot=snapshot).filter(attribute=self.source) diff --git a/apps/conditions/renderers.py b/apps/conditions/renderers.py index deb91e9fc..413be833d 100644 --- a/apps/conditions/renderers.py +++ b/apps/conditions/renderers.py @@ -1,46 +1,27 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): + def render_document(self, xml, conditions): + xml.startElement('conditions', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) - media_type = 'application/xml' - format = 'xml' + for condition in conditions: + self.render_condition(xml, condition) - def render(self, data): + xml.endElement('conditions') - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('Conditions', {}) - - for condition in data: - self._condition(xml, condition) - - xml.endElement('Conditions') - xml.endDocument() - return stream.getvalue() - - def _condition(self, xml, condition): - xml.startElement('Condition', {}) - self._text_element(xml, 'title', {}, condition["title"]) - self._text_element(xml, 'description', {}, condition["description"]) - self._text_element(xml, 'source', {}, condition["source"]) - self._text_element(xml, 'relation', {}, condition["relation"]) - self._text_element(xml, 'target_text', {}, condition["target_text"]) - self._text_element(xml, 'target_option', {}, condition["target_option"]) - xml.endElement('Condition') - - def _text_element(self, xml, tag, condition, text): - xml.startElement(tag, condition) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) + def render_condition(self, xml, condition): + xml.startElement('condition', {}) + self.render_text_element(xml, 'dc:uri', {}, condition["uri"]) + self.render_text_element(xml, 'dc:comment', {}, condition["comment"]) + if condition["source"]: + self.render_text_element(xml, 'source', {'dc:uri': condition["source"]}, None) + self.render_text_element(xml, 'relation', {}, condition["relation"]) + if condition["target_text"]: + self.render_text_element(xml, 'target_text', {}, condition["target_text"]) + if condition["target_option"]: + self.render_text_element(xml, 'target_option', {'dc:uri': condition["target_option"]}, None) + xml.endElement('condition') diff --git a/apps/conditions/serializers.py b/apps/conditions/serializers.py index 4d04dd26b..e9b785359 100644 --- a/apps/conditions/serializers.py +++ b/apps/conditions/serializers.py @@ -3,7 +3,7 @@ from apps.domain.models import Attribute from apps.options.models import OptionSet, Option -from .models import * +from .models import Condition class ConditionIndexSerializer(serializers.ModelSerializer): @@ -12,8 +12,8 @@ class Meta: model = Condition fields = ( 'id', - 'title', - 'description', + 'uri', + 'comment', 'source_label', 'relation_label', 'target_label' @@ -26,8 +26,9 @@ class Meta: model = Condition fields = ( 'id', - 'title', - 'description', + 'uri_prefix', + 'key', + 'comment', 'source', 'relation', 'target_text', @@ -72,7 +73,7 @@ class Meta: class OptionSetSerializer(serializers.ModelSerializer): - conditions = OptionSetOptionSerializer(many=True) + options = OptionSetOptionSerializer(many=True) class Meta: model = OptionSet @@ -85,13 +86,14 @@ class Meta: class ExportSerializer(serializers.ModelSerializer): - target_option = serializers.CharField(source='target_option.title') + source = serializers.CharField(source='source.uri') + target_option = serializers.CharField(source='target_option.uri') class Meta: model = Condition fields = ( - 'title', - 'description', + 'uri', + 'comment', 'source', 'relation', 'target_text', diff --git a/apps/conditions/templates/conditions/conditions.html b/apps/conditions/templates/conditions/conditions.html index a9ad8c490..3cf8c2284 100644 --- a/apps/conditions/templates/conditions/conditions.html +++ b/apps/conditions/templates/conditions/conditions.html @@ -80,7 +80,7 @@

{% trans 'Conditions' %}

{% trans 'Condition' %} - {$ condition.title $} + {$ condition.uri $}
    diff --git a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html index af88b29c8..da06b64ec 100644 --- a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html +++ b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html @@ -14,18 +14,25 @@

    + data-label="{% trans 'Prefix' %}" + data-model="service.values.uri_prefix" + data-errors="service.errors.uri_prefix"> + + + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> data-model="service.values.parent" data-errors="service.errors.parent" data-options="service.entities" - data-options-label="label" + data-options-label="uri" data-options-null="1"> data-model="service.values.optionsets" data-errors="service.errors.optionsets" data-options="service.optionsets" - data-options-label="title" + data-options-label="uri" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}">
    diff --git a/apps/options/models.py b/apps/options/models.py index 95be823ac..5f74b0ba1 100644 --- a/apps/options/models.py +++ b/apps/options/models.py @@ -51,7 +51,7 @@ class Meta: verbose_name_plural = _('OptionSets') def __str__(self): - return self.uri + return self.uri or self.key def save(self, *args, **kwargs): self.uri = self.build_uri() @@ -120,7 +120,7 @@ class Meta: verbose_name_plural = _('Options') def __str__(self): - return self.key + return self.uri or self.key def save(self, *args, **kwargs): self.uri = self.build_uri() diff --git a/apps/options/renderers.py b/apps/options/renderers.py index 395c6a544..0dbc1d602 100644 --- a/apps/options/renderers.py +++ b/apps/options/renderers.py @@ -1,34 +1,7 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer - -class XMLRenderer(BaseRenderer): - - media_type = 'application/xml' - format = 'xml' - - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - self.render_document(xml, data) - xml.endDocument() - return stream.getvalue() - - def render_text_element(self, xml, tag, attrs, text): - xml.startElement(tag, attrs) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) +class XMLRenderer(BaseXMLRenderer): def render_document(self, xml, optionsets): xml.startElement('options', { diff --git a/fixtures/accounts.json b/fixtures/accounts.json deleted file mode 100644 index 232e467b0..000000000 --- a/fixtures/accounts.json +++ /dev/null @@ -1,56 +0,0 @@ -[ - { - "model": "auth.user", - "pk": 1, - "fields": { - "password": "pbkdf2_sha256$24000$WeOxyrvAKISz$ZyzJ+ejSIV2Yf4+9OIEQ+gcXDG/m9PhCyjwIWh6n4pE=", - "last_login": "2016-08-11T11:05:23.538Z", - "is_superuser": true, - "username": "admin", - "first_name": "", - "last_name": "", - "email": "admin@example.com", - "is_staff": true, - "is_active": true, - "date_joined": "2016-08-11T11:05:11.017Z", - "groups": [], - "user_permissions": [] - } - }, - { - "model": "auth.user", - "pk": 2, - "fields": { - "password": "pbkdf2_sha256$24000$VTij4Rwm4Bja$y6w8AwcXIYT4KjM6+hs67vdGmG2ZHy+tHz/eKkUqqcs=", - "last_login": null, - "is_superuser": false, - "username": "manager", - "first_name": "", - "last_name": "", - "email": "manager@example.com", - "is_staff": false, - "is_active": true, - "date_joined": "2016-08-11T11:05:36Z", - "groups": [], - "user_permissions": [] - } - }, - { - "model": "auth.user", - "pk": 3, - "fields": { - "password": "pbkdf2_sha256$24000$fRd65ZujBqjT$FI8wNlDK3/io41XydC4LtnoxkeI4UkgnpZJrpUstkng=", - "last_login": null, - "is_superuser": false, - "username": "user", - "first_name": "", - "last_name": "", - "email": "user@example.com", - "is_staff": false, - "is_active": true, - "date_joined": "2016-08-11T11:05:51Z", - "groups": [], - "user_permissions": [] - } - } -] \ No newline at end of file From a5df6bdc241852eb3a4e85730161eee0851f8964 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Thu, 26 Jan 2017 14:57:16 +0100 Subject: [PATCH 09/51] refactor domain app --- apps/conditions/utils.py | 11 +- apps/core/management/commands/import.py | 2 +- apps/domain/admin.py | 4 +- apps/domain/migrations/0025_refactoring.py | 29 +++ apps/domain/migrations/0026_refactoring.py | 131 ++++++++++ apps/domain/models.py | 230 ++++++++++++------ apps/domain/renderers.py | 164 +++++-------- apps/domain/serializers.py | 34 +-- .../domain/domain_modal_form_attributes.html | 30 +-- .../domain/domain_modal_form_conditions.html | 2 +- .../domain/domain_modal_form_entities.html | 28 +-- apps/domain/utils.py | 125 ++++++++++ apps/domain/views.py | 7 +- fixtures/conditions.json | 171 +------------ 14 files changed, 556 insertions(+), 412 deletions(-) create mode 100644 apps/domain/migrations/0025_refactoring.py create mode 100644 apps/domain/migrations/0026_refactoring.py create mode 100644 apps/domain/utils.py diff --git a/apps/conditions/utils.py b/apps/conditions/utils.py index 1e1fa901a..e281eaaf5 100644 --- a/apps/conditions/utils.py +++ b/apps/conditions/utils.py @@ -26,10 +26,11 @@ def import_xml(conditions_node): condition.comment = condition_node[nstag('dc:comment', nsmap)] condition.relation = condition_node['relation'] - # try: - # condition.source = Attribute.objects.get(identifier=condition.source) - # except Attribute.DoesNotExist: - # condition.source = None + try: + source_uri = condition_node['source'].get(nstag('dc:uri', nsmap)) + condition.source = Attribute.objects.get(uri=source_uri) + except (AttributeError, Condition.DoesNotExist): + condition.source = None try: condition.target_text = condition_node['target_text'] @@ -39,7 +40,7 @@ def import_xml(conditions_node): try: option_uid = condition_node['target_option'].get(nstag('dc:uri', nsmap)) condition.target_option = Option.objects.get(uri=option_uid) - except AttributeError: + except (AttributeError, Option.DoesNotExist): condition.target_option = None condition.save() diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index 95d975982..0af9e88a5 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -4,7 +4,7 @@ from apps.conditions.utils import import_xml as import_conditions from apps.options.utils import import_xml as import_options -#from apps.domain.utils import import_xml as import_domain +from apps.domain.utils import import_xml as import_domain #from apps.questions.utils import import_xml as import_questions diff --git a/apps/domain/admin.py b/apps/domain/admin.py index 37e373375..a06850611 100644 --- a/apps/domain/admin.py +++ b/apps/domain/admin.py @@ -1,11 +1,11 @@ from django.contrib import admin -from .models import * +from .models import AttributeEntity, Attribute, VerboseName, Range class AttributeEntityAdmin(admin.ModelAdmin): + readonly_fields = ('uri', 'label', 'parent_collection', 'is_attribute') - readonly_fields = ('label', 'parent_collection', 'is_attribute') admin.site.register(AttributeEntity, AttributeEntityAdmin) admin.site.register(Attribute, AttributeEntityAdmin) diff --git a/apps/domain/migrations/0025_refactoring.py b/apps/domain/migrations/0025_refactoring.py new file mode 100644 index 000000000..bbfa27d65 --- /dev/null +++ b/apps/domain/migrations/0025_refactoring.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 15:46 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('domain', '0024_meta'), + ] + + operations = [ + migrations.AlterModelOptions( + name='attributeentity', + options={'ordering': ('uri',), 'verbose_name': 'AttributeEntity', 'verbose_name_plural': 'AttributeEntities'}, + ), + migrations.RenameField( + model_name='attributeentity', + old_name='description', + new_name='comment', + ), + migrations.RenameField( + model_name='attributeentity', + old_name='title', + new_name='key', + ), + ] diff --git a/apps/domain/migrations/0026_refactoring.py b/apps/domain/migrations/0026_refactoring.py new file mode 100644 index 000000000..d83c8c94b --- /dev/null +++ b/apps/domain/migrations/0026_refactoring.py @@ -0,0 +1,131 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-25 15:54 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import mptt.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('domain', '0025_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='verbosename', + options={'verbose_name': 'Verbose name', 'verbose_name_plural': 'Verbose names'}, + ), + migrations.AddField( + model_name='attributeentity', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this attribute/entity.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='attribute', + name='optionsets', + field=models.ManyToManyField(blank=True, help_text='Option sets for this attribute.', to='options.OptionSet', verbose_name='Option sets'), + ), + migrations.AlterField( + model_name='attribute', + name='unit', + field=models.CharField(blank=True, help_text='Unit of values for this attribute.', max_length=64, null=True, verbose_name='Unit'), + ), + migrations.AlterField( + model_name='attribute', + name='value_type', + field=models.CharField(choices=[('text', 'Text'), ('url', 'URL'), ('integer', 'Integer'), ('float', 'Float'), ('boolean', 'Boolean'), ('datetime', 'Datetime'), ('options', 'Options')], help_text='Type of values for this attribute.', max_length=8, verbose_name='Value type'), + ), + migrations.AlterField( + model_name='attributeentity', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this attribute/entity.', null=True, verbose_name='Comment'), + ), + migrations.AlterField( + model_name='attributeentity', + name='conditions', + field=models.ManyToManyField(blank=True, help_text='List of conditions evaluated for this attribute/entity.', to='conditions.Condition', verbose_name='Conditions'), + ), + migrations.AlterField( + model_name='attributeentity', + name='is_attribute', + field=models.BooleanField(default=False, help_text='Designates whether this attribute/entity is an attribute (auto-generated).', verbose_name='is attribute'), + ), + migrations.AlterField( + model_name='attributeentity', + name='is_collection', + field=models.BooleanField(default=False, help_text='Designates whether this attribute/entity is a collection.', verbose_name='is collection'), + ), + migrations.AlterField( + model_name='attributeentity', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this attribute/entity. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='attributeentity', + name='label', + field=models.CharField(db_index=True, help_text='The label to be displayed this attribute/entity (auto-generated).', max_length=512, verbose_name='Label'), + ), + migrations.AlterField( + model_name='attributeentity', + name='parent', + field=mptt.fields.TreeForeignKey(blank=True, help_text='Parent entity in the domain model.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='domain.AttributeEntity', verbose_name='Parent entity'), + ), + migrations.AlterField( + model_name='attributeentity', + name='parent_collection', + field=models.ForeignKey(blank=True, default=None, help_text='Next collection entity upwards in the domain model (auto-generated).', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='domain.AttributeEntity', verbose_name='Parent collection'), + ), + migrations.AlterField( + model_name='attributeentity', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this attribute/entity set (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AlterField( + model_name='range', + name='attribute', + field=models.OneToOneField(help_text='Attribute this verbose name belongs to.', on_delete=django.db.models.deletion.CASCADE, to='domain.Attribute', verbose_name='Attribute'), + ), + migrations.AlterField( + model_name='range', + name='maximum', + field=models.FloatField(help_text='Maximum value for this attribute.', verbose_name='Maximum'), + ), + migrations.AlterField( + model_name='range', + name='minimum', + field=models.FloatField(help_text='Minimal value for this attribute.', verbose_name='Minimum'), + ), + migrations.AlterField( + model_name='range', + name='step', + field=models.FloatField(help_text='Step in which this attribute can be incremented/decremented.', verbose_name='Step'), + ), + migrations.AlterField( + model_name='verbosename', + name='attribute_entity', + field=models.OneToOneField(help_text='Attribute/entity this verbose name belongs to.', on_delete=django.db.models.deletion.CASCADE, to='domain.AttributeEntity', verbose_name='Attribute entity'), + ), + migrations.AlterField( + model_name='verbosename', + name='name_de', + field=models.CharField(help_text='German name displayed for this attribute/entity (e.g. Projekt).', max_length=256, verbose_name='Name (de)'), + ), + migrations.AlterField( + model_name='verbosename', + name='name_en', + field=models.CharField(help_text='English name displayed for this attribute/entity (e.g. project).', max_length=256, verbose_name='Name (en)'), + ), + migrations.AlterField( + model_name='verbosename', + name='name_plural_de', + field=models.CharField(help_text='German plural name displayed for this attribute/entity (e.g. Projekte).', max_length=256, verbose_name='Plural name (de)'), + ), + migrations.AlterField( + model_name='verbosename', + name='name_plural_en', + field=models.CharField(help_text='English plural name displayed for this attribute/entity (e.g. projects).', max_length=256, verbose_name='Plural name (en)'), + ), + ] diff --git a/apps/domain/models.py b/apps/domain/models.py index 34676ef50..a32c53f4d 100644 --- a/apps/domain/models.py +++ b/apps/domain/models.py @@ -2,7 +2,6 @@ from django.db import models from django.db.models.signals import post_save -from django.core.validators import RegexValidator from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ @@ -15,33 +14,96 @@ @python_2_unicode_compatible class AttributeEntity(MPTTModel): - parent = TreeForeignKey('self', null=True, blank=True, related_name='children', db_index=True, help_text='optional') + parent = TreeForeignKey( + 'self', null=True, blank=True, related_name='children', db_index=True, + verbose_name=_('Parent entity'), + help_text=_('Parent entity in the domain model.') + ) + parent_collection = models.ForeignKey( + 'AttributeEntity', blank=True, null=True, default=None, related_name='+', db_index=True, + verbose_name=_('Parent collection'), + help_text=_('Next collection entity upwards in the domain model (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this attribute/entity.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this attribute/entity. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this attribute/entity.') + ) + is_collection = models.BooleanField( + default=False, + verbose_name=_('is collection'), + help_text=_('Designates whether this attribute/entity is a collection.') + ) + is_attribute = models.BooleanField( + default=False, + verbose_name=_('is attribute'), + help_text=_('Designates whether this attribute/entity is an attribute (auto-generated).') + ) + conditions = models.ManyToManyField( + Condition, blank=True, + verbose_name=_('Conditions'), + help_text=_('List of conditions evaluated for this attribute/entity.') + ) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this attribute/entity set (auto-generated).') + ) + label = models.CharField( + max_length=512, db_index=True, + verbose_name=_('Label'), + help_text=_('The label to be displayed this attribute/entity (auto-generated).') + ) - title = models.CharField(max_length=256, validators=[ - RegexValidator('^[a-zA-z0-9_]*$', _('Only letters, numbers, or underscores are allowed.')) - ]) - label = models.CharField(max_length=512, db_index=True) + class Meta: + ordering = ('uri', ) + verbose_name = _('AttributeEntity') + verbose_name_plural = _('AttributeEntities') - description = models.TextField(blank=True, null=True) - uri = models.URLField(blank=True, null=True) + def __str__(self): + return self.uri or self.key - is_collection = models.BooleanField(default=False) - is_attribute = models.BooleanField(default=False) + def save(self, *args, **kwargs): - parent_collection = models.ForeignKey('AttributeEntity', blank=True, null=True, default=None, related_name='+', db_index=True) + # init fields + self.label = self.key + self.is_attribute = self.is_attribute or False + self.parent_collection = None - conditions = models.ManyToManyField(Condition, blank=True) + # set parent_collection if the entity is a collection itself + # if self.is_collection and not self.is_attribute: + # self.parent_collection = self - class Meta: - ordering = ('label', ) - verbose_name = _('AttributeEntity') - verbose_name_plural = _('AttributeEntities') + # loop over parents + parent = self.parent + while parent: + # set parent_collection if it is not yet set and if parent is a collection + if not self.parent_collection and parent.is_collection: + self.parent_collection = parent - class MPTTMeta: - order_insertion_by = ['title'] + # update label + self.label = parent.key + '/' + self.label - def __str__(self): - return self.label + parent = parent.parent + + # create uri + self.uri = self.uri_prefix.rstrip('/') + '/domain/' + self.label + + super(AttributeEntity, self).save(*args, **kwargs) + + # recursively save children + for child in self.children.all(): + child.save() @property def range(self): @@ -82,17 +144,32 @@ class Attribute(AttributeEntity): (VALUE_TYPE_OPTIONS, _('Options')) ) - value_type = models.CharField(max_length=8, choices=VALUE_TYPE_CHOICES) - unit = models.CharField(max_length=64, blank=True, null=True) - - optionsets = models.ManyToManyField('options.OptionSet', blank=True) + value_type = models.CharField( + max_length=8, choices=VALUE_TYPE_CHOICES, + verbose_name=_('Value type'), + help_text=_('Type of values for this attribute.') + ) + unit = models.CharField( + max_length=64, blank=True, null=True, + verbose_name=_('Unit'), + help_text=_('Unit of values for this attribute.') + ) + optionsets = models.ManyToManyField( + 'options.OptionSet', blank=True, + verbose_name=_('Option sets'), + help_text=_('Option sets for this attribute.') + ) class Meta: verbose_name = _('Attribute') verbose_name_plural = _('Attributes') def __str__(self): - return self.label + return self.uri or self.key + + def save(self, *args, **kwargs): + self.is_attribute = True + super(Attribute, self).save(*args, **kwargs) @property def options(self): @@ -103,63 +180,42 @@ def options(self): return options_list -def post_save_attribute_entity(sender, **kwargs): - - if not kwargs['raw']: - instance = kwargs['instance'] - - # init fields - instance.label = instance.title - instance.is_attribute = hasattr(instance, 'attribute') - instance.parent_collection = None - - # set parent_collection if the entity is a collection itself - if instance.is_collection and not instance.is_attribute: - instance.parent_collection = instance - - # loop over parents - parent = instance.parent - while parent: - # set parent_collection if it is not yet set and if parent is a collection - if not instance.parent_collection and parent.is_collection: - instance.parent_collection = parent - - # update own full name - instance.label = parent.title + '.' + instance.label - - parent = parent.parent - - post_save.disconnect(post_save_attribute_entity, sender=sender) - instance.save() - post_save.connect(post_save_attribute_entity, sender=sender) - - # update the full name and parent_collection of children - # this makes it recursive - for child in instance.children.all(): - child.save() - - -post_save.connect(post_save_attribute_entity, sender=AttributeEntity) -post_save.connect(post_save_attribute_entity, sender=Attribute) - - +@python_2_unicode_compatible @python_2_unicode_compatible class VerboseName(models.Model, TranslationMixin): - attribute_entity = models.OneToOneField('AttributeEntity') - - name_en = models.CharField(max_length=256) - name_de = models.CharField(max_length=256) - - name_plural_en = models.CharField(max_length=256) - name_plural_de = models.CharField(max_length=256) + attribute_entity = models.OneToOneField( + 'AttributeEntity', + verbose_name=_('Attribute entity'), + help_text=_('Attribute/entity this verbose name belongs to.') + ) + name_en = models.CharField( + max_length=256, + verbose_name=_('Name (en)'), + help_text=_('English name displayed for this attribute/entity (e.g. project).') + ) + name_de = models.CharField( + max_length=256, + verbose_name=_('Name (de)'), + help_text=_('German name displayed for this attribute/entity (e.g. Projekt).') + ) + name_plural_en = models.CharField( + max_length=256, + verbose_name=_('Plural name (en)'), + help_text=_('English plural name displayed for this attribute/entity (e.g. projects).') + ) + name_plural_de = models.CharField( + max_length=256, + verbose_name=_('Plural name (de)'), + help_text=_('German plural name displayed for this attribute/entity (e.g. Projekte).') + ) class Meta: - verbose_name = _('VerboseName') - verbose_name_plural = _('VerboseNames') + verbose_name = _('Verbose name') + verbose_name_plural = _('Verbose names') def __str__(self): - return self.attribute_entity.label + return self.attribute_entity.uri @property def name(self): @@ -173,11 +229,23 @@ def name_plural(self): @python_2_unicode_compatible class Range(models.Model, TranslationMixin): - attribute = models.OneToOneField('Attribute') - - minimum = models.FloatField() - maximum = models.FloatField() - step = models.FloatField() + attribute = models.OneToOneField( + 'Attribute', + verbose_name=_('Attribute'), + help_text=_('Attribute this verbose name belongs to.') + ) + minimum = models.FloatField( + verbose_name=_('Minimum'), + help_text=_('Minimal value for this attribute.') + ) + maximum = models.FloatField( + verbose_name=_('Maximum'), + help_text=_('Maximum value for this attribute.') + ) + step = models.FloatField( + verbose_name=_('Step'), + help_text=_('Step in which this attribute can be incremented/decremented.') + ) class Meta: ordering = ('attribute', ) @@ -185,4 +253,4 @@ class Meta: verbose_name_plural = _('Ranges') def __str__(self): - return self.attribute.label + return self.attribute.uri diff --git a/apps/domain/renderers.py b/apps/domain/renderers.py index 34f608e06..5509dba6c 100644 --- a/apps/domain/renderers.py +++ b/apps/domain/renderers.py @@ -1,136 +1,88 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): - - media_type = 'application/xml' - format = 'xml' - - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('Domain', { + def render_document(self, xml, attribute_entities): + xml.startElement('domain', { 'xmlns:dc': "http://purl.org/dc/elements/1.1/" }) - for attribute_entity in data: + for attribute_entity in attribute_entities: if attribute_entity['is_attribute']: - self._attribute(xml, attribute_entity) + self.render_attribute(xml, attribute_entity) else: - self._attribute_entity(xml, attribute_entity) - - xml.endElement('Domain') - xml.endDocument() - return stream.getvalue() - - def _attribute(self, xml, attribute): - xml.startElement('Attribute', {}) - self._text_element(xml, 'dc:title', {}, attribute["title"]) - self._text_element(xml, 'dc:description', {}, attribute["description"]) - self._text_element(xml, 'dc:uri', {}, attribute["uri"]) - self._text_element(xml, 'is_collection', {}, attribute["is_collection"]) - self._text_element(xml, 'value_type', {}, attribute["value_type"]) - self._text_element(xml, 'unit', {}, attribute["unit"]) - - if 'options' in attribute and attribute['options']: - xml.startElement('Options', {}) - - for option in attribute['options']: - self._option(xml, option) - - xml.endElement('Options') - - if 'range' in attribute and attribute['range']: - self._range(xml, attribute['range']) - - if 'conditions' in attribute and attribute['conditions']: - xml.startElement('Conditions', {}) + self.render_attribute_entity(xml, attribute_entity) - for conditions in attribute['conditions']: - self._conditions(xml, conditions) + xml.endElement('domain') - xml.endElement('Conditions') + def render_attribute_entity(self, xml, attribute_entity): + xml.startElement('entity', {}) + self.render_text_element(xml, 'dc:uri', {}, attribute_entity["uri"]) + self.render_text_element(xml, 'dc:comment', {}, attribute_entity["comment"]) + self.render_text_element(xml, 'is_collection', {}, attribute_entity["is_collection"]) - if 'verbosename' in attribute and attribute['verbosename']: - self._verbosename(xml, attribute['verbosename']) - - xml.endElement('Attribute') + if 'verbosename' in attribute_entity and attribute_entity['verbosename']: + self.render_verbosename(xml, attribute_entity['verbosename']) - def _attribute_entity(self, xml, attribute_entity): - xml.startElement('AttributeEntity', {}) - self._text_element(xml, 'dc:title', {}, attribute_entity["title"]) - self._text_element(xml, 'dc:description', {}, attribute_entity["description"]) - self._text_element(xml, 'dc:uri', {}, attribute_entity["uri"]) - self._text_element(xml, 'is_collection', {}, attribute_entity["is_collection"]) + if 'conditions' in attribute_entity and attribute_entity['conditions']: + xml.startElement('conditions', {}) + for condition_uri in attribute_entity['conditions']: + self.render_text_element(xml, 'condition', {'dc:uri': condition_uri}, None) + xml.endElement('conditions') if 'children' in attribute_entity: - xml.startElement('Children', {}) - + xml.startElement('children', {}) for child in attribute_entity['children']: if child['is_attribute']: - self._attribute(xml, child) + self.render_attribute(xml, child) else: - self._attribute_entity(xml, child) + self.render_attribute_entity(xml, child) + xml.endElement('children') - xml.endElement('Children') + xml.endElement('entity') - if 'conditions' in attribute_entity and attribute_entity['conditions']: - xml.startElement('Conditions', {}) + def render_attribute(self, xml, attribute): + xml.startElement('attribute', {}) + self.render_text_element(xml, 'dc:uri', {}, attribute["uri"]) + self.render_text_element(xml, 'dc:comment', {}, attribute["comment"]) + self.render_text_element(xml, 'is_collection', {}, attribute["is_collection"]) + self.render_text_element(xml, 'value_type', {}, attribute["value_type"]) + self.render_text_element(xml, 'unit', {}, attribute["unit"]) + + if 'range' in attribute and attribute['range']: + self.render_range(xml, attribute['range']) - for conditions in attribute_entity['conditions']: - self._conditions(xml, conditions) + if 'verbosename' in attribute and attribute['verbosename']: + self.render_verbosename(xml, attribute['verbosename']) - xml.endElement('Conditions') + if 'optionsets' in attribute and attribute['optionsets']: + xml.startElement('optionsets', {}) - if 'verbosename' in attribute_entity and attribute_entity['verbosename']: - self._verbosename(xml, attribute_entity['verbosename']) + for optionset_uri in attribute['optionsets']: + self.render_text_element(xml, 'optionset', {'dc:uri': optionset_uri}, None) - xml.endElement('AttributeEntity') + xml.endElement('optionsets') - def _option(self, xml, option): - xml.startElement('Option', {}) - self._text_element(xml, 'order', {}, option["order"]) - self._text_element(xml, 'text_de', {}, option["text_de"]) - self._text_element(xml, 'text_en', {}, option["text_en"]) - self._text_element(xml, 'additional_input', {}, option["additional_input"]) - xml.endElement('Option') + if 'conditions' in attribute and attribute['conditions']: + xml.startElement('conditions', {}) + for condition_uri in attribute['conditions']: + self.render_text_element(xml, 'condition', {'dc:uri': condition_uri}, None) + xml.endElement('conditions') - def _range(self, xml, range): + xml.endElement('attribute') + + def render_range(self, xml, range): xml.startElement('range', {}) - self._text_element(xml, 'minimum', {}, range["minimum"]) - self._text_element(xml, 'maximum', {}, range["maximum"]) - self._text_element(xml, 'step', {}, range["step"]) + self.render_text_element(xml, 'minimum', {}, range["minimum"]) + self.render_text_element(xml, 'maximum', {}, range["maximum"]) + self.render_text_element(xml, 'step', {}, range["step"]) xml.endElement('range') - def _conditions(self, xml, conditions): - xml.startElement('condition', {}) - self._text_element(xml, 'source', {}, conditions["source"]) - self._text_element(xml, 'relation', {}, conditions["relation"]) - self._text_element(xml, 'target_text', {}, conditions["target_text"]) - self._text_element(xml, 'target_option', {}, conditions["target_option"]) - xml.endElement('condition') - - def _verbosename(self, xml, verbosename): + def render_verbosename(self, xml, verbosename): xml.startElement('verbosename', {}) - self._text_element(xml, 'name_en', {}, verbosename["name_en"]) - self._text_element(xml, 'name_de', {}, verbosename["name_de"]) - self._text_element(xml, 'name_plural_en', {}, verbosename["name_plural_en"]) - self._text_element(xml, 'name_plural_de', {}, verbosename["name_plural_de"]) + self.render_text_element(xml, 'name_en', {}, verbosename["name_en"]) + self.render_text_element(xml, 'name_de', {}, verbosename["name_de"]) + self.render_text_element(xml, 'name_plural_en', {}, verbosename["name_plural_en"]) + self.render_text_element(xml, 'name_plural_de', {}, verbosename["name_plural_de"]) xml.endElement('verbosename') - - def _text_element(self, xml, tag, attributes, text): - xml.startElement(tag, attributes) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) diff --git a/apps/domain/serializers.py b/apps/domain/serializers.py index fc27193c1..e35d82231 100644 --- a/apps/domain/serializers.py +++ b/apps/domain/serializers.py @@ -14,7 +14,7 @@ class Meta: model = AttributeEntity fields = ( 'id', - 'title', + 'key', 'label', 'is_collection', 'is_attribute', @@ -43,9 +43,9 @@ class Meta: fields = ( 'id', 'parent', - 'title', - 'description', - 'uri', + 'uri_prefix', + 'key', + 'comment', 'is_collection', 'conditions' ) @@ -68,9 +68,9 @@ class Meta: fields = ( 'id', 'parent', - 'title', - 'description', - 'uri', + 'uri_prefix', + 'key', + 'comment', 'value_type', 'unit', 'is_collection', @@ -122,7 +122,7 @@ class Meta: model = Condition fields = ( 'id', - 'title', + 'uri', ) @@ -166,33 +166,37 @@ class ExportSerializer(serializers.ModelSerializer): value_type = serializers.CharField(source='attribute.value_type', read_only=True) unit = serializers.CharField(source='attribute.unit', read_only=True) - # options = ExportOptionSerializer(source='attribute.options', many=True, read_only=True) range = ExportRangeSerializer(source='attribute.range', read_only=True) verbosename = ExportVerboseNameSerializer(read_only=True) - conditions = ExportConditionSerializer(many=True, read_only=True) + optionsets = serializers.SerializerMethodField() + conditions = serializers.SerializerMethodField() children = serializers.SerializerMethodField() class Meta: model = AttributeEntity fields = ( - 'id', - 'title', - 'description', 'uri', + 'comment', 'is_collection', 'is_attribute', 'value_type', 'unit', 'is_collection', - 'conditions', - # 'options', 'range', 'verbosename', 'conditions', + 'optionsets', 'children' ) def get_children(self, obj): # get the children from the cached mptt tree return ExportSerializer(obj.get_children(), many=True, read_only=True).data + + def get_optionsets(self, obj): + if hasattr(obj, 'attribute'): + return [option.uri for option in obj.attribute.optionsets.all()] + + def get_conditions(self, obj): + return [condition.uri for condition in obj.conditions.all()] diff --git a/apps/domain/templates/domain/domain_modal_form_attributes.html b/apps/domain/templates/domain/domain_modal_form_attributes.html index b715e89de..79d94c374 100644 --- a/apps/domain/templates/domain/domain_modal_form_attributes.html +++ b/apps/domain/templates/domain/domain_modal_form_attributes.html @@ -20,29 +20,29 @@

    data-model="service.values.parent" data-errors="service.errors.parent" data-options="service.entities" - data-options-label="uri" + data-options-label="label" data-options-null="1"> + data-label="{% trans 'Prefix' %}" + data-model="service.values.uri_prefix" + data-errors="service.errors.uri_prefix"> + data-id="key" + data-type="text" + data-label="{% trans 'Key' %}" + data-model="service.values.key" + data-errors="service.errors.key"> + data-id="comment" + data-type="textarea" + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> data-model="service.values.conditions" data-errors="service.errors.conditions" data-options="service.conditions" - data-options-label="title" + data-options-label="uri" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> diff --git a/apps/domain/templates/domain/domain_modal_form_entities.html b/apps/domain/templates/domain/domain_modal_form_entities.html index 02ec4807d..876d42988 100644 --- a/apps/domain/templates/domain/domain_modal_form_entities.html +++ b/apps/domain/templates/domain/domain_modal_form_entities.html @@ -24,25 +24,25 @@

    data-options-null="1"> + data-label="{% trans 'Prefix' %}" + data-model="service.values.uri_prefix" + data-errors="service.errors.uri_prefix"> + data-id="key" + data-type="text" + data-label="{% trans 'Key' %}" + data-model="service.values.key" + data-errors="service.errors.key"> + data-id="comment" + data-type="textarea" + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> Date: Thu, 26 Jan 2017 16:49:31 +0100 Subject: [PATCH 10/51] update fixtures --- fixtures/conditions.json | 2 +- fixtures/domain.json | 1441 +------------------------------------- 2 files changed, 2 insertions(+), 1441 deletions(-) diff --git a/fixtures/conditions.json b/fixtures/conditions.json index 1aa602dcc..d4f35981f 100644 --- a/fixtures/conditions.json +++ b/fixtures/conditions.json @@ -1 +1 @@ -[{"model": "conditions.condition", "pk": 1, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_contains", "comment": "", "source": null, "relation": "contains", "target_text": null, "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_contains"}}, {"model": "conditions.condition", "pk": 2, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_empty", "comment": "", "source": null, "relation": "empty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_empty"}}, {"model": "conditions.condition", "pk": 3, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_equal", "comment": "", "source": null, "relation": "eq", "target_text": null, "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_equal"}}, {"model": "conditions.condition", "pk": 4, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_empty", "comment": "", "source": null, "relation": "notempty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_empty"}}, {"model": "conditions.condition", "pk": 5, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_equal", "comment": "", "source": null, "relation": "neq", "target_text": null, "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_equal"}}, {"model": "conditions.condition", "pk": 6, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_contains", "comment": "", "source": null, "relation": "contains", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_contains"}}, {"model": "conditions.condition", "pk": 7, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_empty", "comment": "", "source": null, "relation": "empty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_empty"}}, {"model": "conditions.condition", "pk": 8, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_equal", "comment": "", "source": null, "relation": "eq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_equal"}}, {"model": "conditions.condition", "pk": 9, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than", "comment": "", "source": null, "relation": "gt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than"}}, {"model": "conditions.condition", "pk": 10, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than_equal", "comment": "", "source": null, "relation": "gte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than_equal"}}, {"model": "conditions.condition", "pk": 11, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than", "comment": "", "source": null, "relation": "lt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than"}}, {"model": "conditions.condition", "pk": 12, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than_equal", "comment": "", "source": null, "relation": "lte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than_equal"}}, {"model": "conditions.condition", "pk": 13, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_empty", "comment": "", "source": null, "relation": "notempty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_empty"}}, {"model": "conditions.condition", "pk": 14, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_equal", "comment": "", "source": null, "relation": "neq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_equal"}}] \ No newline at end of file +[{"model": "conditions.condition", "pk": 1, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_equal", "comment": null, "source": 25, "relation": "eq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_equal"}}, {"model": "conditions.condition", "pk": 2, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_equal", "comment": null, "source": 25, "relation": "neq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_equal"}}, {"model": "conditions.condition", "pk": 3, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_contains", "comment": null, "source": 25, "relation": "contains", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_contains"}}, {"model": "conditions.condition", "pk": 4, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than", "comment": null, "source": 25, "relation": "gt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than"}}, {"model": "conditions.condition", "pk": 5, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than_equal", "comment": null, "source": 25, "relation": "gte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than_equal"}}, {"model": "conditions.condition", "pk": 6, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than", "comment": null, "source": 25, "relation": "lt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than"}}, {"model": "conditions.condition", "pk": 7, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than_equal", "comment": null, "source": 25, "relation": "lte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than_equal"}}, {"model": "conditions.condition", "pk": 8, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_empty", "comment": null, "source": 25, "relation": "empty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_empty"}}, {"model": "conditions.condition", "pk": 9, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_empty", "comment": null, "source": 25, "relation": "notempty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_empty"}}, {"model": "conditions.condition", "pk": 10, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_equal", "comment": "", "source": 26, "relation": "eq", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_equal"}}, {"model": "conditions.condition", "pk": 11, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_equal", "comment": "", "source": 26, "relation": "neq", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_equal"}}, {"model": "conditions.condition", "pk": 12, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_contains", "comment": "", "source": 26, "relation": "contains", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_contains"}}, {"model": "conditions.condition", "pk": 13, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_empty", "comment": "", "source": 26, "relation": "empty", "target_text": "", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_empty"}}, {"model": "conditions.condition", "pk": 14, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_empty", "comment": "", "source": 26, "relation": "notempty", "target_text": "", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_empty"}}] \ No newline at end of file diff --git a/fixtures/domain.json b/fixtures/domain.json index 3bb75bffb..c75363103 100644 --- a/fixtures/domain.json +++ b/fixtures/domain.json @@ -1,1440 +1 @@ -[ - { - "model": "domain.attributeentity", - "pk": 1, - "fields": { - "parent": null, - "title": "individual", - "uri": "http://example.com/elements/domain/individual", - "description": null, - "label": "individual", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 1, - "rght": 22, - "tree_id": 3, - "level": 0, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 2, - "fields": { - "parent": null, - "title": "collection", - "uri": "http://example.com/elements/domain/collection", - "description": null, - "label": "collection", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 1, - "rght": 24, - "tree_id": 1, - "level": 0, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 3, - "fields": { - "parent": 1, - "title": "text", - "uri": "http://example.com/elements/domain/individual/text", - "description": null, - "label": "individual.text", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 16, - "rght": 17, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 4, - "fields": { - "parent": 1, - "title": "textarea", - "uri": "http://example.com/elements/domain/individual/textarea", - "description": null, - "label": "individual.textarea", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 18, - "rght": 19, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 5, - "fields": { - "parent": 1, - "title": "integer", - "uri": "http://example.com/elements/domain/individual/integer", - "description": null, - "label": "individual.integer", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 8, - "rght": 9, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 6, - "fields": { - "parent": 1, - "title": "float", - "uri": "http://example.com/elements/domain/individual/float", - "description": null, - "label": "individual.float", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 6, - "rght": 7, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 7, - "fields": { - "parent": 1, - "title": "range", - "uri": "http://example.com/elements/domain/individual/range", - "description": null, - "label": "individual.range", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 12, - "rght": 13, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 8, - "fields": { - "parent": 1, - "title": "bool", - "uri": "http://example.com/elements/domain/individual/bool", - "description": null, - "label": "individual.bool", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 2, - "rght": 3, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 9, - "fields": { - "parent": 1, - "title": "datetime", - "uri": "http://example.com/elements/domain/individual/datetime", - "description": null, - "label": "individual.datetime", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 4, - "rght": 5, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 10, - "fields": { - "parent": 1, - "title": "url", - "uri": "http://example.com/elements/domain/individual/url", - "description": null, - "label": "individual.url", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 20, - "rght": 21, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 11, - "fields": { - "parent": 1, - "title": "radio", - "uri": "http://example.com/elements/domain/individual/checkbox", - "description": null, - "label": "individual.radio", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 10, - "rght": 11, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 12, - "fields": { - "parent": 1, - "title": "select", - "uri": "http://example.com/elements/domain/individual/select", - "description": null, - "label": "individual.select", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 14, - "rght": 15, - "tree_id": 3, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 13, - "fields": { - "parent": 2, - "title": "bool", - "uri": "http://example.com/elements/domain/collection/bool", - "description": null, - "label": "collection.bool", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 2, - "rght": 3, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 14, - "fields": { - "parent": 2, - "title": "checkbox", - "uri": "http://example.com/elements/domain/collection/checkbox", - "description": null, - "label": "collection.checkbox", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 4, - "rght": 5, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 15, - "fields": { - "parent": 2, - "title": "radio", - "uri": "http://example.com/elements/domain/collection/radio", - "description": null, - "label": "collection.radio", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 12, - "rght": 13, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 16, - "fields": { - "parent": 2, - "title": "datetime", - "uri": "http://example.com/elements/domain/collection/datetime", - "description": null, - "label": "collection.datetime", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 6, - "rght": 7, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 17, - "fields": { - "parent": 2, - "title": "float", - "uri": "http://example.com/elements/domain/collection/float", - "description": null, - "label": "collection.float", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 8, - "rght": 9, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 18, - "fields": { - "parent": 2, - "title": "integer", - "uri": "http://example.com/elements/domain/collection/integer", - "description": null, - "label": "collection.integer", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 10, - "rght": 11, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 19, - "fields": { - "parent": 2, - "title": "range", - "uri": "http://example.com/elements/domain/collection/range", - "description": null, - "label": "collection.range", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 14, - "rght": 15, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 20, - "fields": { - "parent": 2, - "title": "select", - "uri": "http://example.com/elements/domain/collection/select", - "description": null, - "label": "collection.select", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 16, - "rght": 17, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 21, - "fields": { - "parent": 2, - "title": "text", - "uri": "http://example.com/elements/domain/collection/text", - "description": null, - "label": "collection.text", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 18, - "rght": 19, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 22, - "fields": { - "parent": 2, - "title": "textarea", - "uri": "http://example.com/elements/domain/collection/textarea", - "description": null, - "label": "collection.textarea", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 20, - "rght": 21, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 23, - "fields": { - "parent": 2, - "title": "url", - "uri": "http://example.com/elements/domain/collection/url", - "description": null, - "label": "collection.url", - "is_collection": true, - "is_attribute": true, - "parent_collection": null, - "lft": 22, - "rght": 23, - "tree_id": 1, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 24, - "fields": { - "parent": null, - "title": "conditions", - "uri": "http://example.com/elements/domain/conditions", - "description": null, - "label": "conditions", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 1, - "rght": 38, - "tree_id": 2, - "level": 0, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 25, - "fields": { - "parent": 28, - "title": "text", - "uri": "http://example.com/elements/domain/conditions/source/text", - "description": null, - "label": "conditions.source.text", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 5, - "rght": 6, - "tree_id": 2, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 26, - "fields": { - "parent": 28, - "title": "options", - "uri": "http://example.com/elements/domain/conditions/source/options", - "description": null, - "label": "conditions.source.options", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 3, - "rght": 4, - "tree_id": 2, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 27, - "fields": { - "parent": 31, - "title": "text_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.text_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 23, - "rght": 24, - "tree_id": 2, - "level": 2, - "conditions": [ - 1 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 28, - "fields": { - "parent": 24, - "title": "source", - "uri": "http://example.com/elements/domain/conditions/source", - "description": null, - "label": "conditions.source", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 2, - "rght": 7, - "tree_id": 2, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 29, - "fields": { - "parent": 31, - "title": "text_not_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.text_not_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 35, - "rght": 36, - "tree_id": 2, - "level": 2, - "conditions": [ - 2 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 30, - "fields": { - "parent": 31, - "title": "options_contains", - "uri": null, - "description": null, - "label": "conditions.attribute.options_contains", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 9, - "rght": 10, - "tree_id": 2, - "level": 2, - "conditions": [ - 12 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 31, - "fields": { - "parent": 24, - "title": "attribute", - "uri": null, - "description": null, - "label": "conditions.attribute", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 8, - "rght": 37, - "tree_id": 2, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 32, - "fields": { - "parent": 31, - "title": "options_empty", - "uri": null, - "description": null, - "label": "conditions.attribute.options_empty", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 11, - "rght": 12, - "tree_id": 2, - "level": 2, - "conditions": [ - 13 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 33, - "fields": { - "parent": 31, - "title": "options_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.options_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 13, - "rght": 14, - "tree_id": 2, - "level": 2, - "conditions": [ - 10 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 34, - "fields": { - "parent": 31, - "title": "options_not_empty", - "uri": null, - "description": null, - "label": "conditions.attribute.options_not_empty", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 15, - "rght": 16, - "tree_id": 2, - "level": 2, - "conditions": [ - 14 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 35, - "fields": { - "parent": 31, - "title": "options_not_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.options_not_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 17, - "rght": 18, - "tree_id": 2, - "level": 2, - "conditions": [ - 11 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 36, - "fields": { - "parent": 31, - "title": "text_contains", - "uri": null, - "description": null, - "label": "conditions.attribute.text_contains", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 19, - "rght": 20, - "tree_id": 2, - "level": 2, - "conditions": [ - 3 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 37, - "fields": { - "parent": 31, - "title": "text_empty", - "uri": null, - "description": null, - "label": "conditions.attribute.text_empty", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 21, - "rght": 22, - "tree_id": 2, - "level": 2, - "conditions": [ - 8 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 38, - "fields": { - "parent": 31, - "title": "text_greater_than", - "uri": null, - "description": null, - "label": "conditions.attribute.text_greater_than", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 25, - "rght": 26, - "tree_id": 2, - "level": 2, - "conditions": [ - 4 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 39, - "fields": { - "parent": 31, - "title": "text_greater_than_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.text_greater_than_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 27, - "rght": 28, - "tree_id": 2, - "level": 2, - "conditions": [ - 5 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 40, - "fields": { - "parent": 31, - "title": "text_lesser_than", - "uri": null, - "description": null, - "label": "conditions.attribute.text_lesser_than", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 29, - "rght": 30, - "tree_id": 2, - "level": 2, - "conditions": [ - 6 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 41, - "fields": { - "parent": 31, - "title": "text_lesser_than_equal", - "uri": null, - "description": null, - "label": "conditions.attribute.text_lesser_than_equal", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 31, - "rght": 32, - "tree_id": 2, - "level": 2, - "conditions": [ - 7 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 42, - "fields": { - "parent": 31, - "title": "text_not_empty", - "uri": null, - "description": null, - "label": "conditions.attribute.text_not_empty", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 33, - "rght": 34, - "tree_id": 2, - "level": 2, - "conditions": [ - 9 - ] - } - }, - { - "model": "domain.attributeentity", - "pk": 43, - "fields": { - "parent": null, - "title": "set", - "uri": null, - "description": null, - "label": "set", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 1, - "rght": 16, - "tree_id": 4, - "level": 0, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 44, - "fields": { - "parent": 43, - "title": "individual", - "uri": null, - "description": null, - "label": "set.individual", - "is_collection": false, - "is_attribute": false, - "parent_collection": null, - "lft": 10, - "rght": 15, - "tree_id": 4, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 45, - "fields": { - "parent": 43, - "title": "collection", - "uri": null, - "description": null, - "label": "set.collection", - "is_collection": true, - "is_attribute": false, - "parent_collection": 45, - "lft": 2, - "rght": 9, - "tree_id": 4, - "level": 1, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 46, - "fields": { - "parent": 45, - "title": "id", - "uri": null, - "description": null, - "label": "set.collection.id", - "is_collection": false, - "is_attribute": true, - "parent_collection": 45, - "lft": 3, - "rght": 4, - "tree_id": 4, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 47, - "fields": { - "parent": 45, - "title": "text", - "uri": null, - "description": null, - "label": "set.collection.text", - "is_collection": false, - "is_attribute": true, - "parent_collection": 45, - "lft": 5, - "rght": 6, - "tree_id": 4, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 48, - "fields": { - "parent": 45, - "title": "textarea", - "uri": null, - "description": null, - "label": "set.collection.textarea", - "is_collection": false, - "is_attribute": true, - "parent_collection": 45, - "lft": 7, - "rght": 8, - "tree_id": 4, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 49, - "fields": { - "parent": 44, - "title": "text", - "uri": null, - "description": null, - "label": "set.individual.text", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 11, - "rght": 12, - "tree_id": 4, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attributeentity", - "pk": 50, - "fields": { - "parent": 44, - "title": "textarea", - "uri": null, - "description": null, - "label": "set.individual.textarea", - "is_collection": false, - "is_attribute": true, - "parent_collection": null, - "lft": 13, - "rght": 14, - "tree_id": 4, - "level": 2, - "conditions": [] - } - }, - { - "model": "domain.attribute", - "pk": 13, - "fields": { - "value_type": "boolean", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 14, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 2 - ] - } - }, - { - "model": "domain.attribute", - "pk": 16, - "fields": { - "value_type": "datetime", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 17, - "fields": { - "value_type": "float", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 18, - "fields": { - "value_type": "integer", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 15, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 2 - ] - } - }, - { - "model": "domain.attribute", - "pk": 19, - "fields": { - "value_type": "float", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 20, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 1 - ] - } - }, - { - "model": "domain.attribute", - "pk": 21, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 22, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 23, - "fields": { - "value_type": "url", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 30, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 12 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 32, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 13 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 33, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 10 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 34, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 14 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 35, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 11 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 36, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 3 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 37, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 8 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 27, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 1 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 38, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 4 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 39, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 5 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 40, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 6 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 41, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 7 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 42, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 9 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 29, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [ - 2 - ], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 26, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 1 - ] - } - }, - { - "model": "domain.attribute", - "pk": 25, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 8, - "fields": { - "value_type": "boolean", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 9, - "fields": { - "value_type": "datetime", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 6, - "fields": { - "value_type": "float", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 5, - "fields": { - "value_type": "integer", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 11, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 2 - ] - } - }, - { - "model": "domain.attribute", - "pk": 7, - "fields": { - "value_type": "float", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 12, - "fields": { - "value_type": "options", - "unit": null, - "conditions": [], - "optionsets": [ - 1 - ] - } - }, - { - "model": "domain.attribute", - "pk": 3, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 4, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 10, - "fields": { - "value_type": "url", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 46, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 47, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 48, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 49, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - }, - { - "model": "domain.attribute", - "pk": 50, - "fields": { - "value_type": "text", - "unit": null, - "conditions": [], - "optionsets": [] - } - } -] \ No newline at end of file +[{"model": "domain.attributeentity", "pk": 1, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "individual", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/individual", "label": "individual", "lft": 1, "rght": 22, "tree_id": 3, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 2, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "collection", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/collection", "label": "collection", "lft": 1, "rght": 24, "tree_id": 1, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 3, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/text", "label": "individual/text", "lft": 16, "rght": 17, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 4, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/textarea", "label": "individual/textarea", "lft": 18, "rght": 19, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 5, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "integer", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/integer", "label": "individual/integer", "lft": 8, "rght": 9, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 6, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "float", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/float", "label": "individual/float", "lft": 6, "rght": 7, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 7, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "range", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/range", "label": "individual/range", "lft": 12, "rght": 13, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 8, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "bool", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/bool", "label": "individual/bool", "lft": 2, "rght": 3, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 9, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "datetime", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/datetime", "label": "individual/datetime", "lft": 4, "rght": 5, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 10, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "url", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/url", "label": "individual/url", "lft": 20, "rght": 21, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 11, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "radio", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/radio", "label": "individual/radio", "lft": 10, "rght": 11, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 12, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "select", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/select", "label": "individual/select", "lft": 14, "rght": 15, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 13, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "bool", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/bool", "label": "collection/bool", "lft": 2, "rght": 3, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 14, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "checkbox", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/checkbox", "label": "collection/checkbox", "lft": 4, "rght": 5, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 15, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "radio", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/radio", "label": "collection/radio", "lft": 12, "rght": 13, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 16, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "datetime", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/datetime", "label": "collection/datetime", "lft": 6, "rght": 7, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 17, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "float", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/float", "label": "collection/float", "lft": 8, "rght": 9, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 18, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "integer", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/integer", "label": "collection/integer", "lft": 10, "rght": 11, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 19, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "range", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/range", "label": "collection/range", "lft": 14, "rght": 15, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 20, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "select", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/select", "label": "collection/select", "lft": 16, "rght": 17, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 21, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/text", "label": "collection/text", "lft": 18, "rght": 19, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 22, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/textarea", "label": "collection/textarea", "lft": 20, "rght": 21, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 23, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "url", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/url", "label": "collection/url", "lft": 22, "rght": 23, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 24, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "conditions", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions", "label": "conditions", "lft": 1, "rght": 38, "tree_id": 2, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 25, "fields": {"parent": 28, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source/text", "label": "conditions/source/text", "lft": 5, "rght": 6, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 26, "fields": {"parent": 28, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source/options", "label": "conditions/source/options", "lft": 3, "rght": 4, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 27, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_equal", "label": "conditions/attribute/text_equal", "lft": 23, "rght": 24, "tree_id": 2, "level": 2, "conditions": [1]}}, {"model": "domain.attributeentity", "pk": 28, "fields": {"parent": 24, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "source", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source", "label": "conditions/source", "lft": 2, "rght": 7, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 29, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_not_equal", "label": "conditions/attribute/text_not_equal", "lft": 35, "rght": 36, "tree_id": 2, "level": 2, "conditions": [2]}}, {"model": "domain.attributeentity", "pk": 30, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_contains", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_contains", "label": "conditions/attribute/options_contains", "lft": 9, "rght": 10, "tree_id": 2, "level": 2, "conditions": [12]}}, {"model": "domain.attributeentity", "pk": 31, "fields": {"parent": 24, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "attribute", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute", "label": "conditions/attribute", "lft": 8, "rght": 37, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 32, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_empty", "label": "conditions/attribute/options_empty", "lft": 11, "rght": 12, "tree_id": 2, "level": 2, "conditions": [13]}}, {"model": "domain.attributeentity", "pk": 33, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_equal", "label": "conditions/attribute/options_equal", "lft": 13, "rght": 14, "tree_id": 2, "level": 2, "conditions": [10]}}, {"model": "domain.attributeentity", "pk": 34, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_not_empty", "label": "conditions/attribute/options_not_empty", "lft": 15, "rght": 16, "tree_id": 2, "level": 2, "conditions": [14]}}, {"model": "domain.attributeentity", "pk": 35, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_not_equal", "label": "conditions/attribute/options_not_equal", "lft": 17, "rght": 18, "tree_id": 2, "level": 2, "conditions": [11]}}, {"model": "domain.attributeentity", "pk": 36, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_contains", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_contains", "label": "conditions/attribute/text_contains", "lft": 19, "rght": 20, "tree_id": 2, "level": 2, "conditions": [3]}}, {"model": "domain.attributeentity", "pk": 37, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_empty", "label": "conditions/attribute/text_empty", "lft": 21, "rght": 22, "tree_id": 2, "level": 2, "conditions": [8]}}, {"model": "domain.attributeentity", "pk": 38, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_greater_than", "label": "conditions/attribute/text_greater_than", "lft": 25, "rght": 26, "tree_id": 2, "level": 2, "conditions": [4]}}, {"model": "domain.attributeentity", "pk": 39, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_greater_than_equal", "label": "conditions/attribute/text_greater_than_equal", "lft": 27, "rght": 28, "tree_id": 2, "level": 2, "conditions": [5]}}, {"model": "domain.attributeentity", "pk": 40, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_lesser_than", "label": "conditions/attribute/text_lesser_than", "lft": 29, "rght": 30, "tree_id": 2, "level": 2, "conditions": [6]}}, {"model": "domain.attributeentity", "pk": 41, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_lesser_than_equal", "label": "conditions/attribute/text_lesser_than_equal", "lft": 31, "rght": 32, "tree_id": 2, "level": 2, "conditions": [7]}}, {"model": "domain.attributeentity", "pk": 42, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_not_empty", "label": "conditions/attribute/text_not_empty", "lft": 33, "rght": 34, "tree_id": 2, "level": 2, "conditions": [9]}}, {"model": "domain.attributeentity", "pk": 43, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "set", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set", "label": "set", "lft": 1, "rght": 16, "tree_id": 4, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 44, "fields": {"parent": 43, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "individual", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual", "label": "set/individual", "lft": 10, "rght": 15, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 45, "fields": {"parent": 43, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "collection", "comment": null, "is_collection": true, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection", "label": "set/collection", "lft": 2, "rght": 9, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 46, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "id", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/id", "label": "set/collection/id", "lft": 3, "rght": 4, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 47, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/text", "label": "set/collection/text", "lft": 5, "rght": 6, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 48, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/textarea", "label": "set/collection/textarea", "lft": 7, "rght": 8, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 49, "fields": {"parent": 44, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual/text", "label": "set/individual/text", "lft": 11, "rght": 12, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 50, "fields": {"parent": 44, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual/textarea", "label": "set/individual/textarea", "lft": 13, "rght": 14, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attribute", "pk": 13, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 14, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 16, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 17, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 18, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 15, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 19, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 20, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 21, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 22, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 23, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 30, "fields": {"value_type": "text", "unit": null, "conditions": [12], "optionsets": []}}, {"model": "domain.attribute", "pk": 32, "fields": {"value_type": "text", "unit": null, "conditions": [13], "optionsets": []}}, {"model": "domain.attribute", "pk": 33, "fields": {"value_type": "text", "unit": null, "conditions": [10], "optionsets": []}}, {"model": "domain.attribute", "pk": 34, "fields": {"value_type": "text", "unit": null, "conditions": [14], "optionsets": []}}, {"model": "domain.attribute", "pk": 35, "fields": {"value_type": "text", "unit": null, "conditions": [11], "optionsets": []}}, {"model": "domain.attribute", "pk": 36, "fields": {"value_type": "text", "unit": null, "conditions": [3], "optionsets": []}}, {"model": "domain.attribute", "pk": 37, "fields": {"value_type": "text", "unit": null, "conditions": [8], "optionsets": []}}, {"model": "domain.attribute", "pk": 27, "fields": {"value_type": "text", "unit": null, "conditions": [1], "optionsets": []}}, {"model": "domain.attribute", "pk": 38, "fields": {"value_type": "text", "unit": null, "conditions": [4], "optionsets": []}}, {"model": "domain.attribute", "pk": 39, "fields": {"value_type": "text", "unit": null, "conditions": [5], "optionsets": []}}, {"model": "domain.attribute", "pk": 40, "fields": {"value_type": "text", "unit": null, "conditions": [6], "optionsets": []}}, {"model": "domain.attribute", "pk": 41, "fields": {"value_type": "text", "unit": null, "conditions": [7], "optionsets": []}}, {"model": "domain.attribute", "pk": 42, "fields": {"value_type": "text", "unit": null, "conditions": [9], "optionsets": []}}, {"model": "domain.attribute", "pk": 29, "fields": {"value_type": "text", "unit": null, "conditions": [2], "optionsets": []}}, {"model": "domain.attribute", "pk": 26, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 25, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 8, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 9, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 6, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 5, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 11, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 7, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 12, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 3, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 4, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 10, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 46, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 47, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 48, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 49, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 50, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}] \ No newline at end of file From 4445046ad3dcc585a99ed29b7a66a5c07b871527 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 27 Jan 2017 14:13:07 +0100 Subject: [PATCH 11/51] refactor questions app --- apps/conditions/models.py | 4 +- apps/conditions/utils.py | 2 +- apps/core/management/commands/import.py | 2 +- apps/core/renderers.py | 3 + apps/core/static/core/css/base.scss | 11 +- apps/domain/models.py | 5 +- apps/options/models.py | 10 +- apps/projects/serializers.py | 2 +- apps/questions/admin.py | 16 +- apps/questions/migrations/0007_refactoring.py | 226 +++++++++++ .../migrations/0008_data_migration.py | 45 +++ apps/questions/models.py | 380 +++++++++++++----- apps/questions/renderers.py | 153 ++++--- apps/questions/serializers.py | 45 ++- .../catalogs_modal_form_catalogs.html | 27 ++ .../catalogs_modal_form_questions.html | 193 +++++---- .../catalogs_modal_form_questionsets.html | 117 ++++-- .../catalogs_modal_form_sections.html | 61 ++- .../catalogs_modal_form_subsections.html | 61 ++- apps/questions/urls.py | 7 +- apps/questions/utils.py | 145 +++++++ apps/questions/views.py | 21 +- rdmo/settings/base.py | 2 + 23 files changed, 1182 insertions(+), 356 deletions(-) create mode 100644 apps/questions/migrations/0007_refactoring.py create mode 100644 apps/questions/migrations/0008_data_migration.py create mode 100644 apps/questions/utils.py diff --git a/apps/conditions/models.py b/apps/conditions/models.py index 0410b30f0..933bd95e3 100644 --- a/apps/conditions/models.py +++ b/apps/conditions/models.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +from django.conf import settings from django.db import models from django.core.validators import RegexValidator from django.utils.encoding import python_2_unicode_compatible @@ -99,7 +100,8 @@ def save(self, *args, **kwargs): super(Condition, self).save(*args, **kwargs) def build_uri(self): - return self.uri_prefix.rstrip('/') + '/conditions/' + self.key + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/conditions/' + self.key def resolve(self, project, snapshot=None): # get the values for the given project, the given snapshot and the condition's attribute diff --git a/apps/conditions/utils.py b/apps/conditions/utils.py index e281eaaf5..3b905803c 100644 --- a/apps/conditions/utils.py +++ b/apps/conditions/utils.py @@ -29,7 +29,7 @@ def import_xml(conditions_node): try: source_uri = condition_node['source'].get(nstag('dc:uri', nsmap)) condition.source = Attribute.objects.get(uri=source_uri) - except (AttributeError, Condition.DoesNotExist): + except (AttributeError, Attribute.DoesNotExist): condition.source = None try: diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index 0af9e88a5..b684d5b88 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -5,7 +5,7 @@ from apps.conditions.utils import import_xml as import_conditions from apps.options.utils import import_xml as import_options from apps.domain.utils import import_xml as import_domain -#from apps.questions.utils import import_xml as import_questions +from apps.questions.utils import import_xml as import_questions class Command(BaseCommand): diff --git a/apps/core/renderers.py b/apps/core/renderers.py index 8a404000b..aadb0613b 100644 --- a/apps/core/renderers.py +++ b/apps/core/renderers.py @@ -25,6 +25,9 @@ def render(self, data): return stream.getvalue() def render_text_element(self, xml, tag, attrs, text): + # remove None values from attrs + attrs = dict((key, value) for key, value in attrs.iteritems() if value) + xml.startElement(tag, attrs) if text is not None: xml.characters(smart_text(text)) diff --git a/apps/core/static/core/css/base.scss b/apps/core/static/core/css/base.scss index ad8048abf..18716101f 100644 --- a/apps/core/static/core/css/base.scss +++ b/apps/core/static/core/css/base.scss @@ -125,9 +125,14 @@ form .yesno label { /* modals */ -.modal-body > p:last-child, -.modal-body formgroup:last-child .form-group { - margin-bottom: 0; +.modal-body { + > p:last-child, + formgroup:last-child .form-group { + margin-bottom: 0; + } + .formgroup { + margin-bottom: 10px; + } } /* options */ diff --git a/apps/domain/models.py b/apps/domain/models.py index a32c53f4d..f7374a685 100644 --- a/apps/domain/models.py +++ b/apps/domain/models.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals +from django.conf import settings from django.db import models -from django.db.models.signals import post_save from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ @@ -97,7 +97,8 @@ def save(self, *args, **kwargs): parent = parent.parent # create uri - self.uri = self.uri_prefix.rstrip('/') + '/domain/' + self.label + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + self.uri = prefix + '/domain/' + self.label super(AttributeEntity, self).save(*args, **kwargs) diff --git a/apps/options/models.py b/apps/options/models.py index 5f74b0ba1..e8a06bfb8 100644 --- a/apps/options/models.py +++ b/apps/options/models.py @@ -1,9 +1,7 @@ from __future__ import unicode_literals -from django.core.validators import RegexValidator +from django.conf import settings from django.db import models -from django.db.models.signals import pre_save -from django.dispatch import receiver from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ @@ -61,7 +59,8 @@ def save(self, *args, **kwargs): option.save() def build_uri(self): - return self.uri_prefix.rstrip('/') + '/options/' + self.key + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/options/' + self.key @python_2_unicode_compatible @@ -131,4 +130,5 @@ def text(self): return self.trans('text') def build_uri(self): - return self.uri_prefix.rstrip('/') + '/options/' + self.optionset.key + '/' + self.key + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/options/' + self.optionset.key + '/' + self.key diff --git a/apps/projects/serializers.py b/apps/projects/serializers.py index ef26be9af..0037ea909 100644 --- a/apps/projects/serializers.py +++ b/apps/projects/serializers.py @@ -118,7 +118,7 @@ class Meta: def get_id_attribute(self, obj): try: - return {'id': obj.children.get(title='id').pk} + return {'id': obj.children.get(key='id').pk} except AttributeEntity.DoesNotExist: return None diff --git a/apps/questions/admin.py b/apps/questions/admin.py index e9db5ff94..7bc7e4c28 100644 --- a/apps/questions/admin.py +++ b/apps/questions/admin.py @@ -1,25 +1,29 @@ from django.contrib import admin -from .models import * +from .models import Catalog, Section, Subsection, QuestionEntity, Question + + +class CatalogAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) class SectionAdmin(admin.ModelAdmin): - readonly_fields = ('label_en', 'label_de') + readonly_fields = ('uri', 'label_en', 'label_de') class SubsectionAdmin(admin.ModelAdmin): - readonly_fields = ('label_en', 'label_de') + readonly_fields = ('uri', 'label_en', 'label_de') class QuestionEntityAdmin(admin.ModelAdmin): - readonly_fields = ('label_en', 'label_de') + readonly_fields = ('uri', 'label_en', 'label_de') class QuestionAdmin(admin.ModelAdmin): - readonly_fields = ('label_en', 'label_de') + readonly_fields = ('uri', 'label_en', 'label_de') -admin.site.register(Catalog) +admin.site.register(Catalog, CatalogAdmin) admin.site.register(Section, SectionAdmin) admin.site.register(Subsection, SubsectionAdmin) admin.site.register(QuestionEntity, QuestionEntityAdmin) diff --git a/apps/questions/migrations/0007_refactoring.py b/apps/questions/migrations/0007_refactoring.py new file mode 100644 index 000000000..3416c3bea --- /dev/null +++ b/apps/questions/migrations/0007_refactoring.py @@ -0,0 +1,226 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-26 16:01 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('questions', '0006_auto_20160803_1619'), + ] + + operations = [ + migrations.AddField( + model_name='catalog', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this catalog.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='catalog', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this catalog. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AddField( + model_name='catalog', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this catalog (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='catalog', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this catalog.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AddField( + model_name='questionentity', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this question/questionset.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='questionentity', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this question/questionset. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AddField( + model_name='questionentity', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this question/questionset (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='questionentity', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this question/questionset.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AddField( + model_name='section', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this section.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='section', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this section. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AddField( + model_name='section', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this section (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='section', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this section.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AddField( + model_name='subsection', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this subsection.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='subsection', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this subsection. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AddField( + model_name='subsection', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this subsection (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='subsection', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this subsection.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='catalog', + name='order', + field=models.IntegerField(default=0, help_text='The position of this catalog in lists.', verbose_name='Order'), + ), + migrations.AlterField( + model_name='catalog', + name='title_de', + field=models.CharField(help_text='The German title for this catalog.', max_length=256, verbose_name='Title (de)'), + ), + migrations.AlterField( + model_name='catalog', + name='title_en', + field=models.CharField(help_text='The English title for this catalog.', max_length=256, verbose_name='Title (en)'), + ), + migrations.AlterField( + model_name='question', + name='parent', + field=models.ForeignKey(blank=True, help_text='The question set this question belongs to.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='questions.QuestionEntity', verbose_name='Parent'), + ), + migrations.AlterField( + model_name='question', + name='text_de', + field=models.TextField(help_text='The German text for this question.', verbose_name='Text (de)'), + ), + migrations.AlterField( + model_name='question', + name='text_en', + field=models.TextField(help_text='The English text for this question.', verbose_name='Text (en)'), + ), + migrations.AlterField( + model_name='question', + name='widget_type', + field=models.CharField(choices=[('text', 'Text'), ('textarea', 'Textarea'), ('yesno', 'Yes/No'), ('checkbox', 'Checkboxes'), ('radio', 'Radio buttons'), ('select', 'Select drop-down'), ('range', 'Range slider'), ('date', 'Date picker')], help_text='Type of widget for this question.', max_length=12, verbose_name='Widget type'), + ), + migrations.AlterField( + model_name='questionentity', + name='attribute_entity', + field=models.ForeignKey(blank=True, help_text='The attribute/entity this question belongs to.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='domain.AttributeEntity', verbose_name='Attribute entity'), + ), + migrations.AlterField( + model_name='questionentity', + name='help_de', + field=models.TextField(blank=True, help_text='The German help text for this question/questionset.', null=True, verbose_name='Help (de)'), + ), + migrations.AlterField( + model_name='questionentity', + name='help_en', + field=models.TextField(blank=True, help_text='The English help text for this question/questionset.', null=True, verbose_name='Help (en)'), + ), + migrations.AlterField( + model_name='questionentity', + name='label_de', + field=models.TextField(help_text='The German label for this question/questionset (auto-generated).', verbose_name='Label (de)'), + ), + migrations.AlterField( + model_name='questionentity', + name='label_en', + field=models.TextField(help_text='The English label for this question/questionset (auto-generated).', verbose_name='Label (en)'), + ), + migrations.AlterField( + model_name='questionentity', + name='order', + field=models.IntegerField(default=0, help_text='The position of this subsection in lists.', verbose_name='Order'), + ), + migrations.AlterField( + model_name='questionentity', + name='subsection', + field=models.ForeignKey(help_text='The section this question belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='entities', to='questions.Subsection', verbose_name='Catalog'), + ), + migrations.AlterField( + model_name='section', + name='catalog', + field=models.ForeignKey(help_text='The catalog this section belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='sections', to='questions.Catalog', verbose_name='Catalog'), + ), + migrations.AlterField( + model_name='section', + name='label_de', + field=models.TextField(help_text='The German label for this section (auto-generated).', verbose_name='Label (de)'), + ), + migrations.AlterField( + model_name='section', + name='label_en', + field=models.TextField(help_text='The English label for this section (auto-generated).', verbose_name='Label (en)'), + ), + migrations.AlterField( + model_name='section', + name='order', + field=models.IntegerField(default=0, help_text='The position of this section in lists.', verbose_name='Order'), + ), + migrations.AlterField( + model_name='section', + name='title_de', + field=models.CharField(help_text='The German title for this section.', max_length=256, verbose_name='Title (de)'), + ), + migrations.AlterField( + model_name='section', + name='title_en', + field=models.CharField(help_text='The English title for this section.', max_length=256, verbose_name='Title (en)'), + ), + migrations.AlterField( + model_name='subsection', + name='label_de', + field=models.TextField(help_text='The German label for this subsection (auto-generated).', verbose_name='Label (de)'), + ), + migrations.AlterField( + model_name='subsection', + name='label_en', + field=models.TextField(help_text='The English label for this subsection (auto-generated).', verbose_name='Label (en)'), + ), + migrations.AlterField( + model_name='subsection', + name='order', + field=models.IntegerField(default=0, help_text='The position of this subsection in lists.', verbose_name='Order'), + ), + migrations.AlterField( + model_name='subsection', + name='section', + field=models.ForeignKey(help_text='The section this subsection belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='subsections', to='questions.Section', verbose_name='Catalog'), + ), + migrations.AlterField( + model_name='subsection', + name='title_de', + field=models.CharField(help_text='The German title for this subsection.', max_length=256, verbose_name='Title (de)'), + ), + migrations.AlterField( + model_name='subsection', + name='title_en', + field=models.CharField(help_text='The English title for this subsection.', max_length=256, verbose_name='Title (en)'), + ), + ] diff --git a/apps/questions/migrations/0008_data_migration.py b/apps/questions/migrations/0008_data_migration.py new file mode 100644 index 000000000..626da6082 --- /dev/null +++ b/apps/questions/migrations/0008_data_migration.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-19 16:53 +from __future__ import unicode_literals + +from django.db import migrations +from django.utils.text import slugify + + +def create_identifier(apps, schema_editor): + + Catalog = apps.get_model('questions', 'Catalog') + Section = apps.get_model('questions', 'Section') + Subsection = apps.get_model('questions', 'Subsection') + QuestionEntity = apps.get_model('questions', 'QuestionEntity') + + for obj in Catalog.objects.all(): + if not obj.key: + obj.key = slugify(obj.title_en) + obj.save() + + for obj in Section.objects.all(): + if not obj.key: + obj.key = slugify(obj.title_en) + obj.save() + + for obj in Subsection.objects.all(): + if not obj.key: + obj.key = slugify(obj.title_en) + obj.save() + + for obj in QuestionEntity.objects.all(): + if not obj.key: + obj.key = slugify(obj.attribute_entity.key) + obj.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('questions', '0007_refactoring'), + ] + + operations = [ + migrations.RunPython(create_identifier), + ] diff --git a/apps/questions/models.py b/apps/questions/models.py index 9b152ff24..4ea8e45e7 100644 --- a/apps/questions/models.py +++ b/apps/questions/models.py @@ -1,5 +1,6 @@ from __future__ import unicode_literals +from django.conf import settings from django.db import models from django.db.models.signals import post_save from django.utils.encoding import python_2_unicode_compatible @@ -14,10 +15,41 @@ @python_2_unicode_compatible class Catalog(Model, TranslationMixin): - order = models.IntegerField(null=True) - - title_en = models.CharField(max_length=256) - title_de = models.CharField(max_length=256) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this catalog (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this catalog.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this catalog. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this catalog.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this catalog in lists.') + ) + title_en = models.CharField( + max_length=256, + verbose_name=_('Title (en)'), + help_text=_('The English title for this catalog.') + ) + title_de = models.CharField( + max_length=256, + verbose_name=_('Title (de)'), + help_text=_('The German title for this catalog.') + ) class Meta: ordering = ('order',) @@ -25,7 +57,14 @@ class Meta: verbose_name_plural = _('Catalogs') def __str__(self): - return self.label + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(Catalog, self).save(*args, **kwargs) + + for section in self.sections.all(): + section.save() @property def title(self): @@ -35,27 +74,62 @@ def title(self): def label(self): return self.trans('title') - -def post_save_catalog(sender, **kwargs): - instance = kwargs['instance'] - - for section in instance.sections.all(): - section.save() - -post_save.connect(post_save_catalog, sender=Catalog) + def build_uri(self): + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/questions/%s' % self.key @python_2_unicode_compatible class Section(Model, TranslationMixin): - catalog = models.ForeignKey(Catalog, related_name='sections') - order = models.IntegerField(null=True) - - title_en = models.CharField(max_length=256) - title_de = models.CharField(max_length=256) - - label_de = models.TextField() - label_en = models.TextField() + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this section (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this section.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this section. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this section.') + ) + catalog = models.ForeignKey( + Catalog, related_name='sections', + verbose_name=_('Catalog'), + help_text=_('The catalog this section belongs to.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this section in lists.') + ) + title_en = models.CharField( + max_length=256, + verbose_name=_('Title (en)'), + help_text=_('The English title for this section.') + ) + title_de = models.CharField( + max_length=256, + verbose_name=_('Title (de)'), + help_text=_('The German title for this section.') + ) + label_en = models.TextField( + verbose_name=_('Label (en)'), + help_text=_('The English label for this section (auto-generated).') + ) + label_de = models.TextField( + verbose_name=_('Label (de)'), + help_text=_('The German label for this section (auto-generated).') + ) class Meta: ordering = ('catalog__order', 'order') @@ -63,7 +137,17 @@ class Meta: verbose_name_plural = _('Sections') def __str__(self): - return self.label + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + self.label_en = self.build_label('en') + self.label_de = self.build_label('de') + + super(Section, self).save(*args, **kwargs) + + for subsection in self.subsections.all(): + subsection.save() @property def title(self): @@ -73,33 +157,65 @@ def title(self): def label(self): return self.trans('label') + def build_uri(self): + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/questions/%s/%s' % (self.catalog.key, self.key) -def post_save_section(sender, **kwargs): - instance = kwargs['instance'] - instance.label_en = instance.catalog.title_en + ' / ' + instance.title_en - instance.label_de = instance.catalog.title_de + ' / ' + instance.title_de - - post_save.disconnect(post_save_section, sender=sender) - instance.save() - post_save.connect(post_save_section, sender=sender) - - for subsection in instance.subsections.all(): - subsection.save() - -post_save.connect(post_save_section, sender=Section) + def build_label(self, lang): + return getattr(self.catalog, 'title_' + lang) + ' / ' + getattr(self, 'title_' + lang) @python_2_unicode_compatible class Subsection(Model, TranslationMixin): - section = models.ForeignKey(Section, related_name='subsections') - order = models.IntegerField(null=True) - - title_en = models.CharField(max_length=256) - title_de = models.CharField(max_length=256) - - label_de = models.TextField() - label_en = models.TextField() + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this subsection (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this subsection.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this subsection. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this subsection.') + ) + section = models.ForeignKey( + Section, related_name='subsections', + verbose_name=_('Section'), + help_text=_('The section this subsection belongs to.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this subsection in lists.') + ) + title_en = models.CharField( + max_length=256, + verbose_name=_('Title (en)'), + help_text=_('The English title for this subsection.') + ) + title_de = models.CharField( + max_length=256, + verbose_name=_('Title (de)'), + help_text=_('The German title for this subsection.') + ) + label_en = models.TextField( + verbose_name=_('Label (en)'), + help_text=_('The English label for this subsection (auto-generated).') + ) + label_de = models.TextField( + verbose_name=_('Label (de)'), + help_text=_('The German label for this subsection (auto-generated).') + ) class Meta: ordering = ('section__catalog__order', 'section__order', 'order') @@ -107,7 +223,17 @@ class Meta: verbose_name_plural = _('Subsections') def __str__(self): - return self.label + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + self.label_en = self.build_label('en') + self.label_de = self.build_label('de') + + super(Subsection, self).save(*args, **kwargs) + + for entity in self.entities.all(): + entity.save() @property def title(self): @@ -117,45 +243,89 @@ def title(self): def label(self): return self.trans('label') + def build_uri(self): + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + return prefix + '/questions/%s/%s/%s' % (self.section.catalog.key, self.section.key, self.key) -def post_save_subsection(sender, **kwargs): - instance = kwargs['instance'] - instance.label_en = instance.section.label_en + ' / ' + instance.title_en - instance.label_de = instance.section.label_de + ' / ' + instance.title_de - - post_save.disconnect(post_save_subsection, sender=sender) - instance.save() - post_save.connect(post_save_subsection, sender=sender) - - for entity in instance.entities.all(): - entity.save() - - -post_save.connect(post_save_subsection, sender=Subsection) + def build_label(self, lang): + return getattr(self.section, 'label_' + lang) + ' / ' + getattr(self, 'title_' + lang) class QuestionEntity(Model, TranslationMixin): objects = QuestionEntityManager() - attribute_entity = models.ForeignKey(AttributeEntity, blank=True, null=True, on_delete=models.SET_NULL, related_name='+') - - subsection = models.ForeignKey('Subsection', related_name='entities') - order = models.IntegerField(null=True) - - label_de = models.TextField() - label_en = models.TextField() - - help_en = models.TextField(null=True, blank=True) - help_de = models.TextField(null=True, blank=True) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this question/questionset (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this question/questionset.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this question/questionset. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this question/questionset.') + ) + attribute_entity = models.ForeignKey( + AttributeEntity, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', + verbose_name=_('Attribute entity'), + help_text=_('The attribute/entity this question/questionset belongs to.') + ) + subsection = models.ForeignKey( + Subsection, related_name='entities', + verbose_name=_('Subsection'), + help_text=_('The section this question/questionset belongs to.') + ) + order = models.IntegerField( + default=0, + verbose_name=_('Order'), + help_text=_('The position of this question/questionset in lists.') + ) + label_en = models.TextField( + verbose_name=_('Label (en)'), + help_text=_('The English label for this question/questionset (auto-generated).') + ) + label_de = models.TextField( + verbose_name=_('Label (de)'), + help_text=_('The German label for this question/questionset (auto-generated).') + ) + help_en = models.TextField( + null=True, blank=True, + verbose_name=_('Help (en)'), + help_text=_('The English help text for this question/questionset.') + ) + help_de = models.TextField( + null=True, blank=True, + verbose_name=_('Help (de)'), + help_text=_('The German help text for this question/questionset.') + ) class Meta: ordering = ('subsection__section__catalog__order', 'subsection__section__order', 'subsection__order', 'order') - verbose_name = _('QuestionEntity') - verbose_name_plural = _('QuestionEntities') + verbose_name = _('Question entity') + verbose_name_plural = _('Question entities') def __str__(self): - return self.label + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + self.label_en = self.build_label('en') + self.label_de = self.build_label('de') + + super(QuestionEntity, self).save(*args, **kwargs) + + for question in self.questions.all(): + question.save() @property def help(self): @@ -176,23 +346,33 @@ def is_collection(self): def is_set(self): return not hasattr(self, 'question') - -def post_save_question_entity(sender, **kwargs): - instance = kwargs['instance'] - - if instance.attribute_entity: - instance.label_en = instance.subsection.label_en + ' / ' + instance.attribute_entity.title - instance.label_de = instance.subsection.label_de + ' / ' + instance.attribute_entity.title - else: - instance.label_en = instance.subsection.label_en + ' / --' - instance.label_de = instance.subsection.label_de + ' / --' - - post_save.disconnect(post_save_question_entity, sender=sender) - instance.save() - post_save.connect(post_save_question_entity, sender=sender) - - -post_save.connect(post_save_question_entity, sender=QuestionEntity) + def build_uri(self): + prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX + + try: + question = Question.objects.get(pk=self.pk) + return prefix + '/questions/%s/%s/%s/%s/%s' % ( + self.subsection.section.catalog.key, + self.subsection.section.key, + self.subsection.key, + question.parent.key, + self.key + ) + except (Question.DoesNotExist, AttributeError): + # Question.DoesNotExist is raised if self is a questionset + # AttributeError is raised if question.parent is None + return prefix + '/questions/%s/%s/%s/%s' % ( + self.subsection.section.catalog.key, + self.subsection.section.key, + self.subsection.key, + self.key + ) + + def build_label(self, lang): + if self.attribute_entity: + return getattr(self.subsection, 'label_' + lang) + ' / ' + self.attribute_entity.key + else: + return getattr(self.subsection, 'label_' + lang) + ' / --' class Question(QuestionEntity): @@ -208,12 +388,24 @@ class Question(QuestionEntity): ('date', 'Date picker'), ) - parent = models.ForeignKey('QuestionEntity', blank=True, null=True, related_name='questions') - - text_en = models.TextField() - text_de = models.TextField() - - widget_type = models.CharField(max_length=12, choices=WIDGET_TYPE_CHOICES) + parent = models.ForeignKey( + QuestionEntity, blank=True, null=True, related_name='questions', + verbose_name=_('Parent'), + help_text=_('The question set this question belongs to.') + ) + text_en = models.TextField( + verbose_name=_('Text (en)'), + help_text=_('The English text for this question.') + ) + text_de = models.TextField( + verbose_name=_('Text (de)'), + help_text=_('The German text for this question.') + ) + widget_type = models.CharField( + max_length=12, choices=WIDGET_TYPE_CHOICES, + verbose_name=_('Widget type'), + help_text=_('Type of widget for this question.') + ) class Meta: verbose_name = _('Question') diff --git a/apps/questions/renderers.py b/apps/questions/renderers.py index 5c65df04e..a271ad56f 100644 --- a/apps/questions/renderers.py +++ b/apps/questions/renderers.py @@ -1,106 +1,95 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): + def render_document(self, xml, catalogs): + xml.startElement('catalogs', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) - media_type = 'application/xml' - format = 'xml' + for catalog in catalogs: + self.render_catalog(xml, catalog) - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('Catalogs', {}) - - for catalog in data: - self._catalog(xml, catalog) - - xml.endElement('Catalogs') + xml.endElement('catalogs') xml.endDocument() - return stream.getvalue() - def _catalog(self, xml, catalog): - xml.startElement('Catalog', {}) - self._text_element(xml, 'title', {}, catalog["title"]) - self._text_element(xml, 'order', {}, catalog["order"]) + def render_catalog(self, xml, catalog): + xml.startElement('catalog', {}) + self.render_text_element(xml, 'dc:uri', {}, catalog["uri"]) + self.render_text_element(xml, 'dc:comment', {}, catalog["comment"]) + self.render_text_element(xml, 'order', {}, catalog["order"]) + self.render_text_element(xml, 'title', {'lang': 'en'}, catalog["title_en"]) + self.render_text_element(xml, 'title', {'lang': 'de'}, catalog["title_de"]) if 'sections' in catalog and catalog['sections']: - xml.startElement('Sections', {}) - + xml.startElement('sections', {}) for section in catalog['sections']: - self._section(xml, section) + self.render_section(xml, section) + xml.endElement('sections') - xml.endElement('Sections') + xml.endElement('catalog') - xml.endElement('Catalog') - - def _section(self, xml, section): - xml.startElement('Section', {}) - self._text_element(xml, 'order', {}, section["order"]) - self._text_element(xml, 'title_en', {}, section["title_en"]) - self._text_element(xml, 'title_de', {}, section["title_de"]) + def render_section(self, xml, section): + xml.startElement('section', {}) + self.render_text_element(xml, 'dc:uri', {}, section["uri"]) + self.render_text_element(xml, 'dc:comment', {}, section["comment"]) + self.render_text_element(xml, 'order', {}, section["order"]) + self.render_text_element(xml, 'title', {'lang': 'en'}, section["title_en"]) + self.render_text_element(xml, 'title', {'lang': 'de'}, section["title_de"]) if 'subsections' in section and section['subsections']: - xml.startElement('Subsections', {}) - + xml.startElement('subsections', {}) for subsection in section['subsections']: - self._subsection(xml, subsection) + self.render_subsection(xml, subsection) + xml.endElement('subsections') - xml.endElement('Subsections') + xml.endElement('section') - xml.endElement('Section') - - def _subsection(self, xml, subsection): - xml.startElement('Subsection', {}) - self._text_element(xml, 'order', {}, subsection["order"]) - self._text_element(xml, 'title_en', {}, subsection["title_en"]) - self._text_element(xml, 'title_de', {}, subsection["title_de"]) + def render_subsection(self, xml, subsection): + xml.startElement('subsection', {}) + self.render_text_element(xml, 'dc:uri', {}, subsection["uri"]) + self.render_text_element(xml, 'dc:comment', {}, subsection["comment"]) + self.render_text_element(xml, 'order', {}, subsection["order"]) + self.render_text_element(xml, 'title', {'lang': 'en'}, subsection["title_en"]) + self.render_text_element(xml, 'title', {'lang': 'de'}, subsection["title_de"]) if 'entities' in subsection and subsection['entities']: - xml.startElement('QuestionEntities', {}) - + xml.startElement('entities', {}) for questionentity in subsection['entities']: if 'is_set' in questionentity and questionentity['is_set']: - self._questionset(xml, questionentity) + self.render_questionset(xml, questionentity) else: - self._question(xml, questionentity) - - xml.endElement('QuestionEntities') - - xml.endElement('Subsection') - - def _question(self, xml, question): - xml.startElement('Question', {}) - self._text_element(xml, 'text_en', {}, question["text_en"]) - self._text_element(xml, 'text_de', {}, question["text_de"]) - self._text_element(xml, 'attribute_entity', {}, question["attribute_entity"]['label']) - xml.endElement('Question') - - def _questionset(self, xml, questionset): - xml.startElement('QuestionSet', {}) - self._text_element(xml, 'order', {}, questionset["order"]) - self._text_element(xml, 'help_en', {}, questionset["help_en"]) - self._text_element(xml, 'help_de', {}, questionset["help_de"]) - xml.startElement('Questions', {}) - + self.render_question(xml, questionentity) + xml.endElement('entities') + + xml.endElement('subsection') + + def render_question(self, xml, question): + xml.startElement('question', {}) + self.render_text_element(xml, 'dc:uri', {}, question["uri"]) + self.render_text_element(xml, 'dc:comment', {}, question["comment"]) + self.render_text_element(xml, 'order', {}, question["order"]) + self.render_text_element(xml, 'text', {'lang': 'en'}, question["text_en"]) + self.render_text_element(xml, 'text', {'lang': 'de'}, question["text_de"]) + self.render_text_element(xml, 'help', {'lang': 'en'}, question["help_en"]) + self.render_text_element(xml, 'help', {'lang': 'de'}, question["help_de"]) + self.render_text_element(xml, 'widget_type', {}, question["widget_type"]) + self.render_text_element(xml, 'attribute_entity', {'dc:uri': question["attribute_entity"]}, None) + xml.endElement('question') + + def render_questionset(self, xml, questionset): + xml.startElement('questionset', {}) + self.render_text_element(xml, 'dc:uri', {}, questionset["uri"]) + self.render_text_element(xml, 'dc:comment', {}, questionset["comment"]) + self.render_text_element(xml, 'order', {}, questionset["order"]) + self.render_text_element(xml, 'help', {'lang': 'en'}, questionset["help_en"]) + self.render_text_element(xml, 'help', {'lang': 'de'}, questionset["help_de"]) + self.render_text_element(xml, 'attribute_entity', {'dc:uri': questionset["attribute_entity"]}, None) + + xml.startElement('questions', {}) for question in questionset['questions']: - self._question(xml, question) - - xml.endElement('Questions') - xml.endElement('QuestionSet') + self.render_question(xml, question) + xml.endElement('questions') - def _text_element(self, xml, tag, questionentity, text): - xml.startElement(tag, questionentity) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) + xml.endElement('questionset') diff --git a/apps/questions/serializers.py b/apps/questions/serializers.py index c08d02307..373690054 100644 --- a/apps/questions/serializers.py +++ b/apps/questions/serializers.py @@ -6,7 +6,7 @@ from apps.domain.models import AttributeEntity, Attribute -from .models import * +from .models import Catalog, Section, Subsection, QuestionEntity, Question class CatalogIndexSerializer(serializers.ModelSerializer): @@ -15,7 +15,7 @@ class Meta: model = Catalog fields = ( 'id', - 'label', + 'label' ) @@ -25,6 +25,9 @@ class Meta: model = Catalog fields = ( 'id', + 'uri_prefix', + 'key', + 'comment', 'order', 'title', 'title_en', @@ -49,6 +52,9 @@ class Meta: model = Section fields = ( 'id', + 'uri_prefix', + 'key', + 'comment', 'catalog', 'order', 'title', @@ -73,6 +79,9 @@ class Meta: model = Subsection fields = ( 'id', + 'uri_prefix', + 'key', + 'comment', 'section', 'order', 'title', @@ -97,6 +106,9 @@ class Meta: model = QuestionEntity fields = ( 'id', + 'uri_prefix', + 'key', + 'comment', 'subsection', 'attribute_entity', 'order', @@ -111,6 +123,9 @@ class Meta: model = Question fields = ( 'id', + 'uri_prefix', + 'key', + 'comment', 'subsection', 'parent', 'attribute_entity', @@ -271,25 +286,17 @@ def get_urls(self, obj): return urls -class ExportAttributeEntitySerializer(serializers.ModelSerializer): - - class Meta: - model = AttributeEntity - fields = ( - 'id', - 'label' - ) - - class ExportQuestionSerializer(serializers.ModelSerializer): - attribute_entity = ExportAttributeEntitySerializer() + attribute_entity = serializers.CharField(source='attribute_entity.uri') class Meta: model = Question fields = ( 'parent', 'attribute_entity', + 'uri', + 'comment', 'order', 'help_en', 'help_de', @@ -304,12 +311,15 @@ class ExportQuestionEntitySerializer(serializers.ModelSerializer): questions = ExportQuestionSerializer(many=True, read_only=True) text_en = serializers.CharField(source='question.text_en') text_de = serializers.CharField(source='question.text_de') + widget_type = serializers.CharField(source='question.widget_type') - attribute_entity = ExportAttributeEntitySerializer(read_only=True) + attribute_entity = serializers.CharField(source='attribute_entity.uri') class Meta: model = QuestionEntity fields = ( + 'uri', + 'comment', 'text_en', 'text_de', 'is_set', @@ -317,6 +327,7 @@ class Meta: 'order', 'help_en', 'help_de', + 'widget_type', 'questions' ) @@ -328,6 +339,8 @@ class ExportSubsectionSerializer(serializers.ModelSerializer): class Meta: model = Subsection fields = ( + 'uri', + 'comment', 'order', 'title_en', 'title_de', @@ -347,6 +360,8 @@ class ExportSectionSerializer(serializers.ModelSerializer): class Meta: model = Catalog fields = ( + 'uri', + 'comment', 'order', 'title', 'title_en', @@ -362,6 +377,8 @@ class ExportSerializer(serializers.ModelSerializer): class Meta: model = Catalog fields = ( + 'uri', + 'comment', 'order', 'title', 'title_en', diff --git a/apps/questions/templates/questions/catalogs_modal_form_catalogs.html b/apps/questions/templates/questions/catalogs_modal_form_catalogs.html index b89264aa6..8acfc93d0 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_catalogs.html +++ b/apps/questions/templates/questions/catalogs_modal_form_catalogs.html @@ -13,6 +13,33 @@

    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    - - - - - - - - - - - - - - - - + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    diff --git a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html index e206e69d3..9e9a713ba 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html +++ b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html @@ -13,47 +13,88 @@

    +
    +
    + + +
    +
    + + +
    +
    - - - - - - - - + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    diff --git a/apps/questions/templates/questions/catalogs_modal_form_sections.html b/apps/questions/templates/questions/catalogs_modal_form_sections.html index b93b78f45..7a71baaf5 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_sections.html +++ b/apps/questions/templates/questions/catalogs_modal_form_sections.html @@ -13,22 +13,55 @@

    +
    +
    + + +
    +
    + + +
    +
    - - + data-id="comment" + data-type="textarea" + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    - - + data-id="comment" + data-type="textarea" + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> +
    +
    + + +
    +
    + + +
    +
    [0-9]+)/export/(?P[a-z]+)/$', catalog_export, name='questions_catalog_export'), - + url(r'^export/xml/$', questions_catalog_export_xml, name='questions_catalog_export_xml'), + url(r'^catalogs/', catalogs, name='catalogs'), ] diff --git a/apps/questions/utils.py b/apps/questions/utils.py new file mode 100644 index 000000000..e15b9504a --- /dev/null +++ b/apps/questions/utils.py @@ -0,0 +1,145 @@ +from apps.domain.models import AttributeEntity + +from .models import Catalog, Section, Subsection, QuestionEntity, Question + + +def nstag(tag, nsmap): + tag_split = tag.split(':') + return '{%s}%s' % (nsmap[tag_split[0]], tag_split[1]) + + +def import_xml(catalogs_node): + + nsmap = catalogs_node.nsmap + + for catalog_node in catalogs_node.iterchildren(): + import_catalog(catalog_node, nsmap) + + +def import_catalog(catalog_node, nsmap): + catalog_uri = catalog_node[nstag('dc:uri', nsmap)].text + + try: + catalog = Catalog.objects.get(uri=catalog_uri) + except Catalog.DoesNotExist: + catalog = Catalog() + + catalog.uri_prefix = catalog_uri.split('/questions/')[0] + catalog.key = catalog_uri.split('/')[-1] + catalog.comment = catalog_node[nstag('dc:comment', nsmap)] + catalog.order = catalog_node['order'] + for element in catalog_node.title: + setattr(catalog, 'title_' + element.get('lang'), element) + + catalog.save() + + if hasattr(catalog_node, 'sections'): + for section_node in catalog_node.sections.iterchildren(): + import_section(section_node, nsmap, catalog=catalog) + + +def import_section(section_node, nsmap, catalog=None): + section_uri = section_node[nstag('dc:uri', nsmap)].text + + try: + section = Section.objects.get(uri=section_uri) + except Section.DoesNotExist: + section = Section() + + section.uri_prefix = section_uri.split('/questions/')[0] + section.key = section_uri.split('/')[-1] + section.comment = section_node[nstag('dc:comment', nsmap)] + section.catalog = catalog + section.order = section_node['order'] + for element in section_node.title: + setattr(section, 'title_' + element.get('lang'), element) + + section.save() + + if hasattr(section_node, 'subsections'): + for subsection_node in section_node.subsections.iterchildren(): + import_subsection(subsection_node, nsmap, section=section) + + +def import_subsection(subsection_node, nsmap, section=None): + subsection_uri = subsection_node[nstag('dc:uri', nsmap)].text + + try: + subsection = Subsection.objects.get(uri=subsection_uri) + except Subsection.DoesNotExist: + subsection = Subsection() + + subsection.uri_prefix = subsection_uri.split('/questions/')[0] + subsection.key = subsection_uri.split('/')[-1] + subsection.comment = subsection_node[nstag('dc:comment', nsmap)] + subsection.section = section + subsection.order = subsection_node['order'] + for element in subsection_node.title: + setattr(subsection, 'title_' + element.get('lang'), element) + + subsection.save() + + if hasattr(subsection_node, 'entities'): + for entity_node in subsection_node.entities.iterchildren(): + if entity_node.tag == 'questionset': + import_questionset(entity_node, nsmap, subsection=subsection) + else: + import_question(entity_node, nsmap, subsection=subsection) + + +def import_questionset(questionset_node, nsmap, subsection=None): + questionset_uri = questionset_node[nstag('dc:uri', nsmap)].text + + try: + questionset = QuestionEntity.objects.get(uri=questionset_uri) + except QuestionEntity.DoesNotExist: + questionset = QuestionEntity() + print ('create', questionset_uri) + + questionset.uri_prefix = questionset_uri.split('/questions/')[0] + questionset.key = questionset_uri.split('/')[-1] + questionset.comment = questionset_node[nstag('dc:comment', nsmap)] + questionset.subsection = subsection + questionset.order = questionset_node['order'] + for element in questionset_node['help']: + setattr(questionset, 'help_' + element.get('lang'), element.text) + try: + attribute_entity_uri = questionset_node['attribute_entity'].get(nstag('dc:uri', nsmap)) + questionset.attribute_entity = AttributeEntity.objects.get(uri=attribute_entity_uri) + except (AttributeError, AttributeEntity.DoesNotExist): + questionset.attribute_entity = None + + questionset.save() + + if hasattr(questionset_node, 'questions'): + for question_node in questionset_node.questions.iterchildren(): + import_question(question_node, nsmap, subsection=subsection, parent=questionset) + + +def import_question(question_node, nsmap, subsection=None, parent=None): + question_uri = question_node[nstag('dc:uri', nsmap)].text + + try: + question = Question.objects.get(uri=question_uri) + except Question.DoesNotExist: + question = Question() + print ('create', question_uri) + + question.uri_prefix = question_uri.split('/questions/')[0] + question.key = question_uri.split('/')[-1] + question.comment = question_node[nstag('dc:comment', nsmap)] + question.subsection = subsection + question.parent = parent + question.order = question_node['order'] + question.widget_type = question_node.widget_type + for element in question_node['text']: + setattr(question, 'text_' + element.get('lang'), element.text) + for element in question_node['help']: + setattr(question, 'help_' + element.get('lang'), element.text) + try: + attribute_entity_uri = question_node['attribute_entity'].get(nstag('dc:uri', nsmap)) + question.attribute_entity = AttributeEntity.objects.get(uri=attribute_entity_uri) + except (AttributeError, AttributeEntity.DoesNotExist): + question.attribute_entity = None + + question.save() diff --git a/apps/questions/views.py b/apps/questions/views.py index 4ce102a79..9ae0cc1c8 100644 --- a/apps/questions/views.py +++ b/apps/questions/views.py @@ -1,20 +1,26 @@ from django.conf import settings from django.http import HttpResponse -from django.shortcuts import render from django.contrib.admin.views.decorators import staff_member_required from django.shortcuts import render, get_object_or_404 -from rest_framework import viewsets, mixins, filters +from rest_framework import viewsets, mixins from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated from rest_framework.decorators import list_route, detail_route from rest_framework.response import Response from apps.core.serializers import ChoicesSerializer from apps.core.utils import render_to_format +from apps.domain.models import AttributeEntity, Attribute -from .models import * -from .serializers import * -from .renderers import * +from .models import Catalog, Section, Subsection, QuestionEntity, Question +from .serializers import CatalogSerializer, CatalogIndexSerializer, CatalogNestedSerializer +from .serializers import SectionSerializer, SectionIndexSerializer +from .serializers import SubsectionSerializer, SubsectionIndexSerializer +from .serializers import QuestionSetSerializer, QuestionSetIndexSerializer +from .serializers import QuestionSerializer +from .serializers import AttributeEntitySerializer, AttributeSerializer +from .serializers import ExportSerializer +from .renderers import XMLRenderer @staff_member_required @@ -37,7 +43,10 @@ def catalog_export(request, catalog_id, format): def questions_catalog_export_xml(request): queryset = Catalog.objects.all() serializer = ExportSerializer(queryset, many=True) - return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + + response = HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + response['Content-Disposition'] = 'filename="questions.xml"' + return response class CatalogViewSet(viewsets.ModelViewSet): diff --git a/rdmo/settings/base.py b/rdmo/settings/base.py index a5c7b8fd1..7d097e8b0 100644 --- a/rdmo/settings/base.py +++ b/rdmo/settings/base.py @@ -170,6 +170,8 @@ ('tex', _('LaTeX')) )) +DEFAULT_URI_PREFIX = 'http://example.com/terms' + # try override with local configuration try: from .local import * From 920e39f6a55708f84bd55649c7b17942e0a80253 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 27 Jan 2017 16:22:07 +0100 Subject: [PATCH 12/51] refactor more --- apps/conditions/models.py | 21 +- apps/conditions/renderers.py | 9 +- apps/conditions/serializers.py | 2 +- .../templates/conditions/conditions.html | 2 +- .../conditions_modal_form_conditions.html | 32 +- apps/conditions/urls_api.py | 7 +- apps/conditions/utils.py | 14 +- apps/conditions/views.py | 9 +- apps/core/static/core/css/base.scss | 3 - apps/core/utils.py | 9 + apps/domain/migrations/0027_meta.py | 19 + apps/domain/models.py | 41 +- apps/domain/renderers.py | 30 +- apps/domain/serializers.py | 2 +- .../domain/domain_modal_form_attributes.html | 84 +-- .../domain/domain_modal_form_entities.html | 46 +- apps/domain/urls.py | 2 +- apps/domain/urls_api.py | 13 +- apps/domain/utils.py | 58 +- apps/domain/views.py | 9 +- apps/options/migrations/0007_meta.py | 23 + apps/options/models.py | 49 +- apps/options/renderers.py | 4 - apps/options/serializers.py | 4 +- apps/options/templates/options/options.html | 4 +- .../options/options_modal_form_options.html | 109 ++-- .../options_modal_form_optionsets.html | 32 +- apps/options/urls_api.py | 6 +- apps/options/utils.py | 15 +- apps/options/views.py | 10 +- apps/projects/serializers.py | 10 +- apps/questions/migrations/0009_meta.py | 40 ++ apps/questions/models.py | 18 +- .../catalogs_modal_form_catalogs.html | 68 +- .../catalogs_modal_form_questions.html | 217 +++---- .../catalogs_modal_form_questionsets.html | 135 ++-- .../catalogs_modal_form_sections.html | 108 ++-- .../catalogs_modal_form_subsections.html | 108 ++-- apps/questions/urls_api.py | 12 +- apps/questions/utils.py | 32 +- apps/questions/views.py | 22 +- fixtures/conditions.json | 2 +- fixtures/domain.json | 2 +- fixtures/options.json | 132 +--- fixtures/questions.json | 589 +----------------- 45 files changed, 783 insertions(+), 1380 deletions(-) create mode 100644 apps/domain/migrations/0027_meta.py create mode 100644 apps/options/migrations/0007_meta.py create mode 100644 apps/questions/migrations/0009_meta.py diff --git a/apps/conditions/models.py b/apps/conditions/models.py index 933bd95e3..1e2d4ce9f 100644 --- a/apps/conditions/models.py +++ b/apps/conditions/models.py @@ -1,11 +1,11 @@ from __future__ import unicode_literals -from django.conf import settings from django.db import models -from django.core.validators import RegexValidator from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ +from apps.core.utils import get_uri_prefix + @python_2_unicode_compatible class Condition(models.Model): @@ -31,6 +31,11 @@ class Condition(models.Model): (RELATION_NOT_EMPTY, 'is not empty'), ) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this option set (auto-generated).') + ) uri_prefix = models.URLField( max_length=256, blank=True, null=True, verbose_name=_('URI Prefix'), @@ -66,11 +71,6 @@ class Condition(models.Model): verbose_name=_('Target (Option)'), help_text=_('Option this condition is checking against.') ) - uri = models.URLField( - max_length=640, blank=True, null=True, - verbose_name=_('URI'), - help_text=_('The Uniform Resource Identifier of this option set (auto-generated).') - ) class Meta: ordering = ('uri', ) @@ -80,6 +80,10 @@ class Meta: def __str__(self): return self.uri or self.key + @property + def label(self): + return self.key + @property def source_label(self): return self.source.label @@ -100,8 +104,7 @@ def save(self, *args, **kwargs): super(Condition, self).save(*args, **kwargs) def build_uri(self): - prefix = self.uri_prefix.rstrip('/') if self.uri_prefix else settings.DEFAULT_URI_PREFIX - return prefix + '/conditions/' + self.key + return get_uri_prefix(self) + '/conditions/' + self.key def resolve(self, project, snapshot=None): # get the values for the given project, the given snapshot and the condition's attribute diff --git a/apps/conditions/renderers.py b/apps/conditions/renderers.py index 413be833d..3374af8fe 100644 --- a/apps/conditions/renderers.py +++ b/apps/conditions/renderers.py @@ -17,11 +17,8 @@ def render_condition(self, xml, condition): xml.startElement('condition', {}) self.render_text_element(xml, 'dc:uri', {}, condition["uri"]) self.render_text_element(xml, 'dc:comment', {}, condition["comment"]) - if condition["source"]: - self.render_text_element(xml, 'source', {'dc:uri': condition["source"]}, None) + self.render_text_element(xml, 'source', {'dc:uri': condition["source"]}, None) self.render_text_element(xml, 'relation', {}, condition["relation"]) - if condition["target_text"]: - self.render_text_element(xml, 'target_text', {}, condition["target_text"]) - if condition["target_option"]: - self.render_text_element(xml, 'target_option', {'dc:uri': condition["target_option"]}, None) + self.render_text_element(xml, 'target_text', {}, condition["target_text"]) + self.render_text_element(xml, 'target_option', {'dc:uri': condition["target_option"]}, None) xml.endElement('condition') diff --git a/apps/conditions/serializers.py b/apps/conditions/serializers.py index e9b785359..4e042f287 100644 --- a/apps/conditions/serializers.py +++ b/apps/conditions/serializers.py @@ -12,7 +12,7 @@ class Meta: model = Condition fields = ( 'id', - 'uri', + 'label', 'comment', 'source_label', 'relation_label', diff --git a/apps/conditions/templates/conditions/conditions.html b/apps/conditions/templates/conditions/conditions.html index 3cf8c2284..cb932ab77 100644 --- a/apps/conditions/templates/conditions/conditions.html +++ b/apps/conditions/templates/conditions/conditions.html @@ -80,7 +80,7 @@

    {% trans 'Conditions' %}

    {% trans 'Condition' %} - {$ condition.uri $} + {$ condition.label $}
      diff --git a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html index da06b64ec..2cb3fcdf0 100644 --- a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html +++ b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html @@ -13,20 +13,24 @@

      - - - - +
      + + + + +
      - + + + + +
      + + +
      + + + + +
      + data-options-label="label" data-options-null="1"> - - - - - - data-model="service.values.is_collection" data-errors="service.errors.is_collection"> - - - -
      diff --git a/apps/domain/templates/domain/domain_modal_form_entities.html b/apps/domain/templates/domain/domain_modal_form_entities.html index 876d42988..3550e6786 100644 --- a/apps/domain/templates/domain/domain_modal_form_entities.html +++ b/apps/domain/templates/domain/domain_modal_form_entities.html @@ -13,6 +13,31 @@

      +
      + + + + +
      + + data-options-label="label" data-options-null="1"> - - - - - - {% trans 'Options' %}

      {% trans 'Option set' %} - {$ optionset.uri $} + {$ optionset.label $}
        @@ -119,8 +119,8 @@

        {% trans 'Options' %}

        {% trans 'Option' %} + {$ option.label $} {$ option.text $} - {$ option.uri $}
      diff --git a/apps/options/templates/options/options_modal_form_options.html b/apps/options/templates/options/options_modal_form_options.html index d139f98c9..12012a97d 100644 --- a/apps/options/templates/options/options_modal_form_options.html +++ b/apps/options/templates/options/options_modal_form_options.html @@ -13,20 +13,24 @@

      - - - - +
      + + + + +
      data-model="service.values.comment" data-errors="service.errors.comment"> - - - - - - - - - - +
      + + + + +
      +
      + + + + +
      - - - - +
      + + + + +
      -
      -
      - - -
      -
      - - -
      +
      + + + +
      data-model="service.values.order" data-errors="service.errors.order"> - - - - +
      + + + + +
      diff --git a/apps/questions/templates/questions/catalogs_modal_form_questions.html b/apps/questions/templates/questions/catalogs_modal_form_questions.html index 439fe0c5e..989e50a18 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_questions.html +++ b/apps/questions/templates/questions/catalogs_modal_form_questions.html @@ -13,25 +13,23 @@

      -
      -
      - - -
      -
      - - -
      +
      + + + +
      data-model="service.values.comment" data-errors="service.errors.comment"> -
      -
      - - -
      -
      - - -
      -
      - - -
      +
      + + + + + +
      -
      -
      - - -
      -
      - - -
      +
      + + + +
      -
      -
      - - -
      -
      - - -
      +
      + + + +
      -
      -
      - - -
      -
      - - -
      +
      + + + +
      diff --git a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html index 9e9a713ba..df6f9cd95 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html +++ b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html @@ -13,25 +13,23 @@

      -
      -
      - - -
      -
      - - -
      +
      + + + +
      data-errors="service.errors.comment">
      -
      - - -
      -
      - - -
      -
      - - -
      + + + + + +
      -
      -
      - - -
      -
      - - -
      +
      + + + +
      diff --git a/apps/questions/templates/questions/catalogs_modal_form_sections.html b/apps/questions/templates/questions/catalogs_modal_form_sections.html index 7a71baaf5..ea67db5e3 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_sections.html +++ b/apps/questions/templates/questions/catalogs_modal_form_sections.html @@ -13,25 +13,23 @@

      -
      -
      - - -
      -
      - - -
      +
      + + + +
      data-model="service.values.comment" data-errors="service.errors.comment"> -
      -
      - - -
      -
      - - -
      +
      + + + + +
      +
      + + + +
      - - - -
      diff --git a/apps/questions/templates/questions/catalogs_modal_form_subsections.html b/apps/questions/templates/questions/catalogs_modal_form_subsections.html index b4d8f4c1a..d0cd568c7 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_subsections.html +++ b/apps/questions/templates/questions/catalogs_modal_form_subsections.html @@ -13,25 +13,23 @@

      -
      -
      - - -
      -
      - - -
      +
      + + + +
      data-model="service.values.comment" data-errors="service.errors.comment"> -
      -
      - - -
      -
      - - -
      +
      + + + + +
      +
      + + + +
      - - - -
      diff --git a/apps/questions/urls_api.py b/apps/questions/urls_api.py index 511eb87c5..01b2ac009 100644 --- a/apps/questions/urls_api.py +++ b/apps/questions/urls_api.py @@ -2,7 +2,17 @@ from rest_framework import routers -from .views import * +from .views import ( + CatalogViewSet, + SectionViewSet, + SubsectionViewSet, + QuestionSetViewSet, + QuestionViewSet, + AttributeEntityViewSet, + AttributeViewSet, + WidgetTypeViewSet +) + router = routers.DefaultRouter() router.register(r'catalogs', CatalogViewSet, base_name='catalog') diff --git a/apps/questions/utils.py b/apps/questions/utils.py index e15b9504a..cb666cc74 100644 --- a/apps/questions/utils.py +++ b/apps/questions/utils.py @@ -1,13 +1,9 @@ +from apps.core.utils import get_ns_tag from apps.domain.models import AttributeEntity from .models import Catalog, Section, Subsection, QuestionEntity, Question -def nstag(tag, nsmap): - tag_split = tag.split(':') - return '{%s}%s' % (nsmap[tag_split[0]], tag_split[1]) - - def import_xml(catalogs_node): nsmap = catalogs_node.nsmap @@ -17,7 +13,7 @@ def import_xml(catalogs_node): def import_catalog(catalog_node, nsmap): - catalog_uri = catalog_node[nstag('dc:uri', nsmap)].text + catalog_uri = catalog_node[get_ns_tag('dc:uri', nsmap)].text try: catalog = Catalog.objects.get(uri=catalog_uri) @@ -26,7 +22,7 @@ def import_catalog(catalog_node, nsmap): catalog.uri_prefix = catalog_uri.split('/questions/')[0] catalog.key = catalog_uri.split('/')[-1] - catalog.comment = catalog_node[nstag('dc:comment', nsmap)] + catalog.comment = catalog_node[get_ns_tag('dc:comment', nsmap)] catalog.order = catalog_node['order'] for element in catalog_node.title: setattr(catalog, 'title_' + element.get('lang'), element) @@ -39,7 +35,7 @@ def import_catalog(catalog_node, nsmap): def import_section(section_node, nsmap, catalog=None): - section_uri = section_node[nstag('dc:uri', nsmap)].text + section_uri = section_node[get_ns_tag('dc:uri', nsmap)].text try: section = Section.objects.get(uri=section_uri) @@ -48,7 +44,7 @@ def import_section(section_node, nsmap, catalog=None): section.uri_prefix = section_uri.split('/questions/')[0] section.key = section_uri.split('/')[-1] - section.comment = section_node[nstag('dc:comment', nsmap)] + section.comment = section_node[get_ns_tag('dc:comment', nsmap)] section.catalog = catalog section.order = section_node['order'] for element in section_node.title: @@ -62,7 +58,7 @@ def import_section(section_node, nsmap, catalog=None): def import_subsection(subsection_node, nsmap, section=None): - subsection_uri = subsection_node[nstag('dc:uri', nsmap)].text + subsection_uri = subsection_node[get_ns_tag('dc:uri', nsmap)].text try: subsection = Subsection.objects.get(uri=subsection_uri) @@ -71,7 +67,7 @@ def import_subsection(subsection_node, nsmap, section=None): subsection.uri_prefix = subsection_uri.split('/questions/')[0] subsection.key = subsection_uri.split('/')[-1] - subsection.comment = subsection_node[nstag('dc:comment', nsmap)] + subsection.comment = subsection_node[get_ns_tag('dc:comment', nsmap)] subsection.section = section subsection.order = subsection_node['order'] for element in subsection_node.title: @@ -88,23 +84,22 @@ def import_subsection(subsection_node, nsmap, section=None): def import_questionset(questionset_node, nsmap, subsection=None): - questionset_uri = questionset_node[nstag('dc:uri', nsmap)].text + questionset_uri = questionset_node[get_ns_tag('dc:uri', nsmap)].text try: questionset = QuestionEntity.objects.get(uri=questionset_uri) except QuestionEntity.DoesNotExist: questionset = QuestionEntity() - print ('create', questionset_uri) questionset.uri_prefix = questionset_uri.split('/questions/')[0] questionset.key = questionset_uri.split('/')[-1] - questionset.comment = questionset_node[nstag('dc:comment', nsmap)] + questionset.comment = questionset_node[get_ns_tag('dc:comment', nsmap)] questionset.subsection = subsection questionset.order = questionset_node['order'] for element in questionset_node['help']: setattr(questionset, 'help_' + element.get('lang'), element.text) try: - attribute_entity_uri = questionset_node['attribute_entity'].get(nstag('dc:uri', nsmap)) + attribute_entity_uri = questionset_node['attribute_entity'].get(get_ns_tag('dc:uri', nsmap)) questionset.attribute_entity = AttributeEntity.objects.get(uri=attribute_entity_uri) except (AttributeError, AttributeEntity.DoesNotExist): questionset.attribute_entity = None @@ -117,17 +112,16 @@ def import_questionset(questionset_node, nsmap, subsection=None): def import_question(question_node, nsmap, subsection=None, parent=None): - question_uri = question_node[nstag('dc:uri', nsmap)].text + question_uri = question_node[get_ns_tag('dc:uri', nsmap)].text try: question = Question.objects.get(uri=question_uri) except Question.DoesNotExist: question = Question() - print ('create', question_uri) question.uri_prefix = question_uri.split('/questions/')[0] question.key = question_uri.split('/')[-1] - question.comment = question_node[nstag('dc:comment', nsmap)] + question.comment = question_node[get_ns_tag('dc:comment', nsmap)] question.subsection = subsection question.parent = parent question.order = question_node['order'] @@ -137,7 +131,7 @@ def import_question(question_node, nsmap, subsection=None, parent=None): for element in question_node['help']: setattr(question, 'help_' + element.get('lang'), element.text) try: - attribute_entity_uri = question_node['attribute_entity'].get(nstag('dc:uri', nsmap)) + attribute_entity_uri = question_node['attribute_entity'].get(get_ns_tag('dc:uri', nsmap)) question.attribute_entity = AttributeEntity.objects.get(uri=attribute_entity_uri) except (AttributeError, AttributeEntity.DoesNotExist): question.attribute_entity = None diff --git a/apps/questions/views.py b/apps/questions/views.py index 9ae0cc1c8..af3c5db5e 100644 --- a/apps/questions/views.py +++ b/apps/questions/views.py @@ -13,13 +13,21 @@ from apps.domain.models import AttributeEntity, Attribute from .models import Catalog, Section, Subsection, QuestionEntity, Question -from .serializers import CatalogSerializer, CatalogIndexSerializer, CatalogNestedSerializer -from .serializers import SectionSerializer, SectionIndexSerializer -from .serializers import SubsectionSerializer, SubsectionIndexSerializer -from .serializers import QuestionSetSerializer, QuestionSetIndexSerializer -from .serializers import QuestionSerializer -from .serializers import AttributeEntitySerializer, AttributeSerializer -from .serializers import ExportSerializer +from .serializers import ( + CatalogSerializer, + CatalogIndexSerializer, + CatalogNestedSerializer, + SectionSerializer, + SectionIndexSerializer, + SubsectionSerializer, + SubsectionIndexSerializer, + QuestionSetSerializer, + QuestionSetIndexSerializer, + QuestionSerializer, + AttributeEntitySerializer, + AttributeSerializer, + ExportSerializer +) from .renderers import XMLRenderer diff --git a/fixtures/conditions.json b/fixtures/conditions.json index d4f35981f..58d858cb4 100644 --- a/fixtures/conditions.json +++ b/fixtures/conditions.json @@ -1 +1 @@ -[{"model": "conditions.condition", "pk": 1, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_equal", "comment": null, "source": 25, "relation": "eq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_equal"}}, {"model": "conditions.condition", "pk": 2, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_equal", "comment": null, "source": 25, "relation": "neq", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_equal"}}, {"model": "conditions.condition", "pk": 3, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_contains", "comment": null, "source": 25, "relation": "contains", "target_text": "test", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_contains"}}, {"model": "conditions.condition", "pk": 4, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than", "comment": null, "source": 25, "relation": "gt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than"}}, {"model": "conditions.condition", "pk": 5, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than_equal", "comment": null, "source": 25, "relation": "gte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_greater_than_equal"}}, {"model": "conditions.condition", "pk": 6, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than", "comment": null, "source": 25, "relation": "lt", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than"}}, {"model": "conditions.condition", "pk": 7, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than_equal", "comment": null, "source": 25, "relation": "lte", "target_text": "0", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_lesser_than_equal"}}, {"model": "conditions.condition", "pk": 8, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_empty", "comment": null, "source": 25, "relation": "empty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_empty"}}, {"model": "conditions.condition", "pk": 9, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_empty", "comment": null, "source": 25, "relation": "notempty", "target_text": null, "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/text_not_empty"}}, {"model": "conditions.condition", "pk": 10, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_equal", "comment": "", "source": 26, "relation": "eq", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_equal"}}, {"model": "conditions.condition", "pk": 11, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_equal", "comment": "", "source": 26, "relation": "neq", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_equal"}}, {"model": "conditions.condition", "pk": 12, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_contains", "comment": "", "source": 26, "relation": "contains", "target_text": "", "target_option": 1, "uri": "https://rdmorganiser.github.io/elements/conditions/options_contains"}}, {"model": "conditions.condition", "pk": 13, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_empty", "comment": "", "source": 26, "relation": "empty", "target_text": "", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_empty"}}, {"model": "conditions.condition", "pk": 14, "fields": {"uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_empty", "comment": "", "source": 26, "relation": "notempty", "target_text": "", "target_option": null, "uri": "https://rdmorganiser.github.io/elements/conditions/options_not_empty"}}] \ No newline at end of file +[{"model": "conditions.condition", "pk": 1, "fields": {"uri": "http://example.com/terms/conditions/text_equal", "uri_prefix": "", "key": "text_equal", "comment": null, "source": 25, "relation": "eq", "target_text": "test", "target_option": null}}, {"model": "conditions.condition", "pk": 2, "fields": {"uri": "http://example.com/terms/conditions/text_not_equal", "uri_prefix": "", "key": "text_not_equal", "comment": null, "source": 25, "relation": "neq", "target_text": "test", "target_option": null}}, {"model": "conditions.condition", "pk": 3, "fields": {"uri": "http://example.com/terms/conditions/text_contains", "uri_prefix": "", "key": "text_contains", "comment": null, "source": 25, "relation": "contains", "target_text": "test", "target_option": null}}, {"model": "conditions.condition", "pk": 4, "fields": {"uri": "http://example.com/terms/conditions/text_greater_than", "uri_prefix": "", "key": "text_greater_than", "comment": null, "source": 25, "relation": "gt", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 5, "fields": {"uri": "http://example.com/terms/conditions/text_greater_than_equal", "uri_prefix": "", "key": "text_greater_than_equal", "comment": null, "source": 25, "relation": "gte", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 6, "fields": {"uri": "http://example.com/terms/conditions/text_lesser_than", "uri_prefix": "", "key": "text_lesser_than", "comment": null, "source": 25, "relation": "lt", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 7, "fields": {"uri": "http://example.com/terms/conditions/text_lesser_than_equal", "uri_prefix": "", "key": "text_lesser_than_equal", "comment": null, "source": 25, "relation": "lte", "target_text": "0", "target_option": null}}, {"model": "conditions.condition", "pk": 8, "fields": {"uri": "http://example.com/terms/conditions/text_empty", "uri_prefix": "", "key": "text_empty", "comment": null, "source": 25, "relation": "empty", "target_text": null, "target_option": null}}, {"model": "conditions.condition", "pk": 9, "fields": {"uri": "http://example.com/terms/conditions/text_not_empty", "uri_prefix": "", "key": "text_not_empty", "comment": null, "source": 25, "relation": "notempty", "target_text": null, "target_option": null}}, {"model": "conditions.condition", "pk": 10, "fields": {"uri": "http://example.com/terms/conditions/options_equal", "uri_prefix": "", "key": "options_equal", "comment": "", "source": 26, "relation": "eq", "target_text": "", "target_option": 1}}, {"model": "conditions.condition", "pk": 11, "fields": {"uri": "http://example.com/terms/conditions/options_not_equal", "uri_prefix": "", "key": "options_not_equal", "comment": "", "source": 26, "relation": "neq", "target_text": "", "target_option": 1}}, {"model": "conditions.condition", "pk": 12, "fields": {"uri": "http://example.com/terms/conditions/options_contains", "uri_prefix": "", "key": "options_contains", "comment": "", "source": 26, "relation": "contains", "target_text": "", "target_option": 1}}, {"model": "conditions.condition", "pk": 13, "fields": {"uri": "http://example.com/terms/conditions/options_empty", "uri_prefix": "", "key": "options_empty", "comment": "", "source": 26, "relation": "empty", "target_text": "", "target_option": null}}, {"model": "conditions.condition", "pk": 14, "fields": {"uri": "http://example.com/terms/conditions/options_not_empty", "uri_prefix": "", "key": "options_not_empty", "comment": "", "source": 26, "relation": "notempty", "target_text": "", "target_option": null}}] \ No newline at end of file diff --git a/fixtures/domain.json b/fixtures/domain.json index c75363103..2eca36a87 100644 --- a/fixtures/domain.json +++ b/fixtures/domain.json @@ -1 +1 @@ -[{"model": "domain.attributeentity", "pk": 1, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "individual", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/individual", "label": "individual", "lft": 1, "rght": 22, "tree_id": 3, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 2, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "collection", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/collection", "label": "collection", "lft": 1, "rght": 24, "tree_id": 1, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 3, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/text", "label": "individual/text", "lft": 16, "rght": 17, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 4, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/textarea", "label": "individual/textarea", "lft": 18, "rght": 19, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 5, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "integer", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/integer", "label": "individual/integer", "lft": 8, "rght": 9, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 6, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "float", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/float", "label": "individual/float", "lft": 6, "rght": 7, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 7, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "range", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/range", "label": "individual/range", "lft": 12, "rght": 13, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 8, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "bool", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/bool", "label": "individual/bool", "lft": 2, "rght": 3, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 9, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "datetime", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/datetime", "label": "individual/datetime", "lft": 4, "rght": 5, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 10, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "url", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/url", "label": "individual/url", "lft": 20, "rght": 21, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 11, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "radio", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/radio", "label": "individual/radio", "lft": 10, "rght": 11, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 12, "fields": {"parent": 1, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "select", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/individual/select", "label": "individual/select", "lft": 14, "rght": 15, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 13, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "bool", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/bool", "label": "collection/bool", "lft": 2, "rght": 3, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 14, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "checkbox", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/checkbox", "label": "collection/checkbox", "lft": 4, "rght": 5, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 15, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "radio", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/radio", "label": "collection/radio", "lft": 12, "rght": 13, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 16, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "datetime", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/datetime", "label": "collection/datetime", "lft": 6, "rght": 7, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 17, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "float", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/float", "label": "collection/float", "lft": 8, "rght": 9, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 18, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "integer", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/integer", "label": "collection/integer", "lft": 10, "rght": 11, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 19, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "range", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/range", "label": "collection/range", "lft": 14, "rght": 15, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 20, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "select", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/select", "label": "collection/select", "lft": 16, "rght": 17, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 21, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/text", "label": "collection/text", "lft": 18, "rght": 19, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 22, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/textarea", "label": "collection/textarea", "lft": 20, "rght": 21, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 23, "fields": {"parent": 2, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "url", "comment": null, "is_collection": true, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/collection/url", "label": "collection/url", "lft": 22, "rght": 23, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 24, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "conditions", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions", "label": "conditions", "lft": 1, "rght": 38, "tree_id": 2, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 25, "fields": {"parent": 28, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source/text", "label": "conditions/source/text", "lft": 5, "rght": 6, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 26, "fields": {"parent": 28, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source/options", "label": "conditions/source/options", "lft": 3, "rght": 4, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 27, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_equal", "label": "conditions/attribute/text_equal", "lft": 23, "rght": 24, "tree_id": 2, "level": 2, "conditions": [1]}}, {"model": "domain.attributeentity", "pk": 28, "fields": {"parent": 24, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "source", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/source", "label": "conditions/source", "lft": 2, "rght": 7, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 29, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_not_equal", "label": "conditions/attribute/text_not_equal", "lft": 35, "rght": 36, "tree_id": 2, "level": 2, "conditions": [2]}}, {"model": "domain.attributeentity", "pk": 30, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_contains", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_contains", "label": "conditions/attribute/options_contains", "lft": 9, "rght": 10, "tree_id": 2, "level": 2, "conditions": [12]}}, {"model": "domain.attributeentity", "pk": 31, "fields": {"parent": 24, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "attribute", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute", "label": "conditions/attribute", "lft": 8, "rght": 37, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 32, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_empty", "label": "conditions/attribute/options_empty", "lft": 11, "rght": 12, "tree_id": 2, "level": 2, "conditions": [13]}}, {"model": "domain.attributeentity", "pk": 33, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_equal", "label": "conditions/attribute/options_equal", "lft": 13, "rght": 14, "tree_id": 2, "level": 2, "conditions": [10]}}, {"model": "domain.attributeentity", "pk": 34, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_not_empty", "label": "conditions/attribute/options_not_empty", "lft": 15, "rght": 16, "tree_id": 2, "level": 2, "conditions": [14]}}, {"model": "domain.attributeentity", "pk": 35, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "options_not_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/options_not_equal", "label": "conditions/attribute/options_not_equal", "lft": 17, "rght": 18, "tree_id": 2, "level": 2, "conditions": [11]}}, {"model": "domain.attributeentity", "pk": 36, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_contains", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_contains", "label": "conditions/attribute/text_contains", "lft": 19, "rght": 20, "tree_id": 2, "level": 2, "conditions": [3]}}, {"model": "domain.attributeentity", "pk": 37, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_empty", "label": "conditions/attribute/text_empty", "lft": 21, "rght": 22, "tree_id": 2, "level": 2, "conditions": [8]}}, {"model": "domain.attributeentity", "pk": 38, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_greater_than", "label": "conditions/attribute/text_greater_than", "lft": 25, "rght": 26, "tree_id": 2, "level": 2, "conditions": [4]}}, {"model": "domain.attributeentity", "pk": 39, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_greater_than_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_greater_than_equal", "label": "conditions/attribute/text_greater_than_equal", "lft": 27, "rght": 28, "tree_id": 2, "level": 2, "conditions": [5]}}, {"model": "domain.attributeentity", "pk": 40, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_lesser_than", "label": "conditions/attribute/text_lesser_than", "lft": 29, "rght": 30, "tree_id": 2, "level": 2, "conditions": [6]}}, {"model": "domain.attributeentity", "pk": 41, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_lesser_than_equal", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_lesser_than_equal", "label": "conditions/attribute/text_lesser_than_equal", "lft": 31, "rght": 32, "tree_id": 2, "level": 2, "conditions": [7]}}, {"model": "domain.attributeentity", "pk": 42, "fields": {"parent": 31, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text_not_empty", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/conditions/attribute/text_not_empty", "label": "conditions/attribute/text_not_empty", "lft": 33, "rght": 34, "tree_id": 2, "level": 2, "conditions": [9]}}, {"model": "domain.attributeentity", "pk": 43, "fields": {"parent": null, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "set", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set", "label": "set", "lft": 1, "rght": 16, "tree_id": 4, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 44, "fields": {"parent": 43, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "individual", "comment": null, "is_collection": false, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual", "label": "set/individual", "lft": 10, "rght": 15, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 45, "fields": {"parent": 43, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "collection", "comment": null, "is_collection": true, "is_attribute": false, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection", "label": "set/collection", "lft": 2, "rght": 9, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 46, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "id", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/id", "label": "set/collection/id", "lft": 3, "rght": 4, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 47, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/text", "label": "set/collection/text", "lft": 5, "rght": 6, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 48, "fields": {"parent": 45, "parent_collection": 45, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/collection/textarea", "label": "set/collection/textarea", "lft": 7, "rght": 8, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 49, "fields": {"parent": 44, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "text", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual/text", "label": "set/individual/text", "lft": 11, "rght": 12, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 50, "fields": {"parent": 44, "parent_collection": null, "uri_prefix": "https://rdmorganiser.github.io/elements", "key": "textarea", "comment": null, "is_collection": false, "is_attribute": true, "uri": "https://rdmorganiser.github.io/elements/domain/set/individual/textarea", "label": "set/individual/textarea", "lft": 13, "rght": 14, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attribute", "pk": 13, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 14, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 16, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 17, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 18, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 15, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 19, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 20, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 21, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 22, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 23, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 30, "fields": {"value_type": "text", "unit": null, "conditions": [12], "optionsets": []}}, {"model": "domain.attribute", "pk": 32, "fields": {"value_type": "text", "unit": null, "conditions": [13], "optionsets": []}}, {"model": "domain.attribute", "pk": 33, "fields": {"value_type": "text", "unit": null, "conditions": [10], "optionsets": []}}, {"model": "domain.attribute", "pk": 34, "fields": {"value_type": "text", "unit": null, "conditions": [14], "optionsets": []}}, {"model": "domain.attribute", "pk": 35, "fields": {"value_type": "text", "unit": null, "conditions": [11], "optionsets": []}}, {"model": "domain.attribute", "pk": 36, "fields": {"value_type": "text", "unit": null, "conditions": [3], "optionsets": []}}, {"model": "domain.attribute", "pk": 37, "fields": {"value_type": "text", "unit": null, "conditions": [8], "optionsets": []}}, {"model": "domain.attribute", "pk": 27, "fields": {"value_type": "text", "unit": null, "conditions": [1], "optionsets": []}}, {"model": "domain.attribute", "pk": 38, "fields": {"value_type": "text", "unit": null, "conditions": [4], "optionsets": []}}, {"model": "domain.attribute", "pk": 39, "fields": {"value_type": "text", "unit": null, "conditions": [5], "optionsets": []}}, {"model": "domain.attribute", "pk": 40, "fields": {"value_type": "text", "unit": null, "conditions": [6], "optionsets": []}}, {"model": "domain.attribute", "pk": 41, "fields": {"value_type": "text", "unit": null, "conditions": [7], "optionsets": []}}, {"model": "domain.attribute", "pk": 42, "fields": {"value_type": "text", "unit": null, "conditions": [9], "optionsets": []}}, {"model": "domain.attribute", "pk": 29, "fields": {"value_type": "text", "unit": null, "conditions": [2], "optionsets": []}}, {"model": "domain.attribute", "pk": 26, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 25, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 8, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 9, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 6, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 5, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 11, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 7, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 12, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 3, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 4, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 10, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 46, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 47, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 48, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 49, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 50, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}] \ No newline at end of file +[{"model": "domain.attributeentity", "pk": 1, "fields": {"uri": "http://example.com/terms/domain/individual", "uri_prefix": "", "key": "individual", "comment": null, "parent": null, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "individual", "lft": 1, "rght": 22, "tree_id": 3, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 2, "fields": {"uri": "http://example.com/terms/domain/collection", "uri_prefix": "", "key": "collection", "comment": null, "parent": null, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "collection", "lft": 1, "rght": 24, "tree_id": 1, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 3, "fields": {"uri": "http://example.com/terms/domain/individual/text", "uri_prefix": "", "key": "text", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/text", "lft": 16, "rght": 17, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 4, "fields": {"uri": "http://example.com/terms/domain/individual/textarea", "uri_prefix": "", "key": "textarea", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/textarea", "lft": 18, "rght": 19, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 5, "fields": {"uri": "http://example.com/terms/domain/individual/integer", "uri_prefix": "", "key": "integer", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/integer", "lft": 8, "rght": 9, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 6, "fields": {"uri": "http://example.com/terms/domain/individual/float", "uri_prefix": "", "key": "float", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/float", "lft": 6, "rght": 7, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 7, "fields": {"uri": "http://example.com/terms/domain/individual/range", "uri_prefix": "", "key": "range", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/range", "lft": 12, "rght": 13, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 8, "fields": {"uri": "http://example.com/terms/domain/individual/bool", "uri_prefix": "", "key": "bool", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/bool", "lft": 2, "rght": 3, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 9, "fields": {"uri": "http://example.com/terms/domain/individual/datetime", "uri_prefix": "", "key": "datetime", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/datetime", "lft": 4, "rght": 5, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 10, "fields": {"uri": "http://example.com/terms/domain/individual/url", "uri_prefix": "", "key": "url", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/url", "lft": 20, "rght": 21, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 11, "fields": {"uri": "http://example.com/terms/domain/individual/radio", "uri_prefix": "", "key": "radio", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/radio", "lft": 10, "rght": 11, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 12, "fields": {"uri": "http://example.com/terms/domain/individual/select", "uri_prefix": "", "key": "select", "comment": null, "parent": 1, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "individual/select", "lft": 14, "rght": 15, "tree_id": 3, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 13, "fields": {"uri": "http://example.com/terms/domain/collection/bool", "uri_prefix": "", "key": "bool", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/bool", "lft": 2, "rght": 3, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 14, "fields": {"uri": "http://example.com/terms/domain/collection/checkbox", "uri_prefix": "", "key": "checkbox", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/checkbox", "lft": 4, "rght": 5, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 15, "fields": {"uri": "http://example.com/terms/domain/collection/radio", "uri_prefix": "", "key": "radio", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/radio", "lft": 12, "rght": 13, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 16, "fields": {"uri": "http://example.com/terms/domain/collection/datetime", "uri_prefix": "", "key": "datetime", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/datetime", "lft": 6, "rght": 7, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 17, "fields": {"uri": "http://example.com/terms/domain/collection/float", "uri_prefix": "", "key": "float", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/float", "lft": 8, "rght": 9, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 18, "fields": {"uri": "http://example.com/terms/domain/collection/integer", "uri_prefix": "", "key": "integer", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/integer", "lft": 10, "rght": 11, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 19, "fields": {"uri": "http://example.com/terms/domain/collection/range", "uri_prefix": "", "key": "range", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/range", "lft": 14, "rght": 15, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 20, "fields": {"uri": "http://example.com/terms/domain/collection/select", "uri_prefix": "", "key": "select", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/select", "lft": 16, "rght": 17, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 21, "fields": {"uri": "http://example.com/terms/domain/collection/text", "uri_prefix": "", "key": "text", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/text", "lft": 18, "rght": 19, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 22, "fields": {"uri": "http://example.com/terms/domain/collection/textarea", "uri_prefix": "", "key": "textarea", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/textarea", "lft": 20, "rght": 21, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 23, "fields": {"uri": "http://example.com/terms/domain/collection/url", "uri_prefix": "", "key": "url", "comment": null, "parent": 2, "parent_collection": null, "is_collection": true, "is_attribute": true, "label": "collection/url", "lft": 22, "rght": 23, "tree_id": 1, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 24, "fields": {"uri": "http://example.com/terms/domain/conditions", "uri_prefix": "", "key": "conditions", "comment": null, "parent": null, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "conditions", "lft": 1, "rght": 38, "tree_id": 2, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 25, "fields": {"uri": "http://example.com/terms/domain/conditions/source/text", "uri_prefix": "", "key": "text", "comment": null, "parent": 28, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/source/text", "lft": 5, "rght": 6, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 26, "fields": {"uri": "http://example.com/terms/domain/conditions/source/options", "uri_prefix": "", "key": "options", "comment": null, "parent": 28, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/source/options", "lft": 3, "rght": 4, "tree_id": 2, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 27, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_equal", "uri_prefix": "", "key": "text_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_equal", "lft": 23, "rght": 24, "tree_id": 2, "level": 2, "conditions": [1]}}, {"model": "domain.attributeentity", "pk": 28, "fields": {"uri": "http://example.com/terms/domain/conditions/source", "uri_prefix": "", "key": "source", "comment": null, "parent": 24, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "conditions/source", "lft": 2, "rght": 7, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 29, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_not_equal", "uri_prefix": "", "key": "text_not_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_not_equal", "lft": 35, "rght": 36, "tree_id": 2, "level": 2, "conditions": [2]}}, {"model": "domain.attributeentity", "pk": 30, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/options_contains", "uri_prefix": "", "key": "options_contains", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/options_contains", "lft": 9, "rght": 10, "tree_id": 2, "level": 2, "conditions": [12]}}, {"model": "domain.attributeentity", "pk": 31, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute", "uri_prefix": "", "key": "attribute", "comment": null, "parent": 24, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "conditions/attribute", "lft": 8, "rght": 37, "tree_id": 2, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 32, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/options_empty", "uri_prefix": "", "key": "options_empty", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/options_empty", "lft": 11, "rght": 12, "tree_id": 2, "level": 2, "conditions": [13]}}, {"model": "domain.attributeentity", "pk": 33, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/options_equal", "uri_prefix": "", "key": "options_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/options_equal", "lft": 13, "rght": 14, "tree_id": 2, "level": 2, "conditions": [10]}}, {"model": "domain.attributeentity", "pk": 34, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/options_not_empty", "uri_prefix": "", "key": "options_not_empty", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/options_not_empty", "lft": 15, "rght": 16, "tree_id": 2, "level": 2, "conditions": [14]}}, {"model": "domain.attributeentity", "pk": 35, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/options_not_equal", "uri_prefix": "", "key": "options_not_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/options_not_equal", "lft": 17, "rght": 18, "tree_id": 2, "level": 2, "conditions": [11]}}, {"model": "domain.attributeentity", "pk": 36, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_contains", "uri_prefix": "", "key": "text_contains", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_contains", "lft": 19, "rght": 20, "tree_id": 2, "level": 2, "conditions": [3]}}, {"model": "domain.attributeentity", "pk": 37, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_empty", "uri_prefix": "", "key": "text_empty", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_empty", "lft": 21, "rght": 22, "tree_id": 2, "level": 2, "conditions": [8]}}, {"model": "domain.attributeentity", "pk": 38, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_greater_than", "uri_prefix": "", "key": "text_greater_than", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_greater_than", "lft": 25, "rght": 26, "tree_id": 2, "level": 2, "conditions": [4]}}, {"model": "domain.attributeentity", "pk": 39, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_greater_than_equal", "uri_prefix": "", "key": "text_greater_than_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_greater_than_equal", "lft": 27, "rght": 28, "tree_id": 2, "level": 2, "conditions": [5]}}, {"model": "domain.attributeentity", "pk": 40, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_lesser_than", "uri_prefix": "", "key": "text_lesser_than", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_lesser_than", "lft": 29, "rght": 30, "tree_id": 2, "level": 2, "conditions": [6]}}, {"model": "domain.attributeentity", "pk": 41, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_lesser_than_equal", "uri_prefix": "", "key": "text_lesser_than_equal", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_lesser_than_equal", "lft": 31, "rght": 32, "tree_id": 2, "level": 2, "conditions": [7]}}, {"model": "domain.attributeentity", "pk": 42, "fields": {"uri": "http://example.com/terms/domain/conditions/attribute/text_not_empty", "uri_prefix": "", "key": "text_not_empty", "comment": null, "parent": 31, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "conditions/attribute/text_not_empty", "lft": 33, "rght": 34, "tree_id": 2, "level": 2, "conditions": [9]}}, {"model": "domain.attributeentity", "pk": 43, "fields": {"uri": "http://example.com/terms/domain/set", "uri_prefix": "", "key": "set", "comment": null, "parent": null, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "set", "lft": 1, "rght": 16, "tree_id": 4, "level": 0, "conditions": []}}, {"model": "domain.attributeentity", "pk": 44, "fields": {"uri": "http://example.com/terms/domain/set/individual", "uri_prefix": "", "key": "individual", "comment": null, "parent": 43, "parent_collection": null, "is_collection": false, "is_attribute": false, "label": "set/individual", "lft": 10, "rght": 15, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 45, "fields": {"uri": "http://example.com/terms/domain/set/collection", "uri_prefix": "", "key": "collection", "comment": "", "parent": 43, "parent_collection": null, "is_collection": true, "is_attribute": false, "label": "set/collection", "lft": 2, "rght": 9, "tree_id": 4, "level": 1, "conditions": []}}, {"model": "domain.attributeentity", "pk": 46, "fields": {"uri": "http://example.com/terms/domain/set/collection/id", "uri_prefix": "", "key": "id", "comment": null, "parent": 45, "parent_collection": 45, "is_collection": false, "is_attribute": true, "label": "set/collection/id", "lft": 3, "rght": 4, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 47, "fields": {"uri": "http://example.com/terms/domain/set/collection/text", "uri_prefix": "", "key": "text", "comment": null, "parent": 45, "parent_collection": 45, "is_collection": false, "is_attribute": true, "label": "set/collection/text", "lft": 5, "rght": 6, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 48, "fields": {"uri": "http://example.com/terms/domain/set/collection/textarea", "uri_prefix": "", "key": "textarea", "comment": null, "parent": 45, "parent_collection": 45, "is_collection": false, "is_attribute": true, "label": "set/collection/textarea", "lft": 7, "rght": 8, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 49, "fields": {"uri": "http://example.com/terms/domain/set/individual/text", "uri_prefix": "", "key": "text", "comment": null, "parent": 44, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "set/individual/text", "lft": 11, "rght": 12, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attributeentity", "pk": 50, "fields": {"uri": "http://example.com/terms/domain/set/individual/textarea", "uri_prefix": "", "key": "textarea", "comment": null, "parent": 44, "parent_collection": null, "is_collection": false, "is_attribute": true, "label": "set/individual/textarea", "lft": 13, "rght": 14, "tree_id": 4, "level": 2, "conditions": []}}, {"model": "domain.attribute", "pk": 13, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 14, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 16, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 17, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 18, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 15, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 19, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 20, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 21, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 22, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 23, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 30, "fields": {"value_type": "text", "unit": null, "conditions": [12], "optionsets": []}}, {"model": "domain.attribute", "pk": 32, "fields": {"value_type": "text", "unit": null, "conditions": [13], "optionsets": []}}, {"model": "domain.attribute", "pk": 33, "fields": {"value_type": "text", "unit": null, "conditions": [10], "optionsets": []}}, {"model": "domain.attribute", "pk": 34, "fields": {"value_type": "text", "unit": null, "conditions": [14], "optionsets": []}}, {"model": "domain.attribute", "pk": 35, "fields": {"value_type": "text", "unit": null, "conditions": [11], "optionsets": []}}, {"model": "domain.attribute", "pk": 36, "fields": {"value_type": "text", "unit": null, "conditions": [3], "optionsets": []}}, {"model": "domain.attribute", "pk": 37, "fields": {"value_type": "text", "unit": null, "conditions": [8], "optionsets": []}}, {"model": "domain.attribute", "pk": 27, "fields": {"value_type": "text", "unit": null, "conditions": [1], "optionsets": []}}, {"model": "domain.attribute", "pk": 38, "fields": {"value_type": "text", "unit": null, "conditions": [4], "optionsets": []}}, {"model": "domain.attribute", "pk": 39, "fields": {"value_type": "text", "unit": null, "conditions": [5], "optionsets": []}}, {"model": "domain.attribute", "pk": 40, "fields": {"value_type": "text", "unit": null, "conditions": [6], "optionsets": []}}, {"model": "domain.attribute", "pk": 41, "fields": {"value_type": "text", "unit": null, "conditions": [7], "optionsets": []}}, {"model": "domain.attribute", "pk": 42, "fields": {"value_type": "text", "unit": null, "conditions": [9], "optionsets": []}}, {"model": "domain.attribute", "pk": 29, "fields": {"value_type": "text", "unit": null, "conditions": [2], "optionsets": []}}, {"model": "domain.attribute", "pk": 26, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 25, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 8, "fields": {"value_type": "boolean", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 9, "fields": {"value_type": "datetime", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 6, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 5, "fields": {"value_type": "integer", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 11, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [2]}}, {"model": "domain.attribute", "pk": 7, "fields": {"value_type": "float", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 12, "fields": {"value_type": "options", "unit": null, "conditions": [], "optionsets": [1]}}, {"model": "domain.attribute", "pk": 3, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 4, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 10, "fields": {"value_type": "url", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 46, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 47, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 48, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 49, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}, {"model": "domain.attribute", "pk": 50, "fields": {"value_type": "text", "unit": null, "conditions": [], "optionsets": []}}] \ No newline at end of file diff --git a/fixtures/options.json b/fixtures/options.json index 805c4ee4d..a8d6215aa 100644 --- a/fixtures/options.json +++ b/fixtures/options.json @@ -1,131 +1 @@ -[ - { - "model": "options.optionset", - "pk": 1, - "fields": { - "uri_prefix": null, - "key": "one_two_three", - "comment": null, - "order": 0, - "uri": "http://example.com/elements/options/one_two_three/", - "conditions": [] - } - }, - { - "model": "options.optionset", - "pk": 2, - "fields": { - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "one_two_three_other", - "comment": null, - "order": 1, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other", - "conditions": [] - } - }, - { - "model": "options.option", - "pk": 1, - "fields": { - "optionset": 1, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "one", - "comment": null, - "order": 1, - "text_en": "One", - "text_de": "Eins", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/one" - } - }, - { - "model": "options.option", - "pk": 2, - "fields": { - "optionset": 1, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "two", - "comment": null, - "order": 2, - "text_en": "Two", - "text_de": "Zwei", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/two" - } - }, - { - "model": "options.option", - "pk": 3, - "fields": { - "optionset": 1, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "three", - "comment": null, - "order": 3, - "text_en": "Three", - "text_de": "Drei", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three/three" - } - }, - { - "model": "options.option", - "pk": 4, - "fields": { - "optionset": 2, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "one", - "comment": null, - "order": 1, - "text_en": "One", - "text_de": "Eins", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/one" - } - }, - { - "model": "options.option", - "pk": 5, - "fields": { - "optionset": 2, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "two", - "comment": null, - "order": 2, - "text_en": "Two", - "text_de": "Zwei", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/two" - } - }, - { - "model": "options.option", - "pk": 6, - "fields": { - "optionset": 2, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "three", - "comment": null, - "order": 3, - "text_en": "Three", - "text_de": "Drei", - "additional_input": false, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/three" - } - }, - { - "model": "options.option", - "pk": 7, - "fields": { - "optionset": 2, - "uri_prefix": "https://rdmorganiser.github.io/elements", - "key": "other", - "comment": null, - "order": 4, - "text_en": "Other", - "text_de": "Sonstige", - "additional_input": true, - "uri": "https://rdmorganiser.github.io/elements/options/one_two_three_other/other" - } - } -] \ No newline at end of file +[{"model": "options.optionset", "pk": 1, "fields": {"uri": "http://example.com/terms/options/one_two_three", "uri_prefix": null, "key": "one_two_three", "comment": null, "order": 0, "conditions": []}}, {"model": "options.optionset", "pk": 2, "fields": {"uri": "http://example.com/terms/options/one_two_three_other", "uri_prefix": "", "key": "one_two_three_other", "comment": "", "order": 1, "conditions": []}}, {"model": "options.option", "pk": 1, "fields": {"uri": "http://example.com/terms/options/one_two_three/one", "uri_prefix": "", "key": "one", "comment": null, "optionset": 1, "order": 1, "text_en": "One", "text_de": "Eins", "additional_input": false}}, {"model": "options.option", "pk": 2, "fields": {"uri": "http://example.com/terms/options/one_two_three/two", "uri_prefix": "", "key": "two", "comment": null, "optionset": 1, "order": 2, "text_en": "Two", "text_de": "Zwei", "additional_input": false}}, {"model": "options.option", "pk": 3, "fields": {"uri": "http://example.com/terms/options/one_two_three/three", "uri_prefix": "", "key": "three", "comment": null, "optionset": 1, "order": 3, "text_en": "Three", "text_de": "Drei", "additional_input": false}}, {"model": "options.option", "pk": 4, "fields": {"uri": "http://example.com/terms/options/one_two_three_other/one", "uri_prefix": "", "key": "one", "comment": null, "optionset": 2, "order": 1, "text_en": "One", "text_de": "Eins", "additional_input": false}}, {"model": "options.option", "pk": 5, "fields": {"uri": "http://example.com/terms/options/one_two_three_other/two", "uri_prefix": "", "key": "two", "comment": null, "optionset": 2, "order": 2, "text_en": "Two", "text_de": "Zwei", "additional_input": false}}, {"model": "options.option", "pk": 6, "fields": {"uri": "http://example.com/terms/options/one_two_three_other/three", "uri_prefix": "", "key": "three", "comment": null, "optionset": 2, "order": 3, "text_en": "Three", "text_de": "Drei", "additional_input": false}}, {"model": "options.option", "pk": 7, "fields": {"uri": "http://example.com/terms/options/one_two_three_other/other", "uri_prefix": "", "key": "other", "comment": null, "optionset": 2, "order": 4, "text_en": "Other", "text_de": "Sonstige", "additional_input": true}}] \ No newline at end of file diff --git a/fixtures/questions.json b/fixtures/questions.json index 2b072c972..e02d4ebd0 100644 --- a/fixtures/questions.json +++ b/fixtures/questions.json @@ -1,588 +1 @@ -[ - { - "model": "questions.catalog", - "pk": 1, - "fields": { - "created": "2016-12-15T12:00:09.331Z", - "updated": "2017-01-24T15:45:28.084Z", - "order": 0, - "title_en": "Catalog", - "title_de": "Katalog" - } - }, - { - "model": "questions.section", - "pk": 1, - "fields": { - "created": "2016-12-15T12:00:31.550Z", - "updated": "2017-01-24T15:45:28.715Z", - "catalog": 1, - "order": 1, - "title_en": "Widgets", - "title_de": "Widgets", - "label_en": "Catalog / Widgets", - "label_de": "Katalog / Widgets" - } - }, - { - "model": "questions.section", - "pk": 2, - "fields": { - "created": "2016-12-15T12:02:01.898Z", - "updated": "2017-01-24T15:45:28.680Z", - "catalog": 1, - "order": 2, - "title_en": "Conditions", - "title_de": "Bedingungen", - "label_en": "Catalog / Conditions", - "label_de": "Katalog / Bedingungen" - } - }, - { - "model": "questions.subsection", - "pk": 1, - "fields": { - "created": "2016-12-15T12:01:03.104Z", - "updated": "2017-01-24T15:45:28.744Z", - "section": 1, - "order": 1, - "title_en": "Individual questions", - "title_de": "Einzelne Fragen", - "label_en": "Catalog / Widgets / Individual questions", - "label_de": "Katalog / Widgets / Einzelne Fragen" - } - }, - { - "model": "questions.subsection", - "pk": 2, - "fields": { - "created": "2016-12-15T12:01:28.560Z", - "updated": "2017-01-24T15:45:28.989Z", - "section": 1, - "order": 2, - "title_en": "Collection questions", - "title_de": "Fragensammlungen", - "label_en": "Catalog / Widgets / Collection questions", - "label_de": "Katalog / Widgets / Fragensammlungen" - } - }, - { - "model": "questions.subsection", - "pk": 3, - "fields": { - "created": "2016-12-15T12:01:47.090Z", - "updated": "2017-01-24T15:45:28.647Z", - "section": 1, - "order": 3, - "title_en": "Question sets", - "title_de": "Fragensets", - "label_en": "Catalog / Widgets / Question sets", - "label_de": "Katalog / Widgets / Fragensets" - } - }, - { - "model": "questions.questionentity", - "pk": 1, - "fields": { - "created": "2016-12-15T13:28:15.582Z", - "updated": "2017-01-24T15:45:28.779Z", - "attribute_entity": 3, - "subsection": 1, - "order": 1, - "label_en": "Catalog / Widgets / Individual questions / individual.text", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.text", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 2, - "fields": { - "created": "2016-12-15T13:28:41.406Z", - "updated": "2017-01-24T15:45:28.813Z", - "attribute_entity": 4, - "subsection": 1, - "order": 2, - "label_en": "Catalog / Widgets / Individual questions / individual.textarea", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.textarea", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 3, - "fields": { - "created": "2016-12-15T13:29:05.951Z", - "updated": "2017-01-24T15:45:28.842Z", - "attribute_entity": 8, - "subsection": 1, - "order": 3, - "label_en": "Catalog / Widgets / Individual questions / individual.bool", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.bool", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 4, - "fields": { - "created": "2016-12-15T13:30:22.772Z", - "updated": "2017-01-24T15:45:28.871Z", - "attribute_entity": 11, - "subsection": 1, - "order": 4, - "label_en": "Catalog / Widgets / Individual questions / individual.radio", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.radio", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 5, - "fields": { - "created": "2016-12-15T13:31:22.093Z", - "updated": "2017-01-24T15:45:28.900Z", - "attribute_entity": 12, - "subsection": 1, - "order": 5, - "label_en": "Catalog / Widgets / Individual questions / individual.select", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.select", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 6, - "fields": { - "created": "2016-12-15T13:32:11.267Z", - "updated": "2017-01-24T15:45:28.930Z", - "attribute_entity": 7, - "subsection": 1, - "order": 6, - "label_en": "Catalog / Widgets / Individual questions / individual.range", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.range", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 7, - "fields": { - "created": "2016-12-15T13:32:41.210Z", - "updated": "2017-01-24T15:45:28.961Z", - "attribute_entity": 9, - "subsection": 1, - "order": 7, - "label_en": "Catalog / Widgets / Individual questions / individual.datetime", - "label_de": "Katalog / Widgets / Einzelne Fragen / individual.datetime", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 8, - "fields": { - "created": "2016-12-15T13:33:08.787Z", - "updated": "2017-01-24T15:45:29.026Z", - "attribute_entity": 21, - "subsection": 2, - "order": 1, - "label_en": "Catalog / Widgets / Collection questions / collection.text", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.text", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 9, - "fields": { - "created": "2016-12-15T13:33:20.995Z", - "updated": "2017-01-24T15:45:29.054Z", - "attribute_entity": 22, - "subsection": 2, - "order": 2, - "label_en": "Catalog / Widgets / Collection questions / collection.textarea", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.textarea", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 10, - "fields": { - "created": "2016-12-15T13:33:34.934Z", - "updated": "2017-01-24T15:45:29.083Z", - "attribute_entity": 13, - "subsection": 2, - "order": 3, - "label_en": "Catalog / Widgets / Collection questions / collection.bool", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.bool", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 11, - "fields": { - "created": "2016-12-15T13:33:54.082Z", - "updated": "2017-01-24T15:45:29.112Z", - "attribute_entity": 15, - "subsection": 2, - "order": 4, - "label_en": "Catalog / Widgets / Collection questions / collection.radio", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.radio", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 12, - "fields": { - "created": "2016-12-15T13:34:08.899Z", - "updated": "2017-01-24T15:45:29.142Z", - "attribute_entity": 20, - "subsection": 2, - "order": 5, - "label_en": "Catalog / Widgets / Collection questions / collection.select", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.select", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 13, - "fields": { - "created": "2016-12-15T13:34:28.895Z", - "updated": "2017-01-24T15:45:29.171Z", - "attribute_entity": 19, - "subsection": 2, - "order": 6, - "label_en": "Catalog / Widgets / Collection questions / collection.range", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.range", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 14, - "fields": { - "created": "2016-12-15T13:34:39.608Z", - "updated": "2017-01-24T15:45:29.200Z", - "attribute_entity": 16, - "subsection": 2, - "order": 7, - "label_en": "Catalog / Widgets / Collection questions / collection.datetime", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.datetime", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 15, - "fields": { - "created": "2016-12-15T13:35:32.219Z", - "updated": "2017-01-24T15:45:28.620Z", - "attribute_entity": 14, - "subsection": 2, - "order": 8, - "label_en": "Catalog / Widgets / Collection questions / collection.checkbox", - "label_de": "Katalog / Widgets / Fragensammlungen / collection.checkbox", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 16, - "fields": { - "created": "2017-01-24T15:54:14.908Z", - "updated": "2017-01-24T15:58:23.613Z", - "attribute_entity": 44, - "subsection": 3, - "order": 0, - "label_en": "Catalog / Widgets / Question sets / set.individual", - "label_de": "Katalog / Widgets / Fragensets / set.individual", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 17, - "fields": { - "created": "2017-01-24T15:54:23.537Z", - "updated": "2017-01-24T15:58:52.350Z", - "attribute_entity": 45, - "subsection": 3, - "order": 1, - "label_en": "Catalog / Widgets / Question sets / set.collection", - "label_de": "Katalog / Widgets / Fragensets / set.collection", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 18, - "fields": { - "created": "2017-01-24T15:56:13.523Z", - "updated": "2017-01-24T15:58:36.602Z", - "attribute_entity": 49, - "subsection": 3, - "order": 0, - "label_en": "", - "label_de": "", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 19, - "fields": { - "created": "2017-01-24T15:56:34.387Z", - "updated": "2017-01-24T15:58:43.609Z", - "attribute_entity": 50, - "subsection": 3, - "order": 1, - "label_en": "", - "label_de": "", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 20, - "fields": { - "created": "2017-01-24T15:59:11.461Z", - "updated": "2017-01-24T15:59:20.692Z", - "attribute_entity": 47, - "subsection": 3, - "order": 0, - "label_en": "", - "label_de": "", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.questionentity", - "pk": 21, - "fields": { - "created": "2017-01-24T15:59:43.213Z", - "updated": "2017-01-24T15:59:43.213Z", - "attribute_entity": 48, - "subsection": 3, - "order": 1, - "label_en": "", - "label_de": "", - "help_en": null, - "help_de": null - } - }, - { - "model": "questions.question", - "pk": 1, - "fields": { - "parent": null, - "text_en": "Text?", - "text_de": "Text?", - "widget_type": "text" - } - }, - { - "model": "questions.question", - "pk": 2, - "fields": { - "parent": null, - "text_en": "Textarea?", - "text_de": "Textarea?", - "widget_type": "textarea" - } - }, - { - "model": "questions.question", - "pk": 3, - "fields": { - "parent": null, - "text_en": "Yes or no?", - "text_de": "Ja oder Nein?", - "widget_type": "yesno" - } - }, - { - "model": "questions.question", - "pk": 4, - "fields": { - "parent": null, - "text_en": "Radio buttons?", - "text_de": "Radio-Buttons?", - "widget_type": "radio" - } - }, - { - "model": "questions.question", - "pk": 5, - "fields": { - "parent": null, - "text_en": "Select drop-down?", - "text_de": "Select-Aufklappmenü?", - "widget_type": "select" - } - }, - { - "model": "questions.question", - "pk": 6, - "fields": { - "parent": null, - "text_en": "Range slider?", - "text_de": "Bereichs-Schieber?", - "widget_type": "range" - } - }, - { - "model": "questions.question", - "pk": 7, - "fields": { - "parent": null, - "text_en": "Date picker?", - "text_de": "Datumsauswahl?", - "widget_type": "date" - } - }, - { - "model": "questions.question", - "pk": 8, - "fields": { - "parent": null, - "text_en": "Text?", - "text_de": "Text?", - "widget_type": "text" - } - }, - { - "model": "questions.question", - "pk": 9, - "fields": { - "parent": null, - "text_en": "Textarea?", - "text_de": "Textarea?", - "widget_type": "textarea" - } - }, - { - "model": "questions.question", - "pk": 10, - "fields": { - "parent": null, - "text_en": "Yes or no?", - "text_de": "Ja oder Nein?", - "widget_type": "yesno" - } - }, - { - "model": "questions.question", - "pk": 11, - "fields": { - "parent": null, - "text_en": "Radio buttons?", - "text_de": "Radio-Buttons?", - "widget_type": "radio" - } - }, - { - "model": "questions.question", - "pk": 12, - "fields": { - "parent": null, - "text_en": "Select drop-down?", - "text_de": "Select-Aufklappmenü?", - "widget_type": "select" - } - }, - { - "model": "questions.question", - "pk": 13, - "fields": { - "parent": null, - "text_en": "Range slider?", - "text_de": "Bereichs-Schieber?", - "widget_type": "range" - } - }, - { - "model": "questions.question", - "pk": 14, - "fields": { - "parent": null, - "text_en": "Date picker?", - "text_de": "Datumsauswahl?", - "widget_type": "date" - } - }, - { - "model": "questions.question", - "pk": 15, - "fields": { - "parent": null, - "text_en": "Checkbox?", - "text_de": "Ankreuzfelder?", - "widget_type": "checkbox" - } - }, - { - "model": "questions.question", - "pk": 18, - "fields": { - "parent": 16, - "text_en": "Text?", - "text_de": "Text?", - "widget_type": "text" - } - }, - { - "model": "questions.question", - "pk": 20, - "fields": { - "parent": 17, - "text_en": "Text?", - "text_de": "Text?", - "widget_type": "text" - } - }, - { - "model": "questions.question", - "pk": 19, - "fields": { - "parent": 16, - "text_en": "Textarea?", - "text_de": "Textarea?", - "widget_type": "textarea" - } - }, - { - "model": "questions.question", - "pk": 21, - "fields": { - "parent": 17, - "text_en": "Textarea?", - "text_de": "Textarea?", - "widget_type": "textarea" - } - } -] \ No newline at end of file +[{"model": "questions.catalog", "pk": 1, "fields": {"created": "2016-12-15T12:00:09.331Z", "updated": "2017-01-27T12:33:24.712Z", "uri": "http://example.com/questions/catalog", "uri_prefix": null, "key": "catalog", "comment": null, "order": 0, "title_en": "Catalog", "title_de": "Katalog"}}, {"model": "questions.section", "pk": 1, "fields": {"created": "2016-12-15T12:00:31.550Z", "updated": "2017-01-27T12:33:25.446Z", "uri": "http://example.com/questions/catalog/widgets", "uri_prefix": null, "key": "widgets", "comment": null, "catalog": 1, "order": 1, "title_en": "Widgets", "title_de": "Widgets", "label_en": "Catalog / Widgets", "label_de": "Katalog / Widgets"}}, {"model": "questions.section", "pk": 2, "fields": {"created": "2016-12-15T12:02:01.898Z", "updated": "2017-01-27T12:33:26.129Z", "uri": "http://example.com/questions/catalog/conditions", "uri_prefix": null, "key": "conditions", "comment": null, "catalog": 1, "order": 2, "title_en": "Conditions", "title_de": "Bedingungen", "label_en": "Catalog / Conditions", "label_de": "Katalog / Bedingungen"}}, {"model": "questions.subsection", "pk": 1, "fields": {"created": "2016-12-15T12:01:03.104Z", "updated": "2017-01-27T12:33:26.153Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions", "uri_prefix": null, "key": "individual-questions", "comment": null, "section": 1, "order": 1, "title_en": "Individual questions", "title_de": "Einzelne Fragen", "label_en": "Catalog / Widgets / Individual questions", "label_de": "Katalog / Widgets / Einzelne Fragen"}}, {"model": "questions.subsection", "pk": 2, "fields": {"created": "2016-12-15T12:01:28.560Z", "updated": "2017-01-27T12:33:26.346Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions", "uri_prefix": null, "key": "collection-questions", "comment": null, "section": 1, "order": 2, "title_en": "Collection questions", "title_de": "Fragensammlungen", "label_en": "Catalog / Widgets / Collection questions", "label_de": "Katalog / Widgets / Fragensammlungen"}}, {"model": "questions.subsection", "pk": 3, "fields": {"created": "2016-12-15T12:01:47.090Z", "updated": "2017-01-27T12:33:26.542Z", "uri": "http://example.com/questions/catalog/widgets/question-sets", "uri_prefix": null, "key": "question-sets", "comment": null, "section": 1, "order": 3, "title_en": "Question sets", "title_de": "Fragensets", "label_en": "Catalog / Widgets / Question sets", "label_de": "Katalog / Widgets / Fragensets"}}, {"model": "questions.questionentity", "pk": 1, "fields": {"created": "2016-12-15T13:28:15.582Z", "updated": "2017-01-27T12:33:26.832Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 3, "subsection": 1, "order": 1, "label_en": "Catalog / Widgets / Individual questions / text", "label_de": "Katalog / Widgets / Einzelne Fragen / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 2, "fields": {"created": "2016-12-15T13:28:41.406Z", "updated": "2017-01-27T12:33:26.859Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 4, "subsection": 1, "order": 2, "label_en": "Catalog / Widgets / Individual questions / textarea", "label_de": "Katalog / Widgets / Einzelne Fragen / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 3, "fields": {"created": "2016-12-15T13:29:05.951Z", "updated": "2017-01-27T12:33:26.885Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 8, "subsection": 1, "order": 3, "label_en": "Catalog / Widgets / Individual questions / bool", "label_de": "Katalog / Widgets / Einzelne Fragen / bool", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 4, "fields": {"created": "2016-12-15T13:30:22.772Z", "updated": "2017-01-27T12:33:26.911Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 11, "subsection": 1, "order": 4, "label_en": "Catalog / Widgets / Individual questions / radio", "label_de": "Katalog / Widgets / Einzelne Fragen / radio", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 5, "fields": {"created": "2016-12-15T13:31:22.093Z", "updated": "2017-01-27T12:33:26.935Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 12, "subsection": 1, "order": 5, "label_en": "Catalog / Widgets / Individual questions / select", "label_de": "Katalog / Widgets / Einzelne Fragen / select", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 6, "fields": {"created": "2016-12-15T13:32:11.267Z", "updated": "2017-01-27T12:33:26.962Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 7, "subsection": 1, "order": 6, "label_en": "Catalog / Widgets / Individual questions / range", "label_de": "Katalog / Widgets / Einzelne Fragen / range", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 7, "fields": {"created": "2016-12-15T13:32:41.210Z", "updated": "2017-01-27T12:33:26.996Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 9, "subsection": 1, "order": 7, "label_en": "Catalog / Widgets / Individual questions / datetime", "label_de": "Katalog / Widgets / Einzelne Fragen / datetime", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 8, "fields": {"created": "2016-12-15T13:33:08.787Z", "updated": "2017-01-27T12:33:27.024Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 21, "subsection": 2, "order": 1, "label_en": "Catalog / Widgets / Collection questions / text", "label_de": "Katalog / Widgets / Fragensammlungen / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 9, "fields": {"created": "2016-12-15T13:33:20.995Z", "updated": "2017-01-27T12:33:27.052Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 22, "subsection": 2, "order": 2, "label_en": "Catalog / Widgets / Collection questions / textarea", "label_de": "Katalog / Widgets / Fragensammlungen / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 10, "fields": {"created": "2016-12-15T13:33:34.934Z", "updated": "2017-01-27T12:33:27.078Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 13, "subsection": 2, "order": 3, "label_en": "Catalog / Widgets / Collection questions / bool", "label_de": "Katalog / Widgets / Fragensammlungen / bool", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 11, "fields": {"created": "2016-12-15T13:33:54.082Z", "updated": "2017-01-27T12:33:27.106Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 15, "subsection": 2, "order": 4, "label_en": "Catalog / Widgets / Collection questions / radio", "label_de": "Katalog / Widgets / Fragensammlungen / radio", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 12, "fields": {"created": "2016-12-15T13:34:08.899Z", "updated": "2017-01-27T12:33:27.136Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 20, "subsection": 2, "order": 5, "label_en": "Catalog / Widgets / Collection questions / select", "label_de": "Katalog / Widgets / Fragensammlungen / select", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 13, "fields": {"created": "2016-12-15T13:34:28.895Z", "updated": "2017-01-27T12:33:27.164Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 19, "subsection": 2, "order": 6, "label_en": "Catalog / Widgets / Collection questions / range", "label_de": "Katalog / Widgets / Fragensammlungen / range", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 14, "fields": {"created": "2016-12-15T13:34:39.608Z", "updated": "2017-01-27T12:33:27.192Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 16, "subsection": 2, "order": 7, "label_en": "Catalog / Widgets / Collection questions / datetime", "label_de": "Katalog / Widgets / Fragensammlungen / datetime", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 15, "fields": {"created": "2016-12-15T13:35:32.219Z", "updated": "2017-01-27T12:33:27.221Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/checkbox", "uri_prefix": null, "key": "checkbox", "comment": null, "attribute_entity": 14, "subsection": 2, "order": 8, "label_en": "Catalog / Widgets / Collection questions / checkbox", "label_de": "Katalog / Widgets / Fragensammlungen / checkbox", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 16, "fields": {"created": "2017-01-24T15:54:14.908Z", "updated": "2017-01-27T12:33:27.247Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual", "uri_prefix": null, "key": "individual", "comment": null, "attribute_entity": 44, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / individual", "label_de": "Katalog / Widgets / Fragensets / individual", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 17, "fields": {"created": "2017-01-24T15:54:23.537Z", "updated": "2017-01-27T12:33:27.419Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection", "uri_prefix": null, "key": "collection", "comment": null, "attribute_entity": 45, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / collection", "label_de": "Katalog / Widgets / Fragensets / collection", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 18, "fields": {"created": "2017-01-24T15:56:13.523Z", "updated": "2017-01-27T12:33:27.334Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 49, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / text", "label_de": "Katalog / Widgets / Fragensets / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 19, "fields": {"created": "2017-01-24T15:56:34.387Z", "updated": "2017-01-27T12:33:27.508Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 50, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / textarea", "label_de": "Katalog / Widgets / Fragensets / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 20, "fields": {"created": "2017-01-24T15:59:11.461Z", "updated": "2017-01-27T12:33:27.448Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 47, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / text", "label_de": "Katalog / Widgets / Fragensets / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 21, "fields": {"created": "2017-01-24T15:59:43.213Z", "updated": "2017-01-27T12:33:27.477Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 48, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / textarea", "label_de": "Katalog / Widgets / Fragensets / textarea", "help_en": null, "help_de": null}}, {"model": "questions.question", "pk": 1, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 2, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 3, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 4, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 5, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 6, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 7, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 8, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 9, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 10, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 11, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 12, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 13, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 14, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 15, "fields": {"parent": null, "text_en": "Checkbox?", "text_de": "Ankreuzfelder?", "widget_type": "checkbox"}}, {"model": "questions.question", "pk": 18, "fields": {"parent": 16, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 20, "fields": {"parent": 17, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 21, "fields": {"parent": 17, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 19, "fields": {"parent": 16, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}] \ No newline at end of file From ba88ec2a15b9a72ffcccaff07a3cb8ea6d076611 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 27 Jan 2017 16:51:20 +0100 Subject: [PATCH 13/51] refactor views app --- apps/projects/templates/projects/project.html | 2 +- apps/projects/utils.py | 2 +- apps/projects/views.py | 2 +- apps/views/admin.py | 8 +- apps/views/migrations/0003_refactoring.py | 25 ++++++ apps/views/migrations/0004_refactoring.py | 44 ++++++++++ apps/views/migrations/0005_meta.py | 39 +++++++++ apps/views/models.py | 83 ++++++++++++++++--- apps/views/serializers.py | 17 ++-- apps/views/templates/views/views.html | 6 +- .../views/views_modal_form_views.html | 69 ++++++++++++--- apps/views/urls.py | 2 +- apps/views/urls_api.py | 2 +- apps/views/views.py | 4 +- 14 files changed, 266 insertions(+), 39 deletions(-) create mode 100644 apps/views/migrations/0003_refactoring.py create mode 100644 apps/views/migrations/0004_refactoring.py create mode 100644 apps/views/migrations/0005_meta.py diff --git a/apps/projects/templates/projects/project.html b/apps/projects/templates/projects/project.html index 462b71c69..d39439124 100644 --- a/apps/projects/templates/projects/project.html +++ b/apps/projects/templates/projects/project.html @@ -100,7 +100,7 @@

      {% trans 'Views' %}

      {{ view.title }} - {{ view.description }} + {{ view.help }} diff --git a/apps/projects/utils.py b/apps/projects/utils.py index 749eed6dc..ad4fd433e 100644 --- a/apps/projects/utils.py +++ b/apps/projects/utils.py @@ -17,7 +17,7 @@ def get_answers_tree(project, snapshot=None): values[value.attribute.id].append(value) # put all values with an attribute labeled 'id' in a valuesets dict labeled by the parant attribute entities id - if value.attribute.title == 'id': + if value.attribute.key == 'id': if value.attribute.parent.id not in valuesets: valuesets[value.attribute.parent.id] = {} diff --git a/apps/projects/views.py b/apps/projects/views.py index c38f9c698..74cf6e44f 100644 --- a/apps/projects/views.py +++ b/apps/projects/views.py @@ -129,7 +129,7 @@ def project_view_export(request, project_id, view_id, format, snapshot_id=None): except TemplateSyntaxError: rendered_view = None - return render_to_format(request, format, view.title, 'projects/project_view_export.html', { + return render_to_format(request, format, view.key, 'projects/project_view_export.html', { 'project': project, 'rendered_view': rendered_view }) diff --git a/apps/views/admin.py b/apps/views/admin.py index 070f8d7da..77a15b17f 100644 --- a/apps/views/admin.py +++ b/apps/views/admin.py @@ -1,5 +1,9 @@ from django.contrib import admin -from .models import * +from .models import View -admin.site.register(View) + +class ViewAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) + +admin.site.register(View, ViewAdmin) diff --git a/apps/views/migrations/0003_refactoring.py b/apps/views/migrations/0003_refactoring.py new file mode 100644 index 000000000..9a65ca36a --- /dev/null +++ b/apps/views/migrations/0003_refactoring.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-27 15:28 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('views', '0002_view_template'), + ] + + operations = [ + migrations.RenameField( + model_name='view', + old_name='description', + new_name='comment', + ), + migrations.RenameField( + model_name='view', + old_name='title', + new_name='key', + ), + ] diff --git a/apps/views/migrations/0004_refactoring.py b/apps/views/migrations/0004_refactoring.py new file mode 100644 index 000000000..f6142349c --- /dev/null +++ b/apps/views/migrations/0004_refactoring.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-27 15:30 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('views', '0003_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='view', + options={'ordering': ('uri',), 'verbose_name': 'View', 'verbose_name_plural': 'Views'}, + ), + migrations.AddField( + model_name='view', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this catalog (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='view', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this catalog.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='view', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this catalog.', null=True, verbose_name='Comment'), + ), + migrations.AlterField( + model_name='view', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this catalog. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='view', + name='template', + field=models.TextField(blank=True, help_text='The template for this view, written in Django template language.', null=True, verbose_name='Template'), + ), + ] diff --git a/apps/views/migrations/0005_meta.py b/apps/views/migrations/0005_meta.py new file mode 100644 index 000000000..7b3cbaa16 --- /dev/null +++ b/apps/views/migrations/0005_meta.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-27 15:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('views', '0004_refactoring'), + ] + + operations = [ + migrations.AlterModelOptions( + name='view', + options={'ordering': ('key',), 'verbose_name': 'View', 'verbose_name_plural': 'Views'}, + ), + migrations.AlterField( + model_name='view', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this view.', null=True, verbose_name='Comment'), + ), + migrations.AlterField( + model_name='view', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this view. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AlterField( + model_name='view', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this view (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AlterField( + model_name='view', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this view.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + ] diff --git a/apps/views/models.py b/apps/views/models.py index 2dc5f62ac..9a93b368c 100644 --- a/apps/views/models.py +++ b/apps/views/models.py @@ -6,30 +6,89 @@ from django.utils.translation import ugettext_lazy as _ from django.template import Context, Template +from apps.core.utils import get_uri_prefix +from apps.core.models import TranslationMixin from apps.domain.models import AttributeEntity from apps.conditions.models import Condition @python_2_unicode_compatible -class View(models.Model): - - title = models.CharField(max_length=256) - description = models.TextField(blank=True, null=True) - - template = models.TextField(blank=True, null=True) +class View(models.Model, TranslationMixin): + + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this view (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this view.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this view. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this view.') + ) + template = models.TextField( + blank=True, null=True, + verbose_name=_('Template'), + help_text=_('The template for this view, written in Django template language.') + ) + title_en = models.CharField( + max_length=256, null=True, blank=True, + verbose_name=_('Title (en)'), + help_text=_('The English title for this view.') + ) + title_de = models.CharField( + max_length=256, null=True, blank=True, + verbose_name=_('Title (de)'), + help_text=_('The German title for this view.') + ) + help_en = models.TextField( + null=True, blank=True, + verbose_name=_('Help (en)'), + help_text=_('The English help text for this view.') + ) + help_de = models.TextField( + null=True, blank=True, + verbose_name=_('Help (de)'), + help_text=_('The German help text for this view.') + ) class Meta: + ordering = ('key', ) verbose_name = _('View') verbose_name_plural = _('Views') def __str__(self): - return self.title + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(View, self).save(*args, **kwargs) + + @property + def title(self): + return self.trans('title') + + @property + def help(self): + return self.trans('help') + + def build_uri(self): + return get_uri_prefix(self) + '/views/' + self.key def render(self, project, snapshot=None): # get list of conditions conditions = {} for condition in Condition.objects.all(): - conditions[condition.title] = condition.resolve(project, snapshot) + conditions[condition.key] = condition.resolve(project, snapshot) # get the tree of entities entity_trees = AttributeEntity.objects.get_cached_trees() @@ -60,7 +119,7 @@ def render(self, project, snapshot=None): # construct attribute/values tree from the input entity_trees using recursion values_tree = {} for entity_tree in entity_trees: - values_tree[entity_tree.title] = self._build_values_tree(entity_tree) + values_tree[entity_tree.key] = self._build_values_tree(entity_tree) # render the template to a html string return Template(self.template).render(Context({ @@ -106,12 +165,12 @@ def _build_values_tree(self, entity_tree_node, set_index=None): if node_values: # flatten the list if it is not a collection and append a the node for this attribute if child.is_collection: - node[child.title] = node_values + node[child.key] = node_values else: - node[child.title] = node_values[0] + node[child.key] = node_values[0] else: # for an entity proceed with the recursion - node[child.title] = self._build_values_tree(child, set_index) + node[child.key] = self._build_values_tree(child, set_index) return node diff --git a/apps/views/serializers.py b/apps/views/serializers.py index 866b41930..b3a9893f0 100644 --- a/apps/views/serializers.py +++ b/apps/views/serializers.py @@ -1,9 +1,9 @@ -from django.template import Template, TemplateSyntaxError +from django.template import Template, TemplateSyntaxError, Context from rest_framework import serializers from rest_framework import exceptions -from .models import * +from .models import View class ViewIndexSerializer(serializers.ModelSerializer): @@ -12,8 +12,10 @@ class Meta: model = View fields = ( 'id', + 'key', + 'comment', 'title', - 'description' + 'help' ) @@ -32,7 +34,12 @@ class Meta: model = View fields = ( 'id', - 'title', - 'description', + 'uri_prefix', + 'key', + 'comment', + 'title_en', + 'title_de', + 'help_en', + 'help_de', 'template' ) diff --git a/apps/views/templates/views/views.html b/apps/views/templates/views/views.html index d3037d0ce..c0843e256 100644 --- a/apps/views/templates/views/views.html +++ b/apps/views/templates/views/views.html @@ -79,13 +79,15 @@

      {% trans 'Views' %}
      - {% trans 'View' %} {$ view.title $} + {% trans 'View' %} + {$ view.key $} + {$ view.title $}
      • - {$ view.description $} + {$ view.help $}
      diff --git a/apps/views/templates/views/views_modal_form_views.html b/apps/views/templates/views/views_modal_form_views.html index 05bef5ae7..03d8aa73c 100644 --- a/apps/views/templates/views/views_modal_form_views.html +++ b/apps/views/templates/views/views_modal_form_views.html @@ -13,20 +13,67 @@

      +
      + + + + +
      - - + data-label="{% trans 'Comment' %}" + data-model="service.values.comment" + data-errors="service.errors.comment"> +
      + + + + +
      +
      + + + + +
      Date: Fri, 27 Jan 2017 17:02:25 +0100 Subject: [PATCH 14/51] refactor tasks app --- apps/tasks/admin.py | 9 +- apps/tasks/migrations/0004_refactoring.py | 75 +++++++++++ apps/tasks/migrations/0005_data_migration.py | 27 ++++ apps/tasks/models.py | 77 +++++++++-- apps/tasks/serializers.py | 9 +- apps/tasks/templates/tasks/tasks.html | 4 +- .../tasks/tasks_modal_form_tasks.html | 123 ++++++++++++------ apps/views/migrations/0006_title_and_help.py | 35 +++++ 8 files changed, 297 insertions(+), 62 deletions(-) create mode 100644 apps/tasks/migrations/0004_refactoring.py create mode 100644 apps/tasks/migrations/0005_data_migration.py create mode 100644 apps/views/migrations/0006_title_and_help.py diff --git a/apps/tasks/admin.py b/apps/tasks/admin.py index 97213e8cd..c26e1542d 100644 --- a/apps/tasks/admin.py +++ b/apps/tasks/admin.py @@ -1,5 +1,10 @@ from django.contrib import admin -from .models import * +from .models import Task -admin.site.register(Task) + +class TaskAdmin(admin.ModelAdmin): + readonly_fields = ('uri', ) + + +admin.site.register(Task, TaskAdmin) diff --git a/apps/tasks/migrations/0004_refactoring.py b/apps/tasks/migrations/0004_refactoring.py new file mode 100644 index 000000000..1e35c2d77 --- /dev/null +++ b/apps/tasks/migrations/0004_refactoring.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-27 15:52 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('tasks', '0003_meta'), + ] + + operations = [ + migrations.AlterModelOptions( + name='task', + options={'ordering': ('key',), 'verbose_name': 'Task', 'verbose_name_plural': 'Tasks'}, + ), + migrations.AddField( + model_name='task', + name='comment', + field=models.TextField(blank=True, help_text='Additional information about this task.', null=True, verbose_name='Comment'), + ), + migrations.AddField( + model_name='task', + name='key', + field=models.SlugField(blank=True, help_text='The internal identifier of this task. The URI will be generated from this key.', max_length=128, null=True, verbose_name='Key'), + ), + migrations.AddField( + model_name='task', + name='uri', + field=models.URLField(blank=True, help_text='The Uniform Resource Identifier of this task (auto-generated).', max_length=640, null=True, verbose_name='URI'), + ), + migrations.AddField( + model_name='task', + name='uri_prefix', + field=models.URLField(blank=True, help_text='The prefix for the URI of this task.', max_length=256, null=True, verbose_name='URI Prefix'), + ), + migrations.AlterField( + model_name='task', + name='attribute', + field=models.ForeignKey(blank=True, help_text='The attribute this task is refering to.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='domain.Attribute', verbose_name='Attribute'), + ), + migrations.AlterField( + model_name='task', + name='conditions', + field=models.ManyToManyField(blank=True, help_text='The list of conditions evaluated for this task.', to='conditions.Condition', verbose_name='Conditions'), + ), + migrations.AlterField( + model_name='task', + name='text_de', + field=models.CharField(help_text='The German text for this task.', max_length=256, verbose_name='Text (de)'), + ), + migrations.AlterField( + model_name='task', + name='text_en', + field=models.CharField(help_text='The English text for this task.', max_length=256, verbose_name='Text (en)'), + ), + migrations.AlterField( + model_name='task', + name='time_period', + field=models.DurationField(help_text='The the time period after this task becomes active.', verbose_name='Time period'), + ), + migrations.AlterField( + model_name='task', + name='title_de', + field=models.CharField(help_text='The German title for this task.', max_length=256, verbose_name='Title (de)'), + ), + migrations.AlterField( + model_name='task', + name='title_en', + field=models.CharField(help_text='The English title for this task.', max_length=256, verbose_name='Title (en)'), + ), + ] diff --git a/apps/tasks/migrations/0005_data_migration.py b/apps/tasks/migrations/0005_data_migration.py new file mode 100644 index 000000000..715a95646 --- /dev/null +++ b/apps/tasks/migrations/0005_data_migration.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-19 16:53 +from __future__ import unicode_literals + +from django.db import migrations +from django.utils.text import slugify + + +def create_identifier(apps, schema_editor): + + Task = apps.get_model('tasks', 'Task') + + for obj in Task.objects.all(): + if not obj.key: + obj.key = slugify(obj.title_en) + obj.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('tasks', '0004_refactoring'), + ] + + operations = [ + migrations.RunPython(create_identifier), + ] diff --git a/apps/tasks/models.py b/apps/tasks/models.py index 2cf8bcda1..60bec16bb 100644 --- a/apps/tasks/models.py +++ b/apps/tasks/models.py @@ -6,6 +6,7 @@ from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ +from apps.core.utils import get_uri_prefix from apps.core.models import TranslationMixin from apps.domain.models import Attribute from apps.conditions.models import Condition @@ -14,25 +15,72 @@ @python_2_unicode_compatible class Task(TranslationMixin, models.Model): - attribute = models.ForeignKey(Attribute, blank=True, null=True, on_delete=models.SET_NULL, related_name='+') - - time_period = models.DurationField() - - title_en = models.CharField(max_length=256) - title_de = models.CharField(max_length=256) - - text_en = models.CharField(max_length=256) - text_de = models.CharField(max_length=256) - - conditions = models.ManyToManyField(Condition, blank=True) + uri = models.URLField( + max_length=640, blank=True, null=True, + verbose_name=_('URI'), + help_text=_('The Uniform Resource Identifier of this task (auto-generated).') + ) + uri_prefix = models.URLField( + max_length=256, blank=True, null=True, + verbose_name=_('URI Prefix'), + help_text=_('The prefix for the URI of this task.') + ) + key = models.SlugField( + max_length=128, blank=True, null=True, + verbose_name=_('Key'), + help_text=_('The internal identifier of this task. The URI will be generated from this key.') + ) + comment = models.TextField( + blank=True, null=True, + verbose_name=_('Comment'), + help_text=_('Additional information about this task.') + ) + attribute = models.ForeignKey( + Attribute, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', + verbose_name=_('Attribute'), + help_text=_('The attribute this task is refering to.') + ) + time_period = models.DurationField( + verbose_name=_('Time period'), + help_text=_('The the time period after this task becomes active.') + ) + title_en = models.CharField( + max_length=256, + verbose_name=_('Title (en)'), + help_text=_('The English title for this task.') + ) + title_de = models.CharField( + max_length=256, + verbose_name=_('Title (de)'), + help_text=_('The German title for this task.') + ) + text_en = models.CharField( + max_length=256, + verbose_name=_('Text (en)'), + help_text=_('The English text for this task.') + ) + text_de = models.CharField( + max_length=256, + verbose_name=_('Text (de)'), + help_text=_('The German text for this task.') + ) + conditions = models.ManyToManyField( + Condition, blank=True, + verbose_name=_('Conditions'), + help_text=_('The list of conditions evaluated for this task.') + ) class Meta: - ordering = ('attribute',) + ordering = ('uri',) verbose_name = _('Task') verbose_name_plural = _('Tasks') def __str__(self): - return self.title + return self.uri or self.key + + def save(self, *args, **kwargs): + self.uri = self.build_uri() + super(Task, self).save(*args, **kwargs) @property def title(self): @@ -46,6 +94,9 @@ def text(self): def has_conditions(self): return bool(self.conditions.all()) + def build_uri(self): + return get_uri_prefix(self) + '/tasks/' + self.key + def get_deadline(self, project, snapshot=None): values = project.values.filter(snapshot=snapshot).filter(attribute=self.attribute) diff --git a/apps/tasks/serializers.py b/apps/tasks/serializers.py index 671f5b7b4..be0fb6c14 100644 --- a/apps/tasks/serializers.py +++ b/apps/tasks/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from .models import * +from .models import Task from apps.domain.models import Attribute from apps.conditions.models import Condition @@ -12,6 +12,7 @@ class Meta: model = Task fields = ( 'id', + 'key', 'title', 'text' ) @@ -23,7 +24,9 @@ class Meta: model = Task fields = ( 'id', - '__str__', + 'uri_prefix', + 'key', + 'comment', 'attribute', 'time_period', 'title_en', @@ -51,5 +54,5 @@ class Meta: model = Condition fields = ( 'id', - 'title' + 'label' ) diff --git a/apps/tasks/templates/tasks/tasks.html b/apps/tasks/templates/tasks/tasks.html index fdfafcd61..306cc373c 100644 --- a/apps/tasks/templates/tasks/tasks.html +++ b/apps/tasks/templates/tasks/tasks.html @@ -88,7 +88,9 @@

      {% trans 'Task' %}

      - {% trans 'Task' %} {$ task.title $} + {% trans 'Task' %} + {$ task.key $} + {$ task.title $}
        diff --git a/apps/tasks/templates/tasks/tasks_modal_form_tasks.html b/apps/tasks/templates/tasks/tasks_modal_form_tasks.html index 5c6a1b633..5ebbf8b7f 100644 --- a/apps/tasks/templates/tasks/tasks_modal_form_tasks.html +++ b/apps/tasks/templates/tasks/tasks_modal_form_tasks.html @@ -1,7 +1,7 @@ {% load i18n %}
      + + {% endblock %} {% block page %} diff --git a/apps/projects/urls.py b/apps/projects/urls.py index 6b17b931a..ded35c970 100644 --- a/apps/projects/urls.py +++ b/apps/projects/urls.py @@ -4,6 +4,7 @@ urlpatterns = [ url(r'^$', projects, name='projects'), + url(r'^export/xml/$', project_answers_export_xml, name='project_answers_export_xml'), url(r'^(?P[0-9]+)/$', project, name='project'), url(r'^create/$', ProjectCreateView.as_view(), name='project_create'), diff --git a/apps/projects/views.py b/apps/projects/views.py index 74cf6e44f..4bc93cafd 100644 --- a/apps/projects/views.py +++ b/apps/projects/views.py @@ -1,4 +1,5 @@ from django.conf import settings +from django.http import HttpResponse from django.http import HttpResponseRedirect, Http404 from django.contrib.auth.decorators import login_required from django.core.urlresolvers import reverse_lazy @@ -21,6 +22,7 @@ from .models import Project, Snapshot, Value from .serializers import * +from .renderers import * from .utils import get_answers_tree @@ -161,6 +163,13 @@ def snapshot_rollback(request, project_id, snapshot_id): }) +@login_required() +def project_answers_export_xml(request): + queryset = Project.objects.all() + serializer = ExportSerializer(queryset, many=True) + return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + + class ProjectCreateView(ProtectedCreateView): model = Project fields = ['title', 'description', 'catalog'] From 9f91dbe17bd8001cbd3f2aeeb26f66f75d7b9d97 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 31 Jan 2017 12:09:30 +0100 Subject: [PATCH 36/51] refactor projects app --- apps/core/management/commands/import.py | 14 ++- apps/projects/admin.py | 2 +- apps/projects/migrations/0011_refactoring.py | 87 +++++++++++++++++ apps/projects/models.py | 92 +++++++++++++----- apps/projects/renderers.py | 93 ++++++------------ apps/projects/serializers.py | 74 +++++---------- apps/projects/urls.py | 19 +++- apps/projects/urls_api.py | 2 +- apps/projects/utils.py | 99 ++++++++++++++++++++ apps/projects/views.py | 40 +++++--- 10 files changed, 365 insertions(+), 157 deletions(-) create mode 100644 apps/projects/migrations/0011_refactoring.py diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index 179cb3eb3..224dbdc0f 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -1,17 +1,20 @@ from lxml import objectify -from django.core.management.base import BaseCommand +from django.contrib.auth.models import User +from django.core.management.base import BaseCommand, CommandError from apps.conditions.utils import import_xml as import_conditions from apps.options.utils import import_xml as import_options from apps.domain.utils import import_xml as import_domain from apps.questions.utils import import_xml as import_questions +from apps.projects.utils import import_xml as import_projects class Command(BaseCommand): def add_arguments(self, parser): parser.add_argument('xmlfile', action='store', default=False, help='RDMO XML export file') + parser.add_argument('--user', action='store', default=False, help='RDMO username for this import') def handle(self, *args, **options): with open(options['xmlfile']) as f: @@ -29,5 +32,14 @@ def handle(self, *args, **options): elif xml_root.tag == 'catalogs': import_questions(xml_root) + elif xml_root.tag == 'projects': + + try: + user = User.objects.get(username=options['user']) + except User.DoesNotExist: + raise CommandError('Give a valid username using --user.') + + import_projects(xml_root, user) + else: raise Exception('This is not a proper RDMO XML Export.') diff --git a/apps/projects/admin.py b/apps/projects/admin.py index 844374aff..cacf4fb97 100644 --- a/apps/projects/admin.py +++ b/apps/projects/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import * +from .models import Project, Snapshot, Value admin.site.register(Project) diff --git a/apps/projects/migrations/0011_refactoring.py b/apps/projects/migrations/0011_refactoring.py new file mode 100644 index 000000000..0a7ef9a7c --- /dev/null +++ b/apps/projects/migrations/0011_refactoring.py @@ -0,0 +1,87 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-01-30 15:28 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0010_add_db_contraint'), + ] + + operations = [ + migrations.AlterField( + model_name='project', + name='catalog', + field=models.ForeignKey(help_text='The catalog which will be used for this project.', on_delete=django.db.models.deletion.CASCADE, related_name='+', to='questions.Catalog', verbose_name='Catalog'), + ), + migrations.AlterField( + model_name='project', + name='description', + field=models.TextField(blank=True, help_text='A description for this project (optional).', verbose_name='Description'), + ), + migrations.AlterField( + model_name='project', + name='owner', + field=models.ManyToManyField(help_text='The list of owners for this project.', to=settings.AUTH_USER_MODEL, verbose_name='Owner'), + ), + migrations.AlterField( + model_name='project', + name='title', + field=models.CharField(help_text='The title for this project.', max_length=256, verbose_name='Title'), + ), + migrations.AlterField( + model_name='snapshot', + name='description', + field=models.TextField(blank=True, help_text='A description for this snapshot (optional).', verbose_name='Description'), + ), + migrations.AlterField( + model_name='snapshot', + name='project', + field=models.ForeignKey(help_text='The project this snapshot belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='snapshots', to='projects.Project', verbose_name='Project'), + ), + migrations.AlterField( + model_name='snapshot', + name='title', + field=models.CharField(help_text='The title for this snapshot.', max_length=256, verbose_name='Title'), + ), + migrations.AlterField( + model_name='value', + name='attribute', + field=models.ForeignKey(blank=True, help_text='The attribute this value belongs to.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='values', to='domain.Attribute', verbose_name='Attribute'), + ), + migrations.AlterField( + model_name='value', + name='collection_index', + field=models.IntegerField(default=0, help_text='The position of this value in an attribute collection.', verbose_name='Collection index'), + ), + migrations.AlterField( + model_name='value', + name='option', + field=models.ForeignKey(blank=True, help_text='The option stored for this value.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='options.Option', verbose_name='Option'), + ), + migrations.AlterField( + model_name='value', + name='project', + field=models.ForeignKey(help_text='The project this value belongs to.', on_delete=django.db.models.deletion.CASCADE, related_name='values', to='projects.Project', verbose_name='Project'), + ), + migrations.AlterField( + model_name='value', + name='set_index', + field=models.IntegerField(default=0, help_text='The position of this value in an entity collection (i.e. in the question set)', verbose_name='Set index'), + ), + migrations.AlterField( + model_name='value', + name='snapshot', + field=models.ForeignKey(blank=True, help_text='The snapshot this value belongs to.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='values', to='projects.Snapshot', verbose_name='Snapshot'), + ), + migrations.AlterField( + model_name='value', + name='text', + field=models.TextField(blank=True, help_text='The string stored for this value.', null=True, verbose_name='Text'), + ), + ] diff --git a/apps/projects/models.py b/apps/projects/models.py index 63fafbe8f..82f018d62 100644 --- a/apps/projects/models.py +++ b/apps/projects/models.py @@ -16,12 +16,26 @@ @python_2_unicode_compatible class Project(Model): - owner = models.ManyToManyField(User) - - title = models.CharField(max_length=256, verbose_name=_('title')) - description = models.TextField(blank=True, help_text=_('Optional'), verbose_name=_('description')) - - catalog = models.ForeignKey(Catalog, related_name='+', help_text=_('The catalog which will be used for this project.'), verbose_name=_('catalog')) + owner = models.ManyToManyField( + User, + verbose_name=_('Owner'), + help_text=_('The list of owners for this project.') + ) + title = models.CharField( + max_length=256, + verbose_name=_('Title'), + help_text=_('The title for this project.') + ) + description = models.TextField( + blank=True, + verbose_name=_('Description'), + help_text=_('A description for this project (optional).') + ) + catalog = models.ForeignKey( + Catalog, related_name='+', + verbose_name=_('Catalog'), + help_text=_('The catalog which will be used for this project.') + ) class Meta: ordering = ('title', ) @@ -45,10 +59,21 @@ def current_values(self): @python_2_unicode_compatible class Snapshot(Model): - title = models.CharField(max_length=256, verbose_name=_('title')) - description = models.TextField(blank=True, help_text=_('Optional'), verbose_name=_('description')) - - project = models.ForeignKey('Project', related_name='snapshots') + project = models.ForeignKey( + 'Project', related_name='snapshots', + verbose_name=_('Project'), + help_text=_('The project this snapshot belongs to.') + ) + title = models.CharField( + max_length=256, + verbose_name=_('Title'), + help_text=_('The title for this snapshot.') + ) + description = models.TextField( + blank=True, + verbose_name=_('Description'), + help_text=_('A description for this snapshot (optional).') + ) class Meta: ordering = ('project', '-created') @@ -65,7 +90,7 @@ def rollback(self): # first remove all current values Value.objects.filter(snapshot=None).delete() - # remove the snapshot from this snnapshots values + # remove the snapshot from this snapshots values for value in self.values.all(): value.snapshot = None value.save() @@ -93,16 +118,41 @@ def create_values_for_snapshot(sender, **kwargs): @python_2_unicode_compatible class Value(Model): - project = models.ForeignKey('Project', related_name='values') - snapshot = models.ForeignKey('Snapshot', blank=True, null=True, related_name='values') - - attribute = models.ForeignKey(Attribute, related_name='values', blank=True, null=True, on_delete=models.SET_NULL) - - set_index = models.IntegerField(default=0) - collection_index = models.IntegerField(default=0) - - text = models.TextField(blank=True, null=True) - option = models.ForeignKey(Option, blank=True, null=True, on_delete=models.SET_NULL, related_name='+') + project = models.ForeignKey( + 'Project', related_name='values', + verbose_name=_('Project'), + help_text=_('The project this value belongs to.') + ) + snapshot = models.ForeignKey( + 'Snapshot', blank=True, null=True, related_name='values', + verbose_name=_('Snapshot'), + help_text=_('The snapshot this value belongs to.') + ) + attribute = models.ForeignKey( + Attribute, related_name='values', blank=True, null=True, on_delete=models.SET_NULL, + verbose_name=_('Attribute'), + help_text=_('The attribute this value belongs to.') + ) + set_index = models.IntegerField( + default=0, + verbose_name=_('Set index'), + help_text=_('The position of this value in an entity collection (i.e. in the question set)') + ) + collection_index = models.IntegerField( + default=0, + verbose_name=_('Collection index'), + help_text=_('The position of this value in an attribute collection.') + ) + text = models.TextField( + blank=True, null=True, + verbose_name=_('Text'), + help_text=_('The string stored for this value.') + ) + option = models.ForeignKey( + Option, blank=True, null=True, on_delete=models.SET_NULL, related_name='+', + verbose_name=_('Option'), + help_text=_('The option stored for this value.') + ) class Meta: verbose_name = _('Value') diff --git a/apps/projects/renderers.py b/apps/projects/renderers.py index 38110e41e..ac511b571 100644 --- a/apps/projects/renderers.py +++ b/apps/projects/renderers.py @@ -1,94 +1,61 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): - - media_type = 'application/xml' - format = 'xml' - - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('projects', {}) - - for project in data: - self._project(xml, project) + def render_document(self, xml, projects): + xml.startElement('projects', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) + for project in projects: + self.render_project(xml, project) xml.endElement('projects') - xml.endDocument() - return stream.getvalue() - def _project(self, xml, project): + def render_project(self, xml, project): xml.startElement('project', {}) - self._text_element(xml, 'title', {}, project["title"]) - self._text_element(xml, 'description', {}, project["description"]) - self._text_element(xml, 'catalog', {}, project["catalog"]) + self.render_text_element(xml, 'title', {}, project["title"]) + self.render_text_element(xml, 'description', {}, project["description"]) + self.render_text_element(xml, 'catalog', {'dc:uri': project["catalog"]}, None) if 'snapshots' in project and project['snapshots']: xml.startElement('snapshots', {}) - for snapshot in project['snapshots']: - self._snapshot(xml, snapshot) - + self.render_snapshot(xml, snapshot) xml.endElement('snapshots') if 'values' in project and project['values']: xml.startElement('values', {}) - for value in project['values']: - self._value(xml, value) - + self.render_value(xml, value) xml.endElement('values') + self.render_text_element(xml, 'created', {}, project["created"]) + self.render_text_element(xml, 'updated', {}, project["updated"]) xml.endElement('project') - def _snapshot(self, xml, snapshot): + def render_snapshot(self, xml, snapshot): xml.startElement('snapshot', {}) - self._text_element(xml, 'title', {}, snapshot["title"]) - self._text_element(xml, 'description', {}, snapshot["description"]) - self._text_element(xml, 'project', {}, snapshot["project"]) + self.render_text_element(xml, 'title', {}, snapshot["title"]) + self.render_text_element(xml, 'description', {}, snapshot["description"]) if 'values' in snapshot and snapshot['values']: xml.startElement('values', {}) - for value in snapshot['values']: - self._value(xml, value) - + self.render_value(xml, value) xml.endElement('values') + self.render_text_element(xml, 'created', {}, snapshot["created"]) + self.render_text_element(xml, 'updated', {}, snapshot["updated"]) xml.endElement('snapshot') - def _value(self, xml, value): + def render_value(self, xml, value): xml.startElement('value', {}) - self._text_element(xml, 'created', {}, value["created"]) - self._text_element(xml, 'updated', {}, value["updated"]) - - xml.startElement('attribute', value["attribute"]) - xml.endElement('attribute') - - self._text_element(xml, 'set_index', {}, value["set_index"]) - self._text_element(xml, 'collection_index', {}, value["collection_index"]) - self._text_element(xml, 'text', {}, value["text"]) - - if value["option"]: - xml.startElement('option', value["option"]) - xml.endElement('option') - + self.render_text_element(xml, 'attribute', {'dc:uri': value["attribute"]}, None) + self.render_text_element(xml, 'set_index', {}, value["set_index"]) + self.render_text_element(xml, 'collection_index', {}, value["collection_index"]) + self.render_text_element(xml, 'text', {}, value["text"]) + self.render_text_element(xml, 'option', {'dc:uri': value["option"]}, None) + self.render_text_element(xml, 'created', {}, value["created"]) + self.render_text_element(xml, 'updated', {}, value["updated"]) xml.endElement('value') - - def _text_element(self, xml, tag, value, text): - xml.startElement(tag, value) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) diff --git a/apps/projects/serializers.py b/apps/projects/serializers.py index 215c3d321..1f5f39684 100644 --- a/apps/projects/serializers.py +++ b/apps/projects/serializers.py @@ -8,10 +8,10 @@ from apps.options.models import OptionSet, Option from apps.questions.models import Catalog, Section, Subsection, QuestionEntity, Question -from .models import * +from .models import Project, Snapshot, Value -class ProjectsSerializer(serializers.ModelSerializer): +class ProjectSerializer(serializers.ModelSerializer): class Meta: model = Project @@ -335,64 +335,23 @@ class Meta: ) -class ExportAttributeSerializer(serializers.ModelSerializer): - - class Meta: - model = Attribute - fields = ( - 'identifier', - ) - - -class ExportOptionSerializer(serializers.ModelSerializer): - - class Meta: - model = Option - fields = ( - 'identifier', - ) - - class ExportValueSerializer(serializers.ModelSerializer): - attribute = ExportAttributeSerializer() - option = ExportOptionSerializer() + attribute = serializers.CharField(source='attribute.uri') + option = serializers.CharField(source='option.uri') class Meta: model = Value fields = ( - 'id', - 'created', - 'updated', - 'project', - 'snapshot', 'attribute', 'set_index', 'collection_index', 'text', - 'option' - ) - - -class ExportProjectsSerializer(serializers.ModelSerializer): - - values = serializers.SerializerMethodField() - - class Meta: - model = Project - fields = ( - 'id', - 'title', - 'description', - 'catalog', - 'values' + 'option', + 'created', + 'updated' ) - def get_values(self, obj): - values = Value.objects.filter(Snapshot=none) - serializer = ExportValueSerializer(instance=values, many=True) - return serializer.data - class ExportSnapshotSerializer(serializers.ModelSerializer): @@ -403,8 +362,9 @@ class Meta: fields = ( 'title', 'description', - 'project', - 'values' + 'values', + 'created', + 'updated' ) def get_values(self, obj): @@ -416,15 +376,23 @@ def get_values(self, obj): class ExportSerializer(serializers.ModelSerializer): snapshots = ExportSnapshotSerializer(many=True) - values = ExportValueSerializer(many=True) + values = serializers.SerializerMethodField() + + catalog = serializers.CharField(source='catalog.uri') class Meta: model = Project fields = ( - 'id', 'title', 'description', 'catalog', 'snapshots', - 'values' + 'values', + 'created', + 'updated' ) + + def get_values(self, obj): + values = Value.objects.filter(snapshot=None) + serializer = ExportValueSerializer(instance=values, many=True) + return serializer.data diff --git a/apps/projects/urls.py b/apps/projects/urls.py index ded35c970..7bb43ab20 100644 --- a/apps/projects/urls.py +++ b/apps/projects/urls.py @@ -1,10 +1,25 @@ from django.conf.urls import url -from .views import * +from .views import ( + projects, + project, + projects_export_xml, + ProjectCreateView, + ProjectUpdateView, + ProjectDeleteView, + SnapshotCreateView, + SnapshotUpdateView, + snapshot_rollback, + project_answers, + project_answers_export, + project_view, + project_view_export, + project_questions +) urlpatterns = [ url(r'^$', projects, name='projects'), - url(r'^export/xml/$', project_answers_export_xml, name='project_answers_export_xml'), + url(r'^export/xml/$', projects_export_xml, name='project_answers_export_xml'), url(r'^(?P[0-9]+)/$', project, name='project'), url(r'^create/$', ProjectCreateView.as_view(), name='project_create'), diff --git a/apps/projects/urls_api.py b/apps/projects/urls_api.py index facd2c678..d26a7a1e6 100644 --- a/apps/projects/urls_api.py +++ b/apps/projects/urls_api.py @@ -2,7 +2,7 @@ from rest_framework import routers -from .views import * +from .views import ProjectViewSet, ValueViewSet, QuestionEntityViewSet, CatalogViewSet router = routers.DefaultRouter() router.register(r'projects', ProjectViewSet, base_name='project') diff --git a/apps/projects/utils.py b/apps/projects/utils.py index ad4fd433e..12ade2c0e 100644 --- a/apps/projects/utils.py +++ b/apps/projects/utils.py @@ -2,6 +2,13 @@ from django.utils.translation import ugettext_lazy as _ +from apps.core.utils import get_ns_tag +from apps.domain.models import Attribute +from apps.options.models import Option +from apps.questions.utils import Catalog + +from .models import Project, Snapshot, Value + def get_answers_tree(project, snapshot=None): @@ -154,3 +161,95 @@ def get_answer(value, attribute): else: return value.text + + +def import_xml(projects_node, user): + + nsmap = projects_node.nsmap + + for project_node in projects_node.iterchildren(): + import_project(project_node, nsmap, user) + + +def import_project(project_node, nsmap, user): + + try: + project = Project.objects.get(title=project_node['title'], owner=user) + print('skipping existing project "%s".' % project_node['title']) + return + except Project.DoesNotExist: + project = Project(title=project_node['title']) + + try: + catalog_uri = project_node['catalog'].get(get_ns_tag('dc:uri', nsmap)) + project.catalog = Catalog.objects.get(uri=catalog_uri) + except Catalog.DoesNotExist: + print('Skipping project "%s". Catalog not found.' % project_node['title']) + return + + project.description = project_node['description'] + project.created = project_node['created'].text + project.save() + + # add user to owners + project.owner.add(user) + + # loop over snapshots + if hasattr(project_node, 'snapshots'): + for snapshot_node in project_node['snapshots'].iterchildren(): + import_snapshot(snapshot_node, nsmap, project) + + # loop over values + if hasattr(project_node, 'values'): + for value_node in project_node['values'].iterchildren(): + import_value(value_node, nsmap, project) + + +def import_snapshot(snapshot_node, nsmap, project): + + try: + snapshot = project.snapshots.get(title=snapshot_node['title']) + except Snapshot.DoesNotExist: + snapshot = Snapshot(project=project, title=snapshot_node['title']) + + snapshot.description = snapshot_node['description'] + snapshot.created = snapshot_node['created'].text + snapshot.save() + + +def import_value(value_node, nsmap, project, snapshot=None): + + try: + attribute_uri = value_node['attribute'].get(get_ns_tag('dc:uri', nsmap)) + attribute = Attribute.objects.get(uri=attribute_uri) + except Attribute.DoesNotExist: + print('Skipping value for Attribute "%s". Attribute not found.' % attribute_uri) + return + + try: + value = Value.objects.get( + project=project, + snapshot=snapshot, + attribute=attribute, + set_index=value_node['set_index'], + collection_index=value_node['collection_index'] + ) + except Value.DoesNotExist: + value = Value( + project=project, + snapshot=snapshot, + attribute=attribute, + set_index=value_node['set_index'], + collection_index=value_node['collection_index'] + ) + + value.created = value_node['created'].text + value.text = value_node['text'] + + try: + option_uri = value_node['option'].get(get_ns_tag('dc:uri', nsmap)) + value.option = Option.objects.get(uri=option_uri) + except Option.DoesNotExist: + value.option = None + + value.save() diff --git a/apps/projects/views.py b/apps/projects/views.py index 4bc93cafd..44dda34e8 100644 --- a/apps/projects/views.py +++ b/apps/projects/views.py @@ -2,7 +2,7 @@ from django.http import HttpResponse from django.http import HttpResponseRedirect, Http404 from django.contrib.auth.decorators import login_required -from django.core.urlresolvers import reverse_lazy +from django.core.urlresolvers import reverse, reverse_lazy from django.shortcuts import render, get_object_or_404 from django.template import TemplateSyntaxError from django.utils.translation import ugettext_lazy as _ @@ -16,13 +16,19 @@ from apps.core.views import ProtectedCreateView, ProtectedUpdateView, ProtectedDeleteView from apps.core.utils import render_to_format - +from apps.questions.models import Catalog, QuestionEntity from apps.tasks.models import Task from apps.views.models import View from .models import Project, Snapshot, Value -from .serializers import * -from .renderers import * +from .serializers import ( + ProjectSerializer, + ValueSerializer, + QuestionEntitySerializer, + CatalogSerializer, + ExportSerializer +) +from .renderers import XMLRenderer from .utils import get_answers_tree @@ -54,6 +60,16 @@ def project(request, pk): }) +@login_required() +def projects_export_xml(request): + queryset = Project.objects.all() + serializer = ExportSerializer(queryset, many=True) + + response = HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + response['Content-Disposition'] = 'filename="projects.xml"' + return response + + @login_required() def project_answers(request, project_id, snapshot_id=None): project = get_object_or_404(Project.objects.filter(owner=request.user), pk=project_id) @@ -138,12 +154,6 @@ def project_view_export(request, project_id, view_id, format, snapshot_id=None): @login_required() -def project_questions(request, project_id): - return render(request, 'projects/project_questions.html', { - 'project_id': project_id - }) - - def snapshot_rollback(request, project_id, snapshot_id): project = get_object_or_404(Project.objects.filter(owner=request.user), pk=project_id) @@ -164,10 +174,10 @@ def snapshot_rollback(request, project_id, snapshot_id): @login_required() -def project_answers_export_xml(request): - queryset = Project.objects.all() - serializer = ExportSerializer(queryset, many=True) - return HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") +def project_questions(request, project_id): + return render(request, 'projects/project_questions.html', { + 'project_id': project_id + }) class ProjectCreateView(ProtectedCreateView): @@ -223,7 +233,7 @@ def get_queryset(self): class ProjectViewSet(viewsets.ModelViewSet): permission_classes = (IsAuthenticated, ) - serializer_class = ProjectsSerializer + serializer_class = ProjectSerializer def get_queryset(self): return Project.objects.filter(owner=self.request.user) From 4f6098adef98e8d6726bf8b419ba169c967f5907 Mon Sep 17 00:00:00 2001 From: Martin Heger Date: Wed, 25 Jan 2017 15:07:05 +0100 Subject: [PATCH 37/51] add tasks and views xml-export Conflicts: apps/views/views.py --- apps/tasks/renderers.py | 49 +++++++++++++++++++++++++++ apps/tasks/serializers.py | 27 +++++++++++++++ apps/tasks/templates/tasks/tasks.html | 8 +++++ apps/tasks/urls.py | 1 + apps/tasks/views.py | 15 +++++++- apps/views/renderers.py | 44 ++++++++++++++++++++++++ apps/views/serializers.py | 12 +++++++ apps/views/templates/views/views.html | 8 +++++ apps/views/urls.py | 1 + apps/views/views.py | 15 ++++++-- 10 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 apps/tasks/renderers.py create mode 100644 apps/views/renderers.py diff --git a/apps/tasks/renderers.py b/apps/tasks/renderers.py new file mode 100644 index 000000000..2fa1318f1 --- /dev/null +++ b/apps/tasks/renderers.py @@ -0,0 +1,49 @@ +from __future__ import unicode_literals + +from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO +from django.utils.encoding import smart_text +from rest_framework.renderers import BaseRenderer + + +class XMLRenderer(BaseRenderer): + + media_type = 'application/xml' + format = 'xml' + + def render(self, data): + + if data is None: + return '' + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement('tasks', {}) + + for task in data: + self._task(xml, task) + + xml.endElement('tasks') + xml.endDocument() + return stream.getvalue() + + def _task(self, xml, task): + xml.startElement('task', {}) + self._text_element(xml, 'identifier', {}, task["identifier"]) + self._text_element(xml, 'uri', {}, task["uri"]) + self._text_element(xml, 'attribute', {}, task["attribute"]) + self._text_element(xml, 'time_period', {}, task["time_period"]) + self._text_element(xml, 'title_en', {}, task["title_en"]) + self._text_element(xml, 'title_de', {}, task["title_de"]) + self._text_element(xml, 'text_en', {}, task["text_en"]) + self._text_element(xml, 'text_de', {}, task["text_de"]) + self._text_element(xml, 'conditions', {}, task["conditions"]) + xml.endElement('task') + + def _text_element(self, xml, tag, task, text): + xml.startElement(tag, task) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) diff --git a/apps/tasks/serializers.py b/apps/tasks/serializers.py index be0fb6c14..38bea8ebb 100644 --- a/apps/tasks/serializers.py +++ b/apps/tasks/serializers.py @@ -56,3 +56,30 @@ class Meta: 'id', 'label' ) + + +class ExportSerializer(serializers.ModelSerializer): + + class Meta: + model = Task + fields = ( + 'identifier', + 'uri', + 'comment', + 'attribute', + 'time_period', + 'title_en', + 'title_de', + 'text_en', + 'text_de', + 'conditions' + ) + + def get_deadline(self, project, snapshot=None): + values = project.values.filter(snapshot=snapshot).filter(attribute=self.attribute) + + for value in values: + try: + return iso8601.parse_date(value.text) + self.time_period + except iso8601.ParseError: + return None diff --git a/apps/tasks/templates/tasks/tasks.html b/apps/tasks/templates/tasks/tasks.html index 306cc373c..ab0ac9910 100644 --- a/apps/tasks/templates/tasks/tasks.html +++ b/apps/tasks/templates/tasks/tasks.html @@ -51,6 +51,14 @@

      {% trans 'Export' %}

      {% endfor %}

    + + {% endblock %} {% block page %} diff --git a/apps/tasks/urls.py b/apps/tasks/urls.py index b880b2973..2e4df4141 100644 --- a/apps/tasks/urls.py +++ b/apps/tasks/urls.py @@ -4,5 +4,6 @@ urlpatterns = [ url(r'^$', tasks, name='tasks'), + url(r'^export/xml/$', tasks_export_xml, name='tasks_export_xml'), url(r'^export/(?P[a-z]+)/$', tasks_export, name='tasks_export'), ] diff --git a/apps/tasks/views.py b/apps/tasks/views.py index 9efd9a7a5..350e88700 100644 --- a/apps/tasks/views.py +++ b/apps/tasks/views.py @@ -1,6 +1,7 @@ from django.conf import settings -from django.contrib.admin.views.decorators import staff_member_required +from django.http import HttpResponse from django.shortcuts import render +from django.contrib.admin.views.decorators import staff_member_required from django.utils.translation import ugettext_lazy as _ from rest_framework import viewsets @@ -8,6 +9,7 @@ from rest_framework.decorators import list_route from rest_framework.response import Response +from apps.core.serializers import ChoicesSerializer from apps.core.utils import render_to_format from apps.conditions.models import Condition @@ -15,6 +17,7 @@ from .models import * from .serializers import * +from .renderers import * @staff_member_required @@ -31,6 +34,16 @@ def tasks_export(request, format): }) +@staff_member_required +def tasks_export_xml(request): + queryset = Task.objects.all() + serializer = ExportSerializer(queryset, many=True) + + response = HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + response['Content-Disposition'] = 'attachment; filename="tasks.xml"' + return response + + class TaskViewSet(viewsets.ModelViewSet): permission_classes = (DjangoModelPermissions, ) diff --git a/apps/views/renderers.py b/apps/views/renderers.py new file mode 100644 index 000000000..c53352e54 --- /dev/null +++ b/apps/views/renderers.py @@ -0,0 +1,44 @@ +from __future__ import unicode_literals + +from django.utils.xmlutils import SimplerXMLGenerator +from django.utils.six.moves import StringIO +from django.utils.encoding import smart_text +from rest_framework.renderers import BaseRenderer + + +class XMLRenderer(BaseRenderer): + + media_type = 'application/xml' + format = 'xml' + + def render(self, data): + + if data is None: + return '' + + stream = StringIO() + + xml = SimplerXMLGenerator(stream, "utf-8") + xml.startDocument() + xml.startElement('views', {}) + + for view in data: + self._view(xml, view) + + xml.endElement('views') + xml.endDocument() + return stream.getvalue() + + def _view(self, xml, view): + xml.startElement('view', {}) + self._text_element(xml, 'identifier', {}, view["identifier"]) + self._text_element(xml, 'uri', {}, view["uri"]) + self._text_element(xml, 'comment', {}, view["comment"]) + self._text_element(xml, 'template', {}, view["template"]) + xml.endElement('view') + + def _text_element(self, xml, tag, view, text): + xml.startElement(tag, view) + if text is not None: + xml.characters(smart_text(text)) + xml.endElement(tag) diff --git a/apps/views/serializers.py b/apps/views/serializers.py index b3a9893f0..a5e9d6743 100644 --- a/apps/views/serializers.py +++ b/apps/views/serializers.py @@ -43,3 +43,15 @@ class Meta: 'help_de', 'template' ) + + +class ExportSerializer(serializers.ModelSerializer): + + class Meta: + model = View + fields = ( + 'identifier', + 'uri', + 'comment', + 'template' + ) diff --git a/apps/views/templates/views/views.html b/apps/views/templates/views/views.html index c0843e256..dbc00c7bd 100644 --- a/apps/views/templates/views/views.html +++ b/apps/views/templates/views/views.html @@ -57,6 +57,14 @@

    {% trans 'Export' %}

    {% endfor %}

+ + {% endblock %} {% block page %} diff --git a/apps/views/urls.py b/apps/views/urls.py index 7f82a9784..664e79f67 100644 --- a/apps/views/urls.py +++ b/apps/views/urls.py @@ -4,5 +4,6 @@ urlpatterns = [ url(r'^$', views, name='views'), + url(r'^export/xml/$', views_export_xml, name='views_export_xml'), url(r'^export/(?P[a-z]+)/$', views_export, name='views_export'), ] diff --git a/apps/views/views.py b/apps/views/views.py index 7deb02345..a187581b5 100644 --- a/apps/views/views.py +++ b/apps/views/views.py @@ -1,6 +1,7 @@ from django.conf import settings -from django.contrib.admin.views.decorators import staff_member_required +from django.http import HttpResponse from django.shortcuts import render +from django.contrib.admin.views.decorators import staff_member_required from django.utils.translation import ugettext_lazy as _ from rest_framework import viewsets @@ -12,7 +13,7 @@ from .models import View from .serializers import ViewSerializer, ViewIndexSerializer - +from .renderers import XMLRenderer @staff_member_required def views(request): @@ -28,6 +29,16 @@ def views_export(request, format): }) +@staff_member_required +def views_export_xml(request): + queryset = View.objects.all() + serializer = ExportSerializer(queryset, many=True) + + response = HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") + response['Content-Disposition'] = 'filename="views.xml"' + return response + + class ViewViewSet(viewsets.ModelViewSet): permission_classes = (DjangoModelPermissions, IsAuthenticated) From b7de2205948339c3e0c738bfd66ced87e5a73d82 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 31 Jan 2017 14:04:00 +0100 Subject: [PATCH 38/51] refactor views xml-export --- apps/core/management/commands/import.py | 4 ++ apps/views/renderers.py | 51 ++++++++----------------- apps/views/serializers.py | 5 ++- apps/views/urls.py | 2 +- apps/views/utils.py | 30 +++++++++++++++ apps/views/views.py | 3 +- 6 files changed, 57 insertions(+), 38 deletions(-) create mode 100644 apps/views/utils.py diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index 224dbdc0f..6eabdcfc0 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -7,6 +7,7 @@ from apps.options.utils import import_xml as import_options from apps.domain.utils import import_xml as import_domain from apps.questions.utils import import_xml as import_questions +from apps.views.utils import import_xml as import_views from apps.projects.utils import import_xml as import_projects @@ -32,6 +33,9 @@ def handle(self, *args, **options): elif xml_root.tag == 'catalogs': import_questions(xml_root) + elif xml_root.tag == 'views': + import_views(xml_root) + elif xml_root.tag == 'projects': try: diff --git a/apps/views/renderers.py b/apps/views/renderers.py index c53352e54..a36d4b64d 100644 --- a/apps/views/renderers.py +++ b/apps/views/renderers.py @@ -1,44 +1,25 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): + def render_document(self, xml, views): + xml.startElement('views', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) - media_type = 'application/xml' - format = 'xml' - - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('views', {}) - - for view in data: - self._view(xml, view) + for view in views: + self.render_view(xml, view) xml.endElement('views') - xml.endDocument() - return stream.getvalue() - def _view(self, xml, view): + def render_view(self, xml, view): xml.startElement('view', {}) - self._text_element(xml, 'identifier', {}, view["identifier"]) - self._text_element(xml, 'uri', {}, view["uri"]) - self._text_element(xml, 'comment', {}, view["comment"]) - self._text_element(xml, 'template', {}, view["template"]) + self.render_text_element(xml, 'dc:uri', {}, view["uri"]) + self.render_text_element(xml, 'dc:comment', {}, view["comment"]) + self.render_text_element(xml, 'title', {'lang': 'en'}, view["title_en"]) + self.render_text_element(xml, 'title', {'lang': 'de'}, view["title_de"]) + self.render_text_element(xml, 'help', {'lang': 'en'}, view["help_en"]) + self.render_text_element(xml, 'help', {'lang': 'de'}, view["help_de"]) + self.render_text_element(xml, 'template', {}, view["template"]) xml.endElement('view') - - def _text_element(self, xml, tag, view, text): - xml.startElement(tag, view) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) diff --git a/apps/views/serializers.py b/apps/views/serializers.py index a5e9d6743..f12b3504a 100644 --- a/apps/views/serializers.py +++ b/apps/views/serializers.py @@ -50,8 +50,11 @@ class ExportSerializer(serializers.ModelSerializer): class Meta: model = View fields = ( - 'identifier', 'uri', 'comment', + 'title_en', + 'title_de', + 'help_en', + 'help_de', 'template' ) diff --git a/apps/views/urls.py b/apps/views/urls.py index 664e79f67..41c767e4d 100644 --- a/apps/views/urls.py +++ b/apps/views/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import views, views_export +from .views import views, views_export, views_export_xml urlpatterns = [ url(r'^$', views, name='views'), diff --git a/apps/views/utils.py b/apps/views/utils.py new file mode 100644 index 000000000..6044d1e18 --- /dev/null +++ b/apps/views/utils.py @@ -0,0 +1,30 @@ +from lxml import etree + +from apps.core.utils import get_ns_tag +from apps.domain.models import AttributeEntity + +from .models import View + + +def import_xml(views_node): + + nsmap = views_node.nsmap + + for view_node in views_node.iterchildren(): + view_uri = view_node[get_ns_tag('dc:uri', nsmap)].text + + try: + view = View.objects.get(uri=view_uri) + except View.DoesNotExist: + view = View() + + view.uri_prefix = view_uri.split('/views/')[0] + view.key = view_uri.split('/')[-1] + + for element in view_node['title']: + setattr(view, 'title_' + element.get('lang'), element.text) + for element in view_node['help']: + setattr(view, 'help_' + element.get('lang'), element.text) + + view.template = view_node['template'].text + view.save() diff --git a/apps/views/views.py b/apps/views/views.py index a187581b5..40cb3d14d 100644 --- a/apps/views/views.py +++ b/apps/views/views.py @@ -12,9 +12,10 @@ from apps.core.utils import render_to_format from .models import View -from .serializers import ViewSerializer, ViewIndexSerializer +from .serializers import ViewSerializer, ViewIndexSerializer, ExportSerializer from .renderers import XMLRenderer + @staff_member_required def views(request): return render(request, 'views/views.html', { From a0c7a4d9370af06d2fdbab204af861e5b34e3c54 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 31 Jan 2017 14:25:40 +0100 Subject: [PATCH 39/51] refactor tasks xml-export --- apps/core/management/commands/import.py | 4 ++ apps/tasks/renderers.py | 60 +++++++------------ apps/tasks/serializers.py | 23 ++++--- .../tasks/tasks_modal_form_conditions.html | 2 +- apps/tasks/urls.py | 2 +- apps/tasks/urls_api.py | 2 +- apps/tasks/utils.py | 45 ++++++++++++++ apps/tasks/views.py | 15 +++-- 8 files changed, 97 insertions(+), 56 deletions(-) create mode 100644 apps/tasks/utils.py diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index 6eabdcfc0..e9bee7e56 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -7,6 +7,7 @@ from apps.options.utils import import_xml as import_options from apps.domain.utils import import_xml as import_domain from apps.questions.utils import import_xml as import_questions +from apps.tasks.utils import import_xml as import_tasks from apps.views.utils import import_xml as import_views from apps.projects.utils import import_xml as import_projects @@ -33,6 +34,9 @@ def handle(self, *args, **options): elif xml_root.tag == 'catalogs': import_questions(xml_root) + elif xml_root.tag == 'tasks': + import_tasks(xml_root) + elif xml_root.tag == 'views': import_views(xml_root) diff --git a/apps/tasks/renderers.py b/apps/tasks/renderers.py index 2fa1318f1..434880a53 100644 --- a/apps/tasks/renderers.py +++ b/apps/tasks/renderers.py @@ -1,49 +1,31 @@ -from __future__ import unicode_literals +from apps.core.renderers import BaseXMLRenderer -from django.utils.xmlutils import SimplerXMLGenerator -from django.utils.six.moves import StringIO -from django.utils.encoding import smart_text -from rest_framework.renderers import BaseRenderer +class XMLRenderer(BaseXMLRenderer): -class XMLRenderer(BaseRenderer): + def render_document(self, xml, tasks): + xml.startElement('tasks', { + 'xmlns:dc': "http://purl.org/dc/elements/1.1/" + }) - media_type = 'application/xml' - format = 'xml' - - def render(self, data): - - if data is None: - return '' - - stream = StringIO() - - xml = SimplerXMLGenerator(stream, "utf-8") - xml.startDocument() - xml.startElement('tasks', {}) - - for task in data: - self._task(xml, task) + for task in tasks: + self.render_task(xml, task) xml.endElement('tasks') - xml.endDocument() - return stream.getvalue() - def _task(self, xml, task): + def render_task(self, xml, task): xml.startElement('task', {}) - self._text_element(xml, 'identifier', {}, task["identifier"]) - self._text_element(xml, 'uri', {}, task["uri"]) - self._text_element(xml, 'attribute', {}, task["attribute"]) - self._text_element(xml, 'time_period', {}, task["time_period"]) - self._text_element(xml, 'title_en', {}, task["title_en"]) - self._text_element(xml, 'title_de', {}, task["title_de"]) - self._text_element(xml, 'text_en', {}, task["text_en"]) - self._text_element(xml, 'text_de', {}, task["text_de"]) - self._text_element(xml, 'conditions', {}, task["conditions"]) + self.render_text_element(xml, 'dc:uri', {}, task["uri"]) + self.render_text_element(xml, 'dc:comment', {}, task["comment"]) + self.render_text_element(xml, 'attribute', {'dc:uri': task["attribute"]}, None) + self.render_text_element(xml, 'time_period', {}, task["time_period"]) + self.render_text_element(xml, 'title', {'lang': 'en'}, task["title_en"]) + self.render_text_element(xml, 'title', {'lang': 'de'}, task["title_de"]) + self.render_text_element(xml, 'text', {'lang': 'en'}, task["text_en"]) + self.render_text_element(xml, 'text', {'lang': 'de'}, task["text_de"]) + xml.startElement('conditions', {}) + for condition in task["conditions"]: + self.render_text_element(xml, 'condition', {'dc:uri': condition}, None) + xml.endElement('conditions') xml.endElement('task') - def _text_element(self, xml, tag, task, text): - xml.startElement(tag, task) - if text is not None: - xml.characters(smart_text(text)) - xml.endElement(tag) diff --git a/apps/tasks/serializers.py b/apps/tasks/serializers.py index 38bea8ebb..652ba0ed9 100644 --- a/apps/tasks/serializers.py +++ b/apps/tasks/serializers.py @@ -54,16 +54,18 @@ class Meta: model = Condition fields = ( 'id', - 'label' + 'key' ) class ExportSerializer(serializers.ModelSerializer): + attribute = serializers.CharField(source='attribute.uri') + conditions = serializers.SerializerMethodField() + class Meta: model = Task fields = ( - 'identifier', 'uri', 'comment', 'attribute', @@ -75,11 +77,14 @@ class Meta: 'conditions' ) - def get_deadline(self, project, snapshot=None): - values = project.values.filter(snapshot=snapshot).filter(attribute=self.attribute) + def get_conditions(self, obj): + return [condition.uri for condition in obj.conditions.all()] + + # def get_deadline(self, project, snapshot=None): + # values = project.values.filter(snapshot=snapshot).filter(attribute=self.attribute) - for value in values: - try: - return iso8601.parse_date(value.text) + self.time_period - except iso8601.ParseError: - return None + # for value in values: + # try: + # return iso8601.parse_date(value.text) + self.time_period + # except iso8601.ParseError: + # return None diff --git a/apps/tasks/templates/tasks/tasks_modal_form_conditions.html b/apps/tasks/templates/tasks/tasks_modal_form_conditions.html index f66706ccc..f08e7f0be 100644 --- a/apps/tasks/templates/tasks/tasks_modal_form_conditions.html +++ b/apps/tasks/templates/tasks/tasks_modal_form_conditions.html @@ -20,7 +20,7 @@

data-model="service.values.conditions" data-errors="service.errors.conditions" data-options="service.conditions" - data-options-label="title" + data-options-label="key" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> diff --git a/apps/tasks/urls.py b/apps/tasks/urls.py index 2e4df4141..b7446c4d9 100644 --- a/apps/tasks/urls.py +++ b/apps/tasks/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import * +from .views import tasks, tasks_export, tasks_export_xml urlpatterns = [ url(r'^$', tasks, name='tasks'), diff --git a/apps/tasks/urls_api.py b/apps/tasks/urls_api.py index 4bf56b42e..b537f31e1 100644 --- a/apps/tasks/urls_api.py +++ b/apps/tasks/urls_api.py @@ -2,7 +2,7 @@ from rest_framework import routers -from .views import * +from .views import TaskViewSet, AttributeViewSet, ConditionViewSet router = routers.DefaultRouter() router.register(r'tasks', TaskViewSet, base_name='task') diff --git a/apps/tasks/utils.py b/apps/tasks/utils.py new file mode 100644 index 000000000..429e4c42c --- /dev/null +++ b/apps/tasks/utils.py @@ -0,0 +1,45 @@ +from apps.core.utils import get_ns_tag +from apps.conditions.models import Condition +from apps.domain.models import Attribute + +from .models import Task + + +def import_xml(tasks_node): + + nsmap = tasks_node.nsmap + + for task_node in tasks_node.iterchildren(): + task_uri = task_node[get_ns_tag('dc:uri', nsmap)].text + + try: + task = Task.objects.get(uri=task_uri) + except Task.DoesNotExist: + task = Task() + + task.uri_prefix = task_uri.split('/tasks/')[0] + task.key = task_uri.split('/')[-1] + + try: + attribute_uri = task_node['attribute'].get(get_ns_tag('dc:uri', nsmap)) + task.attribute = Attribute.objects.get(uri=attribute_uri) + except (AttributeError, Attribute.DoesNotExist): + task.attribute = None + + task.time_period = task_node['time_period'].text + + for element in task_node['title']: + setattr(task, 'title_' + element.get('lang'), element.text) + for element in task_node['text']: + setattr(task, 'text_' + element.get('lang'), element.text) + + if hasattr(task_node, 'conditions'): + for condition_node in task_node.conditions.iterchildren(): + try: + condition_uri = condition_node.get(get_ns_tag('dc:uri', nsmap)) + condition = Condition.objects.get(uri=condition_uri) + task.conditions.add(condition) + except Condition.DoesNotExist: + pass + + task.save() diff --git a/apps/tasks/views.py b/apps/tasks/views.py index 350e88700..f8bc09b33 100644 --- a/apps/tasks/views.py +++ b/apps/tasks/views.py @@ -9,15 +9,20 @@ from rest_framework.decorators import list_route from rest_framework.response import Response -from apps.core.serializers import ChoicesSerializer from apps.core.utils import render_to_format from apps.conditions.models import Condition from apps.domain.models import Attribute -from .models import * -from .serializers import * -from .renderers import * +from .models import Task +from .serializers import ( + TaskSerializer, + TaskIndexSerializer, + AttributeSerializer, + ConditionSerializer, + ExportSerializer +) +from .renderers import XMLRenderer @staff_member_required @@ -40,7 +45,7 @@ def tasks_export_xml(request): serializer = ExportSerializer(queryset, many=True) response = HttpResponse(XMLRenderer().render(serializer.data), content_type="application/xml") - response['Content-Disposition'] = 'attachment; filename="tasks.xml"' + response['Content-Disposition'] = 'filename="tasks.xml"' return response From 14997ad726836deae9e8ae6ee1dc8b839801c083 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 31 Jan 2017 14:29:17 +0100 Subject: [PATCH 40/51] rename import functions --- apps/conditions/utils.py | 2 +- apps/core/management/commands/import.py | 16 ++++++++-------- apps/domain/utils.py | 2 +- apps/options/utils.py | 2 +- apps/projects/utils.py | 2 +- apps/questions/utils.py | 2 +- apps/tasks/utils.py | 2 +- apps/views/utils.py | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/apps/conditions/utils.py b/apps/conditions/utils.py index e686eb843..13c3527bb 100644 --- a/apps/conditions/utils.py +++ b/apps/conditions/utils.py @@ -5,7 +5,7 @@ from .models import Condition -def import_xml(conditions_node): +def import_conditions(conditions_node): nsmap = conditions_node.nsmap diff --git a/apps/core/management/commands/import.py b/apps/core/management/commands/import.py index e9bee7e56..de88b402a 100644 --- a/apps/core/management/commands/import.py +++ b/apps/core/management/commands/import.py @@ -3,13 +3,13 @@ from django.contrib.auth.models import User from django.core.management.base import BaseCommand, CommandError -from apps.conditions.utils import import_xml as import_conditions -from apps.options.utils import import_xml as import_options -from apps.domain.utils import import_xml as import_domain -from apps.questions.utils import import_xml as import_questions -from apps.tasks.utils import import_xml as import_tasks -from apps.views.utils import import_xml as import_views -from apps.projects.utils import import_xml as import_projects +from apps.conditions.utils import import_conditions +from apps.options.utils import import_options +from apps.domain.utils import import_domain +from apps.questions.utils import import_catalogs +from apps.tasks.utils import import_tasks +from apps.views.utils import import_views +from apps.projects.utils import import_projects class Command(BaseCommand): @@ -32,7 +32,7 @@ def handle(self, *args, **options): import_domain(xml_root) elif xml_root.tag == 'catalogs': - import_questions(xml_root) + import_catalogs(xml_root) elif xml_root.tag == 'tasks': import_tasks(xml_root) diff --git a/apps/domain/utils.py b/apps/domain/utils.py index 558242bcc..1015f4c65 100644 --- a/apps/domain/utils.py +++ b/apps/domain/utils.py @@ -5,7 +5,7 @@ from .models import AttributeEntity, Attribute, Range, VerboseName -def import_xml(domain_node): +def import_domain(domain_node): nsmap = domain_node.nsmap diff --git a/apps/options/utils.py b/apps/options/utils.py index 490db4063..02da7908f 100644 --- a/apps/options/utils.py +++ b/apps/options/utils.py @@ -3,7 +3,7 @@ from .models import OptionSet, Option -def import_xml(optionsets_node): +def import_options(optionsets_node): nsmap = optionsets_node.nsmap diff --git a/apps/projects/utils.py b/apps/projects/utils.py index 12ade2c0e..879402482 100644 --- a/apps/projects/utils.py +++ b/apps/projects/utils.py @@ -163,7 +163,7 @@ def get_answer(value, attribute): return value.text -def import_xml(projects_node, user): +def import_projects(projects_node, user): nsmap = projects_node.nsmap diff --git a/apps/questions/utils.py b/apps/questions/utils.py index cb666cc74..35d211f42 100644 --- a/apps/questions/utils.py +++ b/apps/questions/utils.py @@ -4,7 +4,7 @@ from .models import Catalog, Section, Subsection, QuestionEntity, Question -def import_xml(catalogs_node): +def import_catalogs(catalogs_node): nsmap = catalogs_node.nsmap diff --git a/apps/tasks/utils.py b/apps/tasks/utils.py index 429e4c42c..24b2100bf 100644 --- a/apps/tasks/utils.py +++ b/apps/tasks/utils.py @@ -5,7 +5,7 @@ from .models import Task -def import_xml(tasks_node): +def import_tasks(tasks_node): nsmap = tasks_node.nsmap diff --git a/apps/views/utils.py b/apps/views/utils.py index 6044d1e18..26aa7dad1 100644 --- a/apps/views/utils.py +++ b/apps/views/utils.py @@ -6,7 +6,7 @@ from .models import View -def import_xml(views_node): +def import_views(views_node): nsmap = views_node.nsmap From 5be1e1a5b4801fab761870675d72cac0ce656367 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Wed, 1 Feb 2017 15:25:52 +0100 Subject: [PATCH 41/51] fix labels --- apps/domain/serializers.py | 5 ++--- .../templates/domain/domain_modal_form_conditions.html | 2 +- .../templates/domain/domain_modal_form_optionsets.html | 2 +- apps/options/serializers.py | 2 +- .../templates/options/options_modal_form_conditions.html | 2 +- .../templates/options/options_modal_form_options.html | 2 +- apps/tasks/serializers.py | 2 +- apps/tasks/templates/tasks/tasks_modal_form_conditions.html | 2 +- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/domain/serializers.py b/apps/domain/serializers.py index b040a34ed..d1387ca28 100644 --- a/apps/domain/serializers.py +++ b/apps/domain/serializers.py @@ -14,7 +14,6 @@ class Meta: model = AttributeEntity fields = ( 'id', - 'key', 'label', 'is_collection', 'is_attribute', @@ -112,7 +111,7 @@ class Meta: model = OptionSet fields = ( 'id', - 'uri', + 'label', ) @@ -122,7 +121,7 @@ class Meta: model = Condition fields = ( 'id', - 'uri', + 'label' ) diff --git a/apps/domain/templates/domain/domain_modal_form_conditions.html b/apps/domain/templates/domain/domain_modal_form_conditions.html index d038b9979..1130bfbb6 100644 --- a/apps/domain/templates/domain/domain_modal_form_conditions.html +++ b/apps/domain/templates/domain/domain_modal_form_conditions.html @@ -20,7 +20,7 @@

data-model="service.values.conditions" data-errors="service.errors.conditions" data-options="service.conditions" - data-options-label="uri" + data-options-label="label" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> diff --git a/apps/domain/templates/domain/domain_modal_form_optionsets.html b/apps/domain/templates/domain/domain_modal_form_optionsets.html index 42396690d..4e797b8a8 100644 --- a/apps/domain/templates/domain/domain_modal_form_optionsets.html +++ b/apps/domain/templates/domain/domain_modal_form_optionsets.html @@ -20,7 +20,7 @@

data-model="service.values.optionsets" data-errors="service.errors.optionsets" data-options="service.optionsets" - data-options-label="uri" + data-options-label="label" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> diff --git a/apps/options/serializers.py b/apps/options/serializers.py index eaeed1efc..23e94ba11 100644 --- a/apps/options/serializers.py +++ b/apps/options/serializers.py @@ -66,7 +66,7 @@ class Meta: model = Condition fields = ( 'id', - 'key' + 'label' ) diff --git a/apps/options/templates/options/options_modal_form_conditions.html b/apps/options/templates/options/options_modal_form_conditions.html index f66706ccc..1130bfbb6 100644 --- a/apps/options/templates/options/options_modal_form_conditions.html +++ b/apps/options/templates/options/options_modal_form_conditions.html @@ -20,7 +20,7 @@

data-model="service.values.conditions" data-errors="service.errors.conditions" data-options="service.conditions" - data-options-label="title" + data-options-label="label" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> diff --git a/apps/options/templates/options/options_modal_form_options.html b/apps/options/templates/options/options_modal_form_options.html index 12012a97d..4214fbf82 100644 --- a/apps/options/templates/options/options_modal_form_options.html +++ b/apps/options/templates/options/options_modal_form_options.html @@ -47,7 +47,7 @@

data-model="service.values.optionset" data-errors="service.errors.optionset" data-options="service.optionsets" - data-options-label="uri" + data-options-label="key" data-options-null="1"> data-model="service.values.conditions" data-errors="service.errors.conditions" data-options="service.conditions" - data-options-label="key" + data-options-label="label" data-help="{% trans 'Hold down Control, or Command on a Mac, to select more than one.' %}"> From 505859c57057815c454d0759d52d7e1124f863d3 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Wed, 1 Feb 2017 15:59:28 +0100 Subject: [PATCH 42/51] fix labels and modals in quetsions app --- apps/questions/admin.py | 8 +- apps/questions/migrations/0010_label.py | 54 ++++++++++++ apps/questions/models.py | 83 +++++++------------ .../catalogs_modal_form_questions.html | 46 +++++----- .../catalogs_modal_form_questionsets.html | 23 +++-- 5 files changed, 120 insertions(+), 94 deletions(-) create mode 100644 apps/questions/migrations/0010_label.py diff --git a/apps/questions/admin.py b/apps/questions/admin.py index 7bc7e4c28..f798f5318 100644 --- a/apps/questions/admin.py +++ b/apps/questions/admin.py @@ -8,19 +8,19 @@ class CatalogAdmin(admin.ModelAdmin): class SectionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label_en', 'label_de') + readonly_fields = ('uri', 'label') class SubsectionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label_en', 'label_de') + readonly_fields = ('uri', 'label') class QuestionEntityAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label_en', 'label_de') + readonly_fields = ('uri', 'label') class QuestionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label_en', 'label_de') + readonly_fields = ('uri', 'label') admin.site.register(Catalog, CatalogAdmin) diff --git a/apps/questions/migrations/0010_label.py b/apps/questions/migrations/0010_label.py new file mode 100644 index 000000000..c180492f6 --- /dev/null +++ b/apps/questions/migrations/0010_label.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-01 14:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('questions', '0009_meta'), + ] + + operations = [ + migrations.RemoveField( + model_name='questionentity', + name='label_de', + ), + migrations.RemoveField( + model_name='questionentity', + name='label_en', + ), + migrations.RemoveField( + model_name='section', + name='label_de', + ), + migrations.RemoveField( + model_name='section', + name='label_en', + ), + migrations.RemoveField( + model_name='subsection', + name='label_de', + ), + migrations.RemoveField( + model_name='subsection', + name='label_en', + ), + migrations.AddField( + model_name='questionentity', + name='label', + field=models.CharField(blank=True, help_text='The label to be displayed this question/questionset (auto-generated).', max_length=512, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='section', + name='label', + field=models.CharField(blank=True, help_text='The label to be displayed this section (auto-generated).', max_length=512, null=True, verbose_name='Label'), + ), + migrations.AddField( + model_name='subsection', + name='label', + field=models.CharField(blank=True, help_text='The label to be displayed this subsection (auto-generated).', max_length=512, null=True, verbose_name='Label'), + ), + ] diff --git a/apps/questions/models.py b/apps/questions/models.py index eb60dfe70..366a86fc0 100644 --- a/apps/questions/models.py +++ b/apps/questions/models.py @@ -71,7 +71,7 @@ def title(self): @property def label(self): - return self.trans('title') + return self.key def build_uri(self): return get_uri_prefix(self) + '/questions/%s' % self.key @@ -120,13 +120,10 @@ class Section(Model, TranslationMixin): verbose_name=_('Title (de)'), help_text=_('The German title for this section.') ) - label_en = models.TextField( - verbose_name=_('Label (en)'), - help_text=_('The English label for this section (auto-generated).') - ) - label_de = models.TextField( - verbose_name=_('Label (de)'), - help_text=_('The German label for this section (auto-generated).') + label = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Label'), + help_text=_('The label to be displayed this section (auto-generated).') ) class Meta: @@ -138,9 +135,8 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): + self.label = self.build_label() self.uri = self.build_uri() - self.label_en = self.build_label('en') - self.label_de = self.build_label('de') super(Section, self).save(*args, **kwargs) @@ -151,15 +147,11 @@ def save(self, *args, **kwargs): def title(self): return self.trans('title') - @property - def label(self): - return self.trans('label') + def build_label(self): + return '%s/%s' % (self.catalog.key, self.key) def build_uri(self): - return get_uri_prefix(self) + '/questions/%s/%s' % (self.catalog.key, self.key) - - def build_label(self, lang): - return getattr(self.catalog, 'title_' + lang) + ' / ' + getattr(self, 'title_' + lang) + return get_uri_prefix(self) + '/questions/' + self.label @python_2_unicode_compatible @@ -205,13 +197,10 @@ class Subsection(Model, TranslationMixin): verbose_name=_('Title (de)'), help_text=_('The German title for this subsection.') ) - label_en = models.TextField( - verbose_name=_('Label (en)'), - help_text=_('The English label for this subsection (auto-generated).') - ) - label_de = models.TextField( - verbose_name=_('Label (de)'), - help_text=_('The German label for this subsection (auto-generated).') + label = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Label'), + help_text=_('The label to be displayed this subsection (auto-generated).') ) class Meta: @@ -223,9 +212,8 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): + self.label = self.build_label() self.uri = self.build_uri() - self.label_en = self.build_label('en') - self.label_de = self.build_label('de') super(Subsection, self).save(*args, **kwargs) @@ -236,15 +224,11 @@ def save(self, *args, **kwargs): def title(self): return self.trans('title') - @property - def label(self): - return self.trans('label') + def build_label(self): + return '%s/%s/%s' % (self.section.catalog.key, self.section.key, self.key) def build_uri(self): - return get_uri_prefix(self) + '/questions/%s/%s/%s' % (self.section.catalog.key, self.section.key, self.key) - - def build_label(self, lang): - return getattr(self.section, 'label_' + lang) + ' / ' + getattr(self, 'title_' + lang) + return get_uri_prefix(self) + '/questions/' + self.label class QuestionEntity(Model, TranslationMixin): @@ -286,14 +270,6 @@ class QuestionEntity(Model, TranslationMixin): verbose_name=_('Order'), help_text=_('The position of this question/questionset in lists.') ) - label_en = models.TextField( - verbose_name=_('Label (en)'), - help_text=_('The English label for this question/questionset (auto-generated).') - ) - label_de = models.TextField( - verbose_name=_('Label (de)'), - help_text=_('The German label for this question/questionset (auto-generated).') - ) help_en = models.TextField( null=True, blank=True, verbose_name=_('Help (en)'), @@ -304,6 +280,11 @@ class QuestionEntity(Model, TranslationMixin): verbose_name=_('Help (de)'), help_text=_('The German help text for this question/questionset.') ) + label = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Label'), + help_text=_('The label to be displayed this question/questionset (auto-generated).') + ) class Meta: ordering = ('subsection__section__catalog__order', 'subsection__section__order', 'subsection__order', 'order') @@ -314,9 +295,8 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): + self.label = self.build_label() self.uri = self.build_uri() - self.label_en = self.build_label('en') - self.label_de = self.build_label('de') super(QuestionEntity, self).save(*args, **kwargs) @@ -327,10 +307,6 @@ def save(self, *args, **kwargs): def help(self): return self.trans('help') - @property - def label(self): - return self.trans('label') - @property def is_collection(self): if self.attribute_entity: @@ -342,10 +318,10 @@ def is_collection(self): def is_set(self): return not hasattr(self, 'question') - def build_uri(self): + def build_label(self): try: question = Question.objects.get(pk=self.pk) - return get_uri_prefix(self) + '/questions/%s/%s/%s/%s/%s' % ( + return '%s/%s/%s/%s/%s' % ( self.subsection.section.catalog.key, self.subsection.section.key, self.subsection.key, @@ -355,18 +331,15 @@ def build_uri(self): except (Question.DoesNotExist, AttributeError): # Question.DoesNotExist is raised if self is a questionset # AttributeError is raised if question.parent is None - return get_uri_prefix(self) + '/questions/%s/%s/%s/%s' % ( + return '%s/%s/%s/%s' % ( self.subsection.section.catalog.key, self.subsection.section.key, self.subsection.key, self.key ) - def build_label(self, lang): - if self.attribute_entity: - return getattr(self.subsection, 'label_' + lang) + ' / ' + self.attribute_entity.key - else: - return getattr(self.subsection, 'label_' + lang) + ' / --' + def build_uri(self): + return get_uri_prefix(self) + '/questions/' + self.label class Question(QuestionEntity): diff --git a/apps/questions/templates/questions/catalogs_modal_form_questions.html b/apps/questions/templates/questions/catalogs_modal_form_questions.html index 989e50a18..3e42836ef 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_questions.html +++ b/apps/questions/templates/questions/catalogs_modal_form_questions.html @@ -69,6 +69,29 @@

data-errors="service.errors.order"> +
+ + + + +
data-errors="service.errors.help_de">
-
- - - - -
diff --git a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html index df6f9cd95..1b3627a25 100644 --- a/apps/questions/templates/questions/catalogs_modal_form_questionsets.html +++ b/apps/questions/templates/questions/catalogs_modal_form_questionsets.html @@ -40,7 +40,7 @@

data-options-label="label" data-options-null="1"> - - data-errors="service.errors.order">
+ +
Date: Wed, 1 Feb 2017 16:03:59 +0100 Subject: [PATCH 43/51] update fixtures --- fixtures/questions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/questions.json b/fixtures/questions.json index e02d4ebd0..381ee4412 100644 --- a/fixtures/questions.json +++ b/fixtures/questions.json @@ -1 +1 @@ -[{"model": "questions.catalog", "pk": 1, "fields": {"created": "2016-12-15T12:00:09.331Z", "updated": "2017-01-27T12:33:24.712Z", "uri": "http://example.com/questions/catalog", "uri_prefix": null, "key": "catalog", "comment": null, "order": 0, "title_en": "Catalog", "title_de": "Katalog"}}, {"model": "questions.section", "pk": 1, "fields": {"created": "2016-12-15T12:00:31.550Z", "updated": "2017-01-27T12:33:25.446Z", "uri": "http://example.com/questions/catalog/widgets", "uri_prefix": null, "key": "widgets", "comment": null, "catalog": 1, "order": 1, "title_en": "Widgets", "title_de": "Widgets", "label_en": "Catalog / Widgets", "label_de": "Katalog / Widgets"}}, {"model": "questions.section", "pk": 2, "fields": {"created": "2016-12-15T12:02:01.898Z", "updated": "2017-01-27T12:33:26.129Z", "uri": "http://example.com/questions/catalog/conditions", "uri_prefix": null, "key": "conditions", "comment": null, "catalog": 1, "order": 2, "title_en": "Conditions", "title_de": "Bedingungen", "label_en": "Catalog / Conditions", "label_de": "Katalog / Bedingungen"}}, {"model": "questions.subsection", "pk": 1, "fields": {"created": "2016-12-15T12:01:03.104Z", "updated": "2017-01-27T12:33:26.153Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions", "uri_prefix": null, "key": "individual-questions", "comment": null, "section": 1, "order": 1, "title_en": "Individual questions", "title_de": "Einzelne Fragen", "label_en": "Catalog / Widgets / Individual questions", "label_de": "Katalog / Widgets / Einzelne Fragen"}}, {"model": "questions.subsection", "pk": 2, "fields": {"created": "2016-12-15T12:01:28.560Z", "updated": "2017-01-27T12:33:26.346Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions", "uri_prefix": null, "key": "collection-questions", "comment": null, "section": 1, "order": 2, "title_en": "Collection questions", "title_de": "Fragensammlungen", "label_en": "Catalog / Widgets / Collection questions", "label_de": "Katalog / Widgets / Fragensammlungen"}}, {"model": "questions.subsection", "pk": 3, "fields": {"created": "2016-12-15T12:01:47.090Z", "updated": "2017-01-27T12:33:26.542Z", "uri": "http://example.com/questions/catalog/widgets/question-sets", "uri_prefix": null, "key": "question-sets", "comment": null, "section": 1, "order": 3, "title_en": "Question sets", "title_de": "Fragensets", "label_en": "Catalog / Widgets / Question sets", "label_de": "Katalog / Widgets / Fragensets"}}, {"model": "questions.questionentity", "pk": 1, "fields": {"created": "2016-12-15T13:28:15.582Z", "updated": "2017-01-27T12:33:26.832Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 3, "subsection": 1, "order": 1, "label_en": "Catalog / Widgets / Individual questions / text", "label_de": "Katalog / Widgets / Einzelne Fragen / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 2, "fields": {"created": "2016-12-15T13:28:41.406Z", "updated": "2017-01-27T12:33:26.859Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 4, "subsection": 1, "order": 2, "label_en": "Catalog / Widgets / Individual questions / textarea", "label_de": "Katalog / Widgets / Einzelne Fragen / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 3, "fields": {"created": "2016-12-15T13:29:05.951Z", "updated": "2017-01-27T12:33:26.885Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 8, "subsection": 1, "order": 3, "label_en": "Catalog / Widgets / Individual questions / bool", "label_de": "Katalog / Widgets / Einzelne Fragen / bool", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 4, "fields": {"created": "2016-12-15T13:30:22.772Z", "updated": "2017-01-27T12:33:26.911Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 11, "subsection": 1, "order": 4, "label_en": "Catalog / Widgets / Individual questions / radio", "label_de": "Katalog / Widgets / Einzelne Fragen / radio", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 5, "fields": {"created": "2016-12-15T13:31:22.093Z", "updated": "2017-01-27T12:33:26.935Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 12, "subsection": 1, "order": 5, "label_en": "Catalog / Widgets / Individual questions / select", "label_de": "Katalog / Widgets / Einzelne Fragen / select", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 6, "fields": {"created": "2016-12-15T13:32:11.267Z", "updated": "2017-01-27T12:33:26.962Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 7, "subsection": 1, "order": 6, "label_en": "Catalog / Widgets / Individual questions / range", "label_de": "Katalog / Widgets / Einzelne Fragen / range", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 7, "fields": {"created": "2016-12-15T13:32:41.210Z", "updated": "2017-01-27T12:33:26.996Z", "uri": "http://example.com/questions/catalog/widgets/individual-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 9, "subsection": 1, "order": 7, "label_en": "Catalog / Widgets / Individual questions / datetime", "label_de": "Katalog / Widgets / Einzelne Fragen / datetime", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 8, "fields": {"created": "2016-12-15T13:33:08.787Z", "updated": "2017-01-27T12:33:27.024Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 21, "subsection": 2, "order": 1, "label_en": "Catalog / Widgets / Collection questions / text", "label_de": "Katalog / Widgets / Fragensammlungen / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 9, "fields": {"created": "2016-12-15T13:33:20.995Z", "updated": "2017-01-27T12:33:27.052Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 22, "subsection": 2, "order": 2, "label_en": "Catalog / Widgets / Collection questions / textarea", "label_de": "Katalog / Widgets / Fragensammlungen / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 10, "fields": {"created": "2016-12-15T13:33:34.934Z", "updated": "2017-01-27T12:33:27.078Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 13, "subsection": 2, "order": 3, "label_en": "Catalog / Widgets / Collection questions / bool", "label_de": "Katalog / Widgets / Fragensammlungen / bool", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 11, "fields": {"created": "2016-12-15T13:33:54.082Z", "updated": "2017-01-27T12:33:27.106Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 15, "subsection": 2, "order": 4, "label_en": "Catalog / Widgets / Collection questions / radio", "label_de": "Katalog / Widgets / Fragensammlungen / radio", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 12, "fields": {"created": "2016-12-15T13:34:08.899Z", "updated": "2017-01-27T12:33:27.136Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 20, "subsection": 2, "order": 5, "label_en": "Catalog / Widgets / Collection questions / select", "label_de": "Katalog / Widgets / Fragensammlungen / select", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 13, "fields": {"created": "2016-12-15T13:34:28.895Z", "updated": "2017-01-27T12:33:27.164Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 19, "subsection": 2, "order": 6, "label_en": "Catalog / Widgets / Collection questions / range", "label_de": "Katalog / Widgets / Fragensammlungen / range", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 14, "fields": {"created": "2016-12-15T13:34:39.608Z", "updated": "2017-01-27T12:33:27.192Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 16, "subsection": 2, "order": 7, "label_en": "Catalog / Widgets / Collection questions / datetime", "label_de": "Katalog / Widgets / Fragensammlungen / datetime", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 15, "fields": {"created": "2016-12-15T13:35:32.219Z", "updated": "2017-01-27T12:33:27.221Z", "uri": "http://example.com/questions/catalog/widgets/collection-questions/checkbox", "uri_prefix": null, "key": "checkbox", "comment": null, "attribute_entity": 14, "subsection": 2, "order": 8, "label_en": "Catalog / Widgets / Collection questions / checkbox", "label_de": "Katalog / Widgets / Fragensammlungen / checkbox", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 16, "fields": {"created": "2017-01-24T15:54:14.908Z", "updated": "2017-01-27T12:33:27.247Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual", "uri_prefix": null, "key": "individual", "comment": null, "attribute_entity": 44, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / individual", "label_de": "Katalog / Widgets / Fragensets / individual", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 17, "fields": {"created": "2017-01-24T15:54:23.537Z", "updated": "2017-01-27T12:33:27.419Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection", "uri_prefix": null, "key": "collection", "comment": null, "attribute_entity": 45, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / collection", "label_de": "Katalog / Widgets / Fragensets / collection", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 18, "fields": {"created": "2017-01-24T15:56:13.523Z", "updated": "2017-01-27T12:33:27.334Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 49, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / text", "label_de": "Katalog / Widgets / Fragensets / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 19, "fields": {"created": "2017-01-24T15:56:34.387Z", "updated": "2017-01-27T12:33:27.508Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/individual/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 50, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / textarea", "label_de": "Katalog / Widgets / Fragensets / textarea", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 20, "fields": {"created": "2017-01-24T15:59:11.461Z", "updated": "2017-01-27T12:33:27.448Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 47, "subsection": 3, "order": 0, "label_en": "Catalog / Widgets / Question sets / text", "label_de": "Katalog / Widgets / Fragensets / text", "help_en": null, "help_de": null}}, {"model": "questions.questionentity", "pk": 21, "fields": {"created": "2017-01-24T15:59:43.213Z", "updated": "2017-01-27T12:33:27.477Z", "uri": "http://example.com/questions/catalog/widgets/question-sets/collection/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 48, "subsection": 3, "order": 1, "label_en": "Catalog / Widgets / Question sets / textarea", "label_de": "Katalog / Widgets / Fragensets / textarea", "help_en": null, "help_de": null}}, {"model": "questions.question", "pk": 1, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 2, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 3, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 4, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 5, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 6, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 7, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 8, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 9, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 10, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 11, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 12, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 13, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 14, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 15, "fields": {"parent": null, "text_en": "Checkbox?", "text_de": "Ankreuzfelder?", "widget_type": "checkbox"}}, {"model": "questions.question", "pk": 18, "fields": {"parent": 16, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 20, "fields": {"parent": 17, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 21, "fields": {"parent": 17, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 19, "fields": {"parent": 16, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}] \ No newline at end of file +[{"model": "questions.catalog", "pk": 1, "fields": {"created": "2016-12-15T12:00:09.331Z", "updated": "2017-02-01T14:55:09.776Z", "uri": "http://example.com/terms/questions/catalog", "uri_prefix": "", "key": "catalog", "comment": "", "order": 0, "title_en": "Catalog", "title_de": "Katalog"}}, {"model": "questions.section", "pk": 1, "fields": {"created": "2016-12-15T12:00:31.550Z", "updated": "2017-02-01T14:55:09.795Z", "uri": "http://example.com/terms/questions/catalog/widgets", "uri_prefix": null, "key": "widgets", "comment": null, "catalog": 1, "order": 1, "title_en": "Widgets", "title_de": "Widgets", "label": "catalog/widgets"}}, {"model": "questions.section", "pk": 2, "fields": {"created": "2016-12-15T12:02:01.898Z", "updated": "2017-02-01T14:55:10.400Z", "uri": "http://example.com/terms/questions/catalog/conditions", "uri_prefix": null, "key": "conditions", "comment": null, "catalog": 1, "order": 2, "title_en": "Conditions", "title_de": "Bedingungen", "label": "catalog/conditions"}}, {"model": "questions.subsection", "pk": 1, "fields": {"created": "2016-12-15T12:01:03.104Z", "updated": "2017-02-01T14:55:09.810Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions", "uri_prefix": null, "key": "individual-questions", "comment": null, "section": 1, "order": 1, "title_en": "Individual questions", "title_de": "Einzelne Fragen", "label": "catalog/widgets/individual-questions"}}, {"model": "questions.subsection", "pk": 2, "fields": {"created": "2016-12-15T12:01:28.560Z", "updated": "2017-02-01T14:55:09.948Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions", "uri_prefix": null, "key": "collection-questions", "comment": null, "section": 1, "order": 2, "title_en": "Collection questions", "title_de": "Fragensammlungen", "label": "catalog/widgets/collection-questions"}}, {"model": "questions.subsection", "pk": 3, "fields": {"created": "2016-12-15T12:01:47.090Z", "updated": "2017-02-01T14:55:10.132Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets", "uri_prefix": null, "key": "question-sets", "comment": null, "section": 1, "order": 3, "title_en": "Question sets", "title_de": "Fragensets", "label": "catalog/widgets/question-sets"}}, {"model": "questions.questionentity", "pk": 1, "fields": {"created": "2016-12-15T13:28:15.582Z", "updated": "2017-02-01T14:55:09.838Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 3, "subsection": 1, "order": 1, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/text"}}, {"model": "questions.questionentity", "pk": 2, "fields": {"created": "2016-12-15T13:28:41.406Z", "updated": "2017-02-01T14:55:09.854Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 4, "subsection": 1, "order": 2, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/textarea"}}, {"model": "questions.questionentity", "pk": 3, "fields": {"created": "2016-12-15T13:29:05.951Z", "updated": "2017-02-01T14:55:09.870Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 8, "subsection": 1, "order": 3, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/bool"}}, {"model": "questions.questionentity", "pk": 4, "fields": {"created": "2016-12-15T13:30:22.772Z", "updated": "2017-02-01T14:55:09.886Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 11, "subsection": 1, "order": 4, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/radio"}}, {"model": "questions.questionentity", "pk": 5, "fields": {"created": "2016-12-15T13:31:22.093Z", "updated": "2017-02-01T14:55:09.901Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 12, "subsection": 1, "order": 5, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/select"}}, {"model": "questions.questionentity", "pk": 6, "fields": {"created": "2016-12-15T13:32:11.267Z", "updated": "2017-02-01T14:55:09.917Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 7, "subsection": 1, "order": 6, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/range"}}, {"model": "questions.questionentity", "pk": 7, "fields": {"created": "2016-12-15T13:32:41.210Z", "updated": "2017-02-01T14:55:09.933Z", "uri": "http://example.com/terms/questions/catalog/widgets/individual-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 9, "subsection": 1, "order": 7, "help_en": null, "help_de": null, "label": "catalog/widgets/individual-questions/datetime"}}, {"model": "questions.questionentity", "pk": 8, "fields": {"created": "2016-12-15T13:33:08.787Z", "updated": "2017-02-01T14:55:09.964Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 21, "subsection": 2, "order": 1, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/text"}}, {"model": "questions.questionentity", "pk": 9, "fields": {"created": "2016-12-15T13:33:20.995Z", "updated": "2017-02-01T14:55:09.981Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 22, "subsection": 2, "order": 2, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/textarea"}}, {"model": "questions.questionentity", "pk": 10, "fields": {"created": "2016-12-15T13:33:34.934Z", "updated": "2017-02-01T14:55:09.998Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/bool", "uri_prefix": null, "key": "bool", "comment": null, "attribute_entity": 13, "subsection": 2, "order": 3, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/bool"}}, {"model": "questions.questionentity", "pk": 11, "fields": {"created": "2016-12-15T13:33:54.082Z", "updated": "2017-02-01T14:55:10.016Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/radio", "uri_prefix": null, "key": "radio", "comment": null, "attribute_entity": 15, "subsection": 2, "order": 4, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/radio"}}, {"model": "questions.questionentity", "pk": 12, "fields": {"created": "2016-12-15T13:34:08.899Z", "updated": "2017-02-01T14:55:10.046Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/select", "uri_prefix": null, "key": "select", "comment": null, "attribute_entity": 20, "subsection": 2, "order": 5, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/select"}}, {"model": "questions.questionentity", "pk": 13, "fields": {"created": "2016-12-15T13:34:28.895Z", "updated": "2017-02-01T14:55:10.069Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/range", "uri_prefix": null, "key": "range", "comment": null, "attribute_entity": 19, "subsection": 2, "order": 6, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/range"}}, {"model": "questions.questionentity", "pk": 14, "fields": {"created": "2016-12-15T13:34:39.608Z", "updated": "2017-02-01T14:55:10.089Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/datetime", "uri_prefix": null, "key": "datetime", "comment": null, "attribute_entity": 16, "subsection": 2, "order": 7, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/datetime"}}, {"model": "questions.questionentity", "pk": 15, "fields": {"created": "2016-12-15T13:35:32.219Z", "updated": "2017-02-01T14:55:10.113Z", "uri": "http://example.com/terms/questions/catalog/widgets/collection-questions/checkbox", "uri_prefix": null, "key": "checkbox", "comment": null, "attribute_entity": 14, "subsection": 2, "order": 8, "help_en": null, "help_de": null, "label": "catalog/widgets/collection-questions/checkbox"}}, {"model": "questions.questionentity", "pk": 16, "fields": {"created": "2017-01-24T15:54:14.908Z", "updated": "2017-02-01T14:55:10.175Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/individual", "uri_prefix": null, "key": "individual", "comment": null, "attribute_entity": 44, "subsection": 3, "order": 0, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/individual"}}, {"model": "questions.questionentity", "pk": 17, "fields": {"created": "2017-01-24T15:54:23.537Z", "updated": "2017-02-01T14:55:10.276Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/collection", "uri_prefix": null, "key": "collection", "comment": null, "attribute_entity": 45, "subsection": 3, "order": 1, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/collection"}}, {"model": "questions.questionentity", "pk": 18, "fields": {"created": "2017-01-24T15:56:13.523Z", "updated": "2017-02-01T14:55:10.254Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/individual/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 49, "subsection": 3, "order": 0, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/individual/text"}}, {"model": "questions.questionentity", "pk": 19, "fields": {"created": "2017-01-24T15:56:34.387Z", "updated": "2017-02-01T14:55:10.381Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/individual/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 50, "subsection": 3, "order": 1, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/individual/textarea"}}, {"model": "questions.questionentity", "pk": 20, "fields": {"created": "2017-01-24T15:59:11.461Z", "updated": "2017-02-01T14:55:10.304Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/collection/text", "uri_prefix": null, "key": "text", "comment": null, "attribute_entity": 47, "subsection": 3, "order": 0, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/collection/text"}}, {"model": "questions.questionentity", "pk": 21, "fields": {"created": "2017-01-24T15:59:43.213Z", "updated": "2017-02-01T14:55:10.355Z", "uri": "http://example.com/terms/questions/catalog/widgets/question-sets/collection/textarea", "uri_prefix": null, "key": "textarea", "comment": null, "attribute_entity": 48, "subsection": 3, "order": 1, "help_en": null, "help_de": null, "label": "catalog/widgets/question-sets/collection/textarea"}}, {"model": "questions.question", "pk": 1, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 2, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 3, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 4, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 5, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 6, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 7, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 8, "fields": {"parent": null, "text_en": "Text?", "text_de": "\ufffcText?", "widget_type": "text"}}, {"model": "questions.question", "pk": 9, "fields": {"parent": null, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 10, "fields": {"parent": null, "text_en": "Yes or no?", "text_de": "Ja oder Nein?", "widget_type": "yesno"}}, {"model": "questions.question", "pk": 11, "fields": {"parent": null, "text_en": "Radio buttons?", "text_de": "Radio-Buttons?", "widget_type": "radio"}}, {"model": "questions.question", "pk": 12, "fields": {"parent": null, "text_en": "Select drop-down?", "text_de": "Select-Aufklappmen\u00fc?", "widget_type": "select"}}, {"model": "questions.question", "pk": 13, "fields": {"parent": null, "text_en": "Range slider?", "text_de": "Bereichs-Schieber?", "widget_type": "range"}}, {"model": "questions.question", "pk": 14, "fields": {"parent": null, "text_en": "Date picker?", "text_de": "Datumsauswahl?", "widget_type": "date"}}, {"model": "questions.question", "pk": 15, "fields": {"parent": null, "text_en": "Checkbox?", "text_de": "Ankreuzfelder?", "widget_type": "checkbox"}}, {"model": "questions.question", "pk": 20, "fields": {"parent": 17, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 18, "fields": {"parent": 16, "text_en": "Text?", "text_de": "Text?", "widget_type": "text"}}, {"model": "questions.question", "pk": 19, "fields": {"parent": 16, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}, {"model": "questions.question", "pk": 21, "fields": {"parent": 17, "text_en": "Textarea?", "text_de": "Textarea?", "widget_type": "textarea"}}] \ No newline at end of file From 18872b3854c2118084d4f619f3c552e9a8e79884 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Wed, 1 Feb 2017 16:23:11 +0100 Subject: [PATCH 44/51] add set-uri-prefix script --- .../management/commands/set-uri-prefix.py | 53 +++++++++++++++++++ apps/domain/models.py | 1 - 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 apps/core/management/commands/set-uri-prefix.py diff --git a/apps/core/management/commands/set-uri-prefix.py b/apps/core/management/commands/set-uri-prefix.py new file mode 100644 index 000000000..3a4e1690e --- /dev/null +++ b/apps/core/management/commands/set-uri-prefix.py @@ -0,0 +1,53 @@ +from lxml import objectify + +from django.contrib.auth.models import User +from django.core.management.base import BaseCommand + +from apps.conditions.models import Condition +from apps.options.models import OptionSet, Option +from apps.domain.models import AttributeEntity +from apps.questions.models import Catalog, Section, Subsection, QuestionEntity +from apps.tasks.models import Task +from apps.views.models import View + + +class Command(BaseCommand): + + def add_arguments(self, parser): + parser.add_argument('uri_prefix', action='store', help='URI prefix to be used for all elements.') + + def handle(self, *args, **options): + + for obj in Condition.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in OptionSet.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in Option.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in AttributeEntity.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in Catalog.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in Section.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in Subsection.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in QuestionEntity.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in Task.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + for obj in View.objects.all(): + self._set_uri_prefix(obj, options['uri_prefix']) + + def _set_uri_prefix(self, obj, uri_prefix): + obj.uri_prefix = uri_prefix + obj.save() diff --git a/apps/domain/models.py b/apps/domain/models.py index fc83248e7..645142ce7 100644 --- a/apps/domain/models.py +++ b/apps/domain/models.py @@ -176,7 +176,6 @@ def options(self): return options_list -@python_2_unicode_compatible @python_2_unicode_compatible class VerboseName(models.Model, TranslationMixin): From dbfddc7ca086ed17a259b4b8b22acabb05f09e51 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 3 Feb 2017 12:26:35 +0100 Subject: [PATCH 45/51] add validators for questions app --- apps/core/validators.py | 38 +++++++++++++++++++ apps/questions/models.py | 69 ++++++++++++++++------------------- apps/questions/serializers.py | 10 +++++ apps/questions/validators.py | 39 ++++++++++++++++++++ 4 files changed, 118 insertions(+), 38 deletions(-) create mode 100644 apps/core/validators.py create mode 100644 apps/questions/validators.py diff --git a/apps/core/validators.py b/apps/core/validators.py new file mode 100644 index 000000000..c3ec851f5 --- /dev/null +++ b/apps/core/validators.py @@ -0,0 +1,38 @@ +from django.apps import apps +from django.core.exceptions import ValidationError, ObjectDoesNotExist +from django.utils.translation import ugettext_lazy as _ + +# from rest_framework import serializers + + +def unique_uri_model_validator(instance): + try: + instance.__class__.objects.exclude(pk=instance.pk).get(uri=instance.uri) + raise ValidationError(_('The URI %s is already taken. Please adjust the URI Prefix and/or the Key.' % instance.uri)) + except ObjectDoesNotExist: + pass + + +class UniqueLabelSerializerValidator(object): + + def set_context(self, serializer): + self.instance = serializer.instance + + def __call__(self, data): + Model = self.get_model() + label = self.get_label(data) + + print label + + try: + if self.instance: + Model.objects.exclude(pk=self.instance.pk).get(label=label) + else: + Model.objects.get(label=label) + + raise ValidationError(_('Another %(model)s with the label "%(label)s" already exists. Please adjust the the Key.') % { + 'model': Model._meta.verbose_name.title(), + 'label': label + }) + except ObjectDoesNotExist: + pass diff --git a/apps/questions/models.py b/apps/questions/models.py index 366a86fc0..b44f97f57 100644 --- a/apps/questions/models.py +++ b/apps/questions/models.py @@ -59,7 +59,7 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.uri = self.build_uri() + self.uri = get_uri_prefix(self) + '/questions/%s' % self.key super(Catalog, self).save(*args, **kwargs) for section in self.sections.all(): @@ -73,9 +73,6 @@ def title(self): def label(self): return self.key - def build_uri(self): - return get_uri_prefix(self) + '/questions/%s' % self.key - @python_2_unicode_compatible class Section(Model, TranslationMixin): @@ -135,8 +132,8 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.label = self.build_label() - self.uri = self.build_uri() + self.label = Section.build_label(self.key, self.catalog) + self.uri = get_uri_prefix(self) + '/questions/' + self.label super(Section, self).save(*args, **kwargs) @@ -147,11 +144,9 @@ def save(self, *args, **kwargs): def title(self): return self.trans('title') - def build_label(self): - return '%s/%s' % (self.catalog.key, self.key) - - def build_uri(self): - return get_uri_prefix(self) + '/questions/' + self.label + @classmethod + def build_label(cls, key, catalog): + return '%s/%s' % (catalog.key, key) @python_2_unicode_compatible @@ -212,8 +207,8 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.label = self.build_label() - self.uri = self.build_uri() + self.label = Subsection.build_label(self.key, self.section) + self.uri = get_uri_prefix(self) + '/questions/' + self.label super(Subsection, self).save(*args, **kwargs) @@ -224,11 +219,9 @@ def save(self, *args, **kwargs): def title(self): return self.trans('title') - def build_label(self): - return '%s/%s/%s' % (self.section.catalog.key, self.section.key, self.key) - - def build_uri(self): - return get_uri_prefix(self) + '/questions/' + self.label + @classmethod + def build_label(cls, key, section): + return '%s/%s/%s' % (section.catalog.key, section.key, key) class QuestionEntity(Model, TranslationMixin): @@ -295,8 +288,13 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.label = self.build_label() - self.uri = self.build_uri() + try: + self.label = QuestionEntity.build_label(self.key, self.subsection, self.parent) + except AttributeError: + self.label = QuestionEntity.build_label(self.key, self.subsection) + print 'hey' + + self.uri = get_uri_prefix(self) + '/questions/' + self.label super(QuestionEntity, self).save(*args, **kwargs) @@ -318,29 +316,24 @@ def is_collection(self): def is_set(self): return not hasattr(self, 'question') - def build_label(self): - try: - question = Question.objects.get(pk=self.pk) + @classmethod + def build_label(cls, key, subsection, questionset=None): + if questionset: return '%s/%s/%s/%s/%s' % ( - self.subsection.section.catalog.key, - self.subsection.section.key, - self.subsection.key, - question.parent.key, - self.key + subsection.section.catalog.key, + subsection.section.key, + subsection.key, + questionset.key, + key ) - except (Question.DoesNotExist, AttributeError): - # Question.DoesNotExist is raised if self is a questionset - # AttributeError is raised if question.parent is None + else: return '%s/%s/%s/%s' % ( - self.subsection.section.catalog.key, - self.subsection.section.key, - self.subsection.key, - self.key + subsection.section.catalog.key, + subsection.section.key, + subsection.key, + key ) - def build_uri(self): - return get_uri_prefix(self) + '/questions/' + self.label - class Question(QuestionEntity): diff --git a/apps/questions/serializers.py b/apps/questions/serializers.py index 373690054..2d58a9838 100644 --- a/apps/questions/serializers.py +++ b/apps/questions/serializers.py @@ -7,6 +7,12 @@ from apps.domain.models import AttributeEntity, Attribute from .models import Catalog, Section, Subsection, QuestionEntity, Question +from .validators import ( + SectionUniqueLabelSerializerValidator, + SubsectionUniqueLabelSerializerValidator, + QuestionEntityUniqueLabelSerializerValidator, + QuestionUniqueLabelSerializerValidator +) class CatalogIndexSerializer(serializers.ModelSerializer): @@ -61,6 +67,7 @@ class Meta: 'title_en', 'title_de' ) + validators = (SectionUniqueLabelSerializerValidator(), ) class SubsectionIndexSerializer(serializers.ModelSerializer): @@ -88,6 +95,7 @@ class Meta: 'title_en', 'title_de', ) + validators = (SubsectionUniqueLabelSerializerValidator(), ) class QuestionSetIndexSerializer(serializers.ModelSerializer): @@ -115,6 +123,7 @@ class Meta: 'help_en', 'help_de', ) + validators = (QuestionEntityUniqueLabelSerializerValidator(), ) class QuestionSerializer(serializers.ModelSerializer): @@ -136,6 +145,7 @@ class Meta: 'text_de', 'widget_type', ) + validators = (QuestionUniqueLabelSerializerValidator(), ) class AttributeEntitySerializer(serializers.ModelSerializer): diff --git a/apps/questions/validators.py b/apps/questions/validators.py new file mode 100644 index 000000000..7e10cb256 --- /dev/null +++ b/apps/questions/validators.py @@ -0,0 +1,39 @@ +from apps.core.validators import UniqueLabelSerializerValidator + +from .models import Section, Subsection, QuestionEntity, Question + + +class SectionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + + def get_model(self): + return Section + + def get_label(self, data): + return Section.build_label(data['key'], data['catalog']) + + +class SubsectionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + + def get_model(self): + return Subsection + + def get_label(self, data): + return Subsection.build_label(data['key'], data['section']) + + +class QuestionEntityUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + + def get_model(self): + return QuestionEntity + + def get_label(self, data): + return QuestionEntity.build_label(data['key'], data['subsection']) + + +class QuestionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + + def get_model(self): + return QuestionEntity + + def get_label(self, data): + return Question.build_label(data['key'], data['subsection'], data['parent']) From cc2e62c8425550fef1f65e809192260aa4f76e1a Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 3 Feb 2017 14:24:53 +0100 Subject: [PATCH 46/51] add validators for options app and refactor validators for questions app --- apps/core/validators.py | 41 ++++----- apps/options/admin.py | 2 +- apps/options/migrations/0008_option_path.py | 20 +++++ .../options/migrations/0009_data_migration.py | 25 ++++++ apps/options/migrations/0010_meta.py | 24 ++++++ apps/options/models.py | 22 ++++- apps/options/serializers.py | 2 + apps/options/validators.py | 10 +++ apps/questions/admin.py | 8 +- apps/questions/migrations/0011_path.py | 30 +++++++ apps/questions/migrations/0012_meta.py | 30 +++++++ apps/questions/models.py | 86 +++++++++++++------ apps/questions/serializers.py | 16 ++-- apps/questions/validators.py | 44 +++++----- 14 files changed, 271 insertions(+), 89 deletions(-) create mode 100644 apps/options/migrations/0008_option_path.py create mode 100644 apps/options/migrations/0009_data_migration.py create mode 100644 apps/options/migrations/0010_meta.py create mode 100644 apps/options/validators.py create mode 100644 apps/questions/migrations/0011_path.py create mode 100644 apps/questions/migrations/0012_meta.py diff --git a/apps/core/validators.py b/apps/core/validators.py index c3ec851f5..f68d43ad1 100644 --- a/apps/core/validators.py +++ b/apps/core/validators.py @@ -1,38 +1,35 @@ from django.apps import apps -from django.core.exceptions import ValidationError, ObjectDoesNotExist +from django.core.exceptions import ValidationError, ObjectDoesNotExist, MultipleObjectsReturned from django.utils.translation import ugettext_lazy as _ -# from rest_framework import serializers +class UniquePathValidator(object): -def unique_uri_model_validator(instance): - try: - instance.__class__.objects.exclude(pk=instance.pk).get(uri=instance.uri) - raise ValidationError(_('The URI %s is already taken. Please adjust the URI Prefix and/or the Key.' % instance.uri)) - except ObjectDoesNotExist: - pass - - -class UniqueLabelSerializerValidator(object): + def __init__(self, instance=None): + self.instance = instance def set_context(self, serializer): self.instance = serializer.instance - def __call__(self, data): - Model = self.get_model() - label = self.get_label(data) + def __call__(self, data=None): + model = apps.get_model(app_label=self.app_label, model_name=self.model_name) - print label + if data: + path = self.get_path(model, data) + else: + path = self.instance.path try: if self.instance: - Model.objects.exclude(pk=self.instance.pk).get(label=label) + model.objects.exclude(pk=self.instance.pk).get(path=path) else: - Model.objects.get(label=label) - - raise ValidationError(_('Another %(model)s with the label "%(label)s" already exists. Please adjust the the Key.') % { - 'model': Model._meta.verbose_name.title(), - 'label': label - }) + model.objects.get(path=path) except ObjectDoesNotExist: + return + except MultipleObjectsReturned: pass + + raise ValidationError(_('Another %(model)s with the path "%(path)s" already exists. Please adjust the the Key.') % { + 'model': model._meta.verbose_name.title(), + 'path': path + }) diff --git a/apps/options/admin.py b/apps/options/admin.py index 5fb7f7227..fec423f12 100644 --- a/apps/options/admin.py +++ b/apps/options/admin.py @@ -8,7 +8,7 @@ class OptionSetAdmin(admin.ModelAdmin): class OptionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', ) + readonly_fields = ('uri', 'path') admin.site.register(OptionSet, OptionSetAdmin) diff --git a/apps/options/migrations/0008_option_path.py b/apps/options/migrations/0008_option_path.py new file mode 100644 index 000000000..0102725b3 --- /dev/null +++ b/apps/options/migrations/0008_option_path.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-03 12:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('options', '0007_meta'), + ] + + operations = [ + migrations.AddField( + model_name='option', + name='path', + field=models.SlugField(blank=True, help_text='The path part of the URI for this option.', max_length=512, null=True, verbose_name='Path'), + ), + ] diff --git a/apps/options/migrations/0009_data_migration.py b/apps/options/migrations/0009_data_migration.py new file mode 100644 index 000000000..eec05e8c0 --- /dev/null +++ b/apps/options/migrations/0009_data_migration.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-03 11:30 +from __future__ import unicode_literals + +from django.db import migrations, models + + +def migrate_options(apps, schema_editor): + + Option = apps.get_model('options', 'Option') + + for option in Option.objects.all(): + option.path = option.optionset.key + '/' + option.key + option.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ('options', '0008_option_path'), + ] + + operations = [ + migrations.RunPython(migrate_options), + ] diff --git a/apps/options/migrations/0010_meta.py b/apps/options/migrations/0010_meta.py new file mode 100644 index 000000000..1bb5d8057 --- /dev/null +++ b/apps/options/migrations/0010_meta.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-03 13:07 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('options', '0009_data_migration'), + ] + + operations = [ + migrations.AlterModelOptions( + name='option', + options={'ordering': ('optionset__order', 'order'), 'verbose_name': 'Option', 'verbose_name_plural': 'Options'}, + ), + migrations.AlterField( + model_name='option', + name='path', + field=models.SlugField(blank=True, help_text='The path part of the URI for this option (auto-generated).', max_length=512, null=True, verbose_name='Path'), + ), + ] diff --git a/apps/options/models.py b/apps/options/models.py index 6d6f734f6..313ba71cf 100644 --- a/apps/options/models.py +++ b/apps/options/models.py @@ -8,6 +8,8 @@ from apps.core.models import TranslationMixin from apps.conditions.models import Condition +from .validators import OptionUniquePathValidator + @python_2_unicode_compatible class OptionSet(models.Model): @@ -84,6 +86,11 @@ class Option(models.Model, TranslationMixin): verbose_name=_('Key'), help_text=_('The internal identifier of this option. The URI will be generated from this key.') ) + path = models.SlugField( + max_length=512, blank=True, null=True, + verbose_name=_('Path'), + help_text=_('The path part of the URI for this option (auto-generated).') + ) comment = models.TextField( blank=True, null=True, verbose_name=_('Comment'), @@ -116,7 +123,7 @@ class Option(models.Model, TranslationMixin): ) class Meta: - ordering = ('uri', ) + ordering = ('optionset__order', 'order') verbose_name = _('Option') verbose_name_plural = _('Options') @@ -124,9 +131,15 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.uri = self.build_uri() + self.path = Option.build_path(self.key, self.optionset) + self.uri = get_uri_prefix(self) + '/options/' + self.path + super(Option, self).save(*args, **kwargs) + def clean(self): + self.path = Option.build_path(self.key, self.optionset) + OptionUniquePathValidator(self)() + @property def label(self): return self.optionset.key + '/' + self.key @@ -135,5 +148,6 @@ def label(self): def text(self): return self.trans('text') - def build_uri(self): - return get_uri_prefix(self) + '/options/' + self.label + @classmethod + def build_path(cls, key, optionset): + return optionset.key + '/' + key diff --git a/apps/options/serializers.py b/apps/options/serializers.py index 23e94ba11..f3c4a9304 100644 --- a/apps/options/serializers.py +++ b/apps/options/serializers.py @@ -3,6 +3,7 @@ from apps.conditions.models import Condition from .models import OptionSet, Option +from .validators import OptionUniquePathValidator class OptionSetIndexOptionsSerializer(serializers.ModelSerializer): @@ -58,6 +59,7 @@ class Meta: 'text_de', 'additional_input' ) + validators = (OptionUniquePathValidator(),) class ConditionSerializer(serializers.ModelSerializer): diff --git a/apps/options/validators.py b/apps/options/validators.py new file mode 100644 index 000000000..4b98e898f --- /dev/null +++ b/apps/options/validators.py @@ -0,0 +1,10 @@ +from apps.core.validators import UniquePathValidator + + +class OptionUniquePathValidator(UniquePathValidator): + + app_label = 'options' + model_name = 'option' + + def get_path(self, model, data): + return model.build_path(data['key'], data['optionset']) diff --git a/apps/questions/admin.py b/apps/questions/admin.py index f798f5318..aa5853ee7 100644 --- a/apps/questions/admin.py +++ b/apps/questions/admin.py @@ -8,19 +8,19 @@ class CatalogAdmin(admin.ModelAdmin): class SectionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label') + readonly_fields = ('uri', 'path') class SubsectionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label') + readonly_fields = ('uri', 'path') class QuestionEntityAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label') + readonly_fields = ('uri', 'path') class QuestionAdmin(admin.ModelAdmin): - readonly_fields = ('uri', 'label') + readonly_fields = ('uri', 'path') admin.site.register(Catalog, CatalogAdmin) diff --git a/apps/questions/migrations/0011_path.py b/apps/questions/migrations/0011_path.py new file mode 100644 index 000000000..423e2b5b2 --- /dev/null +++ b/apps/questions/migrations/0011_path.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-03 13:10 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('questions', '0010_label'), + ] + + operations = [ + migrations.RenameField( + model_name='questionentity', + old_name='label', + new_name='path', + ), + migrations.RenameField( + model_name='section', + old_name='label', + new_name='path', + ), + migrations.RenameField( + model_name='subsection', + old_name='label', + new_name='path', + ), + ] diff --git a/apps/questions/migrations/0012_meta.py b/apps/questions/migrations/0012_meta.py new file mode 100644 index 000000000..3ec98622c --- /dev/null +++ b/apps/questions/migrations/0012_meta.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2017-02-03 13:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('questions', '0011_path'), + ] + + operations = [ + migrations.AlterField( + model_name='questionentity', + name='path', + field=models.CharField(blank=True, help_text='The path part of the URI of this question/questionset (auto-generated).', max_length=512, null=True, verbose_name='Path'), + ), + migrations.AlterField( + model_name='section', + name='path', + field=models.CharField(blank=True, help_text='The path part of the URI of this section (auto-generated).', max_length=512, null=True, verbose_name='Label'), + ), + migrations.AlterField( + model_name='subsection', + name='path', + field=models.CharField(blank=True, help_text='The path part of the URI of this subsection (auto-generated).', max_length=512, null=True, verbose_name='Label'), + ), + ] diff --git a/apps/questions/models.py b/apps/questions/models.py index b44f97f57..0ee13cfb1 100644 --- a/apps/questions/models.py +++ b/apps/questions/models.py @@ -9,6 +9,12 @@ from apps.domain.models import AttributeEntity from .managers import QuestionEntityManager +from .validators import ( + SectionUniquePathValidator, + SubsectionUniquePathValidator, + QuestionEntityUniquePathValidator, + QuestionUniquePathValidator +) @python_2_unicode_compatible @@ -92,6 +98,11 @@ class Section(Model, TranslationMixin): verbose_name=_('Key'), help_text=_('The internal identifier of this section. The URI will be generated from this key.') ) + path = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Label'), + help_text=_('The path part of the URI of this section (auto-generated).') + ) comment = models.TextField( blank=True, null=True, verbose_name=_('Comment'), @@ -117,11 +128,6 @@ class Section(Model, TranslationMixin): verbose_name=_('Title (de)'), help_text=_('The German title for this section.') ) - label = models.CharField( - max_length=512, blank=True, null=True, - verbose_name=_('Label'), - help_text=_('The label to be displayed this section (auto-generated).') - ) class Meta: ordering = ('catalog__order', 'order') @@ -132,20 +138,28 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.label = Section.build_label(self.key, self.catalog) - self.uri = get_uri_prefix(self) + '/questions/' + self.label + self.path = Section.build_path(self.key, self.catalog) + self.uri = get_uri_prefix(self) + '/questions/' + self.path super(Section, self).save(*args, **kwargs) for subsection in self.subsections.all(): subsection.save() + def clean(self): + self.path = Section.build_path(self.key, self.catalog) + SectionUniquePathValidator(self)() + @property def title(self): return self.trans('title') + @property + def label(self): + return self.path + @classmethod - def build_label(cls, key, catalog): + def build_path(cls, key, catalog): return '%s/%s' % (catalog.key, key) @@ -167,6 +181,11 @@ class Subsection(Model, TranslationMixin): verbose_name=_('Key'), help_text=_('The internal identifier of this subsection. The URI will be generated from this key.') ) + path = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Label'), + help_text=_('The path part of the URI of this subsection (auto-generated).') + ) comment = models.TextField( blank=True, null=True, verbose_name=_('Comment'), @@ -192,11 +211,6 @@ class Subsection(Model, TranslationMixin): verbose_name=_('Title (de)'), help_text=_('The German title for this subsection.') ) - label = models.CharField( - max_length=512, blank=True, null=True, - verbose_name=_('Label'), - help_text=_('The label to be displayed this subsection (auto-generated).') - ) class Meta: ordering = ('section__catalog__order', 'section__order', 'order') @@ -207,20 +221,27 @@ def __str__(self): return self.uri or self.key def save(self, *args, **kwargs): - self.label = Subsection.build_label(self.key, self.section) - self.uri = get_uri_prefix(self) + '/questions/' + self.label + self.path = Subsection.build_path(self.key, self.section) + self.uri = get_uri_prefix(self) + '/questions/' + self.path super(Subsection, self).save(*args, **kwargs) for entity in self.entities.all(): entity.save() - @property + def clean(self): + self.path = Subsection.build_path(self.key, self.section) + SubsectionUniquePathValidator(self)() + def title(self): return self.trans('title') + @property + def label(self): + return self.path + @classmethod - def build_label(cls, key, section): + def build_path(cls, key, section): return '%s/%s/%s' % (section.catalog.key, section.key, key) @@ -243,6 +264,11 @@ class QuestionEntity(Model, TranslationMixin): verbose_name=_('Key'), help_text=_('The internal identifier of this question/questionset. The URI will be generated from this key.') ) + path = models.CharField( + max_length=512, blank=True, null=True, + verbose_name=_('Path'), + help_text=_('The path part of the URI of this question/questionset (auto-generated).') + ) comment = models.TextField( blank=True, null=True, verbose_name=_('Comment'), @@ -273,11 +299,6 @@ class QuestionEntity(Model, TranslationMixin): verbose_name=_('Help (de)'), help_text=_('The German help text for this question/questionset.') ) - label = models.CharField( - max_length=512, blank=True, null=True, - verbose_name=_('Label'), - help_text=_('The label to be displayed this question/questionset (auto-generated).') - ) class Meta: ordering = ('subsection__section__catalog__order', 'subsection__section__order', 'subsection__order', 'order') @@ -289,18 +310,25 @@ def __str__(self): def save(self, *args, **kwargs): try: - self.label = QuestionEntity.build_label(self.key, self.subsection, self.parent) + self.path = QuestionEntity.build_path(self.key, self.subsection, self.parent) except AttributeError: - self.label = QuestionEntity.build_label(self.key, self.subsection) - print 'hey' + self.path = QuestionEntity.build_path(self.key, self.subsection) - self.uri = get_uri_prefix(self) + '/questions/' + self.label + self.uri = get_uri_prefix(self) + '/questions/' + self.path super(QuestionEntity, self).save(*args, **kwargs) for question in self.questions.all(): question.save() + def clean(self): + try: + self.path = QuestionEntity.build_path(self.key, self.subsection, self.parent) + QuestionUniquePathValidator(self)() + except AttributeError: + self.path = QuestionEntity.build_path(self.key, self.subsection) + QuestionEntityUniquePathValidator(self)() + @property def help(self): return self.trans('help') @@ -316,8 +344,12 @@ def is_collection(self): def is_set(self): return not hasattr(self, 'question') + @property + def label(self): + return self.path + @classmethod - def build_label(cls, key, subsection, questionset=None): + def build_path(cls, key, subsection, questionset=None): if questionset: return '%s/%s/%s/%s/%s' % ( subsection.section.catalog.key, diff --git a/apps/questions/serializers.py b/apps/questions/serializers.py index 2d58a9838..c34ebee6c 100644 --- a/apps/questions/serializers.py +++ b/apps/questions/serializers.py @@ -8,10 +8,10 @@ from .models import Catalog, Section, Subsection, QuestionEntity, Question from .validators import ( - SectionUniqueLabelSerializerValidator, - SubsectionUniqueLabelSerializerValidator, - QuestionEntityUniqueLabelSerializerValidator, - QuestionUniqueLabelSerializerValidator + SectionUniquePathValidator, + SubsectionUniquePathValidator, + QuestionEntityUniquePathValidator, + QuestionUniquePathValidator ) @@ -67,7 +67,7 @@ class Meta: 'title_en', 'title_de' ) - validators = (SectionUniqueLabelSerializerValidator(), ) + validators = (SectionUniquePathValidator(), ) class SubsectionIndexSerializer(serializers.ModelSerializer): @@ -95,7 +95,7 @@ class Meta: 'title_en', 'title_de', ) - validators = (SubsectionUniqueLabelSerializerValidator(), ) + validators = (SubsectionUniquePathValidator(), ) class QuestionSetIndexSerializer(serializers.ModelSerializer): @@ -123,7 +123,7 @@ class Meta: 'help_en', 'help_de', ) - validators = (QuestionEntityUniqueLabelSerializerValidator(), ) + validators = (QuestionEntityUniquePathValidator(), ) class QuestionSerializer(serializers.ModelSerializer): @@ -145,7 +145,7 @@ class Meta: 'text_de', 'widget_type', ) - validators = (QuestionUniqueLabelSerializerValidator(), ) + validators = (QuestionUniquePathValidator(), ) class AttributeEntitySerializer(serializers.ModelSerializer): diff --git a/apps/questions/validators.py b/apps/questions/validators.py index 7e10cb256..b93c3ae88 100644 --- a/apps/questions/validators.py +++ b/apps/questions/validators.py @@ -1,39 +1,37 @@ -from apps.core.validators import UniqueLabelSerializerValidator +from apps.core.validators import UniquePathValidator -from .models import Section, Subsection, QuestionEntity, Question +class SectionUniquePathValidator(UniquePathValidator): -class SectionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + app_label = 'questions' + model_name = 'section' - def get_model(self): - return Section + def get_path(self, model, data): + return model.build_path(data['key'], data['catalog']) - def get_label(self, data): - return Section.build_label(data['key'], data['catalog']) +class SubsectionUniquePathValidator(UniquePathValidator): -class SubsectionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + app_label = 'questions' + model_name = 'subsection' - def get_model(self): - return Subsection + def get_path(self, model, data): + return model.build_path(data['key'], data['section']) - def get_label(self, data): - return Subsection.build_label(data['key'], data['section']) +class QuestionEntityUniquePathValidator(UniquePathValidator): -class QuestionEntityUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + app_label = 'questions' + model_name = 'questionentity' - def get_model(self): - return QuestionEntity + def get_path(self, model, data): + return model.build_path(data['key'], data['subsection']) - def get_label(self, data): - return QuestionEntity.build_label(data['key'], data['subsection']) +class QuestionUniquePathValidator(UniquePathValidator): -class QuestionUniqueLabelSerializerValidator(UniqueLabelSerializerValidator): + app_label = 'questions' + model_name = 'questionentity' - def get_model(self): - return QuestionEntity - - def get_label(self, data): - return Question.build_label(data['key'], data['subsection'], data['parent']) + def get_path(self, model, data): + return model.build_path(data['key'], data['subsection'], data['parent']) From 07bbc7b2ede1ad71d391b845745ca483e6926306 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Fri, 3 Feb 2017 15:05:19 +0100 Subject: [PATCH 47/51] add validators for domain app --- apps/conditions/models.py | 8 ++--- apps/conditions/serializers.py | 6 ++-- .../templates/conditions/conditions.html | 4 +-- .../conditions/conditions_export.html | 2 +- .../conditions_modal_form_conditions.html | 2 +- apps/domain/admin.py | 2 +- apps/domain/migrations/0028_path.py | 20 +++++++++++ apps/domain/models.py | 36 +++++++++++-------- apps/domain/serializers.py | 34 +++++++++--------- apps/domain/templates/domain/domain.html | 6 ++-- .../templates/domain/domain_export.html | 4 +-- .../domain/domain_modal_delete_entities.html | 2 +- .../domain/domain_modal_form_attributes.html | 2 +- .../domain/domain_modal_form_conditions.html | 2 +- .../domain/domain_modal_form_entities.html | 2 +- .../domain/domain_modal_form_optionsets.html | 2 +- apps/domain/validators.py | 10 ++++++ apps/domain/views.py | 6 ++-- apps/options/models.py | 9 +---- apps/options/serializers.py | 6 ++-- apps/options/templates/options/options.html | 4 +-- .../options_modal_form_conditions.html | 2 +- apps/questions/models.py | 16 --------- apps/questions/serializers.py | 14 ++++---- .../templates/questions/catalog_tree.html | 6 ++-- .../templates/questions/catalogs.html | 6 ++-- .../catalogs_modal_form_questions.html | 6 ++-- .../catalogs_modal_form_questionsets.html | 4 +-- .../catalogs_modal_form_sections.html | 2 +- .../catalogs_modal_form_subsections.html | 2 +- .../templates/questions/catalogs_sidebar.html | 2 +- apps/tasks/serializers.py | 4 +-- apps/tasks/templates/tasks/tasks_export.html | 2 +- .../tasks/tasks_modal_form_conditions.html | 2 +- .../tasks/tasks_modal_form_tasks.html | 2 +- 35 files changed, 126 insertions(+), 113 deletions(-) create mode 100644 apps/domain/migrations/0028_path.py create mode 100644 apps/domain/validators.py diff --git a/apps/conditions/models.py b/apps/conditions/models.py index 1e2d4ce9f..c3102e8cc 100644 --- a/apps/conditions/models.py +++ b/apps/conditions/models.py @@ -81,12 +81,8 @@ def __str__(self): return self.uri or self.key @property - def label(self): - return self.key - - @property - def source_label(self): - return self.source.label + def source_path(self): + return self.source.path @property def relation_label(self): diff --git a/apps/conditions/serializers.py b/apps/conditions/serializers.py index 4e042f287..e3d5e567f 100644 --- a/apps/conditions/serializers.py +++ b/apps/conditions/serializers.py @@ -12,9 +12,9 @@ class Meta: model = Condition fields = ( 'id', - 'label', + 'key', 'comment', - 'source_label', + 'source_path', 'relation_label', 'target_label' ) @@ -55,7 +55,7 @@ class Meta: model = Attribute fields = ( 'id', - 'label', + 'path', 'options' ) diff --git a/apps/conditions/templates/conditions/conditions.html b/apps/conditions/templates/conditions/conditions.html index cb932ab77..e42073905 100644 --- a/apps/conditions/templates/conditions/conditions.html +++ b/apps/conditions/templates/conditions/conditions.html @@ -80,12 +80,12 @@

{% trans 'Conditions' %}

{% trans 'Condition' %} - {$ condition.label $} + {$ condition.key $}

  • - {$ condition.source_label $} + {$ condition.source_path $} {$ condition.relation_label $} "{$ condition.target_label $}"
    • diff --git a/apps/conditions/templates/conditions/conditions_export.html b/apps/conditions/templates/conditions/conditions_export.html index 4db2ed5a7..4ac76c3a7 100644 --- a/apps/conditions/templates/conditions/conditions_export.html +++ b/apps/conditions/templates/conditions/conditions_export.html @@ -18,7 +18,7 @@

    {{ condition.title }}

    - {% trans 'Source' %} {{ condition.source_label }} + {% trans 'Source' %} {{ condition.source_path }}

    diff --git a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html index 2cb3fcdf0..1ea124ee3 100644 --- a/apps/conditions/templates/conditions/conditions_modal_form_conditions.html +++ b/apps/conditions/templates/conditions/conditions_modal_form_conditions.html @@ -45,7 +45,7 @@

    data-model="service.values.source" data-errors="service.errors.source" data-options="service.attributes" - data-options-label="label" + data-options-label="path" data-options-null="1"> {% trans 'Export' %}

    {% trans 'Domain' %}

    -
    @@ -94,14 +94,14 @@

    {% trans 'Domain' %}

    {% trans 'Entity' %} {% trans 'Attribute' %} - {$ entity.label $} + {$ entity.path $} collection
    diff --git a/apps/domain/templates/domain/domain_export.html b/apps/domain/templates/domain/domain_export.html index 5ea8975cb..9c37484c3 100644 --- a/apps/domain/templates/domain/domain_export.html +++ b/apps/domain/templates/domain/domain_export.html @@ -8,9 +8,9 @@

    {% trans 'Domain '%}

    {% for entity in entities %} {% if entity.is_attribute %} -

    {% trans 'Attribute' %} – {{ entity.label }}

    +

    {% trans 'Attribute' %} – {{ entity.path }}

    {% else %} -

    {% trans 'Entity' %} – {{ entity.label }}

    +

    {% trans 'Entity' %} – {{ entity.path }}

    {% endif%}

    diff --git a/apps/domain/templates/domain/domain_modal_delete_entities.html b/apps/domain/templates/domain/domain_modal_delete_entities.html index 5164ffcea..67bb32025 100644 --- a/apps/domain/templates/domain/domain_modal_delete_entities.html +++ b/apps/domain/templates/domain/domain_modal_delete_entities.html @@ -33,7 +33,7 @@