Author: bleny Date: 2010-12-23 14:48:19 +0000 (Thu, 23 Dec 2010) New Revision: 850 Log: rename tideBegin and tideEnd to observationBegin and observationEnd in contact to make it program-neutral Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.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-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2010-12-23 14:48:19 UTC (rev 850) @@ -684,4 +684,10 @@ queries.add(sql); } + + @Override + protected void renameContactsColumnsToCommonName_2_0(List<String> queries) { + queries.add("ALTER TABLE Contact RENAME tideBeginDate TO observationBeginDate"); + queries.add("ALTER TABLE Contact RENAME tideEndDate TO observationEndDate"); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2010-12-23 14:48:19 UTC (rev 850) @@ -117,6 +117,8 @@ protected abstract void addAdminRolesToAdmin_2_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; + protected abstract void renameContactsColumnsToCommonName_2_0(List<String> queries); + protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -419,6 +421,8 @@ addAdminRolesToAdmin_2_0(tx, queries); + renameContactsColumnsToCommonName_2_0(queries); + String[] strings = queries.toArray(new String[queries.size()]); executeSQL(tx, true, true, strings); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2010-12-23 14:48:19 UTC (rev 850) @@ -595,7 +595,7 @@ filter.setPeriod(period); if (filter.isSortedByBoardingDate()) { - query.addOrder(contactProperty.$property(Contact.PROPERTY_TIDE_BEGIN_DATE + " DESC")); + query.addOrder(contactProperty.$property(Contact.PROPERTY_OBSERVATION_BEGIN_DATE + " DESC")); } // ORDER_BY 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-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactStatus.java 2010-12-23 14:48:19 UTC (rev 850) @@ -153,8 +153,8 @@ return false; } DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); - Date oldTideBeginDate = oldContact.getTideBeginDate(); - Date newTideBeginDate = newContact.getTideBeginDate(); + Date oldTideBeginDate = oldContact.getObservationBeginDate(); + Date newTideBeginDate = newContact.getObservationBeginDate(); logger.debug("old : " + oldTideBeginDate + ", new : " + newTideBeginDate); @@ -242,15 +242,15 @@ Date tideBeginDate = null; switch(context) { - case OLD: tideBeginDate = oldContact.getTideBeginDate(); break; + case OLD: tideBeginDate = oldContact.getObservationBeginDate(); break; // newContact may be null in CREATE case, so we use the previous // one case NEW: if (newContact != null && - newContact.getTideBeginDate() != null) { - tideBeginDate = newContact.getTideBeginDate(); + newContact.getObservationBeginDate() != null) { + tideBeginDate = newContact.getObservationBeginDate(); } else { - tideBeginDate = oldContact.getTideBeginDate(); + tideBeginDate = oldContact.getObservationBeginDate(); } } @@ -353,12 +353,12 @@ public String toString() { DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); String oldMonth = oldContact != null && - oldContact.getTideBeginDate() != null ? - dateFormat.format(oldContact.getTideBeginDate()) : ""; + oldContact.getObservationBeginDate() != null ? + dateFormat.format(oldContact.getObservationBeginDate()) : ""; String newMonth = newContact != null && - newContact.getTideBeginDate() != null ? - dateFormat.format(newContact.getTideBeginDate()) : ""; + newContact.getObservationBeginDate() != null ? + dateFormat.format(newContact.getObservationBeginDate()) : ""; StringBuilder builder = new StringBuilder("\nContactStatus : VALIDATE :: "). Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactDAOImpl.java 2010-12-23 14:48:19 UTC (rev 850) @@ -103,7 +103,7 @@ } if (fromDate != null) { - query.addWhere(contactProperty.tideBeginDate(), Op.GE, fromDate); + query.addWhere(contactProperty.observationBeginDate(), Op.GE, fromDate); } return query; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2010-12-23 14:48:19 UTC (rev 850) @@ -59,8 +59,8 @@ */ @Override protected void calculTideNbDays() { - Date beginDate = getTideBeginDate(); - Date endDate = getTideEndDate(); + Date beginDate = getObservationBeginDate(); + Date endDate = getObservationEndDate(); if (beginDate != null && endDate != null) { int nbDays = DateUtil.getDifferenceInDays(beginDate, endDate); // nbDays + 1 to have the first day @@ -78,8 +78,8 @@ if (log.isDebugEnabled()) { log.debug("topia " + getTopiaCreateDate()); } - if (getTideBeginDate() != null) { - return getTideBeginDate(); + if (getObservationBeginDate() != null) { + return getObservationBeginDate(); } return getTopiaCreateDate(); } 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-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-12-23 14:48:19 UTC (rev 850) @@ -439,13 +439,13 @@ dateFormat.format(contact.getTopiaCreateDate())); export.record(CONTACT.CONT_ETAT, contact.getContactState().libelle()); - if (contact.getTideBeginDate() != null) { + if (contact.getObservationBeginDate() != null) { export.record(CONTACT.CONT_DEBUT_MAREE, - CONTACT.CONT_DEBUT_MAREE.format(contact.getTideBeginDate())); + CONTACT.CONT_DEBUT_MAREE.format(contact.getObservationBeginDate())); } - if (contact.getTideEndDate() != null) { + if (contact.getObservationEndDate() != null) { export.record(CONTACT.CONT_FIN_MAREE, - CONTACT.CONT_FIN_MAREE.format(contact.getTideEndDate())); + CONTACT.CONT_FIN_MAREE.format(contact.getObservationEndDate())); } export.record(CONTACT.CONT_NB_OBSERV, String.valueOf(contact.getNbObservants())); @@ -632,16 +632,16 @@ log.debug("exception", eee); log.debug("contact : " + contact); if (contact != null) { - log.debug("tideBeginDate : " + contact.getTideBeginDate()); + log.debug("tideBeginDate : " + contact.getObservationBeginDate()); } // The row will be refused in this case throw new ImportRefusedException("Impossible de " + "mettre à jour le nombre de marée réels, " + "vérifiez le mois de " + - dateFormat.format(contact.getTideBeginDate()) + + dateFormat.format(contact.getObservationBeginDate()) + " pour la ligne du plan " + contactCsv.getSampleRow().getCode(), currRow, - Contact.PROPERTY_TIDE_BEGIN_DATE, eee); + Contact.PROPERTY_OBSERVATION_BEGIN_DATE, eee); } result.incNbImported(); @@ -700,9 +700,9 @@ contact.setBoat(ImportHelper.readInt(reader, BOAT.NAVS_COD)); - contact.setTideBeginDate( + contact.setObservationBeginDate( ImportHelper.readDate(reader, CONTACT.CONT_DEBUT_MAREE)); - contact.setTideEndDate( + contact.setObservationEndDate( ImportHelper.readDate(reader, CONTACT.CONT_FIN_MAREE)); int nbObservants = 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-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-12-23 14:48:19 UTC (rev 850) @@ -338,7 +338,7 @@ WaoQueryHelper.BoatProperty boatProperty = WaoQueryHelper.newBoatProperty(); query.setSelect(boatProperty.$alias(), // boat sampleRowProperty.code(), // sample-row code - contactProperty.tideBeginDate()) // boarding date + contactProperty.observationBeginDate()) // boarding date // join contact, boats, and sample-rows .addJoin(contactProperty.boat(), boatProperty.$alias(), false) @@ -347,7 +347,7 @@ // and sort everything .addOrder(boatProperty.name(), sampleRowProperty.code(), - contactProperty.tideBeginDate()); + contactProperty.observationBeginDate()); if (log.isTraceEnabled()) { log.trace("Exec query : " + query); @@ -554,7 +554,7 @@ query.addWhere(WaoQueryHelper.format( "($1 IS NOT NULL AND $1 BETWEEN :fromDate AND :thruDate)" + " OR ($1 IS NULL AND $2 BETWEEN :fromDate AND :thruDate)", - contactProperty.tideBeginDate(), + contactProperty.observationBeginDate(), contactProperty.topiaCreateDate()) ).addParam("fromDate", period.getFromDate()). addParam("thruDate", period.getThruDate()); @@ -619,7 +619,7 @@ String companyNameProperty = TopiaQuery.getProperty(companyProperty, Company.PROPERTY_NAME); String tideBeginDateProperty = - TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_TIDE_BEGIN_DATE); + TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_OBSERVATION_BEGIN_DATE); String dataInputProperty = TopiaQuery.getProperty(contactAlias, Contact.PROPERTY_DATA_INPUT_DATE); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/AbstractServiceTest.java 2010-12-23 14:48:19 UTC (rev 850) @@ -576,7 +576,7 @@ contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); Date begin = DateUtil.createDate(3, 3, 2010); - contact1.setTideBeginDate(begin); + contact1.setObservationBeginDate(begin); serviceContact.saveContact(contact1, false); Contact contact2 = new ContactImpl(); @@ -585,7 +585,7 @@ contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 10, 2010); - contact2.setTideBeginDate(begin); + contact2.setObservationBeginDate(begin); serviceContact.saveContact(contact2, false); Contact contact3 = new ContactImpl(); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/BoatImplTest.java 2010-12-23 14:48:19 UTC (rev 850) @@ -149,7 +149,7 @@ Assert.assertTrue(result); contact1.setContactState(ContactState.BOARDING_DONE); - contact1.setTideBeginDate(DateUtil.createDate(3, 3, 2010)); + contact1.setObservationBeginDate(DateUtil.createDate(3, 3, 2010)); serviceContact.saveContact(contact1, false); result = boat.canCreateContact(company); @@ -234,7 +234,7 @@ Contact contact1 = serviceContact.getNewContact(user, row, boat); contact1.setContactState(ContactState.BOARDING_DONE); Date begin = DateUtil.createDate(3, 5, 2010); - contact1.setTideBeginDate(begin); + contact1.setObservationBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -248,7 +248,7 @@ // Second contact with ValidationProgram = FALSE contact2.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 8, 2010); - contact2.setTideBeginDate(begin); + contact2.setObservationBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); contact2.setValidationProgram(Boolean.FALSE); serviceContact.saveContact(contact2, false); @@ -260,7 +260,7 @@ // Third contact with tideBeginDate < fromDate contact3.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); - contact3.setTideBeginDate(begin); + contact3.setObservationBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -271,7 +271,7 @@ // Fourth contact : OK with an other company contact4.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 5, 2010); - contact4.setTideBeginDate(begin); + contact4.setObservationBeginDate(begin); contact4.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact4, false); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/entity/SampleRowImplTest.java 2010-12-23 14:48:19 UTC (rev 850) @@ -120,8 +120,8 @@ // Contact contact = new ContactImpl(); // Date beginDate = DateUtil.createDate(12, 4, 2009); // Date endDate = DateUtil.createDate(15, 4, 2009); -// contact.setTideBeginDate(beginDate); -// contact.setTideEndDate(endDate); +// contact.setObservationBeginDate(beginDate); +// contact.setObservationEndDate(endDate); // // /** EXEC METHOD **/ // row.addRealTideTime(contact); @@ -132,7 +132,7 @@ //// result.addRealTideTime(-1); //// // Test with a more than one day interval dates from contact //// endDate = DateUtil.createDate(18, 4, 2009); -//// contact.setTideEndDate(endDate); +//// contact.setObservationEndDate(endDate); //// //// getRowFromContext().addRealTideTime(contact); //// result = getRowFromContext().getSampleMonth(beginDate); @@ -149,8 +149,8 @@ // Contact contact = new ContactImpl(); // Date beginDate = DateUtil.createDate(12, 4, 2009); // Date endDate = DateUtil.createDate(12, 4, 2009); -// contact.setTideBeginDate(beginDate); -// contact.setTideEndDate(endDate); +// contact.setObservationBeginDate(beginDate); +// contact.setObservationEndDate(endDate); // // /** EXEC METHOD **/ // row.removeRealTideTime(contact); @@ -163,7 +163,7 @@ // // // Test with a more than one day interval dates from contact : only one tide to remove // endDate = DateUtil.createDate(18, 4, 2009); -// contact.setTideEndDate(endDate); +// contact.setObservationEndDate(endDate); // // getRowFromContext().removeRealTideTime(contact); // result = getRowFromContext().getSampleMonth(beginDate); 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-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceContactInternalTest.java 2010-12-23 14:48:19 UTC (rev 850) @@ -168,7 +168,7 @@ SampleMonth.PROPERTY_PERIOD_DATE, monthDate); Date contactDate = DateUtil.createDate(18, 3, 2010); - when(contact.getTideBeginDate()).thenReturn(contactDate); + when(contact.getObservationBeginDate()).thenReturn(contactDate); when(contact.getSampleRow()).thenReturn(sampleRow); if (needBoat) { @@ -202,7 +202,7 @@ // // SampleMonth result = // service.getExistingSampleMonthForContact(monthDAO, -// contact.getSampleRow(), contact.getTideBeginDate()); +// contact.getSampleRow(), contact.getObservationBeginDate()); // // assertEquals(sampleMonth, result); // @@ -218,10 +218,10 @@ // WaoDAOHelper.getSampleMonthDAO(transaction); // // Date contactDate = DateUtil.createDate(18, 10, 2010); -// when(contact.getTideBeginDate()).thenReturn(contactDate); +// when(contact.getObservationBeginDate()).thenReturn(contactDate); // // service.getExistingSampleMonthForContact(monthDAO, -// contact.getSampleRow(), contact.getTideBeginDate()); +// contact.getSampleRow(), contact.getObservationBeginDate()); // } catch (Exception eee) { // log.error("Error : " + eee.getMessage()); // assertEquals(NullSampleMonthException.class, eee.getClass()); @@ -237,8 +237,8 @@ /** PREPARE DATA **/ prepareData(false, false); - Date tideBeginDate = new Date(contact.getTideBeginDate().getTime()); - when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate); + Date tideBeginDate = new Date(contact.getObservationBeginDate().getTime()); + when(contactReference.getObservationBeginDate()).thenReturn(tideBeginDate); when(contactReference.getSampleRow()).thenReturn(sampleRow); // WARN : by default mockito doesn't initialize Boolean type with null when(contactReference.getValidationProgram()).thenReturn(null); @@ -402,7 +402,7 @@ thenReturn(ContactState.BOARDING_DONE); when(contact.getContactState()). thenReturn(ContactState.BOARDING_DONE); - when(contact.getTideBeginDate()). + when(contact.getObservationBeginDate()). thenReturn(DateUtil.createDate(3, 4, 2010)); service.updateSampleMonthTidesValue(transaction, contactReference, @@ -444,8 +444,8 @@ prepareData(false, false); // contactReference as the same tideBeginDate and sampleRow as contact - Date tideBeginDate = new Date(contact.getTideBeginDate().getTime()); - when(contactReference.getTideBeginDate()).thenReturn(tideBeginDate); + Date tideBeginDate = new Date(contact.getObservationBeginDate().getTime()); + when(contactReference.getObservationBeginDate()).thenReturn(tideBeginDate); when(contactReference.getSampleRow()).thenReturn(sampleRow); // Initialize correct old status in contactReference @@ -594,8 +594,8 @@ assertEquals(sampleRow, result.getSampleRow()); assertEquals(boat, result.getBoat()); - 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(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,0,1,22,3,2010), result.getObservationBeginDate()), 0); + assertEquals(DateUtil.getDifferenceInMinutes(DateUtil.createDate(0,15,2,22,3,2010), result.getObservationEndDate()), 0); assertEquals(1, result.getNbObservants()); assertFalse(result.getMammalsCapture()); @@ -721,8 +721,8 @@ transaction = manager.getContext().beginTransaction(); newContact.setContactState(ContactState.BOARDING_DONE); - newContact.setTideBeginDate(tideBeginDate); - newContact.setTideEndDate(tideEndDate); + newContact.setObservationBeginDate(tideBeginDate); + newContact.setObservationEndDate(tideEndDate); newContact.setNbObservants(1); ContactDAO dao = WaoDAOHelper.getContactDAO(transaction); @@ -745,8 +745,8 @@ Contact existingContact = dao.findByTopiaId(newTopiaId); assertNotNull(existingContact); assertEquals(1, existingContact.getNbObservants()); - assertEquals(tideBeginDate, existingContact.getTideBeginDate()); - assertEquals(tideEndDate, existingContact.getTideEndDate()); + assertEquals(tideBeginDate, existingContact.getObservationBeginDate()); + assertEquals(tideEndDate, existingContact.getObservationEndDate()); assertEquals(ContactState.BOARDING_DONE, existingContact.getContactState()); Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSynthesisImplTest.java 2010-12-23 14:48:19 UTC (rev 850) @@ -158,7 +158,7 @@ contact1.setSampleRow(row); contact1.setContactState(ContactState.BOARDING_DONE); Date begin = DateUtil.createDate(3, 3, 2010); - contact1.setTideBeginDate(begin); + contact1.setObservationBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -168,7 +168,7 @@ contact2.setSampleRow(row); contact2.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); - contact2.setTideBeginDate(begin); + contact2.setObservationBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -178,7 +178,7 @@ contact3.setSampleRow(row); contact3.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); - contact3.setTideBeginDate(begin); + contact3.setObservationBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -251,7 +251,7 @@ contact1.setNbObservants(1); contact1.setContactState(ContactState.BOARDING_DONE); Date begin = DateUtil.createDate(3, 3, 2010); - contact1.setTideBeginDate(begin); + contact1.setObservationBeginDate(begin); contact1.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact1, false); @@ -263,7 +263,7 @@ contact2.setNbObservants(2); contact2.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); - contact2.setTideBeginDate(begin); + contact2.setObservationBeginDate(begin); contact2.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact2, false); @@ -275,7 +275,7 @@ contact3.setNbObservants(1); contact3.setContactState(ContactState.BOARDING_DONE); begin = DateUtil.createDate(3, 3, 2010); - contact3.setTideBeginDate(begin); + contact3.setObservationBeginDate(begin); contact3.setValidationCompany(Boolean.TRUE); serviceContact.saveContact(contact3, false); @@ -360,7 +360,7 @@ // contact1.setSampleRow(row); // contact1.setContactState(ContactState.BOARDING_DONE); // Date begin = DateUtil.createDate(3, 3, 2010); -// contact1.setTideBeginDate(begin); +// contact1.setObservationBeginDate(begin); // serviceContact.saveContact(contact1, false); // // Contact contact2 = new ContactImpl(); @@ -369,7 +369,7 @@ // contact2.setSampleRow(row); // contact2.setContactState(ContactState.BOARDING_DONE); // begin = DateUtil.createDate(3, 10, 2010); -// contact2.setTideBeginDate(begin); +// contact2.setObservationBeginDate(begin); // serviceContact.saveContact(contact2, false); // // Contact contact3 = new ContactImpl(); @@ -530,7 +530,7 @@ contact1.setMainObserver(user); contact1.setSampleRow(row); Date begin = DateUtil.createDate(3, 3, 2010); - contact1.setTideBeginDate(begin); + contact1.setObservationBeginDate(begin); Date inputDate = DateUtil.createDate(15, 4, 2010); contact1.setDataInputDate(inputDate); contact1.setContactState(ContactState.BOARDING_DONE); @@ -542,7 +542,7 @@ contact2.setMainObserver(user); contact2.setSampleRow(row); begin = DateUtil.createDate(3, 3, 2010); - contact2.setTideBeginDate(begin); + contact2.setObservationBeginDate(begin); inputDate = DateUtil.createDate(15, 3, 2010); contact2.setDataInputDate(inputDate); contact2.setContactState(ContactState.BOARDING_DONE); @@ -554,7 +554,7 @@ contact3.setMainObserver(user2); contact3.setSampleRow(row2); begin = DateUtil.createDate(3, 3, 2010); - contact3.setTideBeginDate(begin); + contact3.setObservationBeginDate(begin); contact3.setDataInputDate(begin); contact3.setContactState(ContactState.BOARDING_DONE); contact3.setValidationCompany(Boolean.TRUE); 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-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2010-12-23 14:48:19 UTC (rev 850) @@ -353,8 +353,8 @@ logger.debug("For state : " + contactState); } - Date begin = contact.getTideBeginDate(); - Date end = contact.getTideEndDate(); + Date begin = contact.getObservationBeginDate(); + Date end = contact.getObservationEndDate(); Date input = contact.getDataInputDate(); SampleRow row = contact.getSampleRow(); @@ -409,8 +409,8 @@ if (previousUnfinishedState || commentChanged) { // RAZ des champs - contact.setTideBeginDate(null); - contact.setTideEndDate(null); + contact.setObservationBeginDate(null); + contact.setObservationEndDate(null); contact.setNbObservants(0); contact.setMammalsCapture(false); contact.setMammalsObservation(false); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/Contacts.java 2010-12-23 14:48:19 UTC (rev 850) @@ -414,6 +414,10 @@ return new SimpleDateFormat("dd/MM/yyyy"); } + public DateFormat getDateTimeFormat() { + return new SimpleDateFormat("dd/MM/yyyy HH:mm"); + } + public boolean isEditionMode() { //return contact.getTopiaId().equals(contactEditedId); return contactEdited != null && contact.equals(contactEdited); @@ -666,8 +670,8 @@ logger.debug("For state : " + contactState); } - Date begin = contactEdited.getTideBeginDate(); - Date end = contactEdited.getTideEndDate(); + Date begin = contactEdited.getObservationBeginDate(); + Date end = contactEdited.getObservationEndDate(); Date input = contactEdited.getDataInputDate(); SampleRow row = contactEdited.getSampleRow(); //DateFormat dateFormat = new SimpleDateFormat("MM/yyyy"); @@ -723,8 +727,8 @@ if (previousUnfinishedState || commentChanged) { // RAZ des champs - contactEdited.setTideBeginDate(null); - contactEdited.setTideEndDate(null); + contactEdited.setObservationBeginDate(null); + contactEdited.setObservationEndDate(null); contactEdited.setNbObservants(0); contactEdited.setMammalsCapture(false); contactEdited.setMammalsObservation(false); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-12-23 14:48:19 UTC (rev 850) @@ -69,8 +69,8 @@ Contact.PROPERTY_SAMPLE_ROW, Contact.PROPERTY_BOAT, Contact.PROPERTY_STATE, - Contact.PROPERTY_TIDE_BEGIN_DATE, - Contact.PROPERTY_TIDE_END_DATE, + Contact.PROPERTY_OBSERVATION_BEGIN_DATE, + Contact.PROPERTY_OBSERVATION_END_DATE, Contact.PROPERTY_NB_OBSERVANTS, "mammals", Contact.PROPERTY_COMMENT, @@ -80,8 +80,8 @@ contactModel.get(TopiaEntity.TOPIA_CREATE_DATE).sortable(false); contactModel.get(Contact.PROPERTY_STATE).sortable(false); - contactModel.get(Contact.PROPERTY_TIDE_BEGIN_DATE).sortable(false); - contactModel.get(Contact.PROPERTY_TIDE_END_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_OBSERVATION_BEGIN_DATE).sortable(false); + contactModel.get(Contact.PROPERTY_OBSERVATION_END_DATE).sortable(false); contactModel.get(Contact.PROPERTY_NB_OBSERVANTS).sortable(false); contactModel.get(Contact.PROPERTY_DATA_INPUT_DATE).sortable(false); contactModel.get(Contact.PROPERTY_COMMENT).sortable(false); Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-12-23 14:48:19 UTC (rev 850) @@ -38,8 +38,8 @@ boat-label: Navire state-label: Etat topiaCreateDate-label: Cr\u00e9ation -tideBeginDate-label: D\u00e9but de la mar\u00e9e -tideEndDate-label: Fin de la mar\u00e9e +observationBeginDate-label: D\u00e9but de l'observation +observationEndDate-label: Fin de l'observation nbObservants-label: Nb obs. lastState-label: Etat programName-label: Programme Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2010-12-23 14:48:19 UTC (rev 850) @@ -112,12 +112,16 @@ ${contact.contactState.label} </div> <div class="t-beaneditor-row"> + <t:label t:for="nbObservants" /> + ${contact.nbObservants} + </div + <div class="t-beaneditor-row"> <t:label t:for="beginDate" /> - <t:output value="contact.tideBeginDate" format="dateTimeFormat" /> + <t:output value="contact.observationBeginDate" format="dateTimeFormat" /> </div> <div class="t-beaneditor-row"> <t:label t:for="endDate" /> - <t:output value="contact.tideEndDate" format="dateTimeFormat" /> + <t:output value="contact.observationEndDate" format="dateTimeFormat" /> </div> <div class="t-beaneditor-row"> <img src="${asset:context:img/eye-22px.png}" alt="Observations" title="Observations" />  @@ -163,12 +167,16 @@ <input t:type="select" t:id="contactState" t:value="contact.contactState" t:validate="required"/> </div> <div class="t-beaneditor-row"> + <t:label t:for="nbObservants" /> + <input t:type="textfield" t:id="nbObservants" t:value="contact.nbObservants" t:validate="required"/> + </div> + <div class="t-beaneditor-row"> <t:label t:for="beginDate" /> - <input t:id="beginDate" value="contact.tideBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> + <input t:id="beginDate" value="contact.observationBeginDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> </div> <div class="t-beaneditor-row"> <t:label t:for="endDate" /> - <input t:id="endDate" value="contact.tideEndDate" datePattern="${dateTimeFormatPattern}" timePicker="true" timePickerAdjacent="true" use24hrs="true" /> + <input t:id="endDate" value="contact.observationEndDate" 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" />  Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-23 14:42:28 UTC (rev 849) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-12-23 14:48:19 UTC (rev 850) @@ -29,8 +29,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:layout t:pageTitle="Contacts" t:contentId="so-contacts" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> -<!--t:include="creationDate, lastState, boatName, boatImmatriculation, boatDistrictCode, beginTideDate, endTideDate, - nbObservants, mammals, editDate, comment, validation"--> <div id="so-contacts-search"> <form t:type="form" t:id="searchBoat"> <div> @@ -219,18 +217,18 @@ <p:else>${contact.contactState.libelle()}</p:else> </t:if> </p:stateCell> - <p:tideBeginDateCell> + <p:observationBeginDateCell> <t:if t:test="editionMode"> - <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.tideBeginDate" /> - <p:else><t:output value="contact.tideBeginDate" format="dateFormat" /></p:else> + <input t:type="datefield" t:id="beginDate" class="date" value="contactEdited.observationBeginDate" /> + <p:else><t:output value="contact.observationBeginDate" format="dateTimeFormat" /></p:else> </t:if> - </p:tideBeginDateCell> - <p:tideEndDateCell> + </p:observationBeginDateCell> + <p:observationEndDateCell> <t:if t:test="editionMode"> - <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.tideEndDate" /> - <p:else><t:output value="contact.tideEndDate" format="dateFormat" /></p:else> + <input t:type="datefield" t:id="endDate" class="date" value="contactEdited.observationEndDate" /> + <p:else><t:output value="contact.observationEndDate" format="dateTimeFormat" /></p:else> </t:if> - </p:tideEndDateCell> + </p:observationEndDateCell> <p:nbObservantsCell> <t:if t:test="editionMode"> <input t:type="textfield" t:id="nbObservants" class="nbObservants" value="contactEdited.nbObservants" />