Author: bleny Date: 2011-05-12 14:21:05 +0000 (Thu, 12 May 2011) New Revision: 1271 Log: rename SampleRow#day property to SampeRow#expectedDate Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -874,6 +874,7 @@ protected void addObsDebToSampleRows_3_0(List<String> queries) { queries.add("ALTER TABLE SampleRow ADD blankRow BOOLEAN"); queries.add("UPDATE TABLE SampleRow SET blankRow=FALSE"); + queries.add("ALTER TABLE SampleRow RENAME day TO expectedDate"); } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -311,8 +311,8 @@ // Period filter on sampleRow dates if (period != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { - query.addWhere(sampleRowProperty.day(), TopiaQuery.Op.LE, period.getThruDate()). - addWhere(sampleRowProperty.day(), TopiaQuery.Op.GE, period.getFromDate()); + query.addWhere(sampleRowProperty.expectedDate(), TopiaQuery.Op.LE, period.getThruDate()). + addWhere(sampleRowProperty.expectedDate(), TopiaQuery.Op.GE, period.getFromDate()); } else { period.initDayOfMonthExtremities(); query.addWhere(sampleRowProperty.periodBegin(), TopiaQuery.Op.LE, period.getThruDate()). @@ -320,7 +320,7 @@ } } else if (fromDate != null) { if (ObsProgram.OBSDEB.equals(filter.getObsProgram())) { - query.addWhere(sampleRowProperty.day(), TopiaQuery.Op.GE, fromDate); + query.addWhere(sampleRowProperty.expectedDate(), TopiaQuery.Op.GE, fromDate); } else { query.addWhere(sampleRowProperty.periodEnd(), TopiaQuery.Op.GE, fromDate); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -26,11 +26,9 @@ import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.bean.ObsProgram; -import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; import org.nuiton.util.DateUtil; -import org.nuiton.util.PeriodDates; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -410,11 +408,11 @@ protected void compareDays() { if (oldRow == null) { - addChange("Le jour est " + WaoUtils.formatDate(newRow.getDay())); + addChange("Le jour est " + WaoUtils.formatDate(newRow.getExpectedDate())); } else { - if (DateUtil.getDifferenceInDays(oldRow.getDay(), newRow.getDay()) >= 1) { - addChange("L'observation est déplacée du " + WaoUtils.formatDate(oldRow.getDay()) - + " au " + WaoUtils.formatDate(newRow.getDay())); + if (DateUtil.getDifferenceInDays(oldRow.getExpectedDate(), newRow.getExpectedDate()) >= 1) { + addChange("L'observation est déplacée du " + WaoUtils.formatDate(oldRow.getExpectedDate()) + + " au " + WaoUtils.formatDate(newRow.getExpectedDate())); } } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -44,10 +44,8 @@ import java.text.ParseException; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; /** * @@ -230,7 +228,7 @@ modelBuilder.newColumnForImportExport("SOCIETE", SampleRow.PROPERTY_COMPANY, new CompanyParserFormatter(allCompanies)); } modelBuilder.newColumnForImportExport("OBSERVATEUR_COD", SampleRow.PROPERTY_GROUP_NAME); - modelBuilder.newColumnForImportExport("OBSERVATION_DATE", SampleRow.PROPERTY_DAY, Common.DAY); + modelBuilder.newColumnForImportExport("OBSERVATION_DATE", SampleRow.PROPERTY_EXPECTED_DATE, Common.DAY); ObservationUnitParserFormatter observationUnitParser = new ObservationUnitParserFormatter(observationUnits); ValueGetterSetter<SampleRow, String> regionCodeGetterSetter = new RegionCodeSetter(observationUnitParser); modelBuilder.newColumnForImportExport("REGION_IFREMER_COD", regionCodeGetterSetter); 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 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -113,7 +113,6 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; @@ -122,8 +121,6 @@ import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n.n_; - /** * ServiceContactImpl * @@ -485,9 +482,9 @@ // coordinator tells who are the observers. We can hope that the observers // who was on the observation are the one expected if (newContact.getObsProgram() == ObsProgram.OBSDEB) { - newContact.setObservationBeginDate(row.getDay()); - newContact.setObservationEndDate(row.getDay()); - newContact.setLandingDate(row.getDay()); + newContact.setObservationBeginDate(row.getExpectedDate()); + newContact.setObservationEndDate(row.getExpectedDate()); + newContact.setLandingDate(row.getExpectedDate()); if (CollectionUtils.isNotEmpty(row.getObservers())) { List<WaoUser> expectedObservers = new LinkedList<WaoUser>(row.getObservers()); newContact.setMainObserver(expectedObservers.get(0)); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -119,7 +119,6 @@ import org.nuiton.util.TimeLog; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; -import org.omg.CORBA.NO_MEMORY; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -130,10 +129,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.net.URISyntaxException; import java.text.DateFormat; import java.text.NumberFormat; import java.text.ParseException; @@ -147,8 +142,6 @@ import java.util.LinkedList; import java.util.List; -import static org.nuiton.i18n.I18n.n_; - /** * ServiceSamplingImpl * @@ -304,7 +297,7 @@ if (ObsProgram.OBSDEB.equals(row.getObsProgram())) { // this line has a precise day, let's take the // year of this day - year = row.getDay(); + year = row.getExpectedDate(); } else { if (CollectionUtils.isEmpty(row.getSampleMonth())) { // if the row has no sample months, we can't know @@ -385,7 +378,7 @@ // plus per-program properties if (ObsProgram.OBSDEB.equals(row.getObsProgram())) { sampleRowBinderModelBuilder.addSimpleProperties( - SampleRow.PROPERTY_DAY, + SampleRow.PROPERTY_EXPECTED_DATE, SampleRow.PROPERTY_GROUP_NAME, SampleRow.PROPERTY_OBSERVERS, SampleRow.PROPERTY_OBSERVATION_UNIT, @@ -1502,7 +1495,7 @@ samplingFilter.setSampleRowObserver(connectedUser.getUser()); } - samplingFilter.setOrderBy(SampleRow.PROPERTY_DAY); + samplingFilter.setOrderBy(SampleRow.PROPERTY_EXPECTED_DATE); return samplingFilter; } @@ -1515,7 +1508,7 @@ if (ObsProgram.OBSDEB == sampleRow.getObsProgram()) { - if (sampleRow.getObservers() != null && sampleRow.getDay() != null) { + if (sampleRow.getObservers() != null && sampleRow.getExpectedDate() != null) { // let's find a conflict, is there another sample-row // declaring the this observer should be anywhere on the @@ -1523,7 +1516,7 @@ SamplingFilter samplingFilter = new SamplingFilterImpl(); samplingFilter.setObsProgram(ObsProgram.OBSDEB); - samplingFilter.setPeriod(new PeriodDates(sampleRow.getDay(), sampleRow.getDay())); + samplingFilter.setPeriod(new PeriodDates(sampleRow.getExpectedDate(), sampleRow.getExpectedDate())); String message = ""; @@ -1584,7 +1577,7 @@ log.debug("Filling calendar with " + samplingPlan.size() + " sampling plans"); } for (SampleRow sampleRow : samplingPlan) { - net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getDay()); + net.fortuna.ical4j.model.Date day = new net.fortuna.ical4j.model.Date(sampleRow.getExpectedDate()); String eventTitle = WaoUtils._("wao.export.ical.title"); String eventPlace = sampleRow.getObservationUnit().getDescription(); // liste des noms des observateurs (sauf le connected user) dans Property.Attendee Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -159,7 +159,7 @@ for (SampleRow sampleRow : sampleRows) { // i must be able to read those values without error sampleRow.getObservationUnit().getObservationUnitCode(); - sampleRow.getDay(); + sampleRow.getExpectedDate(); sampleRow.getGroupName(); sampleRow.getCompany().getName(); Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-05-12 09:06:10 UTC (rev 1270) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/SampleRowModelFactory.java 2011-05-12 14:21:05 UTC (rev 1271) @@ -27,12 +27,9 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactFilterImpl; -import fr.ifremer.wao.entity.Company; -import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.WaoUser; import fr.ifremer.wao.service.ServiceContact; -import org.apache.commons.collections.CollectionUtils; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.PropertyConduit; import org.apache.tapestry5.beaneditor.BeanModel; @@ -45,7 +42,6 @@ import java.text.SimpleDateFormat; import java.util.LinkedList; import java.util.List; -import java.util.Observer; /** * Used to generate a bean model for the grid used in sampling plan showed @@ -118,7 +114,7 @@ @Override public String getValue(SampleRow sampleRow) { - return weekFormat.format(sampleRow.getDay()); + return weekFormat.format(sampleRow.getExpectedDate()); } }); add("week", new SampleRowReaderPropertyConduit() { @@ -127,7 +123,7 @@ @Override public String getValue(SampleRow sampleRow) { - return weekFormat.format(sampleRow.getDay()); + return weekFormat.format(sampleRow.getExpectedDate()); } }); add("dayOfWeek", new SampleRowReaderPropertyConduit() { @@ -136,17 +132,17 @@ @Override public String getValue(SampleRow sampleRow) { - return weekFormat.format(sampleRow.getDay()); + return weekFormat.format(sampleRow.getExpectedDate()); } }); } - add(SampleRow.PROPERTY_DAY, new SampleRowReaderPropertyConduit() { + add(SampleRow.PROPERTY_EXPECTED_DATE, new SampleRowReaderPropertyConduit() { @Override public String getValue(SampleRow sampleRow) { - return WaoUtils.formatDate(sampleRow.getDay()); + return WaoUtils.formatDate(sampleRow.getExpectedDate()); } }); if (connectedUser.isObserver()) {