branch develop updated (1f3474a -> 90b80fd)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 1f3474a Correction du calcul du réal en jours de mer dans ObsMer new 6dac550 On gère l'absence de AphiaId (fixes #5973) new 5c5786f Correction clé bundle i18n new 6b25c5a Correction NPE new 6687a87 Correction appel i18n dans JSP new 90b80fd Correction de l'import du plan scléro (refs #2263) The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 90b80fd972944e5860dcef1855f9595227d28b79 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:45:08 2015 +0100 Correction de l'import du plan scléro (refs #2263) commit 6687a87764387fa173a1b9633e166b194c355d32 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:44:53 2015 +0100 Correction appel i18n dans JSP commit 6b25c5a920da5fac639388a4cf1a23c9c6ac2cd4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:30:06 2015 +0100 Correction NPE commit 5c5786f3e6cb01ed7cbc6147e221ad2279a8bc54 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:09:24 2015 +0100 Correction clé bundle i18n commit 6dac5501bce39a2d923245907cbb2a004274007f Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:08:33 2015 +0100 On gère l'absence de AphiaId (fixes #5973) Summary of changes: .../src/main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++ .../wao/services/service/UpdateSampleRowCommand.java | 3 ++- .../wao/services/service/csv/SpeciesImportModel.java | 14 ++++++++++++-- .../csv/operations/OrganisationParserFormatter.java | 2 +- wao-services/src/test/resources/import/especes.csv | 4 ++-- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- .../WEB-INF/content/administration/edit-laboratory.jsp | 8 ++++++-- 8 files changed, 37 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6dac5501bce39a2d923245907cbb2a004274007f Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:08:33 2015 +0100 On gère l'absence de AphiaId (fixes #5973) --- .../wao/services/service/csv/SpeciesImportModel.java | 14 ++++++++++++-- wao-services/src/test/resources/import/especes.csv | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java index 1950450..90a1fe0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java @@ -2,6 +2,7 @@ package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.Species; import fr.ifremer.wao.entity.SpeciesImpl; +import org.nuiton.csv.ValueParser; import org.nuiton.csv.ext.AbstractImportModel; public class SpeciesImportModel extends AbstractImportModel<Species> { @@ -9,10 +10,19 @@ public class SpeciesImportModel extends AbstractImportModel<Species> { public SpeciesImportModel() { super(';'); + modelBuilder.newMandatoryColumn("CODE_PERMANENT", Species.PROPERTY_PERMANENT_CODE); modelBuilder.newMandatoryColumn("NOM_SCIENTIFIQUE", Species.PROPERTY_SCIENTIFIC_NAME); modelBuilder.newMandatoryColumn("NOM_COMMUN", Species.PROPERTY_VERNACULAR_NAME); - modelBuilder.newMandatoryColumn("APHIA_ID", Species.PROPERTY_APHIA_ID); - modelBuilder.newMandatoryColumn("CODE_PERMANENT", Species.PROPERTY_PERMANENT_CODE); + modelBuilder.newMandatoryColumn("APHIA_ID", Species.PROPERTY_APHIA_ID, new ValueParser<String>() { + + @Override + public String parse(String value) { + if ("NA".equals(value)) { + return null; + } + return value; + } + }); } diff --git a/wao-services/src/test/resources/import/especes.csv b/wao-services/src/test/resources/import/especes.csv index 85b3bf9..6912695 100644 --- a/wao-services/src/test/resources/import/especes.csv +++ b/wao-services/src/test/resources/import/especes.csv @@ -1,5 +1,5 @@ NOM_SCIENTIFIQUE;NOM_COMMUN;APHIA_ID;CODE_PERMANENT Engraulis encrasicolus;Anchois;126426;1362 Dicentrarchus labrax;Bar européen;126975;1644 -Merluccius merluccius;Merlu européen;126484;1540 -Gadus morhua;Morue de l'Atlantique;126436;1543 +Merluccius merluccius;Merlu européen;NA;1540 +Gadus morhua;Morue de l'Atlantique;NA;1543 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 5c5786f3e6cb01ed7cbc6147e221ad2279a8bc54 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:09:24 2015 +0100 Correction clé bundle i18n --- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index 5ad3387..3770f2d 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -15,7 +15,7 @@ wao.import.fishingZones.prompt=Import des zones de pêches wao.import.fishingZones.success=Import des zones de pêches réalisé avec succès wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code de la ligne doit être de la forme AAAA_P1234 (AAAA représentant l'année sur quatre chiffres, P le code du programme (M, V, ou D) et 1234 le numéro de la ligne sur quatre chiffres) wao.import.species.prompt=Import des espèces -wao.import.species.succès=Import des espèces réalisé avec succès +wao.import.species.succes=Import des espèces réalisé avec succès wao.import.terrestrialDivisions.prompt=Import des unités d'observation wao.import.terrestrialDivisions.success=Import des unités d'observation réalisé avec succès wao.import.terrestrialLocations.prompt=Import des lieux terrestres -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6b25c5a920da5fac639388a4cf1a23c9c6ac2cd4 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:30:06 2015 +0100 Correction NPE --- .../java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java index 3641d36..980f38b 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/UpdateSampleRowCommand.java @@ -23,6 +23,7 @@ package fr.ifremer.wao.services.service; import com.google.common.base.Functions; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -233,7 +234,7 @@ public class UpdateSampleRowCommand implements Serializable{ } public String getElligibleBoatRegistrationCodes() { - return elligibleBoatRegistrationCodes; + return Strings.nullToEmpty(elligibleBoatRegistrationCodes); } public ImmutableMap<String, TerrestrialLocation> getAllTerrestrialDistricts() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 6687a87764387fa173a1b9633e166b194c355d32 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:44:53 2015 +0100 Correction appel i18n dans JSP --- .../webapp/WEB-INF/content/administration/edit-laboratory.jsp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp index a4ea888..c08b4e6 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp @@ -28,7 +28,9 @@ <s:text name="wao.ui.form.Laboratory.title.creation" /> </s:if> <s:else> - <s:property value="%{getText('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> + <s:text name="wao.ui.form.Laboratory.title.edition"> + <s:param value="laboratory.name"/> + </s:text> </s:else> </title> <content tag="mainClass">form</content> @@ -41,7 +43,9 @@ <s:text name="wao.ui.form.Laboratory.title.creation" /> </s:if> <s:else> - <s:property value="%{getText('wao.ui.form.Laboratory.title.edition', laboratory.name)}" /> + <s:text name="wao.ui.form.Laboratory.title.edition"> + <s:param value="laboratory.name"/> + </s:text> </s:else> </h1> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 90b80fd972944e5860dcef1855f9595227d28b79 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:45:08 2015 +0100 Correction de l'import du plan scléro (refs #2263) --- .../src/main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++ .../service/csv/operations/OrganisationParserFormatter.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java index f8970fa..0b657ae 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java @@ -26,7 +26,7 @@ import com.google.common.base.Function; public class Companies { public static Function<Company, String> getName() { - return Organisations.getFullName(); + return Organisations.getName(); } } diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java index 30efc81..b92e39e 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java @@ -13,6 +13,10 @@ public class Organisations { return Ordering.natural().onResultOf(getFullName()); } + public static <T extends Organisation> Function<T, String> getName() { + return new GetName<>(); + } + protected static class GetFullName<T extends Organisation> implements Function<T, String> { @Override @@ -20,4 +24,12 @@ public class Organisations { return input.getFullName(); } } + + protected static class GetName<T extends Organisation> implements Function<T, String> { + + @Override + public String apply(T input) { + return input.getName(); + } + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java index 58ac330..472f0a2 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java @@ -63,7 +63,7 @@ public class OrganisationParserFormatter implements ValueParserFormatter<Organis @Override public Organisation parse(String organisationName) throws ParseException { if (indexedOrganisations == null) { - indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getFullName()); + indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getName()); } Organisation organisation = null; if (StringUtils.isNotBlank(organisationName)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm