Request IR by Post from Hub

app/data_model/list_store.py

@@ -1,4 +1,5 @@
 import random
+from functools import cached_property
 from string import ascii_letters
 from typing import List, Mapping, Optional
 
@@ -39,6 +40,10 @@ def __getitem__(self, list_item_index):
     def __len__(self):
         return len(self.items)
 
+    @cached_property
+    def non_primary_people(self):
+        return [item for item in self.items if item != self.primary_person]
+
     def index(self, list_item):
         return self.items.index(list_item)
 

app/questionnaire/questionnaire_schema.py

@@ -195,6 +195,9 @@ def get_driving_question_for_list(cls, section, list_name):
             ):
                 return block
 
+    def get_individual_response_list(self):
+        return self.json.get("individual_response", {}).get("for_list")
+
     def get_title_for_section(self, section_id):
         return self._sections_by_id.get(section_id).get("title")
 

app/routes/individual_response.py

@@ -14,6 +14,7 @@
     IndividualResponseHowHandler,
     IndividualResponsePostAddressConfirmHandler,
     IndividualResponseChangeHandler,
+    IndividualResponseWhoHandler,
 )
 
 logger = get_logger()
@@ -53,6 +54,7 @@ def before_individual_response_request():
 def request_individual_response(schema, questionnaire_store):
     language_code = get_session_store().session_data.language_code
     list_item_id = request.args.get("list_item_id")
+
     individual_response_handler = IndividualResponseHandler(
         block_definition=None,
         schema=schema,
@@ -63,10 +65,10 @@ def request_individual_response(schema, questionnaire_store):
         list_item_id=list_item_id,
     )
 
-    if request.method == "GET":
-        return individual_response_handler.handle_get()
+    if request.method == "POST":
+        return individual_response_handler.handle_post()
 
-    return redirect(url_for(".get_individual_response_how", list_item_id=list_item_id))
+    return individual_response_handler.handle_get()
 
 
 @individual_response_blueprint.route("/<list_item_id>/how", methods=["GET", "POST"])
@@ -75,6 +77,7 @@ def request_individual_response(schema, questionnaire_store):
 @with_schema
 def get_individual_response_how(schema, questionnaire_store, list_item_id):
     language_code = get_session_store().session_data.language_code
+
     individual_response_handler = IndividualResponseHowHandler(
         schema=schema,
         questionnaire_store=questionnaire_store,
@@ -84,10 +87,10 @@ def get_individual_response_how(schema, questionnaire_store, list_item_id):
         list_item_id=list_item_id,
     )
 
-    if request.method == "GET" or not individual_response_handler.form.validate():
-        return individual_response_handler.handle_get()
+    if request.method == "POST" and individual_response_handler.form.validate():
+        return individual_response_handler.handle_post()
 
-    return individual_response_handler.handle_post()
+    return individual_response_handler.handle_get()
 
 
 @individual_response_blueprint.route("/<list_item_id>/change", methods=["GET", "POST"])
@@ -105,10 +108,10 @@ def get_individual_response_change(schema, questionnaire_store, list_item_id):
         list_item_id=list_item_id,
     )
 
-    if request.method == "GET" or not individual_response_handler.form.validate():
-        return individual_response_handler.handle_get()
+    if request.method == "POST" and individual_response_handler.form.validate():
+        return individual_response_handler.handle_post()
 
-    return individual_response_handler.handle_post()
+    return individual_response_handler.handle_get()
 
 
 @individual_response_blueprint.route(
@@ -130,10 +133,10 @@ def get_individual_response_post_address_confirm(
         list_item_id=list_item_id,
     )
 
-    if request.method == "GET" or not individual_response_handler.form.validate():
-        return individual_response_handler.handle_get()
+    if request.method == "POST" and individual_response_handler.form.validate():
+        return individual_response_handler.handle_post()
 
-    return individual_response_handler.handle_post()
+    return individual_response_handler.handle_get()
 
 
 @individual_response_blueprint.route("/post/confirmation", methods=["GET", "POST"])
@@ -152,10 +155,31 @@ def get_individual_response_post_address_confirmation(schema, questionnaire_stor
         list_item_id=None,
     )
 
-    if request.method == "GET":
-        return render_template(
-            template="individual_response/confirmation",
-            display_address=questionnaire_store.metadata.get("display_address"),
-        )
+    if request.method == "POST":
+        return redirect(url_for("questionnaire.get_questionnaire"))
+
+    return render_template(
+        template="individual_response/confirmation",
+        display_address=questionnaire_store.metadata.get("display_address"),
+    )
+
+
+@individual_response_blueprint.route("/who", methods=["GET", "POST"])
+@login_required
+@with_questionnaire_store
+@with_schema
+def get_individual_response_who(schema, questionnaire_store):
+    language_code = get_session_store().session_data.language_code
+
+    individual_response_handler = IndividualResponseWhoHandler(
+        schema=schema,
+        questionnaire_store=questionnaire_store,
+        language=language_code,
+        request_args=request.args,
+        form_data=request.form,
+    )
+
+    if request.method == "POST" and individual_response_handler.form.validate():
+        return individual_response_handler.handle_post()
 
-    return redirect(url_for("questionnaire.get_questionnaire"))
+    return individual_response_handler.handle_get()

app/translations/messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-08-13 21:29+0100\n"
+"POT-Creation-Date: 2020-08-17 10:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -273,71 +273,71 @@ msgstr ""
 msgid " (You)"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:177
+#: app/views/handlers/individual_response.py:187
 msgid "How would you like <em>{person_name}</em> to receive a separate census?"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:183
+#: app/views/handlers/individual_response.py:193
 msgid ""
 "For someone to complete a separate census, we need to send them an "
 "individual access code."
 msgstr ""
 
-#: app/views/handlers/individual_response.py:186
+#: app/views/handlers/individual_response.py:196
 msgid "Select how to send access code"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:196
+#: app/views/handlers/individual_response.py:206
 msgid "Post"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:198
+#: app/views/handlers/individual_response.py:208
 msgid ""
 "We can only send this to an unnamed resident at the registered household "
 "address"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:265
+#: app/views/handlers/individual_response.py:282
 msgid "How would you like to answer <em>{person_name_possessive}</em> questions?"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:278
+#: app/views/handlers/individual_response.py:295
 msgid "I would like to request a separate census for them to complete"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:284
+#: app/views/handlers/individual_response.py:301
 msgid "I will ask them to answer their own questions"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:288
+#: app/views/handlers/individual_response.py:305
 msgid "They will need the household access code from the letter we sent you"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:294
+#: app/views/handlers/individual_response.py:311
 msgid "I will answer for {person_name}"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:405
+#: app/views/handlers/individual_response.py:424
 msgid "Do you want to send an individual access code for {person_name} by post?"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:411
+#: app/views/handlers/individual_response.py:430
 msgid ""
 "A letter with an individual access code will be sent to your registered "
 "household address"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:418
+#: app/views/handlers/individual_response.py:437
 msgid ""
 "The letter will be addressed to <strong>Individual Resident</strong> "
 "instead of the name provided"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:431
+#: app/views/handlers/individual_response.py:450
 msgid "Yes, send the access code by post"
 msgstr ""
 
-#: app/views/handlers/individual_response.py:435
+#: app/views/handlers/individual_response.py:454
 msgid "No, send it another way"
 msgstr ""
 
@@ -402,6 +402,14 @@ msgstr ""
 msgid "Submitting"
 msgstr ""
 
+#: templates/hub.html:39
+msgid "If you can’t answer someone else’s questions"
+msgstr ""
+
+#: templates/interstitial.html:23
+msgid "If you can’t answer questions for this person"
+msgstr ""
+
 #: templates/introduction.html:15
 #, python-format
 msgid "You are completing this for <span>%(ru_name)s</span> (%(trading_as_name)s)"
@@ -693,16 +701,12 @@ msgid "Interviewer note:"
 msgstr ""
 
 #: templates/partials/answer-guidance.html:18
-#: templates/partials/individual-response-guidance.html:15
+#: templates/partials/individual-response-guidance.html:13
 #: templates/partials/question-definition.html:19
 msgid "Hide this"
 msgstr ""
 
-#: templates/partials/individual-response-guidance.html:3
-msgid "If you can’t answer questions for this person"
-msgstr ""
-
-#: templates/partials/individual-response-guidance.html:26
+#: templates/partials/individual-response-guidance.html:24
 msgid ""
 "You can <em>share your household access code</em> with the people you "
 "live with so they can complete their own sections."

app/views/contexts/hub_context.py

@@ -1,10 +1,10 @@
+from functools import cached_property
 from typing import List, Mapping, Union
 
 from flask import url_for
 from flask_babel import lazy_gettext
 
 from app.data_model.progress_store import CompletionStatus
-from app.questionnaire import QuestionnaireSchema
 from app.views.contexts import Context
 
 
@@ -60,12 +60,11 @@ def get_context(self, survey_complete, enabled_section_ids) -> Mapping:
             submit_button = lazy_gettext("Continue")
             guidance = None
             warning = None
-            individual_response_enabled = self._individual_response_enabled(
-                self._schema
-            )
+            individual_response_enabled = self._individual_response_enabled
 
         return {
             "individual_response_enabled": individual_response_enabled,
+            "individual_response_url": self._individual_response_url,
             "guidance": guidance,
             "rows": rows,
             "submit_button": submit_button,
@@ -175,18 +174,21 @@ def _get_rows(self, enabled_section_ids) -> List[Mapping[str, Union[str, List]]]
 
         return rows
 
-    def _individual_response_enabled(self, schema: QuestionnaireSchema) -> bool:
-        if not schema.json.get("individual_response"):
+    @cached_property
+    def _individual_response_enabled(self) -> bool:
+        if not self._schema.json.get("individual_response"):
             return False
 
-        for_list = schema.json["individual_response"]["for_list"]
-
-        count_household_members = len(self._list_store[for_list])
-
-        if count_household_members == 0:
-            return False
+        for_list = self._schema.json["individual_response"]["for_list"]
 
-        if count_household_members == 1 and self._list_store[for_list].primary_person:
+        if not self._list_store[for_list].non_primary_people:
             return False
-
         return True
+
+    @cached_property
+    def _individual_response_url(self) -> Union[str, None]:
+        if self._individual_response_enabled:
+            return url_for(
+                "individual_response.request_individual_response", journey="hub"
+            )
+        return None