Promotion restrictions explanation and correction

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1724 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php
index 08123d6..ff4fab6 100644 (file)
--- a/modules/survey/survey.inc.php
+++ b/modules/survey/survey.inc.php
@@ -96,7 +96,7 @@ class Survey
         if ($this->promos == '') {
             return true;
         }
-        $promos = explode('|', $this->promos);
+        $promos = explode(',', $this->promos);
         foreach ($promos as $p) {
             if ((preg_match('#^\d{4}$#', $p) && $p == $promo) ||
                 (preg_match('#^\d{4}-$#', $p) && intval(substr($p, 0, 4)) <= $promo) ||
@@ -534,7 +534,7 @@ abstract class SurveyQuestion
 }
 // }}}
 
-// {{{ abstract class SurveySimple and its derived classes : "opended" questions
+// {{{ abstract class SurveySimple and its derived classes : "open" questions
 // {{{ abstract class SurveySimple extends SurveyQuestion
 abstract class SurveySimple extends SurveyQuestion
 {

diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index 9a507b0..cfeea7b 100644 (file)
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -41,8 +41,10 @@
         function hidePromo(value) {
           if (value == "0" || value == "") { 
             $("#ln_promo").hide(); 
+            $("#ln_promo_exp").hide();
           } else { 
-            $("#ln_promo").show(); 
+            $("#ln_promo").show();
+            $("#ln_promo_exp").show();
           } 
         }
         $("[@name='survey_question[mode]']").change(function() { hidePromo(this.value); });
@@ -63,5 +65,12 @@
       <td class="titre">Promotions</td>
       <td><input type="text" name="survey_question[promos]" size="50" maxlength="200" value="{$survey_current.promos}"/></td>
     </tr>
+    <tr id="ln_promo_exp">
+      <td></td>
+      <td class="smaller">
+        Exemple : 1954,1986-1989,-1942,2000-&nbsp;&nbsp;&nbsp;restreindra le sondage &#224; toutes les promotions suivantes :<br/>
+        1954, 1986 &#224; 1989, toutes jusqu'à 1942 et toutes à partir 2000 (les bornes sont syst&#233;matiquement incluses)
+      </td>
+    </tr>
 
 {* vim:set et sw=2 sts=2 ts=8 enc=utf-8: *}