Author: tchemit Date: 2012-02-09 19:18:14 +0100 (Thu, 09 Feb 2012) New Revision: 312 Url: http://forge.codelutin.com/repositories/revision/echobase/312 Log: - am?\195?\169lioration des r?\195?\169sultats d'import - import common data fonctionne! Added: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/importDataResults.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AccousticDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CatchesDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperation.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResults.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractImportDataService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -57,13 +57,12 @@ */ public abstract class AbstractImportDataService<M extends AbstractImportConfiguration> extends EchoBaseServiceSupport { - public final Map<InputFile, CsvImportResult> doImport(M configuration, - EchoBaseUser user) throws ImportException { + public final List<CsvImportResult> doImport(M configuration, + EchoBaseUser user) throws ImportException { try { - Map<InputFile, CsvImportResult> result = startImport(configuration, - user); + List<CsvImportResult> result = startImport(configuration, user); // do commit commitTransaction("Could not execute import " + getImportLabel()); @@ -77,10 +76,10 @@ protected abstract String getImportLabel(); - protected abstract Map<InputFile, CsvImportResult> startImport(M configuration, - EchoBaseUser user) throws ImportException; + protected abstract List<CsvImportResult> startImport(M configuration, + EchoBaseUser user) throws ImportException; - protected void addResultAndLog(Map<InputFile, CsvImportResult> result, + protected void addResultAndLog(List<CsvImportResult> result, InputFile inputFile, CsvImportResult importResult, EchoBaseUser user) { @@ -88,7 +87,7 @@ if (importResult.getNumberCreated() > 0 || importResult.getNumberUpdated() > 0) { - result.put(inputFile, importResult); + result.add(importResult); String importType = getImportLabel(); @@ -104,17 +103,15 @@ getDAO(EntityModificationLog.class); create(dao, - EntityModificationLog.PROPERTY_ENTITY_TYPE, importResult.entityType, + EntityModificationLog.PROPERTY_ENTITY_TYPE, importResult.entityType.name(), EntityModificationLog.PROPERTY_ENTITY_ID, importType, EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), EntityModificationLog.PROPERTY_MODIFICATION_TEXT, description.toString() ); } - } - protected Reader getInputFileReader(InputFile inputFile) throws EchoBaseTechnicalException { try { Reader reader = new BufferedReader(new InputStreamReader( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AccousticDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AccousticDataImportService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AccousticDataImportService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import com.google.common.collect.Lists; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; import fr.ifremer.echobase.InputFile; @@ -55,6 +55,7 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -73,11 +74,11 @@ } @Override - protected Map<InputFile, CsvImportResult> startImport( + protected List<CsvImportResult> startImport( AccousticDataImportConfiguration configuration, EchoBaseUser user) throws ImportException { - Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + List<CsvImportResult> result = Lists.newLinkedList(); // get selected voyage Voyage voyage = getEntityById(Voyage.class, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CatchesDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CatchesDataImportService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CatchesDataImportService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; @@ -58,6 +59,7 @@ import java.io.Reader; import java.util.Collection; +import java.util.List; import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -76,10 +78,11 @@ } @Override - protected Map<InputFile, CsvImportResult> startImport(CatchesDataImportConfiguration configuration, - EchoBaseUser user) throws ImportException { - Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + protected List<CsvImportResult> startImport(CatchesDataImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + List<CsvImportResult> result = Lists.newLinkedList(); + Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataImportService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/CommonDataImportService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseTechnicalException; @@ -55,9 +56,9 @@ import java.io.Reader; import java.util.Arrays; import java.util.Date; +import java.util.List; import java.util.Map; -import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.l_; /** @@ -74,11 +75,11 @@ } @Override - protected Map<InputFile, CsvImportResult> startImport( + protected List<CsvImportResult> startImport( CommonDataImportConfiguration configuration, EchoBaseUser user) throws ImportException { - Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + List<CsvImportResult> result = Lists.newLinkedList(); CommonDataImportMode importMode = configuration.getImportMode(); @@ -193,7 +194,7 @@ // this means a voyage file with more than one row not possible... throw new ImportException( - _("echobase.importError.can.only.import.one.voyage.atime")); + l_(getLocale(), "echobase.importError.can.only.import.one.voyage.atime")); } importResult.incrementsNumberCreated(); @@ -201,7 +202,7 @@ if (newVoyage == null) { throw new ImportException( - _("echobase.importError.no.voyage.imported")); + l_(getLocale(), "echobase.importError.no.voyage.imported")); } // push back to id of the voyage in configuration for next imports @@ -220,7 +221,7 @@ CommonDataImportConfiguration configuration) throws ImportException { CsvImportResult importResult = new CsvImportResult( - EchoBaseEntityEnum.Voyage, + EchoBaseEntityEnum.Transit, inputFile.getFileName(), false); @@ -239,9 +240,6 @@ TransitDAO dao = getDAO(Transit.class, TransitDAO.class); - - int nbTransits = 0; - Reader reader = getInputFileReader(inputFile); try { Import<TransitImportModelRow> importer = @@ -252,18 +250,13 @@ transit.setRelatedActivity(relatedActivity); - Transit createdTransit = create(dao); + Transit createdTransit = create(dao, transit); voyage.addTransit(createdTransit); importResult.incrementsNumberCreated(); } - if (nbTransits == 0) { - throw new ImportException( - _("echobase.importError.no.transit.imported")); - } - return importResult; } catch (ImportRuntimeException e) { throw new ImportException(getLocale(), inputFile, e); @@ -278,7 +271,7 @@ CommonDataImportConfiguration configuration) throws ImportException { CsvImportResult importResult = new CsvImportResult( - EchoBaseEntityEnum.Voyage, + EchoBaseEntityEnum.Transect, inputFile.getFileName(), false); @@ -316,7 +309,7 @@ timeCoverageEnd); if (transit == null) { throw new ImportException( - _("echobase.importError.no.transit.between.date", + l_(getLocale(), "echobase.importError.no.transit.between.date", voyage.getName(), timeCoverageStart, timeCoverageEnd)); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/OperationImportService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/OperationImportService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -23,6 +23,7 @@ */ package fr.ifremer.echobase.services; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.InputFile; @@ -56,6 +57,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; +import java.util.List; import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -74,11 +76,11 @@ } @Override - protected Map<InputFile, CsvImportResult> startImport( + protected List<CsvImportResult> startImport( OperationImportConfiguration configuration, EchoBaseUser user) throws ImportException { - Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + List<CsvImportResult> result = Lists.newLinkedList(); // get selected voyage Voyage voyage = getEntityById(Voyage.class, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ResultsImportService.java 2012-02-09 18:18:14 UTC (rev 312) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBasePredicates; @@ -60,6 +61,7 @@ import java.io.Reader; import java.util.Arrays; +import java.util.List; import java.util.Map; import static org.nuiton.i18n.I18n.l_; @@ -78,9 +80,11 @@ } @Override - public Map<InputFile, CsvImportResult> startImport(ResultsImportConfiguration configuration, EchoBaseUser user) throws ImportException { - Map<InputFile, CsvImportResult> result = Maps.newHashMap(); + public List<CsvImportResult> startImport(ResultsImportConfiguration configuration, + EchoBaseUser user) throws ImportException { + List<CsvImportResult> result = Lists.newLinkedList(); + ResultsImportMode importMode = configuration.getImportMode(); switch (importMode) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-02-09 18:18:14 UTC (rev 312) @@ -118,7 +118,7 @@ public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy"); - public static final ValueParser<Date> IMPORT_DAY_TIME2 = new DateValue("dd-MM-yy HH:mm:ss"); + public static final ValueParser<Date> IMPORT_DAY_TIME2 = new DateValue("yyyy-MM-dd HH:mm:ss"); public static final ValueParser<Date> IMPORT_DAY_TIME3 = new DateValue("dd-MM-yy HH:mm aa"); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2012-02-09 18:18:14 UTC (rev 312) @@ -23,16 +23,22 @@ */ package fr.ifremer.echobase.ui.actions.importData; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.services.AbstractImportDataService; import fr.ifremer.echobase.services.CsvImportResult; import fr.ifremer.echobase.services.ImportException; import fr.ifremer.echobase.services.configurations.AbstractImportConfiguration; +import fr.ifremer.echobase.services.configurations.ResultsImportConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.List; import java.util.Map; +import java.util.Set; /** * TODO @@ -53,8 +59,10 @@ protected transient S service; - protected Map<InputFile, CsvImportResult> result; + protected transient Exception error; + protected List<CsvImportResult> result; + protected AbstractLaunchImport(Class<M> modelType, Class<S> serviceType) { this.modelType = modelType; this.serviceType = serviceType; @@ -65,10 +73,14 @@ return getEchoBaseSession().getImportDataConfiguration(modelType); } - public Map<InputFile, CsvImportResult> getResult() { + public List<CsvImportResult> getResult() { return result; } + public Exception getError() { + return error; + } + @Override public void prepare() throws Exception { @@ -87,13 +99,43 @@ result = service.doImport(model, getEchoBaseSession().getEchoBaseUser()); - service.commitTransaction("Could not commit imported data"); + addActionMessage(_("echobase.info.import.succeded")); + } catch (ImportException e) { + + addActionError(_("echobase.info.import.failed")); + + if (model instanceof ResultsImportConfiguration) { + ResultsImportConfiguration m = (ResultsImportConfiguration) model; + result = Lists.newLinkedList(); + CsvImportResult value; + + value = CsvImportResult.newResult( + EchoBaseEntityEnum.LengthAgeKey, + m.getLengthAgeKeyFile().getFile().getName(), + false + ); + value.incrementsNumberCreated(); + result.add(value); + + value = CsvImportResult.newResult( + EchoBaseEntityEnum.AcousticInstrument, + m.getLengthAgeKeyFile().getFile().getName(), + false + ); + value.incrementsNumberCreated(); + value.incrementsNumberCreated(); + value.incrementsNumberCreated(); + result.add(value); + + } + if (log.isErrorEnabled()) { log.error("Error while import ", e); } - addActionError(e.getMessage()); + + error = e; } } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-02-09 18:18:14 UTC (rev 312) @@ -1,3 +1,6 @@ +echobase.common.importError=Message d'erreur +echobase.common.importFileName=Nom du fichier importé +echobase.common.nbCreatedObjects=Nombre d'objets crées echobase.error.bad.password= echobase.error.email.already.used= echobase.error.login.unknown= @@ -9,6 +12,8 @@ echobase.error.required.email= echobase.error.required.password= echobase.error.warlocation.notFound= +echobase.info.import.failed=L'import a échoué. +echobase.info.import.succeded= echobase.info.no.sqlQuery.saved= echobase.info.no.sqlQuery.selected= echobase.info.no.table.selected= @@ -17,3 +22,4 @@ echobase.info.user.delete= echobase.info.user.update= echobase.information.mission.created= +echobase.legend.importData.result.resume=Résultat Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-02-09 18:18:14 UTC (rev 312) @@ -34,14 +34,17 @@ echobase.common.email=Email echobase.common.entityType=Type d'entité echobase.common.importDataMode=Type d'import +echobase.common.importError=Message d'erreur +echobase.common.importFileName=Nom du fichier importé echobase.common.importMode=Type d'import -echobase.common.importResult=Résultat \: +echobase.common.importResult=Résultat de l'import echobase.common.inProgress=en cours... echobase.common.jdbcLogin=Login de connexion echobase.common.jdbcPassword=Mot de passe echobase.common.jdbcUrl=Url de connexion echobase.common.loggedDataDatatype=loggedDataDatatype echobase.common.loggedDataFormat=loggedDataFormat +echobase.common.nbCreatedObjects=Nombre d'objets crées echobase.common.notes=notes echobase.common.password=Mot de passe echobase.common.pingDutyCycle=pingDutyCycle @@ -124,6 +127,8 @@ echobase.header.request.result=Résultat de la requête sql echobase.header.user.gridTitle=Liste des utilisateurs echobase.info.dbeditor.propertyDiffsResult=Résultat d'import de données +echobase.info.import.failed=L'import a échoué. +echobase.info.import.succeded=L'import a réussi. echobase.info.no.sqlQuery.saved=Aucune requête d'export sql enregistrée echobase.info.no.sqlQuery.selected=Aucune requête d'export sql sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée @@ -172,6 +177,7 @@ echobase.legend.importData.configure=Configurer l'import echobase.legend.importData.configure.CommonData.selectMission=Sélection de la mission echobase.legend.importData.createMission=Caractéristiques de la nouvelle mission +echobase.legend.importData.result.resume=Résultat echobase.legend.importDb.configuration.files=Choix du fichier d'import de la base complête (fichier zip) echobase.legend.importFileResult=Résultat de l'import %s echobase.legend.sqlQuery.configuration=Configuration de la requête Added: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/importDataResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/importDataResults.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/importDataResults.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -0,0 +1,51 @@ +<%-- + #%L + EchoBase :: UI + + $Id: resultResults.jsp 304 2012-02-02 22:58:29Z tchemit $ + $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/webap... $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<br/> +<s:if test="hasActionErrors()"> + <s:text name="echobase.common.importError"/> + <pre> + <s:property value="error.message"/> + </pre> +</s:if> +<s:else> + <table> + <thead> + <tr> + <th><s:text name="echobase.common.importFileName"/></th> + <th><s:text name="echobase.common.entityType"/></th> + <th><s:text name="echobase.common.nbCreatedObjects"/></th> + </tr> + </thead> + <s:iterator value="result"> + <tr> + <td><s:property value="importFileName"/></td> + <td><s:property value="entityType"/></td> + <td><s:property value="numberCreated"/></td> + </tr> + </s:iterator> + </table> +</s:else> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultAccousticData.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -29,12 +29,4 @@ <s:text name="echobase.common.importDataMode.accousticData"/> </title> -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.resume"/> - </legend> - -</fieldset> -<br/> - -<div>TODO Result</div> +<%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCatchesData.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -29,12 +29,4 @@ <s:text name="echobase.common.importDataMode.catchesData"/> </title> -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.resume"/> - </legend> - -</fieldset> -<br/> - -<div>TODO Result</div> +<%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonData.jsp 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultCommonData.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -29,14 +29,4 @@ <s:text name="echobase.common.importDataMode.commonData"/> </title> -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.resume"/> - </legend> - <s:label value="%{model.mission.missionName}" - key='echobase.common.missionName'/> - -</fieldset> -<br/> - -<div>TODO Result</div> +<%@ include file="/WEB-INF/includes/importDataResults.jsp" %> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperation.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperation.jsp 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultOperation.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -29,12 +29,4 @@ <s:text name="echobase.common.importDataMode.operation"/> </title> -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.resume"/> - </legend> - -</fieldset> -<br/> - -<div>TODO Result</div> +<%@ include file="/WEB-INF/includes/importDataResults.jsp" %> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResults.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResults.jsp 2012-02-09 17:07:50 UTC (rev 311) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/resultResults.jsp 2012-02-09 18:18:14 UTC (rev 312) @@ -26,15 +26,11 @@ <title> <s:text name="echobase.common.importResult"/> - <s:text name="echobase.common.importDataMode.results"/> </title> -<fieldset> - <legend> - <s:text name="echobase.legend.importData.configuration.resume"/> - </legend> +<h4> + <s:text name="echobase.common.importDataMode.results"/> + ( <s:property value="%{getText(model.importMode.i18nKey)}"/> ) +</h4> -</fieldset> -<br/> - -<div>TODO Result</div> +<%@ include file="/WEB-INF/includes/importDataResults.jsp" %>