Author: bleny Date: 2010-11-08 16:40:11 +0000 (Mon, 08 Nov 2010) New Revision: 749 Log: add date in IndicatorLog + rendering in history Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-11-08 16:40:11 UTC (rev 749) @@ -303,6 +303,7 @@ "topiaCreateDate TIMESTAMP WITHOUT TIME ZONE NOT NULL," + "logText TEXT," + "\"comment\" TEXT," + + "modificationDate TIMESTAMP WITHOUT TIME ZONE," + "author CHARACTER VARYING(255)," + "CONSTRAINT author_fkey FOREIGN KEY (author) " + "REFERENCES WaoUser (topiaid) MATCH SIMPLE " + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-11-08 16:40:11 UTC (rev 749) @@ -1000,6 +1000,7 @@ IndicatorLog indicatorLog = new IndicatorLogImpl(); indicatorLog.setAuthor(author); indicatorLog.setComment(comment); + indicatorLog.setModificationDate(new Date()); indicatorLog.setLogText(logText.trim()); // add entity logText Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/IndicatorsHistory.java 2010-11-08 16:40:11 UTC (rev 749) @@ -8,6 +8,8 @@ import org.apache.tapestry5.annotations.Property; import org.apache.tapestry5.ioc.annotations.Inject; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.List; /** @@ -35,4 +37,8 @@ } return indicatorLogs; } + + public DateFormat getDateFormat() { + return new SimpleDateFormat("dd/MM/yyyy"); + } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/IndicatorLevels.tml 2010-11-08 16:40:11 UTC (rev 749) @@ -81,7 +81,9 @@ </td> </t:loop> <td> - <input t:type="textfield" value="indicator.coefficient" size="3" /> + <span t:type="ck/Tooltip" t:value="Attention à bien utiliser ',' et non '.' pour les décimales" t:effect="appear"> + <input t:type="textfield" value="indicator.coefficient" size="3" /> + </span> </td> </tr> </t:if> Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Administration.properties 2010-11-08 16:40:11 UTC (rev 749) @@ -42,6 +42,8 @@ # follow statement doesn't work with BeanEditForm userForm-errors-banner: L'utilisateur n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : +errors-banner: Impossible de modifier les changements des param\u00e8tres des inticateurs : + # UserRole UserRole.ADMIN: Administrateur UserRole.OBSERVER: Observateur Modified: trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml =================================================================== --- trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-08 16:11:08 UTC (rev 748) +++ trunk/wao-ui/src/main/webapp/IndicatorsHistory.tml 2010-11-08 16:40:11 UTC (rev 749) @@ -46,6 +46,7 @@ <p:else> <p t:type="loop" t:source="indicatorLogs" t:value="indicatorLog"> Auteur de la modification : <strong>${indicatorLog.author.fullName}</strong><br /> + Date de la modification : <t:output value="indicatorLog.modificationDate" format="dateFormat" /><br /> Commentaire : ${indicatorLog.comment}<br /> Modifications effectuées : ${indicatorLog.logText}<br /><br />