#554: Questionnaires can include repeat groups of parties or location…

…s. (#738) * Questionnaires can include repeats of parties or locations. * refactored model_helper * added unit tests for model_helper
Cadasta · Oct 3, 2016 · e715894 · e715894
1 parent d01ee93
commit e715894
Show file tree

Hide file tree

Showing 18 changed files with 1,722 additions and 299 deletions.
diff --git a/cadasta/questionnaires/managers.py b/cadasta/questionnaires/managers.py
@@ -43,7 +43,9 @@
 def create_children(children, errors=[], project=None, kwargs={}):
     if children:
         for c in children:
-            if c.get('type') == 'group':
+            if c.get('type') == 'repeat':
+                create_children(c['children'], errors, project, kwargs)
+            elif c.get('type') == 'group':
                 model_name = 'QuestionGroup'
 
                 # parse attribute group
@@ -61,8 +63,9 @@ def create_children(children, errors=[], project=None, kwargs={}):
             else:
                 model_name = 'Question'
 
-            model = apps.get_model('questionnaires', model_name)
-            model.objects.create_from_dict(dict=c, errors=errors, **kwargs)
+            if c.get('type') != 'repeat':
+                model = apps.get_model('questionnaires', model_name)
+                model.objects.create_from_dict(dict=c, errors=errors, **kwargs)
 
 
 def create_options(options, question, errors=[]):
@@ -234,7 +237,6 @@ class QuestionManager(models.Manager):
     def create_from_dict(self, errors=[], **kwargs):
         dict = kwargs.pop('dict')
         instance = self.model(**kwargs)
-
         type_dict = {name: code for code, name in instance.TYPE_CHOICES}
 
         instance.type = type_dict[dict.get('type')]

diff --git a/cadasta/questionnaires/tests/files/t_questionnaire.xlsx b/cadasta/questionnaires/tests/files/t_questionnaire.xlsx
diff --git a/...iles/test_standard_questionnaire_bad.xlsx → ...ires/tests/files/t_questionnaire_bad.xlsx b/...iles/test_standard_questionnaire_bad.xlsx → ...ires/tests/files/t_questionnaire_bad.xlsx
diff --git a/.../files/test_standard_questionnaire_2.xlsx → ...files/t_questionnaire_geotype_select.xlsx b/.../files/test_standard_questionnaire_2.xlsx → ...files/t_questionnaire_geotype_select.xlsx
diff --git a/cadasta/questionnaires/tests/files/t_questionnaire_repeat_location.xlsx b/cadasta/questionnaires/tests/files/t_questionnaire_repeat_location.xlsx
diff --git a/cadasta/questionnaires/tests/files/t_questionnaire_repeat_minus_tenure.xlsx b/cadasta/questionnaires/tests/files/t_questionnaire_repeat_minus_tenure.xlsx
diff --git a/cadasta/questionnaires/tests/files/t_questionnaire_repeat_party.xlsx b/cadasta/questionnaires/tests/files/t_questionnaire_repeat_party.xlsx
diff --git a/cadasta/questionnaires/tests/files/t_questionnaire_repeat_party_minus_tenure.xlsx b/cadasta/questionnaires/tests/files/t_questionnaire_repeat_party_minus_tenure.xlsx
diff --git a/cadasta/questionnaires/tests/files/test_standard_questionnaire.xlsx b/cadasta/questionnaires/tests/files/test_standard_questionnaire.xlsx
diff --git a/cadasta/questionnaires/tests/test_managers.py b/cadasta/questionnaires/tests/test_managers.py
@@ -58,6 +58,51 @@ def test_create_children(self):
             questionnaire=questionnaire,
             question_group__isnull=False).count() == 1
 
+    def test_create_children_with_repeat_group(self):
+        questionnaire = factories.QuestionnaireFactory.create()
+        children = [{
+            'label': 'This form showcases the different question',
+            'name': 'intro',
+            'type': 'note'
+        }, {
+            'label': 'Text question type',
+            'name': 'text_questions',
+            'type': 'repeat',
+            'children': [
+                {
+                    'hint': 'Can be short or long but '
+                            'always one line (type = '
+                            'text)',
+                    'label': 'Text',
+                    'name': 'my_string',
+                    'type': 'text'
+                },
+                {
+                    'hint': 'Nested group',
+                    'label': 'Group',
+                    'name': 'my_group',
+                    'type': 'group',
+                    'children': [
+                        {
+                            'hint': 'More text',
+                            'label': 'Text',
+                            'name': 'my_group_string',
+                            'type': 'text'
+                        },
+                    ]
+                }
+            ],
+        }]
+        create_children(children, kwargs={'questionnaire': questionnaire})
+
+        assert models.QuestionGroup.objects.filter(
+            questionnaire=questionnaire).count() == 1
+        assert models.Question.objects.filter(
+            questionnaire=questionnaire).count() == 3
+        assert models.Question.objects.filter(
+            questionnaire=questionnaire,
+            question_group__isnull=False).count() == 1
+
 
 class CreateOptionsTest(TestCase):