Support multiline text answers.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/htdocs/javascript/survey.js b/htdocs/javascript/survey.js
index 1b30014..80614a9 100644 (file)
--- a/htdocs/javascript/survey.js
+++ b/htdocs/javascript/survey.js
@@ -152,6 +152,7 @@
             if (!q) {
                 q = { qid: id };
             }
+            console.log(q);
             var question = $("#q_edit_new").tmpl(q);
             var type = question
                 .find('select[name$="[type]"]')

diff --git a/modules/survey/question.inc.php b/modules/survey/question.inc.php
index bd206ad..c29af36 100644 (file)
--- a/modules/survey/question.inc.php
+++ b/modules/survey/question.inc.php
@@ -91,6 +91,19 @@ class SurveyQuestion extends PlDBTableEntry
         }
         return $answer;
     }
+
+    public function export()
+    {
+        $export = parent::export();
+        if (isset($export['parameters'])) {
+            foreach ($export['parameters'] as $key=>$value) {
+                $export[$key] = $value;
+            }
+            unset($export['parameters']);
+        }
+        return $export;
+    }
+
 }
 
 class SurveyQuestionGroup extends SurveyQuestion implements SurveyQuestionContainer

diff --git a/templates/survey/edit.questions.tpl b/templates/survey/edit.questions.tpl
index be29c27..866607b 100644 (file)
--- a/templates/survey/edit.questions.tpl
+++ b/templates/survey/edit.questions.tpl
@@ -36,7 +36,7 @@
           Section
         </option>
         <option value="text" {{if type}}{{if type == 'text'}}selected="selected"{{/if}}{{/if}}>
-          Texte
+          Champ libre
         </option>
         <option value="multiple" {{if type}}{{if type == 'multiple'}}selected="selected"{{/if}}{{/if}}>
           Question à choix multiples
@@ -56,6 +56,15 @@
 </script>
 
 <script id="q_edit_text" type="text/x-jquery-tmpl">
+  Type de texte&nbsp;:
+  <select name="q_edit[${qid}][subtype]">
+    <option value="monoline" {{if subtype}}{{if subtype == 'monoline'}}selected="selected"{{/if}}{{/if}}>
+      Une seule ligne
+    </option>
+    <option value="multiline" {{if subtype}}{{if subtype == 'multiline'}}selected="selected"{{/if}}{{/if}}>
+      Plusieurs lignes
+    </option>
+  </select>
 </script>
 
 <script id="q_edit_section" type="text/x-jquery-tmpl">

diff --git a/templates/survey/vote.questions.tpl b/templates/survey/vote.questions.tpl
index 87cb26a..0a1f74e 100644 (file)
--- a/templates/survey/vote.questions.tpl
+++ b/templates/survey/vote.questions.tpl
@@ -35,15 +35,25 @@
 
 <script id="question_text" type="text/x-jquery-tmpl">
   <div>
-    <div><strong>${label}</strong></div>
-    <input type="text" name="qid[${qid}]" value="" />
+    {{if subtype}}
+      {{if subtype == 'monoline'}}
+        <strong>${label}</strong>&nbsp;:
+        <input type="text" name="qid[${qid}]" value="" />
+      {{else}}
+        <div><strong>${label}</strong></div>
+        <textarea name="qid[${qid}]" rows="4" cols="80"></textarea>
+      {{/if}}
+    {{else}}
+      <strong>${label}</strong>&nbsp;:
+      <input type="text" name="qid[${qid}]" value="" />
+    {{/if}}
   </div>
 </script>
 
 <script id="question_multiple" type="text/x-jquery-tmpl">
   <div>
     <div><strong>${label}</strong></div>
-    {{tmpl(parameters.answers) "#question_multiple_answer"}}
+    {{tmpl(answers) "#question_multiple_answer"}}
   </div>
 </script>