From 2cc58cb8dd102feabc24353562586240c2916bd4 Mon Sep 17 00:00:00 2001
From: Sara Arenson <sara_arenson@yahoo.ca>
Date: Mon, 30 Nov 2015 00:45:47 -0600
Subject: [PATCH] question_multiple type now can also pair input boxes with
 checkboxes

---
 questionnaire/qprocessors/choice.py           | 19 +++++++++++++++----
 .../choice-multiple-freeform.html             |  3 +++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/questionnaire/qprocessors/choice.py b/questionnaire/qprocessors/choice.py
index 5ac888d..be45269 100644
--- a/questionnaire/qprocessors/choice.py
+++ b/questionnaire/qprocessors/choice.py
@@ -51,7 +51,7 @@ add_type('choice-freeform', 'Choice with a freeform option [radio]')
 add_type('dropdown', 'Dropdown choice [select]')
 
 
-@question_proc('choice-multiple', 'choice-multiple-freeform')
+@question_proc('choice-multiple', 'choice-multiple-freeform', 'choice-multiple-values')
 def question_multiple(request, question):
     key = "question_%s" % question.number
     choices = []
@@ -79,12 +79,13 @@ def question_multiple(request, question):
     return {
         "choices": choices,
         "extras": extras,
+        "type": question.type,
         "template"  : "questionnaire/choice-multiple-freeform.html",
         "required" : cd.get("required", False) and cd.get("required") != "0",
 
     }
 
-@answer_proc('choice-multiple', 'choice-multiple-freeform')
+@answer_proc('choice-multiple', 'choice-multiple-freeform', 'choice-multiple-values')
 def process_multiple(question, answer):
     multiple = []
     multiple_freeform = []
@@ -100,11 +101,20 @@ def process_multiple(question, answer):
         requiredcount = question.choices().count()
 
     for k, v in answer.items():
-        if k.startswith('multiple'):
+        if k.startswith('multiple') and not k.endswith('value'):
             multiple.append(v)
         if k.startswith('more') and len(v.strip()) > 0:
             multiple_freeform.append(v)
-
+    
+    if len(multiple) > 1:
+    # check for associated values for choice-multiple-values
+        for k, v in answer.items():
+            if k.endswith('value'):
+                choice_text = k.rsplit("_", 2)[0]
+                if choice_text in multiple:
+                    multiple.remove(choice_text)
+                    multiple.append([choice_text, v])        
+        
     if len(multiple) + len(multiple_freeform) < requiredcount:
         raise AnswerException(ungettext(u"You must select at least %d option",
                                         u"You must select at least %d options",
@@ -115,5 +125,6 @@ def process_multiple(question, answer):
     return dumps(multiple)
 add_type('choice-multiple', 'Multiple-Choice, Multiple-Answers [checkbox]')
 add_type('choice-multiple-freeform', 'Multiple-Choice, Multiple-Answers, plus freeform [checkbox, input]')
+add_type('choice-multiple-values', 'Multiple-Choice, Multiple-Answers [checkboxes], plus value box [input] for each selected answer')
 
 
diff --git a/questionnaire/templates/questionnaire/choice-multiple-freeform.html b/questionnaire/templates/questionnaire/choice-multiple-freeform.html
index 3763de7..b71ba4b 100644
--- a/questionnaire/templates/questionnaire/choice-multiple-freeform.html
+++ b/questionnaire/templates/questionnaire/choice-multiple-freeform.html
@@ -8,6 +8,9 @@
                 <label>
                     <input onClick="valchanged('{{ question.number }}_{{ choice.value }}', this.checked);" type="checkbox" id="{{ key }}" name="{{ key }}" value="{{ choice.value }}" {{ checked }}>
                     <span>{{ choice.text }}</span>
+                    {% if qdict.type == 'choice-multiple-values' %}
+                    <input type="text" id="question_{{ question.number }}_{{ choice.value }}_value" name="question_{{ question.number }}_{{ choice.value }}_value" maxlength="4" style="margin-left: 40px; width: 4em">
+                    {% endif %}
                 </label>
             </li>
         {% endfor %}