This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 52ea7b45353990a9f6496ad4220fb8f928820315 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Feb 12 17:35:27 2015 +0100 Dans l'onglet Navires, on ne doit pas voir les navires Scléro (testable-client #6658) --- .../main/java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../wao/entity/SclerochronologySamplingContext.java | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java index b718e24..e3012f1 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/BoatTopiaDao.java @@ -129,6 +129,8 @@ public class BoatTopiaDao extends AbstractBoatTopiaDao<Boat> { ImmutableMap.of("fleetIds", (Object) filter.getFleetIds())); } + query.addNotIn(Boat.PROPERTY_REGISTRATION_CODE, SclerochronologySamplingContext.sclerochronologyVirtualBoatRegistrationCodes()); + if (log.isTraceEnabled()) { log.trace("query to filter boats for " + filter + " is " + query.getHql() + " " + query.getHqlParameters()); } diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java index ca1c677..1738147 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java @@ -22,6 +22,8 @@ package fr.ifremer.wao.entity; */ +import com.google.common.collect.ImmutableSet; + import static org.nuiton.i18n.I18n.n; /** @@ -46,6 +48,12 @@ public enum SclerochronologySamplingContext implements I18nAble { */ TERRESTRIAL_SAMPLING(n("SclerochronologySamplingContext.TERRESTRIAL_SAMPLING")); + protected static final String SCIENTIFIC_CAMPAIGN_BOAT_REGISTRATION_CODE = "SCLEROCAM"; + + protected static final String PROFESSIONAL_BOAT_REGISTRATION_CODE = "SCLEROPRO"; + + protected static final ImmutableSet<String> SCLEROCHRONOLOGY_VIRTUAL_BOAT_REGISTRATION_CODES = ImmutableSet.of(SCIENTIFIC_CAMPAIGN_BOAT_REGISTRATION_CODE, PROFESSIONAL_BOAT_REGISTRATION_CODE); + protected String i18nKey; SclerochronologySamplingContext(String i18nKey) { @@ -64,10 +72,14 @@ public enum SclerochronologySamplingContext implements I18nAble { public String getDedicatedBoatRegistrationCode() { String dedicatedBoatRegistrationCode; if (isScientificCampaign()) { - dedicatedBoatRegistrationCode = "SCLEROCAM"; + dedicatedBoatRegistrationCode = SCIENTIFIC_CAMPAIGN_BOAT_REGISTRATION_CODE; } else { - dedicatedBoatRegistrationCode = "SCLEROPRO"; + dedicatedBoatRegistrationCode = PROFESSIONAL_BOAT_REGISTRATION_CODE; } return dedicatedBoatRegistrationCode; } + + public static ImmutableSet<String> sclerochronologyVirtualBoatRegistrationCodes() { + return SCLEROCHRONOLOGY_VIRTUAL_BOAT_REGISTRATION_CODES; + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.