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

r2185 - in trunk: wao-persistence/src/main/resources wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-web/src/main/resources/i18n
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 18:45:18 +0200 (Tue, 29 Jul 2014) New Revision: 2185 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2185 Log: fixes #4481 migrate schema to pass hibernate validation Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/resources/wao.properties trunk/wao-persistence/src/main/xmi/wao-model.properties trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:45:18 UTC (rev 2185) @@ -146,3 +146,6 @@ ALTER TABLE BoatInfos ALTER COLUMN contactPostalCode TYPE TEXT; ALTER TABLE Company ALTER COLUMN postalCode TYPE TEXT; +-- On corrige les erreurs de validation du schéma indiquées par hibernate + +ALTER TABLE SampleRow ALTER COLUMN averageObservationsCount TYPE integer; Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -34,6 +34,8 @@ hibernate.c3p0.timeout=1800 hibernate.c3p0.max_statements=50 +hibernate.hbm2ddl.auto=validate + # hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory Modified: trunk/wao-persistence/src/main/xmi/wao-model.properties =================================================================== --- trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-persistence/src/main/xmi/wao-model.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -22,6 +22,7 @@ # #L% ### model.tagValue.version=4.1 +model.tagValue.useEnumerationName=true # orderBy tagValues fr.ifremer.wao.entity.SampleRow.attribute.sampleMonth.tagValue.orderBy=periodDate Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -137,9 +137,9 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Create a contact for this boat and sample row %s (%s) wao.ui.contacts.district=Boat District Code wao.ui.contacts.division=Fishing Zone Division -wao.ui.contacts.registrationCode=Boat registration code wao.ui.contacts.observations=Mammals wao.ui.contacts.observers=Main observer +wao.ui.contacts.registrationCode=Boat registration code wao.ui.contacts.title=%s contacts found wao.ui.contacts.validation=Validation wao.ui.contacts.validation.failure=An error occurs %s @@ -169,9 +169,9 @@ wao.ui.field.Boat.district.long=Boat district for boat wao.ui.field.Boat.districtCode=District oode wao.ui.field.Boat.fleet=Fleet -wao.ui.field.Boat.registrationCode=Registration number wao.ui.field.Boat.name=Name wao.ui.field.Boat.portOfRegistry=Port of registry +wao.ui.field.Boat.registrationCode=Registration number wao.ui.field.Boat.shipOwner=Shipowner wao.ui.field.BoatDistrict.code=District code wao.ui.field.BoatInfos.comment=Comment Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 16:17:29 UTC (rev 2184) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 16:45:18 UTC (rev 2185) @@ -138,9 +138,9 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Créer un nouveau contact avec ce navire pour la ligne %s (%s) wao.ui.contacts.district=CQ wao.ui.contacts.division=Division -wao.ui.contacts.registrationCode=N° wao.ui.contacts.observations=Observations et captures accidentelles wao.ui.contacts.observers=Observateurs +wao.ui.contacts.registrationCode=N° wao.ui.contacts.title=%s contacts trouvés wao.ui.contacts.validation=Validations wao.ui.contacts.validation.failure=Une erreur est survenue %s @@ -170,9 +170,9 @@ wao.ui.field.Boat.district.long=Quartier maritime du navire wao.ui.field.Boat.districtCode=Code quartier wao.ui.field.Boat.fleet=Flotille -wao.ui.field.Boat.registrationCode=Immatriculation wao.ui.field.Boat.name=Nom wao.ui.field.Boat.portOfRegistry=Port d'attache +wao.ui.field.Boat.registrationCode=Immatriculation wao.ui.field.Boat.shipOwner=Armateur wao.ui.field.BoatDistrict.code=Code du quartier maritime wao.ui.field.BoatInfos.comment=Commentaire

1 0

r2184 - trunk/wao-persistence/src/main/xmi
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 18:17:29 +0200 (Tue, 29 Jul 2014) New Revision: 2184 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2184 Log: refs #4481 update model diagrams Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ)

1 0

r2183 - in trunk/wao-persistence/src/main: resources/db/migration xmi
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 18:12:43 +0200 (Tue, 29 Jul 2014) New Revision: 2183 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2183 Log: refs #4481 store postal codes as String Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/xmi/wao-model.zargo Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:05:17 UTC (rev 2182) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:12:43 UTC (rev 2183) @@ -140,3 +140,9 @@ ALTER TABLE Boat ALTER COLUMN immatriculation TYPE TEXT; ALTER TABLE Boat RENAME COLUMN immatriculation TO registrationCode; + +-- Les codes postaux ne peuvent être représentés sous forme d'entiers + +ALTER TABLE BoatInfos ALTER COLUMN contactPostalCode TYPE TEXT; +ALTER TABLE Company ALTER COLUMN postalCode TYPE TEXT; + Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ)

1 0

r2182 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration wao-services/src/main/java/fr/ifremer/wao/services/service/csv wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations wao-services/src/main/java/fr/ifremer/wao/services/service/mail wao-services/src/
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 18:05:17 +0200 (Tue, 29 Jul 2014) New Revision: 2182 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2182 Log: refs #4481 change Boat#immatriculation to registrationCode, and change type from int to String Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatRegistrationCodesException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatRegistrationCodeParserFormatter.java Removed: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/boats.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatImpl.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -46,12 +46,12 @@ @Override public String getDescription() { - return getImmatriculation() + " - " + getName(); + return getRegistrationCode() + " - " + getName(); } @Override public String toString() { - return getName() + " (" + getImmatriculation() + ")"; + return getName() + " (" + getRegistrationCode() + ")"; } @Override Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -91,12 +91,12 @@ } if (StringUtils.isNotEmpty(filter.getRegistrationCode())) { - query.addWhereClause("str(b." + Boat.PROPERTY_IMMATRICULATION + ") like :registrationCode", ImmutableMap.of("registrationCode", (Object) (filter.getRegistrationCode() + "%"))); + query.addWhereClause("str(b." + Boat.PROPERTY_REGISTRATION_CODE + ") like :registrationCode", ImmutableMap.of("registrationCode", (Object) (filter.getRegistrationCode() + "%"))); } if (StringUtils.isNotEmpty(filter.getBoatNameOrRegistrationCode())) { query.addWhereClause( - "lower(b." + Boat.PROPERTY_NAME + ") like :boatNameOrRegistrationCode or str(b." + Boat.PROPERTY_IMMATRICULATION + ") like :boatNameOrRegistrationCode", + "lower(b." + Boat.PROPERTY_NAME + ") like :boatNameOrRegistrationCode or str(b." + Boat.PROPERTY_REGISTRATION_CODE + ") like :boatNameOrRegistrationCode", ImmutableMap.of("boatNameOrRegistrationCode", (Object) (filter.getBoatNameOrRegistrationCode().toLowerCase() + "%"))); } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -27,22 +27,22 @@ public class Boats { - public static Function<Boat, Integer> getImmatriculation() { - return new GetImmatriculation(); + public static Function<Boat, String> getRegistrationCode() { + return new GetRegistrationCode(); } - public static String toImmatriculations(Iterable<Boat> boats) { + public static String toRegistrationCodes(Iterable<Boat> boats) { return StringUtils.join( - Iterables.transform(boats, getImmatriculation()), + Iterables.transform(boats, getRegistrationCode()), ' '); } - protected static class GetImmatriculation implements Function<Boat, Integer> { + protected static class GetRegistrationCode implements Function<Boat, String> { @Override - public Integer apply(Boat input) { - Integer immatriculation = input.getImmatriculation(); - return immatriculation; + public String apply(Boat input) { + String registrationCode = input.getRegistrationCode(); + return registrationCode; } } } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -111,9 +111,9 @@ } /** - * Used to get a list of boat's immatriculations linked with the sampleRow. + * Used to get a list of boat's registrationCodes linked with the sampleRow. * - * @return a simple String which contains immatriculations separate by + * @return a simple String which contains registrationCodes separate by * a space */ @Override @@ -122,7 +122,7 @@ for (ElligibleBoat elligible : getElligibleBoat()) { if (elligible.isGlobalActive()) { Boat boat = elligible.getBoat(); - result += boat.getImmatriculation() + " "; + result += boat.getRegistrationCode() + " "; } } return result; Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowLogImpl.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -323,7 +323,7 @@ boolean boatIsElligible = eligibleBoat.isGlobalActive(); boolean boatWasElligible = oldRow != null && oldRow.getElligibleBoatByBoat(eligibleBoat.getBoat()).isGlobalActive(); - String registrationCode = String.valueOf(eligibleBoat.getBoat().getImmatriculation()); + String registrationCode = eligibleBoat.getBoat().getRegistrationCode(); if (boatWasElligible) { if (boatIsElligible) { stillEligibleBoats.add(registrationCode); Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 16:05:17 UTC (rev 2182) @@ -138,3 +138,5 @@ END; ALTER TABLE ContactStateMotif RENAME COLUMN contactStateOrdinal TO contactState; +ALTER TABLE Boat ALTER COLUMN immatriculation TYPE TEXT; +ALTER TABLE Boat RENAME COLUMN immatriculation TO registrationCode; Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsFilterValues.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -90,7 +90,7 @@ Boat boat = contact.getBoat(); boatsFilterValues.addBoatFromContacts(boat); - boatRegistrationCodes.add(FilterOption.forValueAndLabel(String.valueOf(boat.getImmatriculation()), boat.getDescription())); + boatRegistrationCodes.add(FilterOption.forValueAndLabel(String.valueOf(boat.getRegistrationCode()), boat.getDescription())); SampleRow sampleRow = contact.getSampleRow(); sampleRowsFilterValues.addSampleRow(sampleRow); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -63,7 +63,7 @@ import fr.ifremer.wao.entity.TerrestrialLocationTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; import fr.ifremer.wao.services.service.administration.ReferentialService; -import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; +import fr.ifremer.wao.services.service.administration.UnknownBoatRegistrationCodesException; import fr.ifremer.wao.services.service.csv.ObsMerObsVenteSamplingPlanImportExportModel; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -308,8 +308,8 @@ elligibleBoats.add(elligibleBoat.getBoat()); } } - String elligibleBoatImmatriculations = Boats.toImmatriculations(elligibleBoats); - updateSampleRowCommand.setElligibleBoatImmatriculations(elligibleBoatImmatriculations); + String elligibleBoatRegistrationCodes = Boats.toRegistrationCodes(elligibleBoats); + updateSampleRowCommand.setElligibleBoatRegistrationCodes(elligibleBoatRegistrationCodes); } else { @@ -361,13 +361,13 @@ } public void preValidate(AuthenticatedWaoUser authenticatedWaoUser, UpdateSampleRowCommand updateSampleRowCommand) - throws UnknownBoatImmatriculationsException { + throws UnknownBoatRegistrationCodesException { SampleRow sampleRow = updateSampleRowCommand.getSampleRow(); - String elligibleBoatImmatriculations = updateSampleRowCommand.getElligibleBoatImmatriculations(); + String elligibleBoatRegistrationCodes = updateSampleRowCommand.getElligibleBoatRegistrationCodes(); - List<Boat> elligibleBoats = getReferentialService().getBoatsFromImmatriculations(elligibleBoatImmatriculations); + List<Boat> elligibleBoats = getReferentialService().getBoatsFromRegistrationCodes(elligibleBoatRegistrationCodes); ElligibleBoatTopiaDao elligibleBoatDao = getElligibleBoatDao(); for (Boat boat : elligibleBoats) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -64,7 +64,7 @@ protected ImmutableMap<String, DCF5Code> allDcf5Codes; - protected String elligibleBoatImmatriculations; + protected String elligibleBoatRegistrationCodes; /** * La clé est un mois au format YYYY-MM @@ -202,12 +202,12 @@ this.allDcf5Codes = allDcf5Codes; } - public String getElligibleBoatImmatriculations() { - return elligibleBoatImmatriculations; + public String getElligibleBoatRegistrationCodes() { + return elligibleBoatRegistrationCodes; } - public void setElligibleBoatImmatriculations(String elligibleBoatImmatriculations) { - this.elligibleBoatImmatriculations = elligibleBoatImmatriculations; + public void setElligibleBoatRegistrationCodes(String elligibleBoatRegistrationCodes) { + this.elligibleBoatRegistrationCodes = elligibleBoatRegistrationCodes; } public boolean isObservationAlreadyStarted() { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -28,6 +28,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatTopiaDao; @@ -97,8 +98,8 @@ private static final Log log = LogFactory.getLog(ReferentialService.class); - /** Splitter qui permet de détecter toutes les immatriculations dans une chaîne (que le séparateur soit ' ', ',' ou autre). */ - protected static final Splitter BOAT_IMMATRICULATIONS_SPLITTER = Splitter.on(Pattern.compile("[^0-9]+")); + /** Splitter qui permet de détecter toutes les registrationCodes dans une chaîne (que le séparateur soit ' ', ',' ou autre). */ + protected static final Splitter BOAT_REGISTRATION_CODES_SPLITTER = Splitter.on(Pattern.compile("[^0-9]+")).omitEmptyStrings(); /** Pour chaque programme, les référentiels utilisés par ce programme. */ protected static final Map<ObsProgram, List<String>> PER_PROGRAM_REFERENTIAL; @@ -746,7 +747,7 @@ boat.setShipOwner(shipOwner); // now boat object is ready - Boat existingBoat = boatDao.forImmatriculationEquals(boat.getImmatriculation()).findUniqueOrNull(); + Boat existingBoat = boatDao.forRegistrationCodeEquals(boat.getRegistrationCode()).findUniqueOrNull(); if (existingBoat == null) { boatDao.create(boat); } else { @@ -774,28 +775,19 @@ } - public List<Boat> getBoatsFromImmatriculations(String joinedImmatriculations) throws UnknownBoatImmatriculationsException { + public List<Boat> getBoatsFromRegistrationCodes(String joinedRegistrationCodes) throws UnknownBoatRegistrationCodesException { - Iterable<String> splitImmatriculations = BOAT_IMMATRICULATIONS_SPLITTER.split(joinedImmatriculations); + Iterable<String> splitRegistrationCodes = BOAT_REGISTRATION_CODES_SPLITTER.split(joinedRegistrationCodes); - Set<Integer> immatriculations = new HashSet<>(); - for (String splitImmatriculation : splitImmatriculations) { - if (StringUtils.isNotBlank(splitImmatriculation)) { - immatriculations.add(Integer.parseInt(splitImmatriculation)); - } - } + Set<String> registrationCodes = Sets.newHashSet(splitRegistrationCodes); - List<Boat> boats = getBoatDao().forImmatriculationIn(immatriculations).findAll(); + List<Boat> boats = getBoatDao().forRegistrationCodeIn(registrationCodes).findAll(); - if (boats.size() < immatriculations.size()) { + if (boats.size() < registrationCodes.size()) { for (Boat boat : boats) { - immatriculations.remove(boat.getImmatriculation()); + registrationCodes.remove(boat.getRegistrationCode()); } - Set<String> immatriculationStrings = new HashSet<>(); - for (Integer immatriculation : immatriculations) { - immatriculationStrings.add(String.valueOf(immatriculation)); - } - throw new UnknownBoatImmatriculationsException(immatriculationStrings); + throw new UnknownBoatRegistrationCodesException(registrationCodes); } return boats; Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -1,42 +0,0 @@ -package fr.ifremer.wao.services.service.administration; - -/* - * #%L - * Wao :: Services - * %% - * Copyright (C) 2009 - 2014 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import fr.ifremer.wao.WaoException; - -import java.util.Set; - -public class UnknownBoatImmatriculationsException extends WaoException { - - private static final long serialVersionUID = 1L; - - protected Set<String> immatriculations; - - public UnknownBoatImmatriculationsException(Set<String> immatriculations) { - this.immatriculations = immatriculations; - } - - public Set<String> getImmatriculations() { - return immatriculations; - } - -} Copied: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatRegistrationCodesException.java (from rev 2168, trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatImmatriculationsException.java) =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatRegistrationCodesException.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/UnknownBoatRegistrationCodesException.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -0,0 +1,42 @@ +package fr.ifremer.wao.services.service.administration; + +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import fr.ifremer.wao.WaoException; + +import java.util.Set; + +public class UnknownBoatRegistrationCodesException extends WaoException { + + private static final long serialVersionUID = 1L; + + protected Set<String> registrationCodes; + + public UnknownBoatRegistrationCodesException(Set<String> registrationCodes) { + this.registrationCodes = registrationCodes; + } + + public Set<String> getRegistrationCodes() { + return registrationCodes; + } + +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersService.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -144,7 +144,7 @@ if (waoUser.isCanReadBoatsNotEmpty()) { - String canReadBoats = Boats.toImmatriculations(waoUser.getCanReadBoats()); + String canReadBoats = Boats.toRegistrationCodes(waoUser.getCanReadBoats()); updateWaoUserCommand.setCanReadBoats(canReadBoats); @@ -164,15 +164,15 @@ } - public void preValidate(UpdateWaoUserCommand updateWaoUserCommand) throws UnknownBoatImmatriculationsException, LoginMustBeUniqueException { + public void preValidate(UpdateWaoUserCommand updateWaoUserCommand) throws UnknownBoatRegistrationCodesException, LoginMustBeUniqueException { ObsProgram obsProgram = updateWaoUserCommand.getObsProgram(); WaoUser waoUser = updateWaoUserCommand.getWaoUser(); waoUser.clearCanReadBoats(); if (waoUser.hasUserRole(UserRole.PROFESSIONAL, obsProgram)) { - Set<Boat> boatsFromImmatriculations = new HashSet<>(getReferentialService().getBoatsFromImmatriculations(updateWaoUserCommand.getCanReadBoats())); - waoUser.setCanReadBoats(boatsFromImmatriculations); + Set<Boat> boatsFromRegistrationCodes = new HashSet<>(getReferentialService().getBoatsFromRegistrationCodes(updateWaoUserCommand.getCanReadBoats())); + waoUser.setCanReadBoats(boatsFromRegistrationCodes); } WaoUserTopiaDao dao = getWaoUserDao(); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -27,7 +27,7 @@ import fr.ifremer.wao.entity.BoatImpl; import fr.ifremer.wao.entity.ShipOwnerImpl; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.services.service.csv.operations.BoatImmatriculationParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.BoatRegistrationCodeParserFormatter; import fr.ifremer.wao.services.service.csv.operations.DistrictParserFormatter; import fr.ifremer.wao.services.service.csv.operations.PortParserFormatter; import org.nuiton.csv.Common; @@ -79,8 +79,8 @@ modelBuilder = new ModelBuilder<>(); modelBuilder.newColumnForImportExport( "NAVIRE_IMMATRICULATION", - Boat.PROPERTY_IMMATRICULATION, - new BoatImmatriculationParserFormatter(locale)); + Boat.PROPERTY_REGISTRATION_CODE, + new BoatRegistrationCodeParserFormatter(locale)); modelBuilder.newColumnForImportExport( "NAVIRE_NOM", Boat.PROPERTY_NAME); Deleted: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -1,75 +0,0 @@ -/* - * #%L - * Wao :: Business - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.services.service.csv.operations; - -import org.nuiton.csv.ValueParserFormatter; -import org.nuiton.i18n.I18n; - -import java.text.ParseException; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** Used to parse and format boat immatriculation. - * The parser is in charge of validating the 6-digits form of imported - * lines. - * - * This parser/formatter should be used when importing/exporting information - * on boats. - * - * For finding boats associated with an entity when importing contact, see - * {@link BoatParserFormatter} - */ -public class BoatImmatriculationParserFormatter implements ValueParserFormatter<Integer> { - - protected final Locale locale; - - /** Exactly 6 digits */ - protected Pattern pattern = Pattern.compile("\\d{6}"); - - public BoatImmatriculationParserFormatter(Locale locale) { - this.locale = locale; - } - - @Override - public String format(Integer immatriculation) { - return String.valueOf(immatriculation); - } - - /** Parse immatriculation and validate its pattern - * @param imma immatriculation read in file - * @return the immatriculation if it has the good format - * @throws IllegalArgumentException if immatriculation does not follow - * expected pattern - */ - @Override - public Integer parse(String imma) throws ParseException { - Matcher matcher = pattern.matcher(imma); - if (!matcher.find()) { - throw new IllegalArgumentException(I18n.l(locale, "wao.business.boat.validation.immatriculation.wrongFormat")); - } - Integer immatriculation = Integer.parseInt(imma); - return immatriculation; - } -} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -34,23 +34,23 @@ import java.util.List; import java.util.Locale; -/** Parse a boat (identification based on the immatriculation) */ +/** Parse a boat (identification based on the registrationCode) */ public class BoatParserFormatter implements ValueParserFormatter<Boat> { protected final Locale locale; - protected ImmutableMap<Integer, Boat> indexedBoats; + protected ImmutableMap<String, Boat> indexedBoats; public BoatParserFormatter(List<Boat> boats, Locale locale) { this.locale = locale; if (boats != null) { - indexedBoats = Maps.uniqueIndex(boats, Boats.getImmatriculation()); + indexedBoats = Maps.uniqueIndex(boats, Boats.getRegistrationCode()); } } @Override public String format(Boat boat) { - return String.valueOf(boat.getImmatriculation()); + return String.valueOf(boat.getRegistrationCode()); } @Override @@ -59,8 +59,7 @@ if (trimmedValue.isEmpty()) { throw new IllegalArgumentException(I18n.l(locale, "wao.import.contact.failure.boatMissing")); } - Integer key = Integer.valueOf(trimmedValue); - Boat boat = indexedBoats.get(key); + Boat boat = indexedBoats.get(trimmedValue); if (boat == null) { throw new IllegalArgumentException(I18n.l(locale, "wao.import.contact.failure.wrongBoat", value)); } Copied: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatRegistrationCodeParserFormatter.java (from rev 2168, trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java) =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatRegistrationCodeParserFormatter.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatRegistrationCodeParserFormatter.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -0,0 +1,74 @@ +/* + * #%L + * Wao :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.wao.services.service.csv.operations; + +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; + +import java.text.ParseException; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** Used to parse and format boat registrationCode. + * The parser is in charge of validating the 6-digits form of imported + * lines. + * + * This parser/formatter should be used when importing/exporting information + * on boats. + * + * For finding boats associated with an entity when importing contact, see + * {@link BoatParserFormatter} + */ +public class BoatRegistrationCodeParserFormatter implements ValueParserFormatter<String> { + + protected final Locale locale; + + /** Exactly 6 digits */ + protected Pattern pattern = Pattern.compile("\\d{6}"); + + public BoatRegistrationCodeParserFormatter(Locale locale) { + this.locale = locale; + } + + @Override + public String format(String registrationCode) { + return registrationCode; + } + + /** Parse registrationCode and validate its pattern + * @param registrationCode registrationCode read in file + * @return the registrationCode if it has the good format + * @throws IllegalArgumentException if registrationCode does not follow + * expected pattern + */ + @Override + public String parse(String registrationCode) throws ParseException { + Matcher matcher = pattern.matcher(registrationCode); + if (!matcher.find()) { + throw new IllegalArgumentException(I18n.l(locale, "wao.business.boat.validation.registrationCode.wrongFormat")); + } + return registrationCode; + } +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/mail/AddBoatToUserAllegroWalletEmail.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -48,7 +48,7 @@ getLocale(), "wao.email.addBoatToUserAllegroWallet.subject", I18n.l(getLocale(), obsProgram.getI18nKey()), - boat.getImmatriculation(), + boat.getRegistrationCode(), observer.getLogin() ); return subject; Modified: trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache =================================================================== --- trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_en.mustache 2014-07-29 16:05:17 UTC (rev 2182) @@ -1,6 +1,6 @@ Hello, -Please, add boat {{boat.immatriculation}} to the ALLEGRO wallet of the observer +Please, add boat {{boat.registrationCode}} to the ALLEGRO wallet of the observer {{observer.fullName}} {{observer.company.name}} ({{observer.login}}). {{info}} Modified: trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache =================================================================== --- trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/resources/email/AddBoatToUserAllegroWalletEmail_fr.mustache 2014-07-29 16:05:17 UTC (rev 2182) @@ -1,6 +1,6 @@ Bonjour, -Merci d'ajouter le navire {{boat.immatriculation}} au portefeuille ALLEGRO de l'observateur +Merci d'ajouter le navire {{boat.registrationCode}} au portefeuille ALLEGRO de l'observateur {{observer.fullName}} {{observer.company.name}} ({{observer.login}}). {{info}} Modified: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties 2014-07-29 16:05:17 UTC (rev 2182) @@ -13,7 +13,7 @@ wao.action.delete.failure.attachedNews=Object is attached to some news. wao.action.delete.failure.attachedSampleRows=Object is attached to some sample rows. wao.action.delete.failure.attachedWaoUsers=Object is attached to some users. -wao.business.boat.validation.immatriculation.wrongFormat=The boat registry number must be composed of 6 digits +wao.business.boat.validation.registrationCode.wrongFormat=The boat registry number must be composed of 6 digits wao.business.completeSampling.false=No wao.business.completeSampling.true=Yes wao.business.completeSampling.undefined=Undefined Modified: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== --- trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties 2014-07-29 16:05:17 UTC (rev 2182) @@ -13,7 +13,7 @@ wao.action.delete.failure.attachedNews=L'objet est lié à des actualités. wao.action.delete.failure.attachedSampleRows=L'objet est lié à des lignes du plan. wao.action.delete.failure.attachedWaoUsers=L'objet est lié à des utilisateurs. -wao.business.boat.validation.immatriculation.wrongFormat=L'immatriculation du navire doit être formée de 6 chiffres +wao.business.boat.validation.registrationCode.wrongFormat=L'immatriculation du navire doit être formée de 6 chiffres wao.business.completeSampling.false=Non wao.business.completeSampling.true=Oui wao.business.completeSampling.undefined=Non défini Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/administration/ReferentialServiceTest.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -113,14 +113,14 @@ } @Test - public void testGetBoatsByImmatriculations() { + public void testGetBoatsByRegistrationCodes() { testImportBoats(); try { - Collection<Boat> boats = service.getBoatsFromImmatriculations("174258, 284595 978419"); + Collection<Boat> boats = service.getBoatsFromRegistrationCodes("174258, 284595 978419"); Assert.assertEquals(3, boats.size()); - boats = service.getBoatsFromImmatriculations(" "); + boats = service.getBoatsFromRegistrationCodes(" "); Assert.assertTrue(boats.isEmpty()); - } catch (UnknownBoatImmatriculationsException e) { + } catch (UnknownBoatRegistrationCodesException e) { if (log.isDebugEnabled()) { log.debug("unexpected exception raised", e); } Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditSampleRowAction.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -40,7 +40,7 @@ import fr.ifremer.wao.services.service.SamplingPlanService; import fr.ifremer.wao.services.service.UpdateSampleRowCommand; import fr.ifremer.wao.services.service.WrongSampleRowCodeFormatException; -import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; +import fr.ifremer.wao.services.service.administration.UnknownBoatRegistrationCodesException; import fr.ifremer.wao.web.WaoJspActionSupport; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -99,8 +99,8 @@ addFieldError("updateSampleRowCommand.dcf5Codes", t("wao.ui.form.SampleRow.error.missingDcf5Codes")); } - } catch (UnknownBoatImmatriculationsException e) { - addFieldError("updateSampleRowCommand.elligibleBoatImmatriculations", t("wao.ui.unknownBoatImmatriculations", Joiner.on(", ").join(e.getImmatriculations()))); + } catch (UnknownBoatRegistrationCodesException e) { + addFieldError("updateSampleRowCommand.elligibleBoatRegistrationCodes", t("wao.ui.unknownBoatRegistrationCodes", Joiner.on(", ").join(e.getRegistrationCodes()))); } catch (SampleRowCodeMustBeUniqueException e) { addFieldError("updateSampleRowCommand.code", t("wao.ui.form.SampleRow.error.codeMustBeUnique")); } catch (MissingPeriodEndException e) { Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java 2014-07-29 16:05:17 UTC (rev 2182) @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.Preparable; import fr.ifremer.wao.services.service.administration.LoginMustBeUniqueException; -import fr.ifremer.wao.services.service.administration.UnknownBoatImmatriculationsException; +import fr.ifremer.wao.services.service.administration.UnknownBoatRegistrationCodesException; import fr.ifremer.wao.services.service.administration.UpdateWaoUserCommand; import fr.ifremer.wao.services.service.administration.WaoUsersService; import fr.ifremer.wao.web.WaoJspActionSupport; @@ -76,8 +76,8 @@ try { service.preValidate(updateWaoUserCommand); - } catch (UnknownBoatImmatriculationsException unknownBoatImmatriculations) { - addFieldError("updateWaoUserCommand.canReadBoats", t("wao.ui.unknownBoatImmatriculations", Joiner.on(", ").join(unknownBoatImmatriculations.getImmatriculations()))); + } catch (UnknownBoatRegistrationCodesException unknownBoatRegistrationCodes) { + addFieldError("updateWaoUserCommand.canReadBoats", t("wao.ui.unknownBoatRegistrationCodes", Joiner.on(", ").join(unknownBoatRegistrationCodes.getRegistrationCodes()))); } catch (LoginMustBeUniqueException e) { addFieldError("updateWaoUserCommand.waoUser.login", t("wao.ui.form.updateWaoUserCommand.error.loginMustBeUnique")); } Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-07-29 16:05:17 UTC (rev 2182) @@ -137,7 +137,7 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Create a contact for this boat and sample row %s (%s) wao.ui.contacts.district=Boat District Code wao.ui.contacts.division=Fishing Zone Division -wao.ui.contacts.immatriculation=Boat Immatriculation +wao.ui.contacts.registrationCode=Boat registration code wao.ui.contacts.observations=Mammals wao.ui.contacts.observers=Main observer wao.ui.contacts.title=%s contacts found @@ -169,7 +169,7 @@ wao.ui.field.Boat.district.long=Boat district for boat wao.ui.field.Boat.districtCode=District oode wao.ui.field.Boat.fleet=Fleet -wao.ui.field.Boat.immatriculation=Registration number +wao.ui.field.Boat.registrationCode=Registration number wao.ui.field.Boat.name=Name wao.ui.field.Boat.portOfRegistry=Port of registry wao.ui.field.Boat.shipOwner=Shipowner @@ -559,7 +559,7 @@ wao.ui.unit.days=day(s) wao.ui.unit.observations=observations wao.ui.unit.observers=observer(s) -wao.ui.unknownBoatImmatriculations=Unknown boats\: %s +wao.ui.unknownBoatRegistrationCodes=Unknown boats\: %s wao.ui.userList=Users list wao.ui.userMustAcceptCgu=You must accept the terms of use wao.ui.validLogin=Valid identifier Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-07-29 16:05:17 UTC (rev 2182) @@ -138,7 +138,7 @@ wao.ui.contacts.createFromBoatAndSelectedSampleRow=Créer un nouveau contact avec ce navire pour la ligne %s (%s) wao.ui.contacts.district=CQ wao.ui.contacts.division=Division -wao.ui.contacts.immatriculation=N° +wao.ui.contacts.registrationCode=N° wao.ui.contacts.observations=Observations et captures accidentelles wao.ui.contacts.observers=Observateurs wao.ui.contacts.title=%s contacts trouvés @@ -170,7 +170,7 @@ wao.ui.field.Boat.district.long=Quartier maritime du navire wao.ui.field.Boat.districtCode=Code quartier wao.ui.field.Boat.fleet=Flotille -wao.ui.field.Boat.immatriculation=Immatriculation +wao.ui.field.Boat.registrationCode=Immatriculation wao.ui.field.Boat.name=Nom wao.ui.field.Boat.portOfRegistry=Port d'attache wao.ui.field.Boat.shipOwner=Armateur @@ -560,7 +560,7 @@ wao.ui.unit.days=jour(s) wao.ui.unit.observations=observations wao.ui.unit.observers=observateur(s) -wao.ui.unknownBoatImmatriculations=Les navires ayant pour immatriculations %s sont inconnus du référentiel +wao.ui.unknownBoatRegistrationCodes=Les navires ayant pour immatriculations %s sont inconnus du référentiel wao.ui.userList=Liste des utilisateurs wao.ui.userMustAcceptCgu=Vous devez accepter les conditions d'utilisation pour utiliser Wao wao.ui.validLogin=Identifiant valide Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boat-details.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -170,7 +170,7 @@ </table> <s:url action="contacts!applyFilter" id="viewAssociatedContactsForBoatUrl"> - <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.immatriculation"/> + <s:param name="filter.boatFilter.registrationCode" value="boatDetails.boatInfos.boat.registrationCode"/> <s:param name="filter.sampleRowFilter.companyIds" value="boatDetails.boatInfos.company.topiaId"/> <s:param name="filter.periodFrom"/> <s:param name="filter.periodTo"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/boats.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/boats.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/boats.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -222,11 +222,11 @@ <s:param name="boatId" value="topiaId" /> </s:url> <s:a href="%{boatDetailsUrl}" cssClass="boat-details-action"> - <s:property value="%{'' + immatriculation}"/> + <s:property value="registrationCode"/> </s:a> </s:if> <s:else> - <s:property value="%{'' + immatriculation}"/> + <s:property value="registrationCode"/> </s:else> </td> <td<s:if test="!active"> class="inactive"</s:if>> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -395,7 +395,7 @@ </td> <td> <s:set name="boatTooltip"> - <s:text name="wao.ui.boats.registrationCode"/> <s:property value="%{'' + boat.immatriculation}" escapeHtml="false"/> + <s:text name="wao.ui.boats.registrationCode"/> <s:property value="boat.registrationCode" escapeHtml="false"/> <s:text name="wao.ui.boats.boatLength"/> <s:property value="boat.boatLength" escapeHtml="false"/> cm <s:text name="wao.ui.boats.buildYear"/> <s:property value="%{'' + boat.buildYear}" escapeHtml="false"/> <s:text name="wao.ui.boats.district"/> <s:property value="boat.district.districtName" escapeHtml="false"/> (<s:property value="boat.district.districtCode" escapeHtml="false"/>) Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-contact-input.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -136,10 +136,10 @@ </tr> <tr> <th> - <s:text name="wao.ui.field.Boat.immatriculation"/> + <s:text name="wao.ui.field.Boat.registrationCode"/> </th> <td> - <s:property value="updateContactCommand.contact.boat.immatriculation"/> + <s:property value="updateContactCommand.contact.boat.registrationCode"/> </td> </tr> <tr> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/edit-sample-row-input.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -244,7 +244,7 @@ </s:if> - <s:textarea name="updateSampleRowCommand.elligibleBoatImmatriculations" label="%{getText('wao.ui.field.SampleRow.elligibleBoat')}" /> + <s:textarea name="updateSampleRowCommand.elligibleBoatRegistrationCodes" label="%{getText('wao.ui.field.SampleRow.elligibleBoat')}" /> <s:textarea name="updateSampleRowCommand.sampleRow.comment" label="%{getText('wao.ui.field.SampleRow.comment')}" /> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-07-29 15:12:53 UTC (rev 2181) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/synthesis.jsp 2014-07-29 16:05:17 UTC (rev 2182) @@ -216,7 +216,7 @@ <s:text name="wao.ui.synthesis.boarding.mostUsedBoat"> <s:param value="%{synthesis.maxBoardingValue}"/> <s:param value="%{synthesis.maxBoardingBoat.name}"/> - <s:param value="%{synthesis.maxBoardingBoat.immatriculation}"/> + <s:param value="%{synthesis.maxBoardingBoat.registrationCode}"/> </s:text> </p>

1 0

r2181 - trunk/wao-persistence/src/main/resources/db/migration
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 17:12:53 +0200 (Tue, 29 Jul 2014) New Revision: 2181 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2181 Log: refs #4481 fix migration Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 14:59:20 UTC (rev 2180) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 15:12:53 UTC (rev 2181) @@ -111,7 +111,7 @@ WHEN 2 THEN 'DISTRICT' WHEN 3 THEN 'REGION' END; -ALTER TABLE SampleRow RENAME COLUMN locationTypeOrdinal TO locationType; +ALTER TABLE TerrestrialLocation RENAME COLUMN locationTypeOrdinal TO locationType; ALTER TABLE UserProfile ALTER COLUMN obsProgramOrdinal TYPE character varying(255) USING CASE obsProgramOrdinal WHEN 0 THEN 'OBSMER'

1 0

r2180 - in trunk: . wao-persistence/src/main/java/fr/ifremer/wao wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/administration
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 16:59:20 +0200 (Tue, 29 Jul 2014) New Revision: 2180 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2180 Log: refs #4481 migrate all ordinals to names Modified: trunk/pom.xml trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/pom.xml 2014-07-29 14:59:20 UTC (rev 2180) @@ -105,9 +105,9 @@ <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>1.7.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> - <hibernateVersion>4.3.5.Final</hibernateVersion> + <hibernateVersion>4.3.6.Final</hibernateVersion> <mockitoVersion>1.9.5</mockitoVersion> - <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion> + <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> <mustacheVersion>0.8.15</mustacheVersion> <commonsCodecVersion>1.9</commonsCodecVersion> @@ -120,9 +120,9 @@ <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-3</nuitonUtilsVersion> - <eugeneVersion>2.11</eugeneVersion> - <topiaVersion>3.0-beta-7</topiaVersion> + <nuitonUtilsVersion>3.0-rc-4</nuitonUtilsVersion> + <eugeneVersion>2.12</eugeneVersion> + <topiaVersion>3.0-beta-8</topiaVersion>  <locales>fr</locales> Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -138,6 +138,7 @@ return Pattern.compile("^(\\d{4})_" + obsProgram.getShortCode() + "(\\d{4})$"); } + @Deprecated public static <T extends Enum> Collection<Integer> toOrdinals(Collection<T> enums) { List<Integer> ordinals = new LinkedList<>(); for (Enum anEnum : enums) { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -63,45 +63,10 @@ } @Override - public void setState(int state) { - setContactState(ContactState.valueOf(state)); - } - - @Override - public ContactState getContactState() { - return ContactState.valueOf(getState()); - } - - @Override - public void setContactState(ContactState contactState) { - super.setState(contactState.ordinal()); - } - - @Override - public DataReliability getDataReliability() { - return DataReliability.valueOf(getDataReliabilityOrdinal()); - } - - @Override - public void setDataReliability(DataReliability dataReliability) { - setDataReliabilityOrdinal(dataReliability.ordinal()); - } - - @Override public ObsProgram getObsProgram() { return getSampleRow().getObsProgram(); } - @Override - public SamplingStrategy getSamplingStrategy() { - return SamplingStrategy.valueOf(getSamplingStrategyOrdinal()); - } - - @Override - public void setSamplingStrategy(SamplingStrategy samplingStrategy) { - setSamplingStrategyOrdinal(samplingStrategy.ordinal()); - } - /** Value is still used but it's no longer written, it's now computed * from the size of observers. */ protected void updateNbObservers() { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotifImpl.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -33,25 +33,15 @@ } @Override - public void setContactStateOrdinal(int contactStateOrdinal) { - setContactState(ContactState.valueOf(contactStateOrdinal)); - } - - @Override public void setContactState(ContactState contactState) { ContactState substitute = ContactState.getSubstituteForMotif(contactState); - super.setContactStateOrdinal(substitute.ordinal()); + super.setContactState(substitute); } - @Override - public int getContactStateOrdinal() { - return getContactState().ordinal(); - } @Override public ContactState getContactState() { - ContactState contactState = ContactState.valueOf(super.getContactStateOrdinal()); - ContactState substitute = ContactState.getSubstituteForMotif(contactState); + ContactState substitute = ContactState.getSubstituteForMotif(super.getContactState()); return substitute; } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactTopiaDao.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -27,7 +27,6 @@ import com.google.common.collect.Multimaps; import com.google.common.collect.Sets; import fr.ifremer.wao.ContactsFilter; -import fr.ifremer.wao.WaoUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.StringUtils; @@ -133,18 +132,15 @@ } if (CollectionUtils.isNotEmpty(filter.getContactStates())) { - Collection<Integer> contactStateOrdinals = WaoUtils.toOrdinals(filter.getContactStates()); - query.addIn(Contact.PROPERTY_STATE, contactStateOrdinals); + query.addIn(Contact.PROPERTY_CONTACT_STATE, filter.getContactStates()); } if (CollectionUtils.isNotEmpty(filter.getDataReliabilities())) { - Collection<Integer> dataReliabilityOrdinals = WaoUtils.toOrdinals(filter.getDataReliabilities()); - query.addIn(Contact.PROPERTY_DATA_RELIABILITY_ORDINAL, dataReliabilityOrdinals); + query.addIn(Contact.PROPERTY_DATA_RELIABILITY, filter.getDataReliabilities()); } if (CollectionUtils.isNotEmpty(filter.getActualSamplingStrategies())) { - Collection<Integer> actualSamplingStrategyOrdinals = WaoUtils.toOrdinals(filter.getActualSamplingStrategies()); - query.addIn(Contact.PROPERTY_SAMPLING_STRATEGY_ORDINAL, actualSamplingStrategyOrdinals); + query.addIn(Contact.PROPERTY_SAMPLING_STRATEGY, filter.getActualSamplingStrategies()); } if (CollectionUtils.isNotEmpty(filter.getObservedDataControls())) { @@ -208,7 +204,7 @@ TopiaQueryBuilderAddCriteriaOrRunQueryStep<Contact> query = newQueryBuilder(); query.addTopiaIdEquals(Contact.PROPERTY_BOAT, boatId); query.addTopiaIdEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_COMPANY, companyId); - query.addEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, obsProgram.ordinal()); + query.addEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM, obsProgram); query.setOrderByArguments(Contact.PROPERTY_CREATION_DATE + " desc"); return query.findFirstOrNull(); } @@ -216,7 +212,7 @@ public SortedMap<Date, Integer> getActualObservationsByMonths(Date periodFromMonth, Date periodToMonth, ContactsFilter filter) { HqlAndParametersBuilder<Contact> query = toContactHqlAndParametersBuilder(filter); - query.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + query.addEquals(Contact.PROPERTY_CONTACT_STATE, ContactState.OBSERVATION_DONE); List<Contact> contacts = findAll(query.getHql(), query.getHqlParameters()); SortedMap<Date, Integer> actualObservationsMyMonths = new TreeMap<>(); @@ -243,7 +239,7 @@ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); - hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_CONTACT_STATE, ContactState.OBSERVATION_DONE); hqlAndParametersBuilder.addLowerOrEquals(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_AVERAGE_TIDE_TIME, 2.); hqlAndParametersBuilder.setOrderByArguments("boat.name", "sampleRow.code", "observationBeginDate"); @@ -389,7 +385,7 @@ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); - hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_CONTACT_STATE, ContactState.OBSERVATION_DONE); hqlAndParametersBuilder.addNotNull(Contact.PROPERTY_DATA_INPUT_DATE); String hql = "select c.sampleRow.company.topiaId, c.observationEndDate, c.dataInputDate " + hqlAndParametersBuilder.getHql(); @@ -425,8 +421,8 @@ HqlAndParametersBuilder<Contact> hqlAndParametersBuilder = toContactHqlAndParametersBuilder(filter); - hqlAndParametersBuilder.addEquals(Contact.PROPERTY_STATE, ContactState.OBSERVATION_DONE.ordinal()); - hqlAndParametersBuilder.addEquals(Contact.PROPERTY_DATA_RELIABILITY_ORDINAL, DataReliability.RELIABLE.ordinal()); + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_CONTACT_STATE, ContactState.OBSERVATION_DONE); + hqlAndParametersBuilder.addEquals(Contact.PROPERTY_DATA_RELIABILITY, DataReliability.RELIABLE); Map<String, Long> dataReliabilitiesByCompany = countByCompany(hqlAndParametersBuilder); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -193,26 +193,6 @@ } @Override - public ObsProgram getObsProgram() { - return ObsProgram.valueOf(getObsProgramOrdinal()); - } - - @Override - public void setObsProgram(ObsProgram obsProgram) { - setObsProgramOrdinal(obsProgram.ordinal()); - } - - @Override - public SamplingStrategy getSamplingStrategy() { - return SamplingStrategy.valueOf(getSamplingStrategyOrdinal()); - } - - @Override - public void setSamplingStrategy(SamplingStrategy samplingStrategy) { - setSamplingStrategyOrdinal(samplingStrategy.ordinal()); - } - - @Override public void setTerrestrialLocation(TerrestrialLocation terrestrialLocation) { clearTerrestrialLocations(); addTerrestrialLocations(terrestrialLocation); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowTopiaDao.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -75,7 +75,7 @@ query.setAlias("sr"); if (filter.getObsProgram() != null) { - query.addEquals(SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, filter.getObsProgram().ordinal()); + query.addEquals(SampleRow.PROPERTY_OBS_PROGRAM, filter.getObsProgram()); } if (CollectionUtils.isNotEmpty(filter.getSampleRowIds())) { @@ -105,7 +105,7 @@ } if (CollectionUtils.isNotEmpty(filter.getSamplingStrategies())) { - query.addIn(SampleRow.PROPERTY_SAMPLING_STRATEGY_ORDINAL, WaoUtils.toOrdinals(filter.getSamplingStrategies())); + query.addIn(SampleRow.PROPERTY_SAMPLING_STRATEGY, filter.getSamplingStrategies()); } if (CollectionUtils.isNotEmpty(filter.getTerrestrialDistrictIds())) { Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationImpl.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -28,20 +28,6 @@ public class TerrestrialLocationImpl extends TerrestrialLocationAbstract { @Override - public LocationType getLocationType() { - return LocationType.valueOf(getLocationTypeOrdinal()); - } - - @Override - public void setLocationType(LocationType locationType) { - if (locationType == null) { - setLocationTypeOrdinal(null); - } else { - setLocationTypeOrdinal(locationType.ordinal()); - } - } - - @Override public String getDistrictName() { //FIXME Do not use I18n without user locale String districtName = super.getDistrictName(); Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocationTopiaDao.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -21,10 +21,6 @@ * #L% */ -import fr.ifremer.wao.WaoUtils; -import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; - -import java.util.Collection; import java.util.Collections; import java.util.List; @@ -33,16 +29,8 @@ public List<String> findAllDistinctDistrictCodesUsedInLocations() { String hql = " select distinct tl.districtCode" + " " + newFromClause("tl") - + " where tl." + TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL + " is not null"; + + " where tl." + TerrestrialLocation.PROPERTY_LOCATION_TYPE + " is not null"; return findAll(hql, Collections.<String, Object>emptyMap()); } - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> forLocationTypeEquals(LocationType locationType) { - return forLocationTypeOrdinalEquals(locationType.ordinal()); - } - - public TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> forLocationTypeIn(Collection<LocationType> locationTypes) { - return forLocationTypeOrdinalIn(WaoUtils.toOrdinals(locationTypes)); - } - } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/UserProfileImpl.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -25,30 +25,6 @@ public class UserProfileImpl extends UserProfileAbstract { @Override - public UserRole getUserRole() { - return UserRole.valueOf(getUserRoleOrdinal()); - } - - @Override - public void setUserRole(UserRole userRole) { - if (userRole == null) { - setUserRoleOrdinal(null); - } else { - setUserRoleOrdinal(userRole.ordinal()); - } - } - - @Override - public ObsProgram getObsProgram() { - return ObsProgram.valueOf(getObsProgramOrdinal()); - } - - @Override - public void setObsProgram(ObsProgram obsProgram) { - setObsProgramOrdinal(obsProgram.ordinal()); - } - - @Override public boolean isAdmin() { return getUserRole() == UserRole.ADMIN; } Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 14:59:20 UTC (rev 2180) @@ -59,3 +59,82 @@ DROP TABLE indicatorlevel; DROP TABLE indicator; +-- On remplace les champs *Ordinal par leur nom et utilise désormais le name + +ALTER TABLE SampleRow ALTER COLUMN obsProgramOrdinal TYPE character varying(255) USING CASE obsProgramOrdinal + WHEN 0 THEN 'OBSMER' + WHEN 1 THEN 'OBSVENTE' +END; +ALTER TABLE SampleRow RENAME COLUMN obsProgramOrdinal TO obsProgram; + +ALTER TABLE Contact ALTER COLUMN state TYPE character varying(255) USING CASE state + WHEN 0 THEN 'CONTACT_START' + WHEN 1 THEN 'OBSERVATION_EXPECTED' + WHEN 2 THEN 'OBSERVATION_DONE' + WHEN 3 THEN 'OBSERVATION_CANCELLED' + WHEN 4 THEN 'CONTACT_REFUSED' + WHEN 5 THEN 'CONTACT_DEFINITELY_REFUSED' +END; +ALTER TABLE Contact RENAME COLUMN state TO contactState; + +ALTER TABLE Contact ALTER COLUMN dataReliabilityOrdinal TYPE character varying(255) USING CASE dataReliabilityOrdinal + WHEN 0 THEN 'RELIABLE' + WHEN 1 THEN 'DOUBTFUL' + WHEN 2 THEN 'NOT_RELIABLE' + WHEN 3 THEN 'CORRECTION_ASKED' + WHEN 4 THEN 'UNKNOWN' + WHEN 5 THEN 'NOT_PROVIDED' +END; +ALTER TABLE Contact RENAME COLUMN dataReliabilityOrdinal TO dataReliability; + +ALTER TABLE Contact ALTER COLUMN samplingStrategyOrdinal TYPE character varying(255) USING CASE samplingStrategyOrdinal + WHEN 0 THEN 'SIMULTANEOUS_G1_SPECIES' + WHEN 1 THEN 'SIMULTANEOUS_G1_G2_SPECIES' + WHEN 2 THEN 'SIMULTANEOUS_ALL_SPECIES' + WHEN 3 THEN 'SPECIFIC_STOCK' +END; +ALTER TABLE Contact RENAME COLUMN samplingStrategyOrdinal TO samplingStrategy; +UPDATE Contact SET samplingStrategy = NULL where sampleRow in (select sr.topiaId from SampleRow sr where obsProgram = 'OBSMER'); + +ALTER TABLE SampleRow ALTER COLUMN samplingStrategyOrdinal TYPE character varying(255) USING CASE samplingStrategyOrdinal + WHEN 0 THEN 'SIMULTANEOUS_G1_SPECIES' + WHEN 1 THEN 'SIMULTANEOUS_G1_G2_SPECIES' + WHEN 2 THEN 'SIMULTANEOUS_ALL_SPECIES' + WHEN 3 THEN 'SPECIFIC_STOCK' +END; +ALTER TABLE SampleRow RENAME COLUMN samplingStrategyOrdinal TO samplingStrategy; +UPDATE SampleRow SET samplingStrategy = NULL where obsProgram = 'OBSMER'; + +ALTER TABLE TerrestrialLocation ALTER COLUMN locationTypeOrdinal TYPE character varying(255) USING CASE locationTypeOrdinal + WHEN 0 THEN 'PORT' + WHEN 1 THEN 'AUCTION' + WHEN 2 THEN 'DISTRICT' + WHEN 3 THEN 'REGION' +END; +ALTER TABLE SampleRow RENAME COLUMN locationTypeOrdinal TO locationType; + +ALTER TABLE UserProfile ALTER COLUMN obsProgramOrdinal TYPE character varying(255) USING CASE obsProgramOrdinal + WHEN 0 THEN 'OBSMER' + WHEN 1 THEN 'OBSVENTE' +END; +ALTER TABLE UserProfile RENAME COLUMN obsProgramOrdinal TO obsProgram; + +ALTER TABLE UserProfile ALTER COLUMN userRoleOrdinal TYPE character varying(255) USING CASE userRoleOrdinal + WHEN 0 THEN 'ADMIN' + WHEN 1 THEN 'OBSERVER' + WHEN 2 THEN 'COORDINATOR' + WHEN 3 THEN 'GUEST' + WHEN 4 THEN 'PROFESSIONAL' +END; +ALTER TABLE UserProfile RENAME COLUMN userRoleOrdinal TO userRole; + +ALTER TABLE ContactStateMotif ALTER COLUMN contactStateOrdinal TYPE character varying(255) USING CASE contactStateOrdinal + WHEN 0 THEN 'CONTACT_START' + WHEN 1 THEN 'OBSERVATION_EXPECTED' + WHEN 2 THEN 'OBSERVATION_DONE' + WHEN 3 THEN 'OBSERVATION_CANCELLED' + WHEN 4 THEN 'CONTACT_REFUSED' + WHEN 5 THEN 'CONTACT_DEFINITELY_REFUSED' +END; +ALTER TABLE ContactStateMotif RENAME COLUMN contactStateOrdinal TO contactState; + Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -288,7 +288,7 @@ ObsProgram obsProgram = authenticatedWaoUser.getObsProgram(); List<SampleRow> sampleRows = - getSampleRowDao().forObsProgramOrdinalEquals(obsProgram.ordinal()).findAll(); + getSampleRowDao().forObsProgramEquals(obsProgram).findAll(); List<WaoUser> waoUsers = getWaoUserDao().findAll(); List<Boat> boats = getBoatDao().findAll(); List<ContactStateMotif> motives = getContactStateMotifDao().findAll(); @@ -1043,7 +1043,7 @@ // let's try to find a recent similar contact Map<String, Object> properties = new HashMap<>(); - properties.put(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); + properties.put(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM, newContact.getObsProgram()); properties.put(Contact.PROPERTY_SAMPLE_ROW, sampleRow); properties.put(Contact.PROPERTY_MAIN_OBSERVER, observer); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ObsVenteSamplingPlan.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -21,6 +21,7 @@ * #L% */ +import fr.ifremer.wao.WaoUtils; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.collections4.CollectionUtils; @@ -47,6 +48,8 @@ protected int averageObservationsCount; + protected String samplingStrategy; + public ObsVenteSamplingPlanSampleRowPart(Locale locale, Map<Date, SamplingPlanStatistics> nbTidesPerMonth, SampleRow sampleRow, long sampleRowContactCounts) { super(locale, nbTidesPerMonth, sampleRow, sampleRowContactCounts); terrestrialLocationInfos = sampleRow.getTerrestrialLocationInfos(); @@ -59,8 +62,13 @@ } } averageObservationsCount = sampleRow.getAverageObservationsCount(); + samplingStrategy = WaoUtils.l(locale, sampleRow.getSamplingStrategy()); } + public String getSamplingStrategy() { + return samplingStrategy; + } + public String getTerrestrialLocationInfos() { return terrestrialLocationInfos; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -117,8 +117,10 @@ if (company != null) { companies.add(FilterOption.forValueAndLabel(company.getTopiaId(), company.getName())); } - samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); if (sampleRow.getObsProgram().isObsVente()) { + samplingStrategies.add(FilterOption.forEnum(locale, sampleRow.getSamplingStrategy())); + } + if (sampleRow.getObsProgram().isObsVente()) { TerrestrialLocation terrestrialDistrict = sampleRow.getTerrestrialLocation(); terrestrialDistricts.add( FilterOption.forValueAndLabel( Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlan.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -333,8 +333,6 @@ protected String companyName; - protected String samplingStrategy; - protected String professionDescriptionWithoutDCF5; protected Map<String, String> dcf5CodesAndDescriptions; @@ -418,7 +416,6 @@ } professionDescriptionWithoutDCF5 = sampleRow.getProfessionDescriptionWithoutDCF5(); - samplingStrategy = WaoUtils.l(locale, sampleRow.getSamplingStrategy()); sampleRowId = sampleRow.getTopiaId(); // consider a recently created sample row as recently updated @@ -442,10 +439,6 @@ elligibleBoatsProvided = sampleRow.isElligibleBoatNotEmpty(); } - public String getSamplingStrategy() { - return samplingStrategy; - } - public String getSampleRowId() { return sampleRowId; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -59,7 +59,6 @@ import fr.ifremer.wao.entity.SampleRowLogImpl; import fr.ifremer.wao.entity.SampleRowLogTopiaDao; import fr.ifremer.wao.entity.SampleRowTopiaDao; -import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocationTopiaDao; import fr.ifremer.wao.services.AuthenticatedWaoUser; @@ -320,9 +319,6 @@ newSampleRow.setProfession(new ProfessionImpl()); newSampleRow.setFishingZone(new HashSet<FishingZone>()); newSampleRow.setSampleMonth(new HashSet<SampleMonth>()); - if (obsProgram.isObsMer()) { - newSampleRow.setSamplingStrategy(SamplingStrategy.SIMULTANEOUS_ALL_SPECIES); - } String newSampleRowCode = getNewSampleRowCode(obsProgram); newSampleRow.setCode(newSampleRowCode); @@ -743,8 +739,10 @@ throw new MissingFishingZonesException(sampleRow); } - if (sampleRow.getSamplingStrategy().isSpecificStock() && StringUtils.isEmpty(sampleRow.getProfession().getSpecies())) { - throw new MissingProfessionSpeciesException(sampleRow); + if (sampleRow.getObsProgram().isObsVente()) { + if (sampleRow.getSamplingStrategy().isSpecificStock() && StringUtils.isEmpty(sampleRow.getProfession().getSpecies())) { + throw new MissingProfessionSpeciesException(sampleRow); + } } for (SampleMonth sampleMonth : sampleRow.getSampleMonth()) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-29 13:18:07 UTC (rev 2179) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java 2014-07-29 14:59:20 UTC (rev 2180) @@ -239,7 +239,7 @@ // look if already exists and update existing or add new TerrestrialLocation existingLocation = dao.forProperties( TerrestrialLocation.PROPERTY_CODE, location.getCode(), - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, location.getLocationTypeOrdinal()).findUniqueOrNull(); + TerrestrialLocation.PROPERTY_LOCATION_TYPE, location.getLocationType()).findUniqueOrNull(); if (existingLocation == null) { dao.create(location); locationAdded += 1; @@ -260,7 +260,7 @@ // We must find all the distinct district ids and check that // we have an entity representing it. In database a disctrict can // be distinguished from a location by having it's - // locationTypeOrdinal null. + // locationType null. List<String> districtCodes = dao.findAllDistinctDistrictCodesUsedInLocations(); // a binder, needed for update @@ -279,7 +279,7 @@ TerrestrialLocation district = new TerrestrialLocationImpl(); districtBinder.copyExcluding(location, district, TerrestrialLocation.PROPERTY_NAME, TerrestrialLocation.PROPERTY_CODE, TerrestrialLocation.PROPERTY_PORT_CODE, - TerrestrialLocation.PROPERTY_PORT_NAME, TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, + TerrestrialLocation.PROPERTY_PORT_NAME, TerrestrialLocation.PROPERTY_LOCATION_TYPE, TopiaEntity.PROPERTY_TOPIA_ID, TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, TerrestrialLocation.PROPERTY_TOPIA_VERSION); district.setLocationType(LocationType.DISTRICT); @@ -307,7 +307,7 @@ TerrestrialLocation existingDistrict = dao.forProperties( TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode(), - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, LocationType.DISTRICT.ordinal()).findUniqueOrNull(); + TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.DISTRICT).findUniqueOrNull(); if (existingDistrict == null) { dao.create(district); districtAdded += 1; @@ -333,7 +333,7 @@ // try to find it if it's already in DB TerrestrialLocation existingRegion = dao.forProperties( TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode(), - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, LocationType.REGION.ordinal()).findUniqueOrNull(); + TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.REGION).findUniqueOrNull(); // create or update if (existingRegion == null) { @@ -369,7 +369,7 @@ TopiaQueryBuilderAddCriteriaOrRunQueryStep<TerrestrialLocation> query = dao.newQueryBuilder(); - query.addIn(TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, ImmutableSet.of(LocationType.PORT.ordinal(), LocationType.AUCTION.ordinal())); + query.addIn(TerrestrialLocation.PROPERTY_LOCATION_TYPE, ImmutableSet.of(LocationType.PORT, LocationType.AUCTION)); query.addEquals(TerrestrialLocation.PROPERTY_DISTRICT_CODE, district.getDistrictCode()); @@ -383,7 +383,7 @@ TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); - List<TerrestrialLocation> allRegionIfremers = dao.forLocationTypeOrdinalEquals(LocationType.REGION.ordinal()).findAll(); + List<TerrestrialLocation> allRegionIfremers = dao.forLocationTypeEquals(LocationType.REGION).findAll(); return allRegionIfremers; @@ -396,7 +396,7 @@ TerrestrialLocationTopiaDao dao = getPersistenceContext().getTerrestrialLocationDao(); TerrestrialLocation terrestrialDistrict = dao.forProperties( - TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, LocationType.DISTRICT.ordinal(), + TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.DISTRICT, TerrestrialLocation.PROPERTY_DISTRICT_CODE, districtCode).findUnique(); return terrestrialDistrict; @@ -415,7 +415,7 @@ result = dao.findAll(); } else { ContactState substituteState = ContactState.getSubstituteForMotif(contactState); - result = dao.forContactStateOrdinalEquals(substituteState.ordinal()).findAll(); + result = dao.forContactStateEquals(substituteState).findAll(); } if (log.isDebugEnabled()) { @@ -468,7 +468,7 @@ Map<String, Object> properties = new HashMap<>(); // we are looking for ports only - properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE_ORDINAL, LocationType.PORT.ordinal()); + properties.put(TerrestrialLocation.PROPERTY_LOCATION_TYPE, LocationType.PORT); // ports in a specific region properties.put(TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE, region.getRegionIfremerCode());

1 0

r2179 - in trunk/wao-persistence/src: main/java/fr/ifremer/wao/entity test/java/fr/ifremer/wao/entity
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 15:18:07 +0200 (Tue, 29 Jul 2014) New Revision: 2179 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2179 Log: refs #4481 remove a contactState value that was only for obsDeb Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-07-29 12:20:29 UTC (rev 2178) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactState.java 2014-07-29 13:18:07 UTC (rev 2179) @@ -65,11 +65,8 @@ CONTACT_REFUSED(n("ContactState.CONTACT_REFUSED"), true ,true, false), /** After a contact refused, people contacted still refuse the observation. Observer may not try later. */ - CONTACT_DEFINITELY_REFUSED(n("ContactState.CONTACT_DEFINITELY_REFUSED"), true, true, false), + CONTACT_DEFINITELY_REFUSED(n("ContactState.CONTACT_DEFINITELY_REFUSED"), true, true, false); - /** On the work field, observer choose not to get in touch with the people from the boat */ - OBSERVATION_NOT_DONE(n("ContactState.OBSERVATION_NOT_DONE"), true, false, false); - private String i18nKey; /** if true, the state may not be changed. */ @@ -120,7 +117,7 @@ public boolean isAllowed(ObsProgram obsProgram) { boolean allowed; if (obsProgram == ObsProgram.OBSMER) { - allowed = this != OBSERVATION_NOT_DONE; + allowed = true; } else if (obsProgram == ObsProgram.OBSVENTE) { allowed = allowedForObsVente; } else { Added: trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java =================================================================== --- trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java (rev 0) +++ trunk/wao-persistence/src/test/java/fr/ifremer/wao/entity/ContactStateTest.java 2014-07-29 13:18:07 UTC (rev 2179) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.entity; + +import org.junit.Assert; +import org.junit.Test; + +public class ContactStateTest { + + @Test + public void testContacts() { + + for (ContactState contactState : ContactState.values()) { + Assert.assertTrue( + "value " + contactState + " is allowed for no program", + contactState.isAllowed(ObsProgram.OBSMER) || contactState.isAllowed(ObsProgram.OBSVENTE)); + } + + } +} \ No newline at end of file

1 0

r2178 - in trunk: wao-persistence/src/main/java/fr/ifremer/wao/entity wao-persistence/src/main/resources/db/migration wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 14:20:29 +0200 (Tue, 29 Jul 2014) New Revision: 2178 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2178 Log: refs #4481 remove everything about indicators from database and model Removed: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java Deleted: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2014-07-29 12:09:56 UTC (rev 2177) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorImpl.java 2014-07-29 12:20:29 UTC (rev 2178) @@ -1,52 +0,0 @@ -/* - * #%L - * Wao :: Business - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.entity; - -/** - * - */ -public class IndicatorImpl extends IndicatorAbstract { - - @Override - public SynthesisId getSynthesisId() { - SynthesisId result = null; - if (getIndicatorId() != null) { - result = SynthesisId.valueOf(getIndicatorId()); - } - return result; - } - - @Override - public void setSynthesisId(SynthesisId synthesisId) { - setIndicatorId(synthesisId.ordinal()); - } - - /** return the level that contains given value between it's two bound */ - @Override - public IndicatorLevel getLevelForValue(double value) { - for (IndicatorLevel level : getIndicatorLevel()) { - if (level.containsValue(value)) { - return level; - } - } - throw new IllegalStateException("no level found for value " + value); - } -} Deleted: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2014-07-29 12:09:56 UTC (rev 2177) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndicatorLevelImpl.java 2014-07-29 12:20:29 UTC (rev 2178) @@ -1,90 +0,0 @@ -/* - * #%L - * Wao :: Business - * %% - * Copyright (C) 2009 - 2010 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.wao.entity; - -public class IndicatorLevelImpl extends IndicatorLevelAbstract { - - /** the upperBound of the lower level */ - protected double lowerBound; - - protected boolean upperBoundIncluded = false; - - @Override - public double getLowerBound() { - return lowerBound; - } - - @Override - public void setLowerBound(double lowerBound) { - this.lowerBound = lowerBound; - } - - @Override - public boolean isLowerBoundPositiveInfinity() { - return lowerBound == Double.MAX_VALUE; - } - - @Override - public void setLowerBoundToPositiveInfinity() { - lowerBound = Double.MAX_VALUE; - } - - @Override - public boolean lowerEqualsUpperBounds() { - return getLowerBound() == getUpperBound(); - } - - /** if upperBound and lowerBound are equals, return true if value is equals - * if lowerBound and upperBound are different, return true if value is - * between bound. - * - * upperBound is always strict comparison, lowerBound non-strict comparison - */ - @Override - public boolean containsValue(double value) { - boolean containsValue = false; - - if (upperBoundIncluded && value == upperBound) { - containsValue = true; - } else if (lowerEqualsUpperBounds()) { - containsValue = value == getUpperBound(); - } else { - if (getLowerBound() < getUpperBound()) { - containsValue = value >= getLowerBound() - && value < getUpperBound(); - } else { - containsValue = value >= getUpperBound() - && value < getLowerBound(); - } - } - - return containsValue; - } - - @Override - public boolean isUpperBoundIncluded() { - return upperBoundIncluded; - } - - public void setUpperBoundIncluded(boolean upperBoundIncluded) { - this.upperBoundIncluded = upperBoundIncluded; - } -} Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 12:09:56 UTC (rev 2177) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 12:20:29 UTC (rev 2178) @@ -53,3 +53,9 @@ ALTER TABLE contact DROP COLUMN tidenbdays; ALTER TABLE contact DROP COLUMN obsprogramordinal; +-- Suppresion de tout ce qui concerne les indicateurs + +DROP TABLE indicatorlog; +DROP TABLE indicatorlevel; +DROP TABLE indicator; + Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-07-29 12:09:56 UTC (rev 2177) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-07-29 12:20:29 UTC (rev 2178) @@ -32,9 +32,6 @@ import fr.ifremer.wao.entity.ElligibleBoatTopiaDao; import fr.ifremer.wao.entity.FishingGearDCFTopiaDao; import fr.ifremer.wao.entity.FishingZoneTopiaDao; -import fr.ifremer.wao.entity.IndicatorLevelTopiaDao; -import fr.ifremer.wao.entity.IndicatorLogTopiaDao; -import fr.ifremer.wao.entity.IndicatorTopiaDao; import fr.ifremer.wao.entity.NewsTopiaDao; import fr.ifremer.wao.entity.ProfessionTopiaDao; import fr.ifremer.wao.entity.ReferentialMetaTopiaDao; @@ -146,18 +143,6 @@ return getPersistenceContext().getFishingZoneDao(); } - protected IndicatorTopiaDao getIndicatorDao() { - return getPersistenceContext().getIndicatorDao(); - } - - protected IndicatorLevelTopiaDao getIndicatorLevelDao() { - return getPersistenceContext().getIndicatorLevelDao(); - } - - protected IndicatorLogTopiaDao getIndicatorLogDao() { - return getPersistenceContext().getIndicatorLogDao(); - } - protected NewsTopiaDao getNewsDao() { return getPersistenceContext().getNewsDao(); }

1 0

r2177 - in trunk: wao-persistence/src/main/xmi wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/main/java/fr/ifremer/wao/services/service/csv
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 14:09:56 +0200 (Tue, 29 Jul 2014) New Revision: 2177 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2177 Log: refs #4481 fix compilations issues Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ) Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 11:56:54 UTC (rev 2176) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ContactsService.java 2014-07-29 12:09:56 UTC (rev 2177) @@ -203,8 +203,6 @@ Contact contact = new ContactImpl(); - contact.setObsProgram(authenticatedWaoUser.getObsProgram()); - contact.setCreationDate(getNow()); UpdateContactCommand updateContactCommand = new UpdateContactCommand(); @@ -1045,7 +1043,7 @@ // let's try to find a recent similar contact Map<String, Object> properties = new HashMap<>(); - properties.put(Contact.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); + properties.put(Contact.PROPERTY_SAMPLE_ROW + "." + SampleRow.PROPERTY_OBS_PROGRAM_ORDINAL, newContact.getObsProgram().ordinal()); properties.put(Contact.PROPERTY_SAMPLE_ROW, sampleRow); properties.put(Contact.PROPERTY_MAIN_OBSERVER, observer); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-29 11:56:54 UTC (rev 2176) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-07-29 12:09:56 UTC (rev 2177) @@ -133,7 +133,6 @@ @Override public Contact newEmptyInstance() { Contact newContact = new ContactImpl(); - newContact.setObsProgram(obsProgram); return newContact; }

1 0

r2176 - branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action
by bleny＠users.forge.codelutin.com July 29, 2014

July 29, 2014

Author: bleny Date: 2014-07-29 13:56:54 +0200 (Tue, 29 Jul 2014) New Revision: 2176 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2176 Log: add log info on csv import Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java Modified: branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java =================================================================== --- branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-07-29 10:33:20 UTC (rev 2175) +++ branches/wao-4.0.x/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java 2014-07-29 11:56:54 UTC (rev 2176) @@ -79,6 +79,10 @@ csvInputStream = new FileInputStream(csvFile); + if (log.isInfoEnabled()) { + log.info(getAuthenticatedWaoUser().getWaoUser() + " is doing a csv import in action " + this); + } + importCsv(csvInputStream); session.addMessage(getSuccessMessage());

1 0