- Wao-commits - mailman.cloud.codelutin.com

[Suiviobsmer-commits] r1295 - trunk/wao-business/src/main/java/fr/ifremer/wao/bean
by bleny＠users.labs.libre-entreprise.org 24 May '11

24 May '11

Author: bleny Date: 2011-05-24 17:10:03 +0000 (Tue, 24 May 2011) New Revision: 1295 Log: fix filters on facade and zone Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-24 17:09:35 UTC (rev 1294) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-24 17:10:03 UTC (rev 1295) @@ -23,9 +23,11 @@ */ package fr.ifremer.wao.bean; +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.FishingGearDCF; +import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TargetSpeciesDCF; import fr.ifremer.wao.entity.TerrestrialDivision; @@ -37,6 +39,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; public class SamplingFilterValuesImpl extends SamplingFilterValues { @@ -141,8 +144,10 @@ } } else { // for both ObsMer and ObsVente - addFacadeNames(sampleRow.getFacade()); - addSectorsNames(sampleRow.getSectors()); + for (FishingZone fishingZone : sampleRow.getFishingZone()) { + addFacadeNames(fishingZone.getFacadeName()); + addSectorsNames(fishingZone.getSectorName()); + } addPrograms(sampleRow.getProgramName()); Collection<DCF5Code> dcf5Codes = sampleRow.getDCF5Code(); if (dcf5Codes != null) {

1 0

[Suiviobsmer-commits] r1294 - trunk/wao-business/src/main/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 24 May '11

24 May '11

Author: bleny Date: 2011-05-24 17:09:35 +0000 (Tue, 24 May 2011) New Revision: 1294 Log: fix missing join on getBoatsByFilter Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-24 16:55:13 UTC (rev 1293) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-24 17:09:35 UTC (rev 1294) @@ -155,6 +155,10 @@ WaoQueryHelper.SampleRowProperty sampleRowProperty = WaoQueryHelper.newSampleRowProperty(); + query.addLeftJoin(eligibleBoatProperty.sampleRow(), + eligibleBoatProperty.sampleRowProperty().defaultAlias(), + true); + query.addFetch( // XXX 20110524 bleny fetching those two data raise a // 'cannot simultaneously fetch multiple bags' // exception. Not fetching works but data will be lazily

1 0

[Suiviobsmer-commits] r1293 - in trunk/wao-business/src/main/java/fr/ifremer/wao: bean service
by bleny＠users.labs.libre-entreprise.org 24 May '11

24 May '11

Author: bleny Date: 2011-05-24 16:55:13 +0000 (Tue, 24 May 2011) New Revision: 1293 Log: fix performances issues in Boats ; replace ArrayLists by HashSets + prevent lots of lazy loading by loading data for boats once for all Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java 2011-05-23 16:43:46 UTC (rev 1292) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterValuesImpl.java 2011-05-24 16:55:13 UTC (rev 1293) @@ -30,6 +30,7 @@ import fr.ifremer.wao.entity.TerrestrialLocation; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; /** @@ -74,7 +75,23 @@ } @Override + protected void clear() { + super.clear(); + setPortsOfRegistry(new HashSet<TerrestrialLocation>()); + setFleets(new HashSet<Fleet>()); + } + + @Override + protected void removeNullValues() { + super.removeNullValues(); + getPortsOfRegistry().remove(null); + getFleets().remove(null); + } + + @Override public void fillBoats(List<Boat> boats) { + clear(); + for (Boat boat : boats) { List<ElligibleBoat> elligibleBoats = boat.getElligibleBoat(); for (ElligibleBoat elligibleBoat : elligibleBoats) { @@ -83,5 +100,7 @@ addPortsOfRegistry(boat.getPortOfRegistry()); addFleets(boat.getFleet()); } + + removeNullValues(); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-05-23 16:43:46 UTC (rev 1292) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/ContactFilterValuesImpl.java 2011-05-24 16:55:13 UTC (rev 1293) @@ -29,9 +29,11 @@ import fr.ifremer.wao.entity.ObsDebCode; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TerrestrialLocation; +import fr.ifremer.wao.entity.WaoUser; import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; /** @@ -40,95 +42,41 @@ public class ContactFilterValuesImpl extends ContactFilterValues { @Override - public void addContactStateMotifs(ContactStateMotif toAdd) { - if (toAdd == null) { - return; - } - if (getContactStateMotifs() == null) { - setContactStateMotifs(new ArrayList<ContactStateMotif>()); - } - if (!containsContactStateMotifs(toAdd)) { - super.addContactStateMotifs(toAdd); - } + public List<ContactStateMotif> getContactStateMotifsAsList() { + return getAsList(getContactStateMotifs()); } @Override - public void addAllContactStateMotifs(Collection<ContactStateMotif> toAdds) { - if (toAdds == null) { - return; - } - if (getContactStateMotifs() == null) { - setContactStateMotifs(new ArrayList<ContactStateMotif>()); - } - if (!containsAllContactStateMotifs(toAdds)) { - super.addAllContactStateMotifs(toAdds); - } else { - for (ContactStateMotif toAdd : toAdds) { - addContactStateMotifs(toAdd); - } - } + public List<TerrestrialLocation> getTerrestrialLocationsAsList() { + return getAsList(getTerrestrialLocations()); } @Override - public void addTerrestrialLocations(TerrestrialLocation toAdd) { - if (toAdd == null) { - return; - } - if (getTerrestrialLocations() == null) { - setTerrestrialLocations(new ArrayList<TerrestrialLocation>()); - } - if (!containsTerrestrialLocations(toAdd)) { - super.addTerrestrialLocations(toAdd); - } + public List<ObsDebCode> getObsDebCodesAsList() { + return getAsList(getObsDebCodes()); } @Override - public void addAllTerrestrialLocations(Collection<TerrestrialLocation> toAdds) { - if (toAdds == null) { - return; - } - if (getTerrestrialLocations() == null) { - setTerrestrialLocations(new ArrayList<TerrestrialLocation>()); - } - if (!containsAllTerrestrialLocations(toAdds)) { - super.addAllTerrestrialLocations(toAdds); - } else { - for (TerrestrialLocation toAdd : toAdds) { - addTerrestrialLocations(toAdd); - } - } + protected void clear() { + super.clear(); + setObservers(new HashSet<WaoUser>()); + setTerrestrialLocations(new HashSet<TerrestrialLocation>()); + setObsDebCodes(new HashSet<ObsDebCode>()); } @Override - public void addObsDebCodes(ObsDebCode toAdd) { - if (toAdd == null) { - return; - } - if (getObsDebCodes() == null) { - setObsDebCodes(new ArrayList<ObsDebCode>()); - } - if (!containsObsDebCodes(toAdd)) { - super.addObsDebCodes(toAdd); - } + protected void removeNullValues() { + super.removeNullValues(); + getObservers().remove(null); + getTerrestrialLocations().remove(null); + getObsDebCodes().remove(null); } @Override - public List<ContactStateMotif> getContactStateMotifsAsList() { - return getAsList(getContactStateMotifs()); - } + public void fillContacts(List<Contact> contacts) { - @Override - public List<TerrestrialLocation> getTerrestrialLocationsAsList() { - return getAsList(getTerrestrialLocations()); - } + clear(); - @Override - public List<ObsDebCode> getObsDebCodesAsList() { - return getAsList(getObsDebCodes()); - } - - @Override - public void fillContacts(List<Contact> contacts) { for (Contact contact : contacts) { addObservers(contact.getMainObserver()); addTerrestrialLocations(contact.getTerrestrialLocation()); @@ -136,5 +84,7 @@ addObsDebCodes(contact.getObsDebCode()); fillSampleRow(contact.getSampleRow()); } + + removeNullValues(); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-23 16:43:46 UTC (rev 1292) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-24 16:55:13 UTC (rev 1293) @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -41,290 +42,6 @@ public class SamplingFilterValuesImpl extends SamplingFilterValues { @Override - public void addCompanies(Company toAdd) { - if (toAdd == null) { - return; - } - if (getCompanies() == null) { - setCompanies(new ArrayList<Company>()); - } - if (!containsCompanies(toAdd)) { - super.addCompanies(toAdd); - } - } - - @Override - public void addAllCompanies(Collection<Company> toAdds) { - if (toAdds == null) { - return; - } - if (getCompanies() == null) { - setCompanies(new ArrayList<Company>()); - } - if (!containsAllCompanies(toAdds)) { - super.addAllCompanies(toAdds); - } else { - for (Company toAdd : toAdds) { - addCompanies(toAdd); - } - } - } - - @Override - public void addPrograms(String toAdd) { - if (toAdd == null) { - return; - } - if (getPrograms() == null) { - setPrograms(new ArrayList<String>()); - } - if (!containsPrograms(toAdd)) { - super.addPrograms(toAdd); - } - } - - @Override - public void addAllPrograms(Collection<String> toAdds) { - if (toAdds == null) { - return; - } - if (getPrograms() == null) { - setPrograms(new ArrayList<String>()); - } - if (!containsAllPrograms(toAdds)) { - super.addAllPrograms(toAdds); - } else { - for (String toAdd : toAdds) { - addPrograms(toAdd); - } - } - } - - @Override - public void addFacadeNames(String toAdd) { - if (toAdd == null) { - return; - } - if (getFacadeNames() == null) { - setFacadeNames(new ArrayList<String>()); - } - if (!containsFacadeNames(toAdd)) { - // Remove doublons - super.addFacadeNames(toAdd); - } - } - - @Override - public void addAllFacadeNames(Collection<String> toAdds) { - if (toAdds == null) { - return; - } - if (getFacadeNames() == null) { - setFacadeNames(new ArrayList<String>()); - } - if (!containsAllFacadeNames(toAdds)) { - super.addAllFacadeNames(toAdds); - } else { - for (String toAdd : toAdds) { - addFacadeNames(toAdd); - } - } - } - - @Override - public void addSectorsNames(String toAdd) { - if (toAdd == null) { - return; - } - if (getSectorsNames() == null) { - setSectorsNames(new ArrayList<String>()); - } - if (!containsSectorsNames(toAdd)) { - super.addSectorsNames(toAdd); - } - } - - @Override - public void addAllSectorsNames(Collection<String> toAdds) { - if (toAdds == null) { - return; - } - if (getSectorsNames() == null) { - setSectorsNames(new ArrayList<String>()); - } - if (!containsAllSectorsNames(toAdds)) { - super.addAllSectorsNames(toAdds); - } else { - for (String toAdd : toAdds) { - addSectorsNames(toAdd); - } - } - } - - @Override - public void addFishingGearDCFCodes(FishingGearDCF toAdd) { - if (toAdd == null) { - return; - } - if (getFishingGearDCFCodes() == null) { - setFishingGearDCFCodes(new ArrayList<FishingGearDCF>()); - } - if (!containsFishingGearDCFCodes(toAdd)) { - super.addFishingGearDCFCodes(toAdd); - } - } - - @Override - public void addAllFishingGearDCFCodes(Collection<FishingGearDCF> toAdds) { - if (toAdds == null) { - return; - } - if (getFishingGearDCFCodes() == null) { - setFishingGearDCFCodes(new ArrayList<FishingGearDCF>()); - } - if (!containsAllFishingGearDCFCodes(toAdds)) { - super.addAllFishingGearDCFCodes(toAdds); - } else { - for (FishingGearDCF toAdd : toAdds) { - addFishingGearDCFCodes(toAdd); - } - } - } - - @Override - public void addTargetSpeciesDCFCodes(TargetSpeciesDCF toAdd) { - if (toAdd == null) { - return; - } - if (getTargetSpeciesDCFCodes() == null) { - setTargetSpeciesDCFCodes(new ArrayList<TargetSpeciesDCF>()); - } - if (!containsTargetSpeciesDCFCodes(toAdd)) { - super.addTargetSpeciesDCFCodes(toAdd); - } - } - - @Override - public void addAllTargetSpeciesDCFCodes(Collection<TargetSpeciesDCF> toAdds) { - if (toAdds == null) { - return; - } - if (getTargetSpeciesDCFCodes() == null) { - setTargetSpeciesDCFCodes(new ArrayList<TargetSpeciesDCF>()); - } - if (!containsAllTargetSpeciesDCFCodes(toAdds)) { - super.addAllTargetSpeciesDCFCodes(toAdds); - } else { - for (TargetSpeciesDCF toAdd : toAdds) { - addTargetSpeciesDCFCodes(toAdd); - } - } - } - - @Override - public void addTerrestrialDistricts(TerrestrialLocation toAdd) { - if (toAdd == null) { - return; - } - if (getTerrestrialDistricts() == null) { - setTerrestrialDistricts(new ArrayList<TerrestrialLocation>()); - } - if (!containsTerrestrialDistricts(toAdd)) { - super.addTerrestrialDistricts(toAdd); - } - } - - @Override - public void addAllTerrestrialDistricts(Collection<TerrestrialLocation> toAdds) { - if (toAdds == null) { - return; - } - if (getTerrestrialDistricts() == null) { - setTerrestrialDistricts(new ArrayList<TerrestrialLocation>()); - } - if (!containsAllTerrestrialDistricts(toAdds)) { - super.addAllTerrestrialDistricts(toAdds); - } else { - for (TerrestrialLocation toAdd : toAdds) { - addTerrestrialDistricts(toAdd); - } - } - } - - @Override - public void addObservers(WaoUser toAdd) { - if (toAdd == null) { - return; - } - if (getObservers() == null) { - setObservers(new ArrayList<WaoUser>()); - } - if (!containsObservers(toAdd)) { - super.addObservers(toAdd); - } - } - - @Override - public void addAllObservers(Collection<WaoUser> toAdds) { - if (toAdds == null) { - return; - } - if (getObservers() == null) { - setObservers(new ArrayList<WaoUser>()); - } - if (!containsAllObservers(toAdds)) { - super.addAllObservers(toAdds); - } else { - for (WaoUser toAdd : toAdds) { - addObservers(toAdd); - } - } - } - - @Override - public void addObservationUnits(TerrestrialDivision toAdd) { - if (toAdd == null) { - return; - } - if (getObservationUnits() == null) { - setObservationUnits(new ArrayList<TerrestrialDivision>()); - } - if (!containsObservationUnits(toAdd)) { - super.addObservationUnits(toAdd); - } - } - - @Override - public void addSampleRows(SampleRow toAdd) { - if (toAdd == null) { - return; - } - if (getSampleRows() == null) { - setSampleRows(new ArrayList<SampleRow>()); - } - if (!containsSampleRows(toAdd)) { - super.addSampleRows(toAdd); - } - } - - @Override - public void addAllSampleRows(Collection<SampleRow> toAdds) { - if (toAdds == null) { - return; - } - if (getSampleRows() == null) { - setSampleRows(new ArrayList<SampleRow>()); - } - if (!containsAllSampleRows(toAdds)) { - super.addAllSampleRows(toAdds); - } else { - for (SampleRow toAdd : toAdds) { - addSampleRows(toAdd); - } - } - } - - @Override public List<Company> getCompaniesAsList() { return getAsList(getCompanies()); } @@ -441,10 +158,40 @@ addSampleRows(sampleRow); } + protected void clear() { + setCompanies(new HashSet<Company>()); + setPrograms(new HashSet<String>()); + setFacadeNames(new HashSet<String>()); + setSectorsNames(new HashSet<String>()); + setFishingGearDCFCodes(new HashSet<FishingGearDCF>()); + setTargetSpeciesDCFCodes(new HashSet<TargetSpeciesDCF>()); + setTerrestrialDistricts(new HashSet<TerrestrialLocation>()); + setSampleRows(new HashSet<SampleRow>()); + setObservers(new HashSet<WaoUser>()); + setObservationUnits(new HashSet<TerrestrialDivision>()); + } + + protected void removeNullValues() { + getCompanies().remove(null); + getPrograms().remove(null); + getFacadeNames().remove(null); + getSectorsNames().remove(null); + getFishingGearDCFCodes().remove(null); + getTargetSpeciesDCFCodes().remove(null); + getTerrestrialDistricts().remove(null); + getObservers().remove(null); + getObservationUnits().remove(null); + } + @Override public void fillSampleRows(List<SampleRow> sampleRows) { + + clear(); + for (SampleRow sampleRow : sampleRows) { fillSampleRow(sampleRow); } + + removeNullValues(); } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-23 16:43:46 UTC (rev 1292) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-24 16:55:13 UTC (rev 1293) @@ -101,7 +101,7 @@ */ public class ServiceBoatImpl extends ServiceBoatAbstract { - private static final Logger logger = + private static final Logger log = LoggerFactory.getLogger(ServiceBoatImpl.class); private WaoContext context; @@ -135,26 +135,44 @@ BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); WaoQueryBuilder builder = context.newQueryBuilder(); - builder.initializeForBoat(); + WaoQueryHelper.BoatProperty boatProperty = builder.initializeForBoat(); TopiaQuery query = builder.applyBoatFilter(filter); - query.addLoad(Boat.PROPERTY_ACTIVITY_CALENDAR); + query.addFetch( // boatProperty.activityCalendar(), + boatProperty.portOfRegistry(), + boatProperty.fleet(), + boatProperty.boatDistrict()); - if (logger.isDebugEnabled()) { - logger.debug("query to get boats by filter : " + query); + // join boat to sample rows through eligible boats + WaoQueryHelper.ElligibleBoatProperty eligibleBoatProperty = + WaoQueryHelper.newElligibleBoatProperty(); + + query.addLeftJoin(boatProperty.elligibleBoat(), + eligibleBoatProperty.$alias(), true); + + // load data for sample row: company, fishingZone, DCF5Code, profession + WaoQueryHelper.SampleRowProperty sampleRowProperty = + WaoQueryHelper.newSampleRowProperty(); + + query.addFetch( // XXX 20110524 bleny fetching those two data raise a + // 'cannot simultaneously fetch multiple bags' + // exception. Not fetching works but data will be lazily + // loaded and it costs performance in + // BoatFilterValues#fillBoats() + // + // sampleRowProperty.fishingZone(), + // sampleRowProperty.dCF5Code(), + sampleRowProperty.company(), + sampleRowProperty.profession()); + + if (log.isDebugEnabled()) { + log.debug("query to get boats by filter : " + query); } Map<Integer, Boat> results = dao.findAllMappedByQuery(query, Boat.PROPERTY_IMMATRICULATION, Integer.class); - if (filter.getObsProgram() == ObsProgram.OBSDEB) { - // force load - for (Boat boat : results.values()) { - boat.getPortOfRegistry(); - } - } - return results; } @@ -494,8 +512,8 @@ // Reset limit : no pagination needed for results query.resetLimit(); - if (logger.isDebugEnabled()) { - logger.debug("Exec query : " + query); + if (log.isDebugEnabled()) { + log.debug("Exec query : " + query); } List<Boat> boats = dao.findAllByQuery(query); @@ -594,7 +612,6 @@ @Override protected BoatFilterValues executeGetPossibleValuesForFilter(TopiaContext transaction, BoatFilter filter) throws Exception { - ServiceReferential serviceReferential = context.getServiceFactory().getServiceReferential(); ServiceSampling serviceSampling = context.getServiceFactory().getServiceSampling(); BoatFilterValues result = new BoatFilterValuesImpl(); @@ -604,43 +621,23 @@ filter.setStartIndex(null); filter.setEndIndex(null); - if (filter.isBoatFiltered() || filter.isSamplingFiltered()) { + // run the query and extract data + Map<Integer, Boat> indexedBoats = executeGetBoatsByFilter(transaction, filter); + List<Boat> boats = new ArrayList<Boat>(indexedBoats.values()); - // run the query and extract data - Map<Integer, Boat> indexedBoats = executeGetBoatsByFilter(transaction, filter); - List<Boat> boats = new ArrayList<Boat>(indexedBoats.values()); + // collect values + result.fillBoats(boats); - // collect values - result.fillBoats(boats); + if (filter.getObsProgram() == ObsProgram.OBSDEB) { + // in obsdeb, we don't consider boat eligibility and we + // cannot collect sample row, it would be too expensive, + // so we don't try to restrict the values et let all the sample + // rows - if (filter.getObsProgram() == ObsProgram.OBSDEB) { - // in obsdeb, we don't consider boat eligibility and we cannot collect - // sample row, it would be tee expensive, so we don't try to restrict - // the values et let all the sample rows - - SampleRow sampleRow = filter.getSampleRow(); - filter.setSampleRow(null); - result.setSampleRows(serviceSampling.getSampleRowsByFilter(filter)); - filter.setSampleRow(sampleRow); - } - - } else { - - // we can't run the query and browse thousand of boats so we - // fill with default values - - result.setFacadeNames(serviceReferential.getFacades(filter)); - result.setSectorsNames(serviceReferential.getSectors(filter)); - SampleRow sampleRow = filter.getSampleRow(); filter.setSampleRow(null); result.setSampleRows(serviceSampling.getSampleRowsByFilter(filter)); filter.setSampleRow(sampleRow); - - result.setPortsOfRegistry(serviceReferential.getAllPorts(null)); - - FleetDAO fleetDAO = WaoDAOHelper.getFleetDAO(transaction); - result.setFleets(fleetDAO.findAll()); } filter.setStartIndex(startIndex);

1 0

[Suiviobsmer-commits] r1292 - trunk/wao-business/src/main/java/fr/ifremer/wao/entity
by bleny＠users.labs.libre-entreprise.org 23 May '11

23 May '11

Author: bleny Date: 2011-05-23 16:43:46 +0000 (Mon, 23 May 2011) New Revision: 1292 Log: getObservationType deal with NPE Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 16:28:33 UTC (rev 1291) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 16:43:46 UTC (rev 1292) @@ -476,7 +476,11 @@ @Override public ObservationType getObservationType() { - return ObservationType.valueOf(getObservationTypeOrdinal()); + ObservationType observationType = null; + if (getObservationTypeOrdinal() != null) { + observationType = ObservationType.valueOf(getObservationTypeOrdinal()); + } + return observationType; } @Override

1 0

[Suiviobsmer-commits] r1291 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/io/csv2 wao-business/src/main/java/fr/ifremer/wao/io/csv2/models wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 23 May '11

23 May '11

Author: bleny Date: 2011-05-23 16:28:33 +0000 (Mon, 23 May 2011) New Revision: 1291 Log: fix sampling plan import ; fix delete contact and sample row Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.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/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -488,4 +488,15 @@ public boolean isFieldWorkObservation() { return ObservationType.FIELD_WORK_OBSERVATION.equals(getObservationType()); } + + @Override + public String toString() { + StringBuffer stringBuffer = new StringBuffer(); + stringBuffer.append(getCode()).append(" (").append(getObsProgram()); + if (getObservationType() != null) { + stringBuffer.append(", ").append(getObservationType().toString()); + } + stringBuffer.append(")"); + return stringBuffer.toString(); + } } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Common.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -161,13 +161,27 @@ } } - public static final ValueParserFormatter<Boolean> BOOLEAN = new ValueParserFormatter<Boolean>() { + public static class BooleanParserFormatter implements + ValueParserFormatter<Boolean> { + protected Boolean defaultValue; + protected Boolean nullAllowed; + + public BooleanParserFormatter(Boolean defaultValue, + boolean nullAllowed) { + this.defaultValue = defaultValue; + this.nullAllowed = nullAllowed; + } + @Override public String format(Boolean bool) { String value; if (bool == null) { - value = "?"; + if (nullAllowed) { + value = "?"; + } else { + throw new IllegalArgumentException(); + } } else if (bool) { value = "Y"; } else { @@ -179,7 +193,9 @@ @Override public Boolean parse(String value) throws ParseException { Boolean result; - if (StringUtils.isBlank(value) || "?".equals(value)) { + if (StringUtils.isBlank(value)) { + result = defaultValue; + } else if ("?".equals(value)) { result = null; } else if ("Y".equals(value)) { result = true; @@ -188,10 +204,17 @@ } else { result = Boolean.parseBoolean(value); } + + if (result == null && ! nullAllowed) { + throw new IllegalArgumentException(); + } return result; } - }; + } + public static final ValueParserFormatter<Boolean> BOOLEAN = + new BooleanParserFormatter(null, true); + public static final ValueParserFormatter<Date> DAY = new DateValue("dd/MM/yyyy"); public static final ValueParserFormatter<Date> DAY_TIME = new DateValue("dd/MM/yyyy HH:mm"); Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/Import.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -223,7 +223,14 @@ try { field.setValue(element, parsedValue); } catch (Exception e) { - throw new RuntimeException(WaoUtils._("csv.import.error.unableToSetValue", parsedValue, element.toString(), lineNumber), e); + String message = WaoUtils._("csv.import.error.unableToSetValue", + parsedValue, + element.toString(), + lineNumber, field.getHeaderName()); + if (log.isErrorEnabled()) { + log.error(message); + } + throw new RuntimeException(message, e); } time = timeLog.log(time, "setValue"); 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-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -207,22 +207,51 @@ protected void buildModel() { modelBuilder = new ModelBuilder<SampleRow>(); - modelBuilder.newColumnForImportExport("PLAN_CODE", SampleRow.PROPERTY_CODE); + modelBuilder.newColumnForImportExport( + "PLAN_CODE", + SampleRow.PROPERTY_CODE); if (connectedUser.isAdmin()) { - modelBuilder.newColumnForImportExport("SOCIETE", SampleRow.PROPERTY_COMPANY, new CompanyParserFormatter(allCompanies)); + modelBuilder.newColumnForImportExport( + "SOCIETE", + SampleRow.PROPERTY_COMPANY, + new CompanyParserFormatter(allCompanies)); } - modelBuilder.newColumnForImportExport("OBSERVATEUR_COD", SampleRow.PROPERTY_GROUP_NAME); - modelBuilder.newColumnForImportExport("OBSERVATEURS", SampleRow.PROPERTY_OBSERVERS, new UsersParserFormatter(allWaoUsers)); + modelBuilder.newColumnForImportExport( + "OBSERVATEUR_COD", + SampleRow.PROPERTY_GROUP_NAME); + modelBuilder.newColumnForImportExport( + "OBSERVATEURS", + SampleRow.PROPERTY_OBSERVERS, + new UsersParserFormatter(allWaoUsers)); if (observationType == ObservationType.FIELD_WORK_OBSERVATION) { - 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); - modelBuilder.newColumnForImportExport(OBSERVATION_UNIT_HEADER_NAME, SampleRow.PROPERTY_OBSERVATION_UNIT, observationUnitParser); - modelBuilder.newColumnForImportExport("LIGNE_SANS_CONTACTS", SampleRow.PROPERTY_BLANK_ROW, Common.BOOLEAN); + 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); + modelBuilder.newColumnForImportExport( + OBSERVATION_UNIT_HEADER_NAME, + SampleRow.PROPERTY_OBSERVATION_UNIT, + observationUnitParser); + modelBuilder.newColumnForImportExport( + "LIGNE_SANS_CONTACTS", + SampleRow.PROPERTY_BLANK_ROW, + new Common.BooleanParserFormatter(false, false)); } else if (observationType == ObservationType.PHONE_CALL) { - modelBuilder.newColumnForImportExport("OBSERVATION_DATE", SampleRow.PROPERTY_EXPECTED_DATE, Common.WEEK); - modelBuilder.newColumnForImportExport(BOAT_HEADER_NAME, SampleRow.PROPERTY_BOAT, new BoatParserFormatter(allActiveBoats)); + modelBuilder.newColumnForImportExport( + "OBSERVATION_DATE", + SampleRow.PROPERTY_EXPECTED_DATE, + Common.WEEK); + modelBuilder.newColumnForImportExport( + BOAT_HEADER_NAME, + SampleRow.PROPERTY_BOAT, + new BoatParserFormatter(allActiveBoats)); } if (log.isDebugEnabled()) { log.debug("model built : " + modelBuilder.getColumnsForImport()); 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-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -970,7 +970,9 @@ if (delete) { // Need to decrement estimated value if contactFound has // OBSERVATION_DONE state and may be real value (normally not allowed) - updateSampleMonthTidesValue(transaction, contactFound, null, true); + if (contactFound.getObsProgram() != ObsProgram.OBSDEB) { + updateSampleMonthTidesValue(transaction, contactFound, null, true); + } // Execute delete dao.delete(contactFound); 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-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -581,6 +581,7 @@ TopiaContext transaction, SamplingFilter filter) throws TopiaException { + String orderByClause = filter.getOrderBy(); if (filter.getObsProgram() == ObsProgram.OBSDEB) { // in ObsDeb, ordering is done by date of action filter.setOrderBy(SampleRow.PROPERTY_EXPECTED_DATE); @@ -634,6 +635,8 @@ + " returns " + rows.size() + " lines."); } + filter.setOrderBy(orderByClause); + return rows; } Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-05-23 16:28:33 UTC (rev 1291) @@ -48,7 +48,7 @@ csv.import.error.unableToParseValue=Unable to parse value '%s' (column '%s', line %s) csv.import.error.unableToReadField=Unable to read value of column '%s' at line %s csv.import.error.unableToReadLine=Unable to read line %s -csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s) +csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s, column '%s') csv.import.error.unrecognizedHeaders=Fields %s are not recognized. Accepted fields are %s. csv.import.logComment=Edited through import fr.ifremer.wao.entity.FishingGearDCF.=Not specified Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-05-23 16:28:33 UTC (rev 1291) @@ -48,7 +48,7 @@ csv.import.error.unableToParseValue=Erreur lors de l'interprétation de la valeur '%s' (colonne '%s', ligne %s) csv.import.error.unableToReadField=Impossible de lire la colonne '%s' à la ligne %s csv.import.error.unableToReadLine=Impossible de lire la ligne %s -csv.import.error.unableToSetValue=Impossible d'enregistrer la valeur '%s' (entité '%s', ligne %s) +csv.import.error.unableToSetValue=Impossible d'enregistrer la valeur '%s' (entité '%s', ligne %s, column '%s') csv.import.error.unrecognizedHeaders=Les champs %s ne sont pas reconnus. Les champs possibles sont %s. csv.import.logComment=Modification depuis import fr.ifremer.wao.entity.FishingGearDCF.=Non spécifié Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-05-23 16:28:33 UTC (rev 1291) @@ -185,6 +185,7 @@ } protected void setObservationType(ObservationType observationType) { + samplingFilter.resetFilter(); samplingFilter.getFilter().setExpectedObservationType(observationType); } @@ -262,7 +263,10 @@ @Log public void onActionFromDeleteSampleRow(String sampleRowId) throws WaoBusinessException { - SampleRow sampleRow = getSampleRows().get(sampleRowId); + SampleRow sampleRow = serviceSampling.getSampleRow(sampleRowId); + if (sampleRow == null) { + throw new IllegalStateException(); + } serviceSampling.deleteSampleRow(sampleRow); } Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-23 13:20:25 UTC (rev 1290) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-23 16:28:33 UTC (rev 1291) @@ -60,11 +60,13 @@ </li> </t:unless> <t:unless test="connectedUser.admin"> - <li> - <a t:type="pagelink" t:page="roadMap" t:context="connectedUser.token"> - ${message:wao.ui.misc.iCalendarExport} - </a> - </li> + <t:if t:test="showFieldWorkSamplingPlan()"> + <li> + <a t:type="pagelink" t:page="roadMap" t:context="connectedUser.token"> + ${message:wao.ui.misc.iCalendarExport} + </a> + </li> + </t:if> </t:unless> </ul>

1 0

[Suiviobsmer-commits] r1290 - in trunk/wao-business/src: main/java/fr/ifremer/wao/io/csv2/models test/java/fr/ifremer/wao/service
by bleny＠users.labs.libre-entreprise.org 23 May '11

23 May '11

Author: bleny Date: 2011-05-23 13:20:25 +0000 (Mon, 23 May 2011) New Revision: 1290 Log: code style ; add test for synthesis Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 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-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/SamplingPlanImportExportModel.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -81,11 +81,12 @@ indexedObservationUnits.put(regionCode, unitCodesToDivision); } - if (log.isDebugEnabled()) { + if (log.isTraceEnabled()) { for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { - log.debug(entry.getKey()); + log.trace(entry.getKey()); for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { - log.debug(" -> " + unitCodesToDivision.getKey() + " -> " + unitCodesToDivision.getValue()); + log.trace(" -> " + unitCodesToDivision.getKey() + " -> " + + unitCodesToDivision.getValue()); } } } 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-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -23,7 +23,6 @@ */ package fr.ifremer.wao.service; -import fr.ifremer.wao.AbstractServiceTest; import fr.ifremer.wao.TestManager; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.bean.BoatFilter; @@ -555,5 +554,10 @@ log.debug(contactStateStatistic.getCompanyName() + " -> " + contactStateStatistic.getData()); } + ContactStateStatistics contactStateStatistic = contactStateStatistics. + iterator().next(); + Assert.assertEquals("Code Lutin", contactStateStatistic.getCompanyName()); + Assert.assertEquals(2, contactStateStatistic.getData().get + (ContactState.OBSERVATION_DONE).intValue()); } } Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-05-23 09:44:39 UTC (rev 1289) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ServiceSamplingImplTest.java 2011-05-23 13:20:25 UTC (rev 1290) @@ -257,9 +257,8 @@ public void testGetSampleRowsOrderedByFishingZone() throws Exception { log.info("getSampleRowsOrderedByFishingZone"); + /** PREPARE DATA **/ - /** PREPARE DATA **/ - TopiaContext transaction = manager.getContext().beginTransaction(); List<FishingZone> zones = prepareFishingZones(transaction); @@ -527,15 +526,16 @@ ConnectedUser connectedUser = getConnectedUser(observer, UserRole.OBSERVER, ObsProgram.OBSMER); manager.getServiceContact().saveContact(connectedUser, contact, false); - boolean errorCatched = false; try { serviceSampling.deleteSampleRow(row); - Assert.fail(); + Assert.fail("deleting a sample-row with associated contact should" + + " not be permitted"); } catch (WaoBusinessException eee) { - log.debug("Business error", eee); - errorCatched = true; + if (log.isTraceEnabled()) { + log.trace("exception raised while trying to delete sample row", + eee); + } } - Assert.assertTrue(errorCatched); } @Test

1 0

[Suiviobsmer-commits] r1289 - in trunk: wao-business/src/main/java/fr/ifremer/wao/bean wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/test/java/fr/ifremer/wao/service wao-ui/src/main/java/fr/ifremer/wao/ui/components wao-ui/src/main/resources/fr/ifremer/wao/ui/components wao-ui/src/main/resources/i18n wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 23 May '11

23 May '11

Author: bleny Date: 2011-05-23 09:44:39 +0000 (Mon, 23 May 2011) New Revision: 1289 Log: add ContactStatesStatistics synthesis for ObsDeb Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/Synthesis.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/SamplingFilterValuesImpl.java 2011-05-23 09:44:39 UTC (rev 1289) @@ -31,7 +31,6 @@ import fr.ifremer.wao.entity.TerrestrialDivision; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.WaoUser; -import org.apache.commons.collections.OrderedMap; import java.util.ArrayList; import java.util.Collection; 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-20 09:13:43 UTC (rev 1288) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-23 09:44:39 UTC (rev 1289) @@ -581,6 +581,11 @@ TopiaContext transaction, SamplingFilter filter) throws TopiaException { + if (filter.getObsProgram() == ObsProgram.OBSDEB) { + // in ObsDeb, ordering is done by date of action + filter.setOrderBy(SampleRow.PROPERTY_EXPECTED_DATE); + } + SampleRowDAO dao = WaoDAOHelper.getSampleRowDAO(transaction); // TopiaQuery query = dao.createQuery("S"). @@ -1517,11 +1522,6 @@ samplingFilter.setSampleRowObserver(connectedUser.getUser()); } - if (connectedUser.isObsDeb()) { - // in ObsDeb, ordering is done by date of action - samplingFilter.setOrderBy(SampleRow.PROPERTY_EXPECTED_DATE); - } - return samplingFilter; } 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 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2011-05-23 09:44:39 UTC (rev 1289) @@ -530,6 +530,8 @@ (TopiaContext transaction, SamplingFilter filter) throws TopiaException { + filter.setOrderBy(null); + WaoQueryBuilder builder = context.newQueryBuilder(); ContactProperty contactProperty = builder.initializeForContact(); TopiaQuery query = builder.applySamplingFilter(filter). 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-20 09:13:43 UTC (rev 1288) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/service/ObsDebTest.java 2011-05-23 09:44:39 UTC (rev 1289) @@ -30,6 +30,7 @@ import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ContactFilter; import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.bean.ContactStateStatistics; import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterValues; @@ -55,6 +56,7 @@ import java.io.IOException; import java.io.InputStream; +import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; @@ -283,6 +285,7 @@ // as a coordinator, i can export the sampling plan SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); + samplingFilter.setExpectedObservationType(ObservationType.FIELD_WORK_OBSERVATION); InputStream input = serviceSampling.exportSamplingPlanCsv(fixtures.joshAsCoordinator(), samplingFilter); String csv = IOUtils.toString(input); @@ -529,14 +532,28 @@ // TODO 20110426 bleny consider validation company and validation program when counting SamplingFilter samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); - Map<String, Map<String, Integer>> observationHours = serviceSynthesis.getObservationHours(samplingFilter); + Map<String, Map<String, Integer>> observationHours = + serviceSynthesis.getObservationHours(samplingFilter); Assert.assertEquals(2, observationHours.get("2010").get("09").intValue()); - Assert.assertEquals("24 values associated with '2010', one for each hour of the day", 24, observationHours.get("2010").size()); + Assert.assertEquals("24 values associated with '2010', one for each hour of the day", + 24, observationHours.get("2010").size()); samplingFilter = serviceSampling.newSamplingFilter(fixtures.joshAsCoordinator()); - Map<String, Map<String, Integer>> boatsCounts = serviceSynthesis.getDistinctBoatsCounts(samplingFilter); - Assert.assertEquals("Two distinct boats observed on February 2010", 2, boatsCounts.get("2010").get("02").intValue()); - Assert.assertEquals("12 values for must be associated to '2010', one for each month", 12, boatsCounts.get("2010").size()); + Map<String, Map<String, Integer>> boatsCounts = + serviceSynthesis.getDistinctBoatsCounts(samplingFilter); + Assert.assertEquals("Two distinct boats observed on February 2010", + 2, boatsCounts.get("2010").get("02").intValue()); + Assert.assertEquals("12 values for must be associated to '2010', one for each month", + 12, boatsCounts.get("2010").size()); + + samplingFilter = serviceSampling. + newSamplingFilter(fixtures.joshAsCoordinator()); + Collection<ContactStateStatistics> contactStateStatistics = + serviceSynthesis.getContactStateStatistics(samplingFilter); + for (ContactStateStatistics contactStateStatistic : contactStateStatistics) { + log.debug(contactStateStatistic.getCompanyName() + " -> " + + contactStateStatistic.getData()); + } } } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/components/SamplingFilterComponent.java 2011-05-23 09:44:39 UTC (rev 1289) @@ -23,6 +23,7 @@ */ package fr.ifremer.wao.ui.components; +import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.SamplingFilterValues; import fr.ifremer.wao.service.ServiceSampling; @@ -32,6 +33,9 @@ import org.apache.tapestry5.annotations.Persist; import org.apache.tapestry5.internal.OptionModelImpl; import org.apache.tapestry5.internal.SelectModelImpl; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.util.EnumSelectModel; import org.nuiton.util.PeriodDates; import java.util.ArrayList; @@ -44,6 +48,9 @@ public class SamplingFilterComponent extends FilterComponent<SamplingFilter> { @Parameter(required = false) + private Boolean showObservationTypes; + + @Parameter(required = false) private Boolean showEstimatedTides; @Parameter(required = true) @@ -55,6 +62,9 @@ @Parameter(required = true) private ServiceSampling serviceSampling; + @Inject + private Messages messages; + /* * Datas */ @@ -131,6 +141,13 @@ return showEstimatedTides; } + public Boolean getShowObservationTypes() { + if (showObservationTypes == null) { + showObservationTypes = true; + } + return showObservationTypes; + } + public String getLegendMsg() { return legendMsg; } @@ -192,4 +209,13 @@ } return regionIfremerSelectModel; } + + public SelectModel getObservationTypeSelectModel() { + ObservationType[] allowedObservationTypes = { + ObservationType.FIELD_WORK_OBSERVATION, + ObservationType.PHONE_CALL }; + EnumSelectModel selectModel = new EnumSelectModel(ObservationType.class, + messages, allowedObservationTypes); + return selectModel; + } } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-05-23 09:44:39 UTC (rev 1289) @@ -73,6 +73,13 @@ </div> <t:if test="user.obsDeb">  + <t:if t:test="showObservationTypes"> + <label for="observationType">${message:wao.ui.field.SampleRow.observationType}</label> + <input t:type="select" + t:id="observationType" + t:value="filter.expectedObservationType" + t:model="observationTypeSelectModel" /> + </t:if> <label for="regionIfremer">${message:wao.ui.field.TerrestrialDivision.regionIfremer}</label> <t:select t:id="regionIfremer" t:model="regionIfremerSelectModel" Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties 2011-05-23 09:44:39 UTC (rev 1289) @@ -127,6 +127,7 @@ wao.ui.field.SampleRow.fishingZones=Fishing zone(s) wao.ui.field.SampleRow.libelle=Labels wao.ui.field.SampleRow.meshSize=Mesh size +wao.ui.field.SampleRow.observationType=Observation type wao.ui.field.SampleRow.observationUnit=Observation unit wao.ui.field.SampleRow.observers=Observers wao.ui.field.SampleRow.other=Other Modified: trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties =================================================================== --- trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties 2011-05-23 09:44:39 UTC (rev 1289) @@ -126,6 +126,7 @@ wao.ui.field.SampleRow.fishingZones=Zone(s) de pêche wao.ui.field.SampleRow.libelle=Libellé wao.ui.field.SampleRow.meshSize=Maillage +wao.ui.field.SampleRow.observationType=Type d'observation wao.ui.field.SampleRow.observationUnit=Unité d'observation wao.ui.field.SampleRow.observers=Observateurs wao.ui.field.SampleRow.other=Autre Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-05-23 09:44:39 UTC (rev 1289) @@ -79,7 +79,8 @@ t:user="connectedUser" t:serviceSampling="serviceSampling" t:visibleOnStartup="false" - t:legendMsg="${message:wao.ui.misc.advancedSearch}" /> + t:legendMsg="${message:wao.ui.misc.advancedSearch}" + t:showObservationTypes="false" /> <div t:type="grid" Modified: trunk/wao-ui/src/main/webapp/Synthesis.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-05-20 09:13:43 UTC (rev 1288) +++ trunk/wao-ui/src/main/webapp/Synthesis.tml 2011-05-23 09:44:39 UTC (rev 1289) @@ -92,14 +92,14 @@ </a> </li> </t:if> - <li> - <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_CONTACT_STATE}"> - <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="${message:SynthesisId.IND_CONTACT_STATE}" /> - </a> - </li> </t:unless> </p:else> </t:if> + <li> + <a t:type="actionlink" t:context="[actionSynthesisId,'IND_CONTACT_STATE']" t:zone="so-synthesis-main" title="${message:SynthesisId.IND_CONTACT_STATE}"> + <img src="${asset:context:}/img/synthesis-ind-contact-states.png" alt="${message:SynthesisId.IND_CONTACT_STATE}" /> + </a> + </li> </ul> </div> <div t:type="zone" t:id="delegator" class="fleft" t:update="show" id="so-synthesis-main">

1 0

[Suiviobsmer-commits] r1288 - trunk/wao-business/src/main/java/fr/ifremer/wao/bean
by bleny＠users.labs.libre-entreprise.org 20 May '11

20 May '11

Author: bleny Date: 2011-05-20 09:13:43 +0000 (Fri, 20 May 2011) New Revision: 1288 Log: update isBoatFiltered with new fields Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2011-05-19 14:49:04 UTC (rev 1287) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/bean/BoatFilterImpl.java 2011-05-20 09:13:43 UTC (rev 1288) @@ -41,6 +41,7 @@ StringUtils.isNotEmpty(getBoatDistrictCode()) || StringUtils.isNotEmpty(getShipOwnerName()) || getBoatImmatriculation() != null || - getPortOfRegistry() != null; + getPortOfRegistry() != null || + getFleet() != null; } }

1 0

[Suiviobsmer-commits] r1287 - trunk/wao-business/src/main/java/fr/ifremer/wao
by bleny＠users.labs.libre-entreprise.org 19 May '11

19 May '11

Author: bleny Date: 2011-05-19 14:49:04 +0000 (Thu, 19 May 2011) New Revision: 1287 Log: add filter on sample row in boats for row of type phone call Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 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-17 16:36:33 UTC (rev 1286) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoQueryBuilder.java 2011-05-19 14:49:04 UTC (rev 1287) @@ -25,6 +25,7 @@ import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.DataReliability; import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.SamplingFilter; import fr.ifremer.wao.bean.UserFilter; import fr.ifremer.wao.entity.Company; @@ -497,22 +498,39 @@ if (filter.getObsProgram() == ObsProgram.OBSDEB) { if (filter.getSampleRow() != null) { - String observationUnitCode = filter.getSampleRow().getObservationUnit().getObservationUnitCode(); + if (filter.getSampleRow().isFieldWorkObservation()) { - WaoQueryHelper.TerrestrialDivisionProperty subTerrestrialDivisionProperty = - WaoQueryHelper.newTerrestrialDivisionProperty("TD2"); + // We will filter according to terrestrial division, + // the sample row is associated to a terrestrial + // division, the division contains multiple ports so + // we want all the boats having a port of registry in + // this observation unit - TopiaQuery subquery = WaoQueryHelper.createQuery(subTerrestrialDivisionProperty). - setSelect(subTerrestrialDivisionProperty.portProperty().topiaId()). - addEquals(subTerrestrialDivisionProperty.observationUnitCode(), observationUnitCode); + String observationUnitCode = filter.getSampleRow().getObservationUnit().getObservationUnitCode(); - if (logger.isDebugEnabled()) { - logger.debug("subquery to find ports given an observation unit code: " + subquery); - } + WaoQueryHelper.TerrestrialDivisionProperty subTerrestrialDivisionProperty = + WaoQueryHelper.newTerrestrialDivisionProperty("TD2"); - query.addSubQuery(WaoQueryHelper.format( - "$1 IN (?)", boatProperty.portOfRegistryProperty().topiaId()), subquery); + TopiaQuery subquery = WaoQueryHelper.createQuery(subTerrestrialDivisionProperty). + setSelect(subTerrestrialDivisionProperty.portProperty().topiaId()). + addEquals(subTerrestrialDivisionProperty.observationUnitCode(), observationUnitCode); + if (logger.isDebugEnabled()) { + logger.debug("subquery to find ports given an observation unit code: " + subquery); + } + + query.addSubQuery(WaoQueryHelper.format( + "$1 IN (?)", boatProperty.portOfRegistryProperty().topiaId()), subquery); + + } else if (filter.getSampleRow().isPhoneCall()) { + // We will filter according to the fleet of the + // sample row, we want to get all the boats we can + // found in the same fleet as the boat associated to the + // sample row + query.addEquals(boatProperty.fleet(), + filter.getSampleRow().getBoat() + .getFleet()); + } } } else { applySamplingFilter(filter);

1 0

[Suiviobsmer-commits] r1286 - in trunk: wao-business/src/main/java/fr/ifremer/wao/entity wao-business/src/main/java/fr/ifremer/wao/service wao-business/src/main/resources/i18n wao-business/src/main/xmi wao-ui/src/main/java/fr/ifremer/wao/ui/pages wao-ui/src/main/webapp
by bleny＠users.labs.libre-entreprise.org 17 May '11

17 May '11

Author: bleny Date: 2011-05-17 16:36:33 +0000 (Tue, 17 May 2011) New Revision: 1286 Log: update SampleRowForm to allow modification of sample row for phone call (week in date selection, boat, no observation unit) Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/SampleRowForm.tml Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -142,6 +142,11 @@ } @Override + public String getDescription() { + return getImmatriculation() + " - " + getName(); + } + + @Override public String toString() { return getName() + " (" + getImmatriculation() + ")"; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -478,4 +478,14 @@ public ObservationType getObservationType() { return ObservationType.valueOf(getObservationTypeOrdinal()); } + + @Override + public boolean isPhoneCall() { + return ObservationType.PHONE_CALL.equals(getObservationType()); + } + + @Override + public boolean isFieldWorkObservation() { + return ObservationType.FIELD_WORK_OBSERVATION.equals(getObservationType()); + } } 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-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -469,6 +469,15 @@ } } + protected void compareBoats() { + if (oldRow == null || oldRow.getBoat() == null) { + addChange("Le navire associé est " + newRow.getBoat().getDescription()); + } else if ( ! newRow.getBoat().equals(oldRow.getBoat())) { + addChange("Le navire associé passe de '" + oldRow.getBoat().getDescription() + + " à " + newRow.getBoat().getDescription()); + } + } + private void compareBlankRows() { if (oldRow == null || oldRow.isBlankRow() != newRow.isBlankRow()) { if (newRow.isBlankRow()) { @@ -524,7 +533,11 @@ } if (ObsProgram.OBSDEB.equals(obsProgram)) { compareDays(); - compareObservationUnits(); + if (newRow.isPhoneCall()) { + compareBoats(); + } else { + compareObservationUnits(); + } compareObservers(); compareBlankRows(); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -668,4 +668,11 @@ return boatFilter; } + + @Override + protected List<Boat> executeGetAllActiveBoats(TopiaContext transaction) throws Exception { + BoatDAO dao = WaoDAOHelper.getBoatDAO(transaction); + List<Boat> boats = dao.findAllByActive(true); + return boats; + } } 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-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -817,7 +817,9 @@ } @Override - protected SampleRow executeNewOperation(TopiaContext transaction, ConnectedUser connectedUser, ObservationType observationType) { + protected SampleRow executeNewSampleRow(TopiaContext transaction, + ConnectedUser connectedUser, + ObservationType observationType) { SampleRow newSampleRow = executeNewSampleRow(connectedUser); newSampleRow.setObservationType(observationType); return newSampleRow; Modified: trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/resources/i18n/wao-business_en_GB.properties 2011-05-17 16:36:33 UTC (rev 1286) @@ -150,6 +150,7 @@ wao.error.serviceBoat.exportBoatCsv= wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= +wao.error.serviceBoat.getAllActiveBoats= wao.error.serviceBoat.getBoat= wao.error.serviceBoat.getBoatNamesStartWith= wao.error.serviceBoat.getBoatsByFilter= Modified: trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-business/src/main/resources/i18n/wao-business_fr_FR.properties 2011-05-17 16:36:33 UTC (rev 1286) @@ -150,6 +150,7 @@ wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires sélectionnés wao.error.serviceBoat.getActivityCalendarLogAccessFile= wao.error.serviceBoat.getActivityCalendarLogFile= +wao.error.serviceBoat.getAllActiveBoats= wao.error.serviceBoat.getBoat=Impossible de charger le navire wao.error.serviceBoat.getBoatNamesStartWith=Impossible de récupérer les navires avec un nom commencant par '%1$s' wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) 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 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ContactForm.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -26,6 +26,7 @@ import fr.ifremer.wao.bean.ContactFilterImpl; import fr.ifremer.wao.bean.ContactState; import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.bean.UserRole; import fr.ifremer.wao.bean.ValidationResult; import fr.ifremer.wao.entity.Contact; @@ -236,6 +237,18 @@ return result; } + public SelectModel getObservationTypeSelectModel() { + EnumSelectModel selectModel = null; + if (getContact().getSampleRow().isFieldWorkObservation()) { + ObservationType[] allowedObservationTypes = { + ObservationType.FIELD_WORK_OBSERVATION, + ObservationType.FIELD_WORK_SURVEY }; + selectModel = new EnumSelectModel(ObservationType.class, messages, + allowedObservationTypes); + } + return selectModel; + } + @Inject private ServiceReferential serviceReferential; Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/SampleRowForm.java 2011-05-17 16:36:33 UTC (rev 1286) @@ -26,6 +26,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoException; +import fr.ifremer.wao.bean.BoatFilter; import fr.ifremer.wao.bean.ConnectedUser; import fr.ifremer.wao.bean.ObsProgram; import fr.ifremer.wao.bean.SamplingFilter; @@ -79,6 +80,7 @@ import org.apache.tapestry5.ioc.services.PropertyAccess; import org.apache.tapestry5.services.BeanModelSource; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.DateUtil; import org.nuiton.util.PeriodDates; import org.nuiton.util.StringUtil; import org.slf4j.Logger; @@ -553,6 +555,17 @@ /************** OBSDEB ***********/ + /** get the format of date needed to fill the value of SampleRow#expectedDate */ + public String getExpectedDateFormat() { + String expectedDateFormat; + if (getSampleRow().isPhoneCall()) { + expectedDateFormat = "w/yyyy"; + } else { + expectedDateFormat = "dd/MM/yyyy"; + } + return expectedDateFormat; + } + public List<WaoUser> getObservers() { List<WaoUser> observers = serviceUser.getObservers(getSampleRow().getCompany(), true); return observers; @@ -563,6 +576,11 @@ return observationUnits; } + public List<Boat> getBoats() { + List<Boat> boats = serviceBoat.getAllActiveBoats(); + return boats; + } + /*************************** SAMPLE ROW ***********************************/ private String sampleRowId; Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-05-17 16:36:33 UTC (rev 1286) @@ -224,13 +224,16 @@ <t:block id="editObservationReport"> <t:if test="connectedUser.obsdeb"> - <div> - <label for="observationType">${message:wao.ui.field.Contact.observationType}</label> - <input t:type="select" - t:id="observationType" - t:value="contact.observationType" - t:validate="required" /> - </div> + <t:if test="observationTypeSelectModel"> + <div> + <label for="observationType">${message:wao.ui.field.Contact.observationType}</label> + <input t:type="select" + t:id="observationType" + t:value="contact.observationType" + t:model="observationTypeSelectModel" + t:validate="required" /> + </div> + </t:if> </t:if> <div> <label for="contactState">${message:wao.ui.field.Contact.contactState}</label> Modified: trunk/wao-ui/src/main/webapp/SampleRowForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-05-17 14:33:43 UTC (rev 1285) +++ trunk/wao-ui/src/main/webapp/SampleRowForm.tml 2011-05-17 16:36:33 UTC (rev 1286) @@ -56,21 +56,7 @@ t:selectedValue="sampleRow.company" /> </div> </t:if> - <div class="t-beaneditor-row"> - <label for="expectedDate">${message:wao.ui.field.SampleRow.expectedDate}</label> - <input t:type="datefield" t:id="expectedDate" class="date" value="sampleRow.expectedDate" /> - </div> <div class="acenter"> - <label for="observationUnit">${message:wao.ui.field.SampleRow.observationUnit}</label> - </div> - <div class="acenter"> - <t:topiaEntitySelector t:id="observationUnit" - t:clazzName="TerrestrialDivision" - t:labelPropertyName="description" - t:values="observationUnits" - t:selectedValue="sampleRow.observationUnit" /> - </div> - <div class="acenter"> <label for="observers">${message:wao.ui.field.SampleRow.observers}</label> </div> <div class="acenter"> @@ -82,6 +68,34 @@ t:selectedValues="sampleRow.observers" size="6"/> </div> + <div class="t-beaneditor-row"> + <label for="expectedDate">${message:wao.ui.field.SampleRow.expectedDate}</label> + <input t:type="datefield" + t:id="expectedDate" + t:format="${expectedDateFormat}" + class="date" + value="sampleRow.expectedDate" /> + </div> + <t:if test="sampleRow.phoneCall"> + <label for="boat">${message:wao.ui.field.SampleRow.boat}</label> + <t:topiaEntitySelector t:id="boat" + t:clazzName="Boat" + t:labelPropertyName="description" + t:values="boats" + t:selectedValue="sampleRow.boat" /> + </t:if> + <t:if test="sampleRow.fieldWorkObservation"> + <div class="acenter"> + <label for="observationUnit">${message:wao.ui.field.SampleRow.observationUnit}</label> + </div> + <div class="acenter"> + <t:topiaEntitySelector t:id="observationUnit" + t:clazzName="TerrestrialDivision" + t:labelPropertyName="description" + t:values="observationUnits" + t:selectedValue="sampleRow.observationUnit" /> + </div> + </t:if> </fieldset> </t:unless> </t:block>

1 0