Author: bleny Date: 2010-12-23 11:42:31 +0000 (Thu, 23 Dec 2010) New Revision: 848 Log: switch to date+time in contact tideBegin and tideEnd : UI + import/export Modified: trunk/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/resources/import/contacts.csv trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties trunk/wao-ui/src/main/webapp/ContactForm.tml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/pom.xml 2010-12-23 11:42:31 UTC (rev 848) @@ -329,7 +329,7 @@ <!-- libraries version --> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> - <nuitonUtilsVersion>1.5.1</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> <nuitonWebVersion>0.1</nuitonWebVersion> <topiaVersion>2.5-SNAPSHOT</topiaVersion> <eugeneVersion>2.3-SNAPSHOT</eugeneVersion> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-23 11:42:31 UTC (rev 848) @@ -146,12 +146,18 @@ * @return true if tideBeginDate status changed */ public boolean isTideBeginDateMonthChanged() { + if (logger.isDebugEnabled()) { + + } if (oldContact == null || newContact == null) { return false; } DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); Date oldTideBeginDate = oldContact.getTideBeginDate(); Date newTideBeginDate = newContact.getTideBeginDate(); + + logger.debug("old : " + oldTideBeginDate + ", new : " + newTideBeginDate); + // Only if old not null and new not null if (oldTideBeginDate != null && newTideBeginDate != null) { String oldTideBeginStr = dateFormat.format(oldTideBeginDate); @@ -258,6 +264,9 @@ query.addEquals(SampleMonth.PROPERTY_SAMPLE_ROW, sampleRow). addBetween(SampleMonth.PROPERTY_PERIOD_DATE, period.getFromDate(), period.getThruDate()); //add(SampleMonth.PERIOD_DATE, period); + + logger.debug("query=" + query); + SampleMonth result = monthDAO.findByQuery(query); if (result == null) { throw new NullSampleMonthException("Aucun mois correspondant pour" + Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv/WaoCsvHeader.java 2010-12-23 11:42:31 UTC (rev 848) @@ -29,6 +29,7 @@ import java.text.DateFormat; import java.text.NumberFormat; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Locale; /** @@ -59,6 +60,15 @@ * @return a String corresponding to the date pattern */ String datePattern(); + + /** + * format a date using the right pattern for this field. The pattern + * used will be the same returned by datePattern + * + * @param date the date to be formatted + * @return + */ + String format(Date date); } public interface ContactHeader extends IOHeader { @@ -226,6 +236,14 @@ return defaultDatePattern(); } + @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + String result = dateFormat.format(date); + return result; + } + + public static String defaultDatePattern() { return "MM/yyyy"; } @@ -354,9 +372,20 @@ @Override public String datePattern() { - return defaultDatePattern(); + String pattern = defaultDatePattern(); + if (this == CONT_DEBUT_MAREE || this == CONT_FIN_MAREE) { + pattern = "dd/MM/yyyy HH:mm"; + } + return pattern; } + @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + String result = dateFormat.format(date); + return result; + } + private static String defaultDatePattern() { return "dd/MM/yyyy"; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-23 11:42:31 UTC (rev 848) @@ -441,11 +441,11 @@ contact.getContactState().libelle()); if (contact.getTideBeginDate() != null) { export.record(CONTACT.CONT_DEBUT_MAREE, - dateFormat.format(contact.getTideBeginDate())); + CONTACT.CONT_DEBUT_MAREE.format(contact.getTideBeginDate())); } if (contact.getTideEndDate() != null) { export.record(CONTACT.CONT_FIN_MAREE, - dateFormat.format(contact.getTideEndDate())); + CONTACT.CONT_FIN_MAREE.format(contact.getTideEndDate())); } export.record(CONTACT.CONT_NB_OBSERV, String.valueOf(contact.getNbObservants())); @@ -629,6 +629,11 @@ updateValidation); } catch (NullSampleMonthException eee) { + log.debug("exception", eee); + log.debug("contact : " + contact); + if (contact != null) { + log.debug("tideBeginDate : " + contact.getTideBeginDate()); + } // The row will be refused in this case throw new ImportRefusedException("Impossible de " + "mettre à jour le nombre de marée réels, " + Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/io/ImportHelperTest.java 2010-12-23 11:42:31 UTC (rev 848) @@ -43,6 +43,8 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; @@ -194,6 +196,12 @@ } @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + return dateFormat.format(date); + } + + @Override public String name() { return "DATE_1"; } @@ -213,6 +221,12 @@ } @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + return dateFormat.format(date); + } + + @Override public String name() { return "DATE_2"; } @@ -231,6 +245,12 @@ } @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + return dateFormat.format(date); + } + + @Override public String name() { return "DATE_3"; } @@ -250,6 +270,12 @@ } @Override + public String format(Date date) { + DateFormat dateFormat = new SimpleDateFormat(datePattern()); + return dateFormat.format(date); + } + + @Override public String name() { return "DATE_4"; } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-23 11:42:31 UTC (rev 848) @@ -550,9 +550,9 @@ when(reader.get(BOAT.NAVS_COD.name())). thenReturn(String.valueOf(boat.getImmatriculation())); when(reader.get(CONTACT.CONT_DEBUT_MAREE.name())). - thenReturn("22/03/2010"); + thenReturn("22/03/2010 1:00"); when(reader.get(CONTACT.CONT_FIN_MAREE.name())). - thenReturn("22/03/10"); + thenReturn("22/03/10 2:15"); when(reader.get(CONTACT.CONT_NB_OBSERV.name())). thenReturn("1"); when(reader.get(CONTACT.CONT_MAM_CAPT.name())). @@ -593,10 +593,10 @@ assertEquals(observer, result.getMainObserver()); assertEquals(sampleRow, result.getSampleRow()); assertEquals(boat, result.getBoat()); - assertEquals(DateUtil.createDate(22,3,2010), - result.getTideBeginDate()); - assertEquals(DateUtil.createDate(22,3,2010), - result.getTideEndDate()); + + assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,0,1,22,3,2010), result.getTideBeginDate()), 0); + assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,15,2,22,3,2010), result.getTideEndDate()), 0); + assertEquals(1, result.getNbObservants()); assertFalse(result.getMammalsCapture()); assertTrue(result.getMammalsObservation()); Modified: trunk/wao-business/src/test/resources/import/contacts.csv =================================================================== --- trunk/wao-business/src/test/resources/import/contacts.csv 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-business/src/test/resources/import/contacts.csv 2010-12-23 11:42:31 UTC (rev 848) @@ -1,2 +1,2 @@ "CONT_CREATION","OBSERV_ID","PLAN_CODE","NAVS_COD","CONT_ETAT","CONT_DEBUT_MAREE","CONT_FIN_MAREE","CONT_NB_OBSERV","CONT_MAM_CAPT","CONT_MAM_OBS","CONT_COMMENT","CONT_ALLEGRO","CONT_SOCIETE_VALID","CONT_PROGRAM_VALID" -17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ",18/03/2010,19/03/2010,1,,,,22/07/2010,"A","A" +17/03/2010,"jmichmuche","2010_01",175846,"Embarquement réalisé ","18/03/2010 12:34","19/03/2010 22:33",1,,,,22/07/2010,"A","A" Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-23 11:42:31 UTC (rev 848) @@ -21,6 +21,7 @@ import org.apache.tapestry5.Block; import org.apache.tapestry5.EventContext; import org.apache.tapestry5.RenderSupport; +import org.apache.tapestry5.annotations.Component; import org.apache.tapestry5.annotations.Environmental; import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; import org.apache.tapestry5.annotations.IncludeStylesheet; @@ -34,6 +35,7 @@ import org.apache.tapestry5.ioc.Messages; import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.ioc.services.PropertyAccess; +import org.chenillekit.tapestry.core.components.DateTimeField; import org.slf4j.Logger; import java.text.DateFormat; @@ -82,6 +84,14 @@ @InjectComponent private Zone globalZone; + public String getDateTimeFormatPattern() { + return "dd/MM/yyyy HH:mm"; + } + + public DateFormat getDateTimeFormat() { + return new SimpleDateFormat(getDateTimeFormatPattern()); + } + public DateFormat getDateFormat() { return new SimpleDateFormat("dd/MM/yyyy"); } @@ -267,6 +277,9 @@ /************************ OBSERVATION REPORT ******************************/ + @Component + private DateTimeField beginDate, endDate; + @Inject private Block viewObservationReport; Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/ContactForm.properties 2010-12-23 11:42:31 UTC (rev 848) @@ -2,8 +2,8 @@ mainObserver-label: Observateur r\u00e9f\u00e9rant secondaryObserver-label: Observateur contactState-label: \u00c9tat du contact -beginDate-label: D\u00e9but de la mar\u00e9e -endDate-label: Fin de la mar\u00e9e +beginDate-label: D\u00e9but d'observation +endDate-label: Fin d'observation mammalsObservation-label: Observations de mammif\u00e8res mammalsCapture-label: Capture accidentelle de mammif\u00e8res inputDate-label: Date de saisie des donn\u00e9es dans Allegro Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-22 11:16:07 UTC (rev 847) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 11:42:31 UTC (rev 848) @@ -113,11 +113,11 @@ </div> <div class="t-beaneditor-row"> <t:label t:for="beginDate" /> - <t:output value="contact.tideBeginDate" format="dateFormat" /> + <t:output value="contact.tideBeginDate" format="dateTimeFormat" /> </div> <div class="t-beaneditor-row"> <t:label t:for="endDate" /> - <t:output value="contact.tideEndDate" format="dateFormat" /> + <t:output value="contact.tideEndDate" format="dateTimeFormat" /> </div> <div class="t-beaneditor-row"> <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" /> @@ -164,11 +164,11 @@ </div> <div class="t-beaneditor-row"> <t:label t:for="beginDate" /> - <input t:type="datefield" t:id="beginDate" class="date" value="contact.tideBeginDate" /> + <input t:id="beginDate" value="contact.tideBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> <div class="t-beaneditor-row"> <t:label t:for="endDate" /> - <input t:type="datefield" t:id="endDate" class="date" value="contact.tideEndDate" /> + <input t:id="endDate" value="contact.tideEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> <div class="t-beaneditor-row"> <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />