Bug 1188

.gitignore

@@ -53,4 +53,5 @@ wiki/wiki-jar/Test de base/
 /process-manager/process-manager-ejb/src/main/resources/META-INF/MANIFEST.MF
 /process-manager/process-manager-war/src/main/webapp/META-INF
 /project-manager/project-manager-ejb/src/main/resources/META-INF/MANIFEST.MF
-/project-manager/project-manager-war/src/main/webapp/META-INF
+/project-manager/project-manager-war/src/main/webapp/META-INF
+/survey/survey-config/.project

survey/survey-config/src/main/config/properties/com/stratelia/webactiv/survey/multilang/surveyBundle.properties

@@ -94,7 +94,8 @@ survey.radio = Bouton radio
 survey.checkbox = Case � cocher
 survey.list = Liste d\u00e9roulante
 
-survey.confirmUpdateSurvey = Attention, modifier cette enqu\u00eate supprimera toutes les r\u00e9ponses d\u00e9j\u00e0 enregistr\u00e9e, Etes-vous s\u00fbr de vouloir modifier
+survey.confirmUpdateSurvey = Attention, modifier cette enqu\u00eate supprimera toutes les r\u00e9ponses d\u00e9j\u00e0 enregistr\u00e9es. Etes-vous s\u00fbr de vouloir modifier
+survey.confirmUpdatePoll = Attention, modifier ce sondage supprimera tous les votes d\u00e9j\u00e0 enregistr\u00e9s. Etes-vous s\u00fbr de vouloir modifier
 survey.surveyAnonymous = Enqu\u00eate anonyme
 survey.pollAnonymous = Vote anonyme
 survey.choice = Vue

survey/survey-config/src/main/config/properties/com/stratelia/webactiv/survey/multilang/surveyBundle_de.properties

@@ -98,6 +98,7 @@ survey.list = Dropdown-Liste
 survey.results = 
 
 survey.confirmUpdateSurvey =  Warning! Modifying this survey will delete all recorded answers! Do you really want to update the survey?
+survey.confirmUpdatePoll = Warning! Modifying this poll will delete all recorded votes! Do you really want to update the poll
 survey.surveyAnonymous = Anonymous survey
 survey.pollAnonymous = Anonymous vote
 survey.choice = look view

survey/survey-config/src/main/config/properties/com/stratelia/webactiv/survey/multilang/surveyBundle_en.properties

@@ -94,7 +94,8 @@ survey.radio = Radio button
 survey.checkbox = Checkbox
 survey.list = Dropdown list
 
-survey.confirmUpdateSurvey =  Warning! Modifying this survey will delete all recorded answers! Do you really want to update the survey?
+survey.confirmUpdateSurvey =  Warning! Modifying this survey will delete all recorded answers! Do you really want to update the survey
+survey.confirmUpdatePoll = Warning! Modifying this poll will delete all recorded votes! Do you really want to update the poll
 survey.surveyAnonymous = Anonymous survey
 survey.pollAnonymous = Anonymous vote
 survey.choice = look view

survey/survey-config/src/main/config/properties/com/stratelia/webactiv/survey/multilang/surveyBundle_fr.properties

@@ -94,7 +94,8 @@ survey.radio = Bouton radio
 survey.checkbox = Case � cocher
 survey.list = Liste d\u00e9roulante
 
-survey.confirmUpdateSurvey = Attention, modifier cette enqu\u00eate supprimera toutes les r\u00e9ponses d\u00e9j\u00e0 enregistr\u00e9e, Etes-vous s\u00fbr de vouloir modifier
+survey.confirmUpdateSurvey = Attention, modifier cette enqu\u00eate supprimera toutes les r\u00e9ponses d\u00e9j\u00e0 enregistr\u00e9es. Etes-vous s\u00fbr de vouloir modifier
+survey.confirmUpdatePoll = Attention, modifier ce sondage supprimera tous les votes d\u00e9j\u00e0 enregistr\u00e9s. Etes-vous s\u00fbr de vouloir modifier
 survey.surveyAnonymous = Enqu\u00eate anonyme
 survey.pollAnonymous = Vote anonyme
 survey.choice = Vue

survey/survey-jar/src/main/java/com/stratelia/webactiv/survey/SurveyContentManager.java

@@ -59,8 +59,9 @@ public class SurveyContentManager implements ContentInterface {
    * @return a List of SilverContent
    */
   public List getSilverContentById(List<Integer> ids, String peasId, String userId, List<String> userRoles) {
-    if (getContentManager() == null)
+    if (getContentManager() == null) {
       return new ArrayList<SilverContentInterface>();
+    }
 
     return getHeaders(makePKArray(ids, peasId));
   }

survey/survey-war/src/main/java/com/stratelia/webactiv/survey/servlets/RecordParticipation.java

@@ -46,8 +46,9 @@ public void doPost(HttpServletRequest request, HttpServletResponse response)
 
     // Cookie Validity
     int cookieDuration = 3650;
-    if (request.getParameter("duration") != null)
-      cookieDuration = new Integer(request.getParameter("duration")).intValue();
+    if (request.getParameter("duration") != null) {
+      cookieDuration = Integer.parseInt(request.getParameter("duration"));
+    }
 
     String componentId = request.getParameter("cid");
     String surveyId = request.getParameter("sid");

survey/survey-war/src/main/webapp/survey/jsp/questionsUpdate.jsp

@@ -129,7 +129,8 @@ $(document).ready(function(){
 <%-- //TODO add the operation Pane only if there is no question (depends on vote or survey) --%>
 <view:operationPane>
   <c:if test="${!isPolling}">
-    <view:operation altText="<%=resources.getString("QuestionAdd")%>" icon="icons/questionAdd.gif" action="javaScript:addQuestion();"></view:operation>
+    <fmt:message var="addQuestionLabel" key="QuestionAdd"/>
+    <view:operation altText="${addQuestionLabel}" icon="icons/questionAdd.gif" action="javaScript:addQuestion();"></view:operation>
   </c:if>
 </view:operationPane>
 <fmt:message var="extraInfoBB" key="SurveyUpdate"/>

survey/survey-war/src/main/webapp/survey/jsp/surveyList.jsp

@@ -49,7 +49,11 @@
 <fmt:setLocale value="${sessionScope['SilverSessionController'].favoriteLanguage}" />
 <view:setBundle bundle="${requestScope.resources.multilangBundle}" />
 
+<c:set var="isPolling" value="${requestScope['PollingStationMode']}" />
 <fmt:message var="surveyConfirmUpdateLabel" key="survey.confirmUpdateSurvey" />
+<c:if test="${isPolling}">
+  <fmt:message var="surveyConfirmUpdateLabel" key="survey.confirmUpdatePoll"/>
+</c:if>
 
 <%!String lockSrc = "";
   String unlockSrc = "";

survey/survey-war/src/main/webapp/survey/jsp/surveyUpdate.jsp

@@ -264,9 +264,8 @@ function isCorrectForm() {
 <%
 
         out.println(frame.printBefore());
-        out.println(board.printBefore());
 %>
-
+<view:board>
 
 <center>
 <form name="surveyForm" action="surveyUpdate.jsp" method="post">
@@ -301,7 +300,27 @@ function isCorrectForm() {
         <input type="text" class="dateToPick" name="endDate" size="14" value="<%=endDate%>" maxlength="<%=DBUtil.getDateFieldLength()%>"/>
       </td>
     </tr>
-    <tr>
+    <%
+    String anonymousCheck = "";
+    if (anonymous) {
+      anonymousCheck = "checked";
+    }
+
+    //Mode anonyme -> force les enquetes a etre toutes anonymes
+    String anonymousDisabled = "";
+    if(surveyScc.isAnonymousModeEnabled()) {
+      anonymousDisabled = "disabled";
+    }
+
+    String anonymousLabel = resources.getString("survey.surveyAnonymous");
+    String displayVote = "";
+    if (surveyScc.isPollingStationMode()) {
+      anonymousLabel = resources.getString("survey.pollAnonymous");
+      displayVote="display:none;";
+    }
+
+    %>
+    <tr style="<%=displayVote%>">
       <td class="txtlibform"><%=resources.getString("SurveyCreationNbQuestionPerPage")%>
         :</td>
       <td>
@@ -310,20 +329,7 @@ function isCorrectForm() {
       </td>
     </tr>
     <tr>
-    <%
-    String anonymousCheck = "";
-    if (anonymous)
-    {
-    	anonymousCheck = "checked";
-    }
-
-    //Mode anonyme -> force les enquetes a etre toutes anonymes
-	String anonymousDisabled = "";
-	if(surveyScc.isAnonymousModeEnabled()) {
-		anonymousDisabled = "disabled";
-	}
-    %>
-    	<td class="txtlibform"><%=resources.getString("survey.surveyAnonymous")%> :</td>
+    	<td class="txtlibform"><%=anonymousLabel%> :</td>
     	<td>
     	  <input type="checkbox" name="anonymous" value="true" <%=anonymousCheck%> <%=anonymousDisabled%>>
     	  <input type="hidden" name="anonymousString" value="<%=anonymousString%>">
@@ -343,14 +349,14 @@ function isCorrectForm() {
 </table>
 </form>
 </center>
+</view:board>
 <%
-		out.println(board.printAfter());
         out.println(frame.printMiddle());
         Button validateButton = (Button) gef.getFormButton(resources.getString("GML.validate"), "javascript:onClick=sendData()", false);
         ButtonPane buttonPane = gef.getButtonPane();
         buttonPane.addButton(validateButton);
         buttonPane.setHorizontalPosition();
-        out.println("<BR><center>"+buttonPane.print()+"</center>");
+        out.println("<br/><center>"+buttonPane.print()+"</center>");
         out.println(frame.printAfter());
         out.println(window.printAfter());
 %>