LUT-27671 : no deletion of fields already filled in and deactivation

obfromevi · TimotheeHrl · commit df6e62215bcf · 2024-09-23T15:04:46.000+02:00
diff --git a/src/java/fr/paris/lutece/plugins/forms/service/FormService.java b/src/java/fr/paris/lutece/plugins/forms/service/FormService.java
@@ -41,9 +41,11 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 
 import fr.paris.lutece.api.user.User;
+import fr.paris.lutece.plugins.forms.business.CompositeDisplayType;
 import fr.paris.lutece.plugins.forms.business.Form;
 import fr.paris.lutece.plugins.forms.business.FormDisplay;
 import fr.paris.lutece.plugins.forms.business.FormHome;
@@ -608,21 +610,68 @@ public void saveOrUpdateField( Entry entry, String fieldName, String title, Stri
     }
 
     /**
-     * Get the responses which verify the filter
+     * Check if responses exist for a composite (question or group of questions)
+     * 
+     * @param formDisplay
+     *            the form display
+     * @param nIdEntry
+     *            the entry id
+     * @return true if responses exist, false otherwise
+     */
+    public boolean existCompositeResponses( FormDisplay formDisplay, int nIdEntry )
+    {
+        boolean existCompositeResponses = false;
+        
+        if ( CollectionUtils.isEmpty( FormResponseHome.selectAllFormResponsesUncompleteByIdForm( formDisplay.getFormId( ) ) ) )
+        {
+            return false;
+        }
+        
+        if ( CompositeDisplayType.GROUP.getLabel( ).equalsIgnoreCase( formDisplay.getCompositeType( ) ) )
+        {
+    	    List<Question> questionsList = new ArrayList<>( );
+            ICompositeDisplay composite = formDisplayToComposite( formDisplay, null, 0 );
+            composite.addQuestions( questionsList );
+        	
+            if ( CollectionUtils.isNotEmpty( questionsList ) )
+            {
+        	    List<Integer> idEntryList = questionsList.stream( ).map( Question::getIdEntry ).collect( Collectors.toList( ) );
+        	    ResponseFilter responsefilter = new ResponseFilter( );
+        	    responsefilter.setListIdEntry( idEntryList );
+        		
+        	    existCompositeResponses = existsFilledResponse( responsefilter );
+            }
+        }
+        else if ( CompositeDisplayType.QUESTION.getLabel( ).equalsIgnoreCase( formDisplay.getCompositeType( ) ) && nIdEntry > 0 )
+        {
+    	    ResponseFilter responsefilter = new ResponseFilter( );
+            responsefilter.setIdEntry( nIdEntry );
+            
+            existCompositeResponses = existsFilledResponse( responsefilter );
+        }
+        
+        return existCompositeResponses;
+    }
+    
+    /**
+     * Check if any response value filled exists for a question
      * 
      * @param responseFilter
-     *            the filter
-     * @return the list of responses
+     *            the response filter
+     * @return true if a response filled exist, false otherwise
      */
-    public List<Response> getResponseList( ResponseFilter responseFilter )
+    private boolean existsFilledResponse( ResponseFilter responseFilter )
     {
-    	List<Response> responseList = new ArrayList<>( );
+    	boolean existsFilledResponse = false ;
     	
-    	if ( responseFilter != null )
-    	{
-    		responseList = ResponseHome.getResponseList( responseFilter );
-    	}
+    	List<Response> responseList = ResponseHome.getResponseList( responseFilter );
+
+		if ( CollectionUtils.isNotEmpty( responseList ) 
+				&& responseList.stream( ).anyMatch( response -> StringUtils.isNotBlank( response.getResponseValue( ) ) ) )
+		{
+			existsFilledResponse = true;
+		}
     	
-    	return responseList;
+    	return existsFilledResponse;
     }
 }
diff --git a/src/java/fr/paris/lutece/plugins/forms/web/CompositeQuestionDisplay.java b/src/java/fr/paris/lutece/plugins/forms/web/CompositeQuestionDisplay.java
@@ -203,7 +203,7 @@ public String getCompositeHtml( HttpServletRequest request, List<FormQuestionRes
 
         IEntryDisplayService displayService = EntryServiceManager.getInstance( ).getEntryDisplayService( entry.getEntryType( ) );
 
-        if ( displayService != null && isCompositeEnabled( entry, listFormQuestionResponse, displayType ) )
+        if ( displayService != null && isQuestionEnabled( entry, listFormQuestionResponse, displayType ) )
         {
             List<Response> listResponse = findResponses( listFormQuestionResponse );
             setQuestionVisibility( listResponse, displayType );
@@ -284,31 +284,49 @@ public String getCompositeHtml( HttpServletRequest request, List<FormQuestionRes
         return strQuestionTemplate;
     }
     
-    private boolean isCompositeEnabled( Entry entry, List<FormQuestionResponse> listFormQuestionResponse, DisplayType displayType )
+    /**
+     * Check if the question is enabled so that it can be displayed in the form
+     * 
+     * @param entry
+     *            the entry
+     * @param listFormQuestionResponse
+     *            the list of form question responses
+     * @param displayType
+     *            the display type
+     * @return true if the question is enabled, false otherwise
+     */
+    private boolean isQuestionEnabled( Entry entry, List<FormQuestionResponse> listFormQuestionResponse, DisplayType displayType )
     {
-    	boolean isCompositeEnabled = true;
+    	boolean isQuestionEnabled = true;
         Field disabledField = entry.getFieldByCode( IEntryTypeService.FIELD_DISABLED );
         
         if ( disabledField != null && Boolean.parseBoolean( disabledField.getValue( ) ) )
         {
         	switch( displayType.getMode( ) )
             {
                 case EDITION:
-                	isCompositeEnabled = false;
+                	isQuestionEnabled = false;
                     break;
                 case READONLY:
-                	isCompositeEnabled = isResponseValueExiste( listFormQuestionResponse );
+                	isQuestionEnabled = existsResponseFilled( listFormQuestionResponse );
                     break;
                 default: // Nothing to do
             }
         }
 
-        return isCompositeEnabled;
+        return isQuestionEnabled;
     }
     
-    private boolean isResponseValueExiste( List<FormQuestionResponse> listFormQuestionResponse )
+    /**
+     * Check if a response value filled exists to a question 
+     * 
+     * @param listFormQuestionResponse
+     *            the list of form question responses
+     * @return true if a response value filled exists, false otherwise
+     */
+    private boolean existsResponseFilled( List<FormQuestionResponse> listFormQuestionResponse )
     {
-    	boolean isResponseValueExiste = false;
+    	boolean existsResponseFilled = false;
     	
         if ( CollectionUtils.isNotEmpty( listFormQuestionResponse ) )
         {
@@ -317,11 +335,11 @@ private boolean isResponseValueExiste( List<FormQuestionResponse> listFormQuesti
         	if ( CollectionUtils.isNotEmpty( listResponse ) 
         			&& listResponse.stream( ).anyMatch( response -> StringUtils.isNotBlank( response.getResponseValue( ) ) ) )
         	{
-        		isResponseValueExiste = true;
+        		existsResponseFilled = true;
         	}
         }
         
-        return isResponseValueExiste;
+        return existsResponseFilled;
     }
 
     /**
diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/AbstractFormQuestionJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/AbstractFormQuestionJspBean.java
@@ -97,7 +97,7 @@ public abstract class AbstractFormQuestionJspBean extends AbstractJspBean
     protected static final String ACTION_MODIFY_GROUP = "modifyGroup";
     protected static final String ACTION_DUPLICATE_QUESTION = "duplicateQuestion";
     protected static final String ACTION_SAVE_QUESTION = "saveQuestion";
-    protected static final String ACTION_MODIFY_FIELD_DISABLED = "modifyFieldDisabled";
+    protected static final String ACTION_DISABLE_QUESTION = "disableQuestion";
 
     // Views
     protected static final String VIEW_CREATE_GROUP = "createGroup";
diff --git a/src/java/fr/paris/lutece/plugins/forms/web/admin/FormQuestionJspBean.java b/src/java/fr/paris/lutece/plugins/forms/web/admin/FormQuestionJspBean.java
@@ -69,8 +69,6 @@
 import fr.paris.lutece.plugins.genericattributes.business.EntryHome;
 import fr.paris.lutece.plugins.genericattributes.business.Field;
 import fr.paris.lutece.plugins.genericattributes.business.FieldHome;
-import fr.paris.lutece.plugins.genericattributes.business.Response;
-import fr.paris.lutece.plugins.genericattributes.business.ResponseFilter;
 import fr.paris.lutece.plugins.genericattributes.service.entrytype.EntryTypeServiceManager;
 import fr.paris.lutece.plugins.genericattributes.service.entrytype.IEntryTypeService;
 import fr.paris.lutece.portal.service.admin.AccessDeniedException;
@@ -126,7 +124,7 @@ public class FormQuestionJspBean extends AbstractFormQuestionJspBean
 
     // Markers
     private static final String MARK_FIELDS_LIST_BY_ID_ENTRIES = "fields_list_by_id_entries";
-    private static final String MARK_ID_QUESTION_ENTRY_MAP = "idQuestionEntryMap";
+    private static final String MARK_QUESTION_ENTRY_MAP = "questionEntryMap";
 
     // Constants
     private static final String PUBLIC_IMAGE_RESOURCE = "public_image_resource";
@@ -168,7 +166,7 @@ public String getManageQuestions( HttpServletRequest request )
         model.put( FormsConstants.MARK_ENTRY_TYPE_REF_LIST, FormsEntryUtils.initListEntryType( ) );
         model.put( FormsConstants.MARK_ID_PARENT, _nIdParentSelected );
         model.put( SecurityTokenService.MARK_TOKEN, SecurityTokenService.getInstance( ).getToken( request, ACTION_SAVE_QUESTION ) );
-        model.put( MARK_ID_QUESTION_ENTRY_MAP, getIdQuestionEntryMap( listICompositeDisplay ) );
+        model.put( MARK_QUESTION_ENTRY_MAP, getQuestionEntryMap( listICompositeDisplay ) );
 
         setPageTitleProperty( StringUtils.EMPTY );
         HtmlTemplate templateList = AppTemplateService.getTemplate( TEMPLATE_MANAGE_QUESTIONS, locale, model );
@@ -568,7 +566,7 @@ public String getConfirmRemoveComposite( HttpServletRequest request )
             _formDisplay = FormDisplayHome.findByPrimaryKey( nIdDisplay );
         }
         
-        if ( isCompositeHasResponses( nIdEntry ) )
+        if ( _formService.existCompositeResponses( _formDisplay, nIdEntry ) )
         {
         	boolean bIsQuestion = CompositeDisplayType.QUESTION.getLabel( ).equalsIgnoreCase( _formDisplay.getCompositeType( ) );
         	String strMessage = bIsQuestion ? MESSAGE_CANT_REMOVE_ENTRY_RESOURCES_ATTACHED : MESSAGE_CANT_REMOVE_GROUP_RESOURCES_ATTACHED;
@@ -587,51 +585,6 @@ public String getConfirmRemoveComposite( HttpServletRequest request )
 
         return redirect( request, strMessageUrl );
     }
-    
-    private boolean isCompositeHasResponses( int nIdEntry )
-    {
-    	boolean isCompositeHasResponses = false ;
-    	
-    	if ( CompositeDisplayType.QUESTION.getLabel( ).equalsIgnoreCase( _formDisplay.getCompositeType( ) ) && nIdEntry > 0 )
-        {
-    	    ResponseFilter responsefilter = new ResponseFilter( );
-            responsefilter.setIdEntry( nIdEntry );
-            
-            isCompositeHasResponses = isExisteQuestionFilled( responsefilter );
-        }
-    	else if ( CompositeDisplayType.GROUP.getLabel( ).equalsIgnoreCase( _formDisplay.getCompositeType( ) ) )
-        {
-    	    List<Question> questionsList = new ArrayList<>( );
-            ICompositeDisplay composite = _formService.formDisplayToComposite( _formDisplay, null, 0 );
-            composite.addQuestions( questionsList );
-        	
-            if ( CollectionUtils.isNotEmpty( questionsList ) )
-            {
-        	    List<Integer> idEntryList = questionsList.stream( ).map( Question::getIdEntry ).collect( Collectors.toList( ) );
-        	    ResponseFilter responsefilter = new ResponseFilter( );
-        	    responsefilter.setListIdEntry( idEntryList );
-        		
-        	    isCompositeHasResponses = isExisteQuestionFilled( responsefilter );
-            }
-        }
-    	
-    	return isCompositeHasResponses;
-    }
-    
-    private boolean isExisteQuestionFilled( ResponseFilter responsefilter )
-    {
-    	boolean isExisteQuestionFilled = false ;
-    	
-    	List<Response> responseList = _formService.getResponseList( responsefilter );
-
-		if ( CollectionUtils.isNotEmpty(responseList) 
-				&& responseList.stream( ).anyMatch( response -> StringUtils.isNotBlank( response.getResponseValue( ) ) ) )
-		{
-			isExisteQuestionFilled = true;
-		}
-    	
-    	return isExisteQuestionFilled;
-    }
 
     private String getConfirmMessageRemoveQuestion( Form form, FormDisplay formDisplay )
     {
@@ -796,14 +749,14 @@ public String doMoveComposite( HttpServletRequest request )
     }
     
     /**
-     * Modify the field attribute disabled
+     * change the deactivation of a question
      * 
      * @param request
      *            The HTTP request
      * @return The URL to go after performing the action
      */
-    @Action( value = ACTION_MODIFY_FIELD_DISABLED )
-    public String doModifyFieldDisabled( HttpServletRequest request )
+    @Action( value = ACTION_DISABLE_QUESTION )
+    public String doToggleQuestionDisabled( HttpServletRequest request )
     {
     	int nIdStep = NumberUtils.toInt( request.getParameter( FormsConstants.PARAMETER_ID_STEP ), INTEGER_MINUS_ONE );
     	int nIdQuestion = NumberUtils.toInt( request.getParameter( FormsConstants.PARAMETER_ID_QUESTION ), INTEGER_MINUS_ONE );
@@ -815,10 +768,9 @@ public String doModifyFieldDisabled( HttpServletRequest request )
         	
             if ( entry != null )
             {
-                Field disabledField = entry.getFieldByCode( IEntryTypeService.FIELD_DISABLED );
-                boolean valueField = disabledField != null ? !Boolean.parseBoolean( disabledField.getValue( ) ) : false;
+                boolean bFieldDisabled = entry.isDisabled( );
                 
-                _formService.saveOrUpdateField( entry, IEntryTypeService.FIELD_DISABLED, null, Boolean.toString( valueField ) );
+                _formService.saveOrUpdateField( entry, IEntryTypeService.FIELD_DISABLED, null, Boolean.toString( !bFieldDisabled ) );
                 
                 getFormDatabaseService( ).updateQuestion( questionToUpdate );
             }
@@ -834,7 +786,7 @@ public String doModifyFieldDisabled( HttpServletRequest request )
      *            list of compositeDisplay objects
      * @return map
      */
-    private Map<String, Entry> getIdQuestionEntryMap( List<ICompositeDisplay> listICompositeDisplay )
+    private Map<String, Entry> getQuestionEntryMap( List<ICompositeDisplay> listICompositeDisplay )
     {
     	Map<String, Entry> questionEntryMap = new HashMap<>( );
     	
diff --git a/webapp/WEB-INF/templates/admin/plugins/forms/manage_questions.html b/webapp/WEB-INF/templates/admin/plugins/forms/manage_questions.html
@@ -88,18 +88,18 @@
                                                 <#if group>
                                                     <@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?view=modifyGroup&id_step=${step.id}&id_group=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.modifyGroup}' buttonIcon='pencil' size='sm' />
                                                 <#else>
-													<#if idQuestionEntryMap?? && idQuestionEntryMap?has_content>
-														<#assign entry=idQuestionEntryMap[composite.formDisplay.compositeId?c] />
+													<#if questionEntryMap?? && questionEntryMap?has_content>
+														<#assign entry=questionEntryMap[composite.formDisplay.compositeId?c] />
 														<#if entry??><#assign idEntry>${entry.idEntry}</#assign></#if>
 													</#if>
                                                     <@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?view=modifyQuestion&id_step=${step.id}&id_question=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.modifyQuestion}' buttonIcon='pencil' size='sm' />
 													<@button type='button' style='modal' buttonTargetId='#qModal' params='data-url="jsp/admin/plugins/forms/ManageControls.jsp?view=manageConditionControl&id_step=${step.id}&id_target=${composite.formDisplay.id}&control_type=CONDITIONAL"' title='#i18n{forms.manage_questions.action.condition}' hideTitle=['all'] buttonIcon='question' size='sm' />
 													<@button type='button' style='modal' buttonTargetId='#qModal' params='data-url="jsp/admin/plugins/forms/ManageControls.jsp?view=manageControl&id_step=${step.id}&id_target=${composite.formDisplay.compositeId}&control_type=VALIDATION"' title='#i18n{forms.manage_questions.action.control}' hideTitle=['all'] buttonIcon='check' size='sm' />
 													<@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?action=duplicateQuestion&id_step=${step.id}&id_target=${composite.formDisplay.compositeId}&token=${token}' class='btn-into'  title='#i18n{forms.manage_questions.action.copy}' buttonIcon='copy' size='sm' />
 													<#if entry?? && entry.disabled>
-														<@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?action=modifyFieldDisabled&id_step=${step.id}&id_question=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.enable}' class='btn-into' buttonIcon='play' size='sm' />
+														<@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?action=disableQuestion&id_step=${step.id}&id_question=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.enable}' class='btn-into' buttonIcon='play' size='sm' />
 													<#else>
-														<@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?action=modifyFieldDisabled&id_step=${step.id}&id_question=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.disable}' class='btn-into' buttonIcon='stop' size='sm' />
+														<@aButton hideTitle=['all'] href='jsp/admin/plugins/forms/ManageQuestions.jsp?action=disableQuestion&id_step=${step.id}&id_question=${composite.formDisplay.compositeId}' title='#i18n{forms.manage_questions.action.disable}' class='btn-into' buttonIcon='stop' size='sm' />
 													</#if>
 												</#if>
 												<@button type='button' style='modal' buttonTargetId='#qModal' params='data-url="jsp/admin/plugins/forms/ManageQuestions.jsp?view=moveComposite&id_step=${step.id}&id_display=${composite.formDisplay.id}"' title='#i18n{forms.manage_questions.action.move}' hideTitle=['all'] buttonIcon='sort' size='sm' />

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ public String getCompositeHtml( HttpServletRequest request, List<FormQuestionRes`
`203`	`203`
`204`	`204`	`IEntryDisplayService displayService = EntryServiceManager.getInstance( ).getEntryDisplayService( entry.getEntryType( ) );`
`205`	`205`
`206`		`- if ( displayService != null && isCompositeEnabled( entry, listFormQuestionResponse, displayType ) )`
	`206`	`+ if ( displayService != null && isQuestionEnabled( entry, listFormQuestionResponse, displayType ) )`
`207`	`207`	`{`
`208`	`208`	`List<Response> listResponse = findResponses( listFormQuestionResponse );`
`209`	`209`	`setQuestionVisibility( listResponse, displayType );`
`@@ -284,31 +284,49 @@ public String getCompositeHtml( HttpServletRequest request, List<FormQuestionRes`
`284`	`284`	`return strQuestionTemplate;`
`285`	`285`	`}`
`286`	`286`
`287`		`- private boolean isCompositeEnabled( Entry entry, List<FormQuestionResponse> listFormQuestionResponse, DisplayType displayType )`
	`287`	`+ /**`
	`288`	`+ * Check if the question is enabled so that it can be displayed in the form`
	`289`	`+ *`
	`290`	`+ * @param entry`
	`291`	`+ * the entry`
	`292`	`+ * @param listFormQuestionResponse`
	`293`	`+ * the list of form question responses`
	`294`	`+ * @param displayType`
	`295`	`+ * the display type`
	`296`	`+ * @return true if the question is enabled, false otherwise`
	`297`	`+ */`
	`298`	`+ private boolean isQuestionEnabled( Entry entry, List<FormQuestionResponse> listFormQuestionResponse, DisplayType displayType )`
`288`	`299`	`{`
`289`		`- boolean isCompositeEnabled = true;`
	`300`	`+ boolean isQuestionEnabled = true;`
`290`	`301`	`Field disabledField = entry.getFieldByCode( IEntryTypeService.FIELD_DISABLED );`
`291`	`302`
`292`	`303`	`if ( disabledField != null && Boolean.parseBoolean( disabledField.getValue( ) ) )`
`293`	`304`	`{`
`294`	`305`	`switch( displayType.getMode( ) )`
`295`	`306`	`{`
`296`	`307`	`case EDITION:`
`297`		`- isCompositeEnabled = false;`
	`308`	`+ isQuestionEnabled = false;`
`298`	`309`	`break;`
`299`	`310`	`case READONLY:`
`300`		`- isCompositeEnabled = isResponseValueExiste( listFormQuestionResponse );`
	`311`	`+ isQuestionEnabled = existsResponseFilled( listFormQuestionResponse );`
`301`	`312`	`break;`
`302`	`313`	`default: // Nothing to do`
`303`	`314`	`}`
`304`	`315`	`}`
`305`	`316`
`306`		`- return isCompositeEnabled;`
	`317`	`+ return isQuestionEnabled;`
`307`	`318`	`}`
`308`	`319`
`309`		`- private boolean isResponseValueExiste( List<FormQuestionResponse> listFormQuestionResponse )`
	`320`	`+ /**`
	`321`	`+ * Check if a response value filled exists to a question`
	`322`	`+ *`
	`323`	`+ * @param listFormQuestionResponse`
	`324`	`+ * the list of form question responses`
	`325`	`+ * @return true if a response value filled exists, false otherwise`
	`326`	`+ */`
	`327`	`+ private boolean existsResponseFilled( List<FormQuestionResponse> listFormQuestionResponse )`
`310`	`328`	`{`
`311`		`- boolean isResponseValueExiste = false;`
	`329`	`+ boolean existsResponseFilled = false;`
`312`	`330`
`313`	`331`	`if ( CollectionUtils.isNotEmpty( listFormQuestionResponse ) )`
`314`	`332`	`{`
`@@ -317,11 +335,11 @@ private boolean isResponseValueExiste( List<FormQuestionResponse> listFormQuesti`
`317`	`335`	`if ( CollectionUtils.isNotEmpty( listResponse )`
`318`	`336`	`&& listResponse.stream( ).anyMatch( response -> StringUtils.isNotBlank( response.getResponseValue( ) ) ) )`
`319`	`337`	`{`
`320`		`- isResponseValueExiste = true;`
	`338`	`+ existsResponseFilled = true;`
`321`	`339`	`}`
`322`	`340`	`}`
`323`	`341`
`324`		`- return isResponseValueExiste;`
	`342`	`+ return existsResponseFilled;`
`325`	`343`	`}`
`326`	`344`
`327`	`345`	`/**`