From e82a20a5455b82a67b506d566bce68d3704ae45b Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Fri, 8 Nov 2013 17:14:14 +0100
Subject: [PATCH] bzr revid: rim@openerp.com-20131108161414-nd908nzsr44n7u1e

---
 addons/survey/controllers/main.py        | 33 ++++++++++++++----------
 addons/survey/static/src/js/survey.js    |  9 +++++++
 addons/survey/views/survey_templates.xml | 32 ++++++++++++-----------
 3 files changed, 45 insertions(+), 29 deletions(-)
 create mode 100644 addons/survey/static/src/js/survey.js

diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index f9022dbef48..88f4718b2a6 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -119,21 +119,21 @@ class WebsiteSurvey(http.Controller):
                                     'pagination': pagination})
 
     def validate_free_text(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         problems = []
         if question.constr_mandatory:
             problems = problems + self.__has_empty_input(question, post, answer_tag)
         return problems
 
     def validate_textbox(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         problems = []
         if question.constr_mandatory:
             problems = problems + self.__has_empty_input(question, post, answer_tag)
         return problems
 
     def validate_numerical_box(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         # Check for an empty input
         problems = []
         if question.constr_mandatory:
@@ -149,7 +149,7 @@ class WebsiteSurvey(http.Controller):
         return problems
 
     def validate_datetime(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         problems = []
         if question.constr_mandatory:
             problems = problems + self.__has_empty_input(question, post, answer_tag)
@@ -159,37 +159,42 @@ class WebsiteSurvey(http.Controller):
         return problems
 
     def validate_simple_choice_scale(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         problems = []
         if question.constr_mandatory:
             problems = problems + self.__has_empty_input(question, post, answer_tag)
         return problems
 
     def validate_simple_choice_dropdown(self, survey_id, page_nr, question, post):
-        answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
         problems = []
         if question.constr_mandatory:
             problems = problems + self.__has_empty_input(question, post, answer_tag)
         return problems
 
-    # def validate_multiple_choice(self, survey_id, page_nr, question, post):
-    #     answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
-    #     problems = []
-    #     return problems
+    def validate_multiple_choice(self, survey_id, page_nr, question, post):
+        answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
+        problems = []
+        if question.constr_mandatory:
+            answers = dict_keys_startswith(post, answer_tag)
+            print(answers)
+            if not answers:
+                return [{'qlabel': question.question,
+                'errmsg': "This question is mandatory"}]
+        return problems
 
     # def validate_vector(self, survey_id, page_nr, question, post):
-    #     answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+    #     answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
     #     problems = []
     #     return problems
 
     # def validate_matrix(self, survey_id, page_nr, question, post):
-    #     answer_tag = survey_id.__str__() + '*' + page_nr + '*' + question.id.__str__()
+    #     answer_tag = survey_id.__str__() + '--' + page_nr + '--' + question.id.__str__()
     #     problems = []
     #     return problems
 
     def __has_empty_input(self, question, post, answer_tag):
         ''' Check for an empty input '''
-        print(answer_tag)
         if answer_tag not in post or post[answer_tag].strip() == "":
             return [{'qlabel': question.question,
                 'errmsg': "This question is mandatory"}]
@@ -197,7 +202,7 @@ class WebsiteSurvey(http.Controller):
             return []
 
 
-def __dict_keys_startswith(self, dictionary, string):
+def dict_keys_startswith(dictionary, string):
     '''Returns a dictionary containing the elements of <dict> whose keys start
     with <string>.
 
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
new file mode 100644
index 00000000000..e24bda38079
--- /dev/null
+++ b/addons/survey/static/src/js/survey.js
@@ -0,0 +1,9 @@
+$(document).ready(function () {
+    console.debug("[survey] Custom JS for survey loaded");
+    $('.survey-btn').click(
+        function(){
+            console.debug("[survey] Page button clicked");
+        }
+    );
+
+});
\ No newline at end of file
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index c448c7041d3..be635b90c25 100644
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -42,6 +42,9 @@
         <!-- A survey -->
         <template id="survey" name="Survey">
             <t t-call="website.layout">
+                <t t-set="head">
+                    <script type="text/javascript" src="/survey/static/src/js/survey.js" />
+                </t>
                 <div class="wrap">
                     <div class="container">
                         <div class="row">
@@ -57,7 +60,7 @@
                                         </h1>
                                     </div>
                                     <div class="text-center">
-                                        <form role="form" method="post" t-att-name="survey.id.__str__() + '*-1'" t-att-action="'/survey/fill/' + survey.id.__str__()" target="">
+                                        <form role="form" method="post" t-att-name="survey.id.__str__() + '---1'" t-att-action="'/survey/fill/' + survey.id.__str__()" target="">
                                             <input type="hidden" name="current" t-att-value="pagination['current'].__str__()" />
                                             <input type="hidden" name="next" t-att-value="pagination['next'].__str__()" />
                                             <input type="submit" class="btn btn-primary active" value="Take survey"/>
@@ -90,8 +93,8 @@
         <!-- Navigation & Submission -->
         <template id="navsub" name="Footer for navigation and submission">
             <div class="text-center">
-                <t t-if="pagination['current'] != -1 and pagination['next'] != 'finished'"><input type="submit" class="btn btn-primary active" value="Next page"/></t>
-                <t t-if="pagination['next'] == 'finished'"><input type="submit" class="btn btn-success active" value="Submit survey"/></t>
+                <t t-if="pagination['current'] != -1 and pagination['next'] != 'finished'"><input type="submit" class="btn btn-primary active survey-btn" value="Next page"/></t>
+                <t t-if="pagination['next'] == 'finished'"><input type="submit" class="btn btn-success active survey-btn" value="Submit survey"/></t>
             </div>
         </template>
 
@@ -121,7 +124,7 @@
                 </div>
             </t>
 
-            <form role="form" method="post" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__()" t-att-action="'/survey/fill/' + survey.id.__str__()" target="">
+            <form role="form" method="post" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__()" t-att-action="'/survey/fill/' + survey.id.__str__()" target="">
                 <input type="hidden" name="current" t-att-value="pagination['current'].__str__()" />
                 <input type="hidden" name="next" t-att-value="pagination['next'].__str__()" />
                 <t t-foreach='page.question_ids' t-as='question'>
@@ -144,32 +147,31 @@
             <t t-if="not is_vector_element"> <!-- if -->
                 <h3>
                     <t t-if="question.constr_mandatory"><span class="glyphicon glyphicon-exclamation-sign"></span></t>
-                    <span t-field='question.question'/><br/>
-
+                    <span t-field='question.question' t-att-id="'survey_' + survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"/><br/>
                     <small><t t-if="question.description"><span t-field='question.description'/></t></small>
                 </h3>
             </t>
             <t t-if="is_vector_element"> <!-- else -->
                 <t t-if="question.type == 'simple_choice_scale'">
-                    <span t-field='question.question'/><t t-raw="'&lt;/td&gt;&lt;td&gt;'" />
+                    <span t-field='question.question' t-att-id="'survey_' + survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"/><t t-raw="'&lt;/td&gt;&lt;td&gt;'" />
                 </t>
             </t> <!-- endif -->
 
             <!-- instanciating different types of questions -->
             <t t-if="question.type in ['free_text']">
-                <textarea class="form-control" rows="3" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()"></textarea>
+                <textarea class="form-control" rows="3" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"></textarea>
             </t>
 
             <t t-if="question.type in ['textbox']">
-                <input type="text" class="form-control" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()"/>
+                <input type="text" class="form-control" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"/>
             </t>
 
             <t t-if="question.type in ['numerical_box']">
-                <input type="number" class="form-control" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()"/>
+                <input type="number" class="form-control" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"/>
             </t>
 
             <t t-if="question.type in ['datetime']" >
-                <input type="datetime-local" class="form-control" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()"/>
+                <input type="datetime-local" class="form-control" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()"/>
                 TODO: replace html5 datetime widget by OpenERP-CMS datetime widget
             </t>
 
@@ -177,7 +179,7 @@
                 <t t-foreach='question.suggested_answers_ids' t-as='suggestion'>
                     <div class="radio-inline">
                         <label>
-                            <input type="radio" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()" t-att-value='suggestion.value' />
+                            <input type="radio" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()" t-att-value='suggestion.value' />
                             <span t-field='suggestion.value'/>
                         </label>
                     </div>
@@ -185,7 +187,7 @@
             </t>
 
             <t t-if="question.type in ['simple_choice_dropdown']">
-                <select class="form-control" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__()">
+                <select class="form-control" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__()">
                     <option disabled="1" selected="1">Choose...</option>
                     <t t-foreach='question.suggested_answers_ids' t-as='suggestion'>
                         <option><t t-esc='suggestion.value'/></option>
@@ -197,7 +199,7 @@
                 <t t-foreach='question.suggested_answers_ids' t-as='suggestion'>
                     <div class="checkbox">
                         <label>
-                            <input type="checkbox" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__() + '*' + suggestion.id.__str__()" t-att-value='suggestion.value' />
+                            <input type="checkbox" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question.id.__str__() + '--' + suggestion.id.__str__()" t-att-value='suggestion.value' />
                             <span t-field='suggestion.value'/>
                         </label>
                     </div>
@@ -240,7 +242,7 @@
 
             <!-- Comments -->
             <t t-if="question.comments_allowed">
-                Other: <input type="text" class="form-control" t-att-name="survey.id.__str__() + '*' + pagination['current'].__str__() + '*' + question.id.__str__() + '*comments'"/>
+                Other: <input type="text" class="form-control" t-att-name="survey.id.__str__() + '--' + pagination['current'].__str__() + '--' + question."/>
             </t>
 
         </template>