FORMS-820 : publicdashboard returns now a list of formReponses

Author: NLG85

src/java/fr/paris/lutece/plugins/forms/dashboard/PublicDashboardForms.java

@@ -9,7 +9,6 @@
 import fr.paris.lutece.plugins.forms.business.FormResponse;
 import fr.paris.lutece.plugins.forms.business.FormResponseHome;
 import fr.paris.lutece.plugins.forms.business.FormResponseStep;
-import fr.paris.lutece.plugins.genericattributes.business.Response;
 import fr.paris.lutece.portal.service.dashboard.IPublicDashboardComponent;
 import fr.paris.lutece.portal.service.i18n.I18nService;
 import fr.paris.lutece.portal.service.util.AppPropertiesService;
@@ -21,7 +20,7 @@ public class PublicDashboardForms implements IPublicDashboardComponent {
 	public static final String DASHBOARD_PROPERTIES_QUESTION_PUBLISHED = "forms.publicdashboard.question.isPublished";
 	private String strIdComponent = "forms.dashboardForms";
 	private static final String TEMPLATE_DASHBOARD_FORMS = "/skin/plugins/forms/publicdashboard_form.html";
-	private static final String MARK_DASHBOARD_FORMS = "forms_publicdashboard";
+	private static final String MARK_LIST_FORMRESPONSE = "list_formsresponse";
 
 	@Override
 	public String getComponentDescription( Locale local ) {
@@ -43,81 +42,49 @@ public String getDashboardTemplate()
 	public Map<String, Object> getDashboardModel( String user_id, Map<String,String[]> additionalParameters )
 	{
 		Map<String, Object> model = new HashMap<String, Object>( );
-		model.put( MARK_DASHBOARD_FORMS, searchDashboardFormsQuestionReponse( user_id, AppPropertiesService.getPropertyBoolean(DASHBOARD_PROPERTIES_FORMRESPONSE_PUBLISHED, true), AppPropertiesService.getPropertyBoolean(DASHBOARD_PROPERTIES_QUESTION_PUBLISHED, true) ) );
+		model.put( MARK_LIST_FORMRESPONSE, searchDashboardFormReponsesFromUser( user_id, AppPropertiesService.getPropertyBoolean(DASHBOARD_PROPERTIES_FORMRESPONSE_PUBLISHED, true), AppPropertiesService.getPropertyBoolean(DASHBOARD_PROPERTIES_QUESTION_PUBLISHED, true) ) );
 		return model;
 	}
 
 	/**
-	 * Search all the responses from a user.
+	 * Search all the formResponse published from a user.
 	 * @param userId the userid
 	 * @param published_formresponse_only request only the formResponse published
 	 * @param published_questions_only request only the question published
-	 * @return
+	 * @return a list of form response from the user id and filtered by published formresponse
 	 */
-    private static Map<String, Map<String, String>> searchDashboardFormsQuestionReponse( String userId, boolean published_formresponse_only, boolean published_questions_only )
+	private static List<FormResponse> searchDashboardFormReponsesFromUser( String userId, boolean published_formresponse_only, boolean published_questions_only )
     {
 
-    	
-        Map<String, Map<String, String>> mapResponsesValuesByFormResponse = new HashMap<String, Map<String, String>>( );
         List<FormResponse> formResponseList = FormResponseHome.getFormResponseByGuid( userId );
-
-        for ( FormResponse formRep : formResponseList )
+        //If the propertie published_formresponse_only is true, remove unpublished formReponse  
+        formResponseList.removeIf( f -> !f.isPublished( ) && published_formresponse_only );
+        if (published_questions_only)
         {
-        	
-        	getFormResponse(mapResponsesValuesByFormResponse, formRep, published_formresponse_only, published_questions_only);
+        	formResponseFilteredByQuestionsPublished(formResponseList);
         }
-        
-        return mapResponsesValuesByFormResponse;
+        return formResponseList;
 
     }
 
     /**
-     * search all the formResponse from a user.
-     * @param mapResponsesValuesByFormResponse the map filled with all the responses from a user
-     * @param formRep The formResponses from a user
-     * @param published_formresponse_only request only the formResponse published
-     * @param published_questions_only request only the question published
+     * remove the questionReponse not published.
+     * @param formRep The formResponse from a user
      */
-    private static void getFormResponse( Map<String, Map<String, String>> mapResponsesValuesByFormResponse, FormResponse formRep, boolean published_formresponse_only, boolean published_questions_only )
+    private static void formResponseFilteredByQuestionsPublished( List<FormResponse> lstFormRep )
     {
-    	//check if formResponse is published or if there is not control of the status of the formResponse
-    	if ( formRep.isPublished( ) || !published_formresponse_only )
+    	for ( FormResponse formRep : lstFormRep )
         {
-        	List<FormResponseStep> lstStep = formRep.getSteps( );
-            Map<String, String> mapResponsesValues = new HashMap<String, String>( );
+    		List<FormResponseStep> lstStep = formRep.getSteps( );
             for ( FormResponseStep step : lstStep )
             {
                 List<FormQuestionResponse> lstQr = step.getQuestions( );
-                for ( FormQuestionResponse fqr : lstQr )
-                {
-                	getResponse(mapResponsesValues, fqr, published_questions_only);
-                }
-            }
-        
-            if ( !mapResponsesValues.isEmpty( ) )
-            {
-            	mapResponsesValuesByFormResponse.put( String.valueOf( formRep.getId() ), mapResponsesValues );
-            }
+                lstQr.removeIf( f -> !f.getQuestion( ).isPublished( ) );
+                step.setQuestions(lstQr);
+            };
         }
+    	
     }
 
-    /**
-     * Search all the question response from a user.
-     * @param mapResponsesValues the map filled with all the responses from a user
-     * @param formQuestionResponse the QuestionResponse from the user
-     * @param published_questions_only request only the question published
-     */
-    private static void getResponse( Map<String, String> mapResponsesValues, FormQuestionResponse formQuestionResponse, boolean published_questions_only )
-    {
-    	//check if question is published or if there is not control of the status of the question
-    	if ( formQuestionResponse.getQuestion( ).isPublished( ) || !published_questions_only )
-        {
-            List<Response> lstresp = formQuestionResponse.getEntryResponse( );
-            for ( Response resp : lstresp )
-            {
-                mapResponsesValues.put( formQuestionResponse.getQuestion( ).getTitle( ), resp.getResponseValue( ) );
-            }
-        }
-    }
 
 }

webapp/WEB-INF/templates/skin/plugins/forms/publicdashboard_form.html

@@ -2,12 +2,16 @@ <h2>#i18n{forms.publicdashboard.title}</h2>
 		<div class="table-responsive">
 			<table class="table table-striped">
 				<tbody>
-					<#list forms_publicdashboard?keys as keyForm>
-						<#list forms_publicdashboard[keyForm]?keys as keyFormQuestionReponse>
-							<tr>
-								<td>${keyFormQuestionReponse}</td>
-								<td>${forms_publicdashboard[keyForm][keyFormQuestionReponse]!}</td>
-							</tr>
+					<#list list_formsresponse as formRep>
+						<#list formRep.steps as step>
+							<#list step.questions as question>
+								<tr>
+									<td>${question.question.title!}</td>
+									<#list question.entryResponse as response>
+										<td>${response.responseValue!}</td>
+									</#list>
+								</tr>
+							</#list>
 						</#list>
 					</#list>
 				</tbody>