From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Wed, 23 Jun 2010 22:36:35 +0000 (+0200)
Subject: In survey results, clusters all empty comments for free text
X-Git-Tag: xorg/1.0.0~64
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=cd7a9c53f9dfb4c2d33f9340feadcc3dbcfc1876;hp=12678e901f4d02dedfb7ffcd31f41d509fb68a8d;p=platal.git

In survey results, clusters all empty comments for free text
---

diff --git a/templates/survey/show_checkboxtable.tpl b/templates/survey/show_checkboxtable.tpl
index 02d2923..b58a0e9 100644
--- a/templates/survey/show_checkboxtable.tpl
+++ b/templates/survey/show_checkboxtable.tpl
@@ -23,9 +23,9 @@
 <table class="bicol">
   <tr class="pair">
     <td></td>
-  {foreach from=$squestion.choices item=schoice}
-    <td>{$schoice}</td>
-  {/foreach}
+    {foreach from=$squestion.choices item=schoice}
+      <td>{$schoice}</td>
+    {/foreach}
   </tr>
 {foreach from=$squestion.subquestions item=ssubq key=ssqid}
   <tr class="{cycle values="impair,pair"}">
@@ -45,6 +45,7 @@
     </td>
     {/foreach}
   {/if}
+  </tr>
 {/foreach}
 </table>
 
diff --git a/templates/survey/show_radiotable.tpl b/templates/survey/show_radiotable.tpl
index 8b6d648..9f24aa1 100644
--- a/templates/survey/show_radiotable.tpl
+++ b/templates/survey/show_radiotable.tpl
@@ -30,21 +30,21 @@
 {foreach from=$squestion.subquestions item=ssubq key=ssqid}
   <tr class="{cycle values="impair,pair"}">
     <td>{$ssubq}</td>
-  {assign var=sid value=$survey.id}
-  {assign var=sqid value=$squestion.id}
-  {if $survey_resultmode}
-    {foreach from=$squestion.choices item=schoice key=value}
-    <td>
-      {$squestion.result.$ssqid.$value*100/$survey.votes|string_format:"%.1f"}% ({$squestion.result.$ssqid.$value} votes)
-    </td>
-    {/foreach}
-  {else}
-    {foreach from=$squestion.choices item=schoice key=value}
-    <td>
-      <label><input type="radio" name="survey{$sid}[{$sqid}][{$ssqid}]" value="{$value}" {if !$survey_votemode}disabled="disabled" {/if}/></label>
-    </td>
-    {/foreach}
-  {/if}
+    {assign var=sid value=$survey.id}
+    {assign var=sqid value=$squestion.id}
+    {if $survey_resultmode}
+      {foreach from=$squestion.choices item=schoice key=value}
+        <td>
+          {$squestion.result.$ssqid.$value*100/$survey.votes|string_format:"%.1f"}% ({$squestion.result.$ssqid.$value} votes)
+        </td>
+      {/foreach}
+    {else}
+      {foreach from=$squestion.choices item=schoice key=value}
+        <td>
+          <label><input type="radio" name="survey{$sid}[{$sqid}][{$ssqid}]" value="{$value}" {if !$survey_votemode}disabled="disabled" {/if}/></label>
+        </td>
+      {/foreach}
+    {/if}
   </tr>
 {/foreach}
 </table>
diff --git a/templates/survey/show_text.tpl b/templates/survey/show_text.tpl
index 464cb34..21791c1 100644
--- a/templates/survey/show_text.tpl
+++ b/templates/survey/show_text.tpl
@@ -21,12 +21,25 @@
 {**************************************************************************}
 
 {if $survey_resultmode}
-  Quelques réponses données par les personnes sondées&nbsp;:
-  <ul>
-  {foreach item=sresult from=$squestion.result}
-    <li>{$sresult.answer}</li>
-  {/foreach}
-  </ul>
+  {if count($squestion.result) == 0}
+  Aucune réponse n'a été donnée.
+  {else}
+    {if count($squestion.result) ==1}
+    Une réponse donnée par une d{else}Quelques réponses données par li{/if}es personnes sondées&nbsp;:
+    <ul>
+    {assign var=nbhidden value=0}
+    {foreach item=sresult from=$squestion.result}
+      {if trim($result.answer)}
+      <li>{$sresult.answer}</li>
+      {else}
+      {assign var=nbhidden value=$nbhidden+1}
+      {/if}
+    {/foreach}
+    {if $nbhidden > 0}
+      <li>{$nbhidden} réponse{if $nbhidden > 1}s{/if} vide{if $nbhidden > 1}s{/if}</li>
+    {/if}
+    </ul>
+  {/if}
 {else}
   <input type="text" name="survey{$survey.id}[{$squestion.id}]" value="" size="50" maxlength="200" {if !$survey_votemode}disabled="disabled"{/if}/>
 {/if}
diff --git a/templates/survey/show_textarea.tpl b/templates/survey/show_textarea.tpl
index d05fd6d..055810e 100644
--- a/templates/survey/show_textarea.tpl
+++ b/templates/survey/show_textarea.tpl
@@ -21,12 +21,25 @@
 {**************************************************************************}
 
 {if $survey_resultmode}
-  Quelques réponses données par les personnes sondées&nbsp;:
-  <ul>
-  {foreach item=sresult from=$squestion.result}
-    <li>{$sresult.answer}</li>
-  {/foreach}
-  </ul>
+  {if count($squestion.result) == 0}
+  Aucune réponse n'a été donnée.
+  {else}
+    {if count($squestion.result) ==1}
+    Une réponse donnée par une d{else}Quelques réponses données par li{/if}es personnes sondées&nbsp;:
+    <ul>
+    {assign var=nbhidden value=0}
+    {foreach item=sresult from=$squestion.result}
+      {if trim($result.answer)}
+      <li>{$sresult.answer}</li>
+      {else}
+      {assign var=nbhidden value=$nbhidden+1}
+      {/if}
+    {/foreach}
+    {if $nbhidden > 0}
+      <li><em>{$nbhidden} réponse{if $nbhidden > 1}s{/if} vide{if $nbhidden > 1}s{/if}</em></li>
+    {/if}
+    </ul>
+  {/if}
 {else}
   <textarea name="survey{$survey.id}[{$squestion.id}]" rows="5" cols="60" {if !$survey_votemode}disabled="disabled"{/if}></textarea>
 {/if}