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 0715813fe4309dcefc4d6a8aabd5c4c18c8abcd8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 17:59:07 2014 +0100 Ajout de l'interface utilisateur d'import du référentiel des espèces --- .../service/administration/ReferentialService.java | 4 +++- .../java/fr/ifremer/wao/web/WaoJspActionSupport.java | 4 ++++ .../web/action/administration/ImportSpeciesAction.java | 18 ++++++++++++++++++ .../src/main/resources/i18n/wao-web_en_GB.properties | 2 ++ .../src/main/resources/i18n/wao-web_fr_FR.properties | 2 ++ .../content/administration/referential-management.jsp | 18 ++++++++++++++++++ 6 files changed, 47 insertions(+), 1 deletion(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java index 0e22420..9843992 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java @@ -124,7 +124,9 @@ public class ReferentialService extends WaoServiceSupport { TerrestrialLocation.class.getName(), Boat.class.getName())); - // TODO brendan 02/12/14 Species + perProgramReferential.put(ObsProgram.SCLEROCHRONOLOGY, Arrays.asList( + FishingZone.class.getName(), + Species.class.getName())); PER_PROGRAM_REFERENTIAL = Collections.unmodifiableMap(perProgramReferential); } diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java b/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java index 118f6a0..24e41a4 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java @@ -59,6 +59,10 @@ public class WaoJspActionSupport extends WaoActionSupport { return getObsProgram().isObsVente(); } + public boolean isSclerochronology() { + return getObsProgram().isSclerochronology(); + } + public String getText(Enum<?> enumeration) { return getText(enumeration.getClass().getSimpleName() + "." + enumeration.name()); } diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java new file mode 100644 index 0000000..88f2b4c --- /dev/null +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java @@ -0,0 +1,18 @@ +package fr.ifremer.wao.web.action.administration; + +import fr.ifremer.wao.services.service.ImportErrorException; + +import java.io.InputStream; + +public class ImportSpeciesAction extends AbstractImportReferentialAction { + + @Override + protected void importCsv(InputStream csvInputStream) throws ImportErrorException { + service.importSpecies(csvInputStream); + } + + @Override + protected String getSuccessMessage() { + return t("wao.import.species.success"); + } +} diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index e1020e5..bafdcd9 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -14,6 +14,8 @@ wao.import.contactStateMotives.success=Import contact state motives successful wao.import.fishingZones.prompt=Import fishing zones wao.import.fishingZones.success=Import fishing zones successful wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code must follow pattern YYYY_P1234 (YYYY is the year with 4 digits, P the program and 1234 the line number) +wao.import.species.prompt=Import species +wao.import.species.success=Species import successful wao.import.terrestrialDivisions.success= wao.import.terrestrialLocations.prompt=Import terrestrial locations wao.import.terrestrialLocations.success=Import terrestrial locations successful 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 ff1b2cc..2d02f42 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 @@ -14,6 +14,8 @@ wao.import.contactStateMotives.success=Import des motifs de refus réalisé avec 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.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 diff --git a/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp b/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp index 88899f0..b3d6b83 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp @@ -101,6 +101,24 @@ </s:form> </s:if> + <s:if test="sclerochronology"> + <s:form action="import-species" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text name="wao.import.species.prompt" /> + </legend> + + <s:file name="csvFile" cssClass="float-left" /> + + <s:submit type="button"> + <i class="icon-upload"></i> <s:text name="wao.ui.action.csvImport" /> + </s:submit> + </fieldset> + + </s:form> + </s:if> + <table class="table table-bordered"> <tr> <th> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.