FORMS-817 : Add bookmarks (creation date, update date, status, status update date)

Author: felixdupriez

src/java/fr/paris/lutece/plugins/forms/service/provider/GenericFormsProvider.java

@@ -66,17 +66,23 @@
 import fr.paris.lutece.portal.service.file.IFileStoreServiceProvider;
 import fr.paris.lutece.portal.service.i18n.I18nService;
 import fr.paris.lutece.portal.service.util.AppLogService;
-import fr.paris.lutece.portal.service.util.AppPathService;
+import fr.paris.lutece.portal.service.util.AppPropertiesService;
 import fr.paris.lutece.util.url.UrlItem;
 
 public abstract class GenericFormsProvider implements IProvider
 {
     // MESSAGE
     private static final String MESSAGE_DESCRIPTION = "forms.marker.provider.url.detail.reponse.description";
 
+    // PROPERTY
+    private static final String PROPERTY_LUTECE_ADMIN_PROD_URL = "lutece.admin.prod.url";
     // MARKS
     private static final String MARK_POSITION = "position_";
     private static final String MARK_URL_ADMIN_RESPONSE = "url_admin_forms_response_detail";
+    private static final String MARK_CREATION_DATE = "creation_date";
+    private static final String MARK_UPDATE_DATE = "update_date";
+    private static final String MARK_STATUS = "status";
+    private static final String MARK_STATUS_UPDATE_DATE = "update_date_status";
     // PARAMETERS
     public static final String PARAMETER_VIEW_FORM_RESPONSE_DETAILS = "view_form_response_details";
     public static final String PARAMETER_ID_FORM_RESPONSES = "id_form_response";
@@ -157,11 +163,20 @@ public Collection<InfoMarker> provideMarkerValues( )
         result.addAll( markers.values( ) );
 
         InfoMarker notifyMarkerUrl = new InfoMarker( MARK_URL_ADMIN_RESPONSE );
-        UrlItem url = new UrlItem( AppPathService.getBaseUrl( _request ) + MultiviewFormResponseDetailsJspBean.CONTROLLER_JSP_NAME_WITH_PATH );
+        UrlItem url = new UrlItem( AppPropertiesService.getProperty( PROPERTY_LUTECE_ADMIN_PROD_URL ) + MultiviewFormResponseDetailsJspBean.CONTROLLER_JSP_NAME_WITH_PATH );
         url.addParameter( FormsConstants.PARAMETER_TARGET_VIEW, PARAMETER_VIEW_FORM_RESPONSE_DETAILS );
         url.addParameter( PARAMETER_ID_FORM_RESPONSES, _formResponse.getId( ) );
         notifyMarkerUrl.setValue( url.getUrl( ) );
         result.add( notifyMarkerUrl );
+        
+        InfoMarker creationDateMarker = new InfoMarker( MARK_CREATION_DATE );
+        creationDateMarker.setValue( _formResponse.getCreation( ).toString( ) );
+        InfoMarker updateDateMarker = new InfoMarker( MARK_UPDATE_DATE );
+        updateDateMarker.setValue( _formResponse.getCreation( ).toString( ) );
+        InfoMarker statusMarker = new InfoMarker( MARK_STATUS );
+        statusMarker.setValue( String.valueOf( _formResponse.isPublished( ) ) );
+        InfoMarker updateStatusDateMarker = new InfoMarker( MARK_STATUS_UPDATE_DATE );
+        updateStatusDateMarker.setValue( _formResponse.getUpdateStatus( ).toString( ) );
         return result;
     }
 
@@ -187,6 +202,21 @@ public static Collection<InfoMarker> getProviderMarkerDescriptions( Form form )
         InfoMarker notifyMarkerURl = new InfoMarker( MARK_URL_ADMIN_RESPONSE );
         notifyMarkerURl.setDescription( I18nService.getLocalizedString( MESSAGE_DESCRIPTION, I18nService.getDefaultLocale( ) ) );
         collectionNotifyMarkers.add( notifyMarkerURl );
+        
+        InfoMarker creationDateMarker = new InfoMarker( MARK_CREATION_DATE );
+        creationDateMarker.setDescription( "Date de creation" );
+        InfoMarker updateDateMarker = new InfoMarker( MARK_UPDATE_DATE );
+        updateDateMarker.setDescription( "Date de mise à jour" );
+        InfoMarker statusMarker = new InfoMarker( MARK_STATUS );
+        statusMarker.setDescription( "Status" );
+        InfoMarker updateStatusDateMarker = new InfoMarker( MARK_STATUS_UPDATE_DATE );
+        updateStatusDateMarker.setDescription( "Date de mise à jour du status" );
+        
+        collectionNotifyMarkers.add( creationDateMarker );
+        collectionNotifyMarkers.add( updateDateMarker );
+        collectionNotifyMarkers.add( statusMarker );
+        collectionNotifyMarkers.add( updateStatusDateMarker );
+        
         return collectionNotifyMarkers;
     }