branch develop updated (dad5aa1 -> f5bb858)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from dad5aa1 Faire fonctionner la migration 3.905 sous pg (See #8171) new 3225ca9 Use java 8 new 38c71a4 passage méthode en publique new 6072d69 Ajout de l'import des mises en œuvre des engins (See #8181) new f5bb858 Livrable #8181 Merge branch 'feature/8181' into develop The 4 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 f5bb858406547c39c947a324aa6f6ca780d5c601 Merge: dad5aa1 6072d69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:46 2016 +0200 Livrable #8181 Merge branch 'feature/8181' into develop commit 6072d6954a5209c992d8aa3a3c403345a6d1b5a3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:43 2016 +0200 Ajout de l'import des mises en œuvre des engins (See #8181) commit 38c71a4b7034e5bb3acd1b287bdefef41558df59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:29:53 2016 +0200 passage méthode en publique commit 3225ca9b1088e0a526d914ed76b10dbfe5efe31c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:19:29 2016 +0200 Use java 8 Summary of changes: .../echobase/entities/references/Gears.java | 41 ------------ .../echobase/services/service/DbEditorService.java | 10 +-- .../contexts/ImportDataContextSupport.java | 3 +- .../GearCharacteristicValuesImportModel.java | 39 +++++++++++ .../GearCharacteristicValuesImportRow.java | 47 +++++++++++++ .../services/service/importdb/ImportService.java | 76 ++++++++++++++++++++++ ...rtTable.java => ImportGearCharacteristics.java} | 53 +++------------ .../src/main/resources/config/struts-dbeditor.xml | 9 +++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++++ 11 files changed, 202 insertions(+), 93 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/{ImportTable.java => ImportGearCharacteristics.java} (62%) -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3225ca9b1088e0a526d914ed76b10dbfe5efe31c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:19:29 2016 +0200 Use java 8 --- .../echobase/entities/references/Gears.java | 41 ---------------------- .../contexts/ImportDataContextSupport.java | 3 +- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java deleted file mode 100644 index 52a60df..0000000 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java +++ /dev/null @@ -1,41 +0,0 @@ -package fr.ifremer.echobase.entities.references; - -/* - * #%L - * EchoBase :: Domain - * %% - * Copyright (C) 2011 - 2015 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% - */ - -import com.google.common.base.Function; - -/** - * Created on 1/21/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since XXX - */ -public class Gears { - public static final Function<Gear, String> GEAR_CASINO_GEAR_NAME = new Function<Gear, String>() { - @Override - public String apply(Gear input) { - //FIXME : Remove the dummy test when all gear in db have a casino name - // return StringUtils.isEmpty(casinoGearName) ? input.getName() : casinoGearName; - return input.getCasinoGearName(); - } - }; -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java index ddac448..a24b12e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java @@ -39,7 +39,6 @@ import fr.ifremer.echobase.entities.references.DepthStratums; import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.GearMetadatas; -import fr.ifremer.echobase.entities.references.Gears; import fr.ifremer.echobase.entities.references.OperationMetadata; import fr.ifremer.echobase.entities.references.OperationMetadatas; import fr.ifremer.echobase.entities.references.Port; @@ -223,7 +222,7 @@ public abstract class ImportDataContextSupport<C extends ImportDataConfiguration public final Map<String, Gear> getGearsByCasinoGearName() { if (gearsByCasinoGearName == null) { - gearsByCasinoGearName = persistenceService.getEntitiesMap(Gear.class, Gears.GEAR_CASINO_GEAR_NAME); + gearsByCasinoGearName = persistenceService.getEntitiesMap(Gear.class, Gear::getCasinoGearName); } return gearsByCasinoGearName; } -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 38c71a4b7034e5bb3acd1b287bdefef41558df59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:29:53 2016 +0200 passage méthode en publique --- .../fr/ifremer/echobase/services/service/DbEditorService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java index 6eff2e3..2d5976d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/DbEditorService.java @@ -720,11 +720,11 @@ public class DbEditorService extends EchoBaseServiceSupport { return filterHql; } - protected void createEntityModificationLog(TableMeta<EchoBaseUserEntityEnum> tableMeta, - String messagePrefix, - TopiaEntity entity, - EchoBaseUser user, - BeanMonitor monitor) throws TopiaException { + public void createEntityModificationLog(TableMeta<EchoBaseUserEntityEnum> tableMeta, + String messagePrefix, + TopiaEntity entity, + EchoBaseUser user, + BeanMonitor monitor) throws TopiaException { StringBuilder buffer; -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6072d6954a5209c992d8aa3a3c403345a6d1b5a3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:43 2016 +0200 Ajout de l'import des mises en œuvre des engins (See #8181) --- .../GearCharacteristicValuesImportModel.java | 39 +++++++ .../GearCharacteristicValuesImportRow.java | 47 ++++++++ .../services/service/importdb/ImportService.java | 76 +++++++++++++ .../dbeditor/ImportGearCharacteristics.java | 122 +++++++++++++++++++++ .../src/main/resources/config/struts-dbeditor.xml | 9 ++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++ 8 files changed, 310 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java new file mode 100644 index 0000000..37271bb --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportModel.java @@ -0,0 +1,39 @@ +package fr.ifremer.echobase.services.service.importdb; + +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearCharacteristic; +import fr.ifremer.echobase.services.service.importdata.csv.EchoBaseImportExportModelSupport; + +import java.util.Map; + +/** + * Created on 14/05/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0 + */ +public class GearCharacteristicValuesImportModel extends EchoBaseImportExportModelSupport<GearCharacteristicValuesImportRow> { + + public static GearCharacteristicValuesImportModel forImport(char separator, + Map<String, Gear> gearsByCasinoGearName, + Map<String, GearCharacteristic> gearCharacteristicsByName) { + + GearCharacteristicValuesImportModel model = new GearCharacteristicValuesImportModel(separator); + model.newForeignKeyColumn(GearCharacteristicValuesImportRow.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearsByCasinoGearName); + model.newForeignKeyColumn(GearCharacteristicValuesImportRow.PROPERTY_CHARACTERISTIC, GearCharacteristic.class, GearCharacteristic.PROPERTY_NAME, gearCharacteristicsByName); + model.newMandatoryColumn(GearCharacteristicValuesImportRow.PROPERTY_DATA_VALUE); + + return model; + + } + + @Override + public GearCharacteristicValuesImportRow newEmptyInstance() { + return new GearCharacteristicValuesImportRow(); + } + + protected GearCharacteristicValuesImportModel(char separator) { + super(separator); + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java new file mode 100644 index 0000000..04356da --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/GearCharacteristicValuesImportRow.java @@ -0,0 +1,47 @@ +package fr.ifremer.echobase.services.service.importdb; + +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearCharacteristic; +import fr.ifremer.echobase.entities.references.GearCharacteristicValue; +import fr.ifremer.echobase.entities.references.GearCharacteristicValueImpl; + +/** + * Created on 14/05/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 4.0 + */ +public class GearCharacteristicValuesImportRow { + + public static final String PROPERTY_GEAR = "gear"; + public static final String PROPERTY_CHARACTERISTIC = "characteristic"; + public static final String PROPERTY_DATA_VALUE = "dataValue"; + + private Gear gear; + private final GearCharacteristicValue gearCharacteristicValue; + + public GearCharacteristicValuesImportRow() { + gearCharacteristicValue = new GearCharacteristicValueImpl(); + } + + public void setGear(Gear gear) { + this.gear = gear; + } + + public void setDataValue(String dataValue) { + gearCharacteristicValue.setDataValue(dataValue); + } + + public void setCharacteristic(GearCharacteristic characteristic) { + gearCharacteristicValue.setGearCharacteristic(characteristic); + } + + public Gear getGear() { + return gear; + } + + public GearCharacteristicValue getGearCharacteristicValue() { + return gearCharacteristicValue; + } + +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java index 75fb24d..0ca2c5a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportService.java @@ -21,10 +21,15 @@ package fr.ifremer.echobase.services.service.importdb; import com.google.common.base.Charsets; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import com.google.common.io.Files; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.entities.references.Gear; +import fr.ifremer.echobase.entities.references.GearCharacteristic; +import fr.ifremer.echobase.entities.references.GearCharacteristicValue; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.DbEditorService; import fr.ifremer.echobase.services.service.UserDbPersistenceService; @@ -37,11 +42,14 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TableMeta; import org.nuiton.topia.service.csv.in.CsvImportResult; import org.nuiton.topia.service.csv.in.ImportModelFactory; +import org.nuiton.util.beans.BeanMonitor; import javax.inject.Inject; import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.util.Collection; +import java.util.Map; /** * To import datas from a csv file into the db. @@ -119,4 +127,72 @@ public class ImportService extends EchoBaseServiceSupport { return result; } + public CsvImportResult<EchoBaseUserEntityEnum> importGearCharacteristicValues(String importFileName, + File importFile, + EchoBaseUser user) throws IOException { + + // On importe et regroupe les caractéristiques par engin + Multimap<Gear, GearCharacteristicValue> gearCharacteristicValuesByGear = ArrayListMultimap.create(); + + try (BufferedReader bf = Files.newReader(importFile, Charsets.UTF_8)) { + + Map<String, Gear> gearsByCasinoGearName = persistenceService.getEntitiesMap(Gear.class, Gear::getCasinoGearName); + Map<String, GearCharacteristic> gearCharacteristicsByName = persistenceService.getEntitiesMap(GearCharacteristic.class, GearCharacteristic::getName); + GearCharacteristicValuesImportModel csvModel = GearCharacteristicValuesImportModel.forImport(getCsvSeparator(), gearsByCasinoGearName, gearCharacteristicsByName); + + try (Import<GearCharacteristicValuesImportRow> importer = Import.newImport(csvModel, bf)) { + + for (GearCharacteristicValuesImportRow gearCharacteristicValuesImportRow : importer) { + + Gear gear = gearCharacteristicValuesImportRow.getGear(); + GearCharacteristicValue gearCharacteristicValue = gearCharacteristicValuesImportRow.getGearCharacteristicValue(); + gearCharacteristicValuesByGear.put(gear, gearCharacteristicValue); + + } + + } + + } catch (EchoBaseTechnicalException eee) { + throw eee; + } catch (Exception eee) { + log.error("Failed to read import file " + importFile.getName(), eee); + throw new EchoBaseTechnicalException(eee); + } + + String messagePrefix = "Import des caractéristiques d'engin à partir du fichier " + importFileName + " le " + newDate(); + + CsvImportResult<EchoBaseUserEntityEnum> result = CsvImportResult.newResult(EchoBaseUserEntityEnum.Gear, importFileName, false); + + TableMeta<EchoBaseUserEntityEnum> meta = dbEditorService.getTableMeta(EchoBaseUserEntityEnum.Gear); + BeanMonitor beanMonitor = new BeanMonitor(); + + for (Map.Entry<Gear, Collection<GearCharacteristicValue>> gearCollectionEntry : gearCharacteristicValuesByGear.asMap().entrySet()) { + + Gear gear = gearCollectionEntry.getKey(); + beanMonitor.setBean(gear); + + Collection<GearCharacteristicValue> gearCharacteristicValues = gearCollectionEntry.getValue(); + gear.addAllGearCharacteristicValue(gearCharacteristicValues); + + result.incrementsNumberUpdated(); + + if (user != null) { + + dbEditorService.createEntityModificationLog( + meta, + messagePrefix, + gear, + user, + beanMonitor); + + } + + } + + persistenceService.commit(); + + return result; + + } + } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java new file mode 100644 index 0000000..b1d1adb --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportGearCharacteristics.java @@ -0,0 +1,122 @@ +package fr.ifremer.echobase.ui.actions.dbeditor; + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.services.service.importdb.ImportService; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.service.csv.in.CsvImportResult; + +import javax.inject.Inject; +import java.io.File; + +/** + * Created on 14/05/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ImportGearCharacteristics extends AbstractLoadPage { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(ImportGearCharacteristics.class); + + /** WTF ? */ + protected File importFile; + + /** WTF ? */ + protected String importFileContentType; + + /** WTF ? */ + protected String importFileFileName; + + /** CSV import result */ + private CsvImportResult<EchoBaseUserEntityEnum> result; + + private Exception error; + + public CsvImportResult<EchoBaseUserEntityEnum> getResult() { + return result; + } + + public File getImportFile() { + return importFile; + } + + public void setImportFile(File importFile) { + this.importFile = importFile; + } + + public String getImportFileContentType() { + return importFileContentType; + } + + public void setImportFileContentType(String importFileContentType) { + this.importFileContentType = importFileContentType; + } + + public String getImportFileFileName() { + return importFileFileName; + } + + public void setImportFileFileName(String importFileFileName) { + this.importFileFileName = importFileFileName; + } + + public Exception getError() { + return error; + } + + public String getErrorStack() { + + String errorStack = null; + if (error != null) { + + errorStack = ExceptionUtils.getStackTrace(error); + } + return errorStack; + } + + @Override + public String input() throws Exception { + load(); + return INPUT; + } + + @Override + @InputConfig(methodName = "input") + public String execute() throws Exception { + + try { + result = importService.importGearCharacteristicValues( + importFileFileName, + importFile, + getEchoBaseSession().getUser()); + + } catch (Exception eee) { + + result = CsvImportResult.newResult(EchoBaseUserEntityEnum.GearCharacteristic, + importFileFileName, + false); + error = eee; + + addFlashError(t("echobase.info.import.failed")); + + if (log.isErrorEnabled()) { + log.error("Error while import ", eee); + } + } + + return SUCCESS; + } + + //------------------------------------------------------------------------// + //-- Injected objects // + //------------------------------------------------------------------------// + + @Inject + protected transient ImportService importService; + +} diff --git a/echobase-ui/src/main/resources/config/struts-dbeditor.xml b/echobase-ui/src/main/resources/config/struts-dbeditor.xml index c571650..bba646d 100644 --- a/echobase-ui/src/main/resources/config/struts-dbeditor.xml +++ b/echobase-ui/src/main/resources/config/struts-dbeditor.xml @@ -84,6 +84,15 @@ <!--<result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result>--> </action> + <!-- Import some entities from a csv file --> + <action name="doImportGearCharacteristics" + class="fr.ifremer.echobase.ui.actions.dbeditor.ImportGearCharacteristics"> + <interceptor-ref name="prepareParamsStackLoggued"/> + <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> + <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> + <!--<result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result>--> + </action> + <!-- Export a selected entity type to a csv file --> <action name="doExport" class="fr.ifremer.echobase.ui.actions.dbeditor.ExportTable"> diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index b658fcd..a993625 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -421,6 +421,7 @@ echobase.title.importData.selectImportType=Select type of import echobase.title.importDb=Database import echobase.title.importDbProgress=Importing data echobase.title.importDbResult=Data import results +echobase.title.importGearCharacteristics=Import Gears characteristics echobase.title.importLog.detail=Import detail echobase.title.importLog.files=Import files echobase.title.importLogs=Import logs diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index 01edb49..06a8fd6 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -424,6 +424,7 @@ echobase.title.importData.selectImportType=Sélection du type d'import echobase.title.importDb=Import d'une base echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données +echobase.title.importGearCharacteristics=Importer les caractéristiques des engins echobase.title.importLog.detail=Détail d'un import echobase.title.importLog.files=Fichiers d'import echobase.title.importLogs=Liste des imports diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp index 0366ac1..265021a 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp @@ -225,6 +225,21 @@ align="right"/> </s:form> </s:if> + <s:if test="%{entityType.name() == 'Gear'}"> + <sj:tab id="tab_importGearCharacteristicValuesForm" target="importGearCharacteristicValuesForm" + key="echobase.title.importGearCharacteristics"/> + + <s:form id="importGearCharacteristicValuesForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> + + <s:hidden key="entityType" label=''/> + <s:file key="importFile" requiredLabel="true" label="%{getText('echobase.label.importFile')}"/> + + <br/> + <s:submit key="echobase.action.importTable" action="doImportGearCharacteristics" + align="right"/> + </s:form> + </s:if> <sj:tab id="tab_exportForm" target="exportForm" key="echobase.title.exportTable"/> -- 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 echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f5bb858406547c39c947a324aa6f6ca780d5c601 Merge: dad5aa1 6072d69 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat May 14 11:38:46 2016 +0200 Livrable #8181 Merge branch 'feature/8181' into develop .../echobase/entities/references/Gears.java | 41 ------- .../echobase/services/service/DbEditorService.java | 10 +- .../contexts/ImportDataContextSupport.java | 3 +- .../GearCharacteristicValuesImportModel.java | 39 +++++++ .../GearCharacteristicValuesImportRow.java | 47 ++++++++ .../services/service/importdb/ImportService.java | 76 +++++++++++++ .../dbeditor/ImportGearCharacteristics.java | 122 +++++++++++++++++++++ .../src/main/resources/config/struts-dbeditor.xml | 9 ++ .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 +++ 11 files changed, 316 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm