Author: bleny Date: 2014-02-28 17:06:46 +0100 (Fri, 28 Feb 2014) New Revision: 1702 Url: http://codelutin.com/projects/wao/repository/revisions/1702 Log: refs #4482 add boats and boatgroups import in UI Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java Modified: 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/administration/referential-management.jsp Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatGroupsAction.java 2014-02-28 16:06:46 UTC (rev 1702) @@ -0,0 +1,20 @@ +package fr.ifremer.wao.web.action.administration; + +import fr.ifremer.wao.services.service.ImportErrorException; +import org.nuiton.i18n.I18n; + +import java.io.InputStream; + +public class ImportBoatGroupsAction extends AbstractImportReferentialAction { + + @Override + protected void importCsv(InputStream csvInputStream) throws ImportErrorException { + service.importBoatGroups(csvInputStream); + } + + @Override + protected String getSuccessMessage() { + return I18n.t("wao.import.boatGroups.success"); + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportBoatsAction.java 2014-02-28 16:06:46 UTC (rev 1702) @@ -0,0 +1,20 @@ +package fr.ifremer.wao.web.action.administration; + +import fr.ifremer.wao.services.service.ImportErrorException; +import org.nuiton.i18n.I18n; + +import java.io.InputStream; + +public class ImportBoatsAction extends AbstractImportReferentialAction { + + @Override + protected void importCsv(InputStream csvInputStream) throws ImportErrorException { + service.importBoats(csvInputStream); + } + + @Override + protected String getSuccessMessage() { + return I18n.t("wao.import.boats.success"); + } + +} 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-02-28 15:26:57 UTC (rev 1701) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-02-28 16:06:46 UTC (rev 1702) @@ -1,6 +1,10 @@ fr.ifremer.wao.services.service.ReferentialState.lastUpdate=Last update fr.ifremer.wao.services.service.ReferentialState.referentialName=Referential fr.ifremer.wao.services.service.ReferentialState.size=Lines count +wao.import.boatGroups.prompt=Import boats +wao.import.boatGroups.success=Import boats successful +wao.import.boats.prompt=Import boat groups +wao.import.boats.success=Import boat groups successful wao.import.contactStateMotives.prompt=Import contact state motives wao.import.contactStateMotives.success=Import contact state motives successful wao.import.fishingZones.prompt=Import fishing zones 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-02-28 15:26:57 UTC (rev 1701) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-02-28 16:06:46 UTC (rev 1702) @@ -1,6 +1,10 @@ fr.ifremer.wao.services.service.ReferentialState.lastUpdate=Date de dernière mise à jour fr.ifremer.wao.services.service.ReferentialState.referentialName=Référentiel fr.ifremer.wao.services.service.ReferentialState.size=Nombre de lignes en base +wao.import.boatGroups.prompt=Import des flotilles +wao.import.boatGroups.success=Import des flotilles réalisé avec succès +wao.import.boats.prompt=Import des navires +wao.import.boats.success=Import des navires réalisé avec succès wao.import.contactStateMotives.prompt=Import des motifs de refus wao.import.contactStateMotives.success=Import des motifs de refus réalisé avec succès wao.import.fishingZones.prompt=Import des zones de pêches Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-02-28 15:26:57 UTC (rev 1701) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/administration/referential-management.jsp 2014-02-28 16:06:46 UTC (rev 1702) @@ -8,14 +8,14 @@ </head> <div class="alert alert-info"> - <s:property value="getText('wao.ui.import.disclaimer')" /> + <s:text name="wao.ui.import.disclaimer" /> </div> <s:form action="import-fishing-zones" method="POST" enctype="multipart/form-data"> <fieldset> <legend> - <s:property value="getText('wao.import.fishingZones.prompt')" /> + <s:text name="wao.import.fishingZones.prompt" /> </legend> <s:file name="csvFile" /> @@ -31,7 +31,7 @@ <fieldset> <legend> - <s:property value="getText('wao.import.terrestrialLocations.prompt')" /> + <s:text name="wao.import.terrestrialLocations.prompt" /> </legend> <s:file name="csvFile" /> @@ -43,12 +43,28 @@ </s:form> + <s:form action="import-boats" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text name="wao.import.boats.prompt" /> + </legend> + + <s:file name="csvFile" /> + + <s:submit type="button"> + <i class="icon-upload"></i> Importer + </s:submit> + </fieldset> + + </s:form> + <s:if test="obsMer"> <s:form action="import-contact-state-motives" method="POST" enctype="multipart/form-data"> <fieldset> <legend> - <s:property value="getText('wao.import.contactStateMotives.prompt')" /> + <s:text name="wao.import.contactStateMotives.prompt" /> </legend> <s:file name="csvFile" /> @@ -66,7 +82,7 @@ <fieldset> <legend> - <s:property value="getText('wao.import.obsDebCodes.prompt')" /> + <s:text name="wao.import.obsDebCodes.prompt" /> </legend> <s:file name="csvFile" /> @@ -82,7 +98,7 @@ <fieldset> <legend> - <s:property value="getText('wao.import.terrestrialDivisions.prompt')" /> + <s:text name="wao.import.terrestrialDivisions.prompt" /> </legend> <s:file name="csvFile" /> @@ -93,18 +109,34 @@ </fieldset> </s:form> + + <s:form action="import-boat-groups" method="POST" enctype="multipart/form-data"> + + <fieldset> + <legend> + <s:text name="wao.import.boatGroups.prompt" /> + </legend> + + <s:file name="csvFile" /> + + <s:submit type="button"> + <i class="icon-upload"></i> Importer + </s:submit> + </fieldset> + + </s:form> </s:if> <table class="table table-bordered"> <tr> <th> - <s:property value="getText('fr.ifremer.wao.services.service.ReferentialState.referentialName')" /> + <s:text name="fr.ifremer.wao.services.service.ReferentialState.referentialName" /> </th> <th> - <s:property value="getText('fr.ifremer.wao.services.service.ReferentialState.size')" /> + <s:text name="fr.ifremer.wao.services.service.ReferentialState.size" /> </th> <th> - <s:property value="getText('fr.ifremer.wao.services.service.ReferentialState.lastUpdate')" /> + <s:text name="fr.ifremer.wao.services.service.ReferentialState.lastUpdate" /> </th> </tr> <s:iterator value="referentialStates">