This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit e433083f291fcdf35a2a953366ba41e6feb975c8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 09:58:02 2014 +0100 ajout d'une method pour savoir si on est sur pg (pour les migrations) --- .../ifremer/echobase/entities/EchoBaseUserPersistenceContext.java | 1 + .../echobase/entities/EchoBaseUserTopiaPersistenceContext.java | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java index 444b578..bb7d68d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserPersistenceContext.java @@ -49,6 +49,7 @@ public interface EchoBaseUserPersistenceContext extends TopiaPersistenceContext, void setSpatialStructureFound(boolean spatialStructureFound); + boolean isPostgresql(); String getUrl(); diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java index 0313149..d09114d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaPersistenceContext.java @@ -71,4 +71,12 @@ public class EchoBaseUserTopiaPersistenceContext extends AbstractEchoBaseUserTop public String getUrl() { return getHibernateSupport().getHibernateConfiguration().getProperty(Environment.URL); } + + public boolean isPostgresql() { + + String dialect = getHibernateSupport().getHibernateConfiguration().getProperty(Environment.DIALECT); + boolean result = DriverType.POSTGRESQL.getDialectClass().getName().equals(dialect); + return result; + + } } -- 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 http://git.codelutin.com/echobase.git commit c846e804bec721237d35d828c22f2c7672c4b706 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 09:59:10 2014 +0100 ajout migration 2.7.2 + normalisation des autres scripts de migration --- .../workingDb/MigrationCallBackForVersion2_7_2.java | 13 +++++++++---- .../2.5.1-0-postgis-structure.sql} | 0 .../2.5.1-1-postgis-view.sql} | 0 .../2.6-0-postgis-view.sql} | 0 .../2.6.1-0-postgis-structure.sql} | 0 .../2.7.2-0-postgis-view.sql} | 0 .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 3 +++ .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 3 +++ 8 files changed, 15 insertions(+), 4 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java index 785c459..fc16c8c 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/MigrationCallBackForVersion2_7_2.java @@ -1,7 +1,6 @@ package fr.ifremer.echobase.persistence.migration.workingDb; import fr.ifremer.echobase.entities.EchoBaseUserTopiaPersistenceContext; -import fr.ifremer.echobase.io.EchoBaseIOUtil; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.Version; @@ -15,8 +14,6 @@ import java.util.List; */ public class MigrationCallBackForVersion2_7_2 extends MigrationCallBackForVersion { - public static final String POSTGIS_STRUCTURE_SQL = "/migration/postgis-view-2.7.2.sql"; - @Override public Version getVersion() { return new Version("2.7.2"); @@ -35,10 +32,18 @@ public class MigrationCallBackForVersion2_7_2 extends MigrationCallBackForVersio // fix reload TotalSampleView (see https://forge.codelutin.com/issues/6318) updatePostgis(queries); } + + // add FileImport entity (see https://forge.codelutin.com/issues/6367) + addFileImportEntity(tx, queries); + } protected void updatePostgis(List<String> queries) { - queries.add(EchoBaseIOUtil.loadScript(POSTGIS_STRUCTURE_SQL)); + addScript("2.7.2-0-postgis-view.sql", queries); + } + + protected void addFileImportEntity(EchoBaseUserTopiaPersistenceContext tx, List<String> queries) { + addSpecificScript(tx, "2.7.2-1-add-importFile-entity.sql", queries); } } \ No newline at end of file diff --git a/echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.5.1-0-postgis-structure.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-structure-2.5.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.5.1-0-postgis-structure.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.5.1-1-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.5.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.5.1-1-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.6.sql b/echobase-domain/src/main/resources/migration/workingDb/2.6-0-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.6.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.6-0-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql b/echobase-domain/src/main/resources/migration/workingDb/2.6.1-0-postgis-structure.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-structure-2.6.1.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.6.1-0-postgis-structure.sql diff --git a/echobase-domain/src/main/resources/migration/postgis-view-2.7.2.sql b/echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql similarity index 100% rename from echobase-domain/src/main/resources/migration/postgis-view-2.7.2.sql rename to echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql new file mode 100644 index 0000000..b407135 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql @@ -0,0 +1,3 @@ +CREATE TABLE IMPORTFILE( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name VARCHAR(255), file BLOB, importLog VARCHAR(255)); +ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); +ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql new file mode 100644 index 0000000..969b487 --- /dev/null +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql @@ -0,0 +1,3 @@ +CREATE TABLE IMPORTFILE( topiaid character varying(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, name character varying(255), file OID, importLog character varying(255)); +ALTER TABLE IMPORTFILE ADD CONSTRAINT PK_IMPORTFILE PRIMARY KEY(TOPIAID); +ALTER TABLE IMPORTFILE ADD CONSTRAINT FK_IMPORTFILE_IMPORTLOG FOREIGN KEY(IMPORTLOG) REFERENCES IMPORTLOG(TOPIAID); -- 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 http://git.codelutin.com/echobase.git commit 7db77e56e18ed5bbe9664792a5e6b64e598b320f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 10:59:19 2014 +0100 enregistrement des fichiers d'import --- .../services/service/UserDbPersistenceService.java | 53 +++++++++++++++++++++- .../importdata/AbstractImportDataService.java | 51 ++++++++++++++++----- 2 files changed, 90 insertions(+), 14 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java index 644a18c..f7db9b5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/UserDbPersistenceService.java @@ -23,6 +23,7 @@ package fr.ifremer.echobase.services.service; import com.google.common.base.Function; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -30,6 +31,7 @@ import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.EntityModificationLog; +import fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Category; @@ -62,7 +64,9 @@ import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.EchoBaseServiceSupport; +import org.apache.commons.io.IOUtils; import org.nuiton.csv.ValueParser; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; @@ -72,11 +76,18 @@ import org.nuiton.topia.persistence.TopiaNotFoundException; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import javax.inject.Inject; +import javax.sql.rowset.serial.SerialBlob; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.io.OutputStream; import java.util.Collection; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.zip.GZIPOutputStream; /** * TODO @@ -401,8 +412,7 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { ImportLog.PROPERTY_IMPORT_USER, userEMail, ImportLog.PROPERTY_IMPORT_DATE, date, ImportLog.PROPERTY_IMPORT_TEXT, comment, - ImportLog.PROPERTY_IMPORT_ID, importIds - ); + ImportLog.PROPERTY_IMPORT_ID, importIds); return importLog; } @@ -410,6 +420,45 @@ public class UserDbPersistenceService extends EchoBaseServiceSupport { persistenceContext.getImportLogDao().delete(importLog); } + public ImportFile createImportFile(InputFile inputFile) { + + Preconditions.checkNotNull(inputFile); + Preconditions.checkArgument(inputFile.hasFile()); + + File file = inputFile.getFile(); + + SerialBlob serialBlob; + + try { + + + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { + + try (OutputStream outputStream = new GZIPOutputStream(out)) { + + try (InputStream stream = new FileInputStream(file)) { + + IOUtils.copy(stream, outputStream); + + } + } + + byte[] fileContent = out.toByteArray(); + serialBlob = new SerialBlob(fileContent); + + } + + } catch (Exception e) { + throw new EchoBaseTechnicalException("Could not serialize file content " + file, e); + } + + ImportFile importFile = persistenceContext.getImportFileDao().create( + ImportFile.PROPERTY_NAME, inputFile.getFileName(), + ImportFile.PROPERTY_FILE, serialBlob); + return importFile; + + } + //------------------------------------------------------------------------// //--- LengthAgeKey -------------------------------------------------------// //------------------------------------------------------------------------// diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index 123327d..75098d2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -27,6 +27,7 @@ import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; @@ -57,6 +58,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.sql.SQLException; import java.util.Date; import java.util.List; import java.util.Locale; @@ -131,8 +133,8 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur return new EchoBaseCsvFileImportResult(inputFile.getFileName()); } - public ImportLog computeImportLogEntry(M configuration, - EchoBaseUser user) { + public ImportLog computeImportLogEntry(M configuration, EchoBaseUser user) { + Date importDate = newDate(); String importUser = user.getEmail(); @@ -170,19 +172,44 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur } String importText = buffer.toString().trim(); - ImportLog importLog = persistenceService.createImportLog( - configuration.getVoyageId(), - configuration.getImportType(), - importUser, - importDate, - importText, - importIds - ); + ImportLog importLog = persistenceService.createImportLog(configuration.getVoyageId(), + configuration.getImportType(), + importUser, + importDate, + importText, + importIds); + + addImportFiles(importLog, configuration.getInputFiles()); + return importLog; + + } + + protected void addImportFiles(ImportLog importLog, InputFile... inputFiles) { + + for (InputFile inputFile : inputFiles) { + + if (inputFile.hasFile()) { + + ImportFile importFile = persistenceService.createImportFile(inputFile); + + if (log.isInfoEnabled()) { + try { + log.info("Add ImportFile: " + importFile.getName() + " - size: " + importFile.getFile().length()); + } catch (SQLException e) { + throw new EchoBaseTechnicalException("Can't get length of importFile " + importFile.getName()); + } + } + importLog.addImportFile(importFile); + + } + + } + } - protected String computeResultAndLogBookEntry(M configuration, - EchoBaseUser user) { + + protected String computeResultAndLogBookEntry(M configuration, EchoBaseUser user) { Date importDate = newDate(); String importUser = user.getEmail(); -- 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 http://git.codelutin.com/echobase.git commit f5ec58a247b40d5663d52279869752c5946169b0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 12:30:42 2014 +0100 pouvoir telecharger les fichier d'import sur l'ecran de tableau de bord --- .../ui/actions/workingDb/DownloadImportFile.java | 95 ++++++++++++++++++++++ .../ui/actions/workingDb/GetImportLogDetail.java | 9 ++ .../src/main/resources/config/struts-workingDb.xml | 12 +++ .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 53 ++++++++++-- echobase-ui/src/main/webapp/js/test.js | 65 --------------- 7 files changed, 167 insertions(+), 71 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java new file mode 100644 index 0000000..5069ee5 --- /dev/null +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/DownloadImportFile.java @@ -0,0 +1,95 @@ +package fr.ifremer.echobase.ui.actions.workingDb; + +import fr.ifremer.echobase.entities.ImportFile; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.io.IOUtils; + +import javax.inject.Inject; +import java.io.InputStream; +import java.net.URLDecoder; +import java.sql.Blob; +import java.util.zip.GZIPInputStream; + +/** + * Created on 12/30/14. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.7.2 + */ +public class DownloadImportFile extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** id of import file to download. */ + protected String importFileId; + + protected String filename; + + public void setImportFileId(String importFileId) { + this.importFileId = importFileId; + } + + public String getImportFileId() { + return importFileId; + } + + public String getFilename() { + return filename; + } + + /** Input stream of the file to download. */ + protected transient InputStream inputStream; + + public InputStream getInputStream() { + return inputStream; + } + + /** Length of the file to download. */ + protected long contentLength; + + public long getContentLength() { + return contentLength; + } + + /** Content type of the file to download. */ + protected String contentType; + + public String getContentType() { + return contentType; + } + + @Override + public String execute() throws Exception { + + //FIXME Find out why we need to decode id? + String id = URLDecoder.decode(importFileId, "UTF-8"); + ImportFile importFile = userDbPersistenceService.getImportFile(id); + + filename = importFile.getName(); + + contentType = "application/text"; + + Blob file = importFile.getFile(); + { + byte[] bytes; + try (InputStream binaryStream = file.getBinaryStream()) { + bytes = IOUtils.toString(new GZIPInputStream(binaryStream)).getBytes(); + } + contentLength = bytes.length; + } + + inputStream = new GZIPInputStream(file.getBinaryStream(), 65535); + + return SUCCESS; + + } + + //------------------------------------------------------------------------// + //-- Injected objects // + //------------------------------------------------------------------------// + + @Inject + protected transient UserDbPersistenceService userDbPersistenceService; + +} \ No newline at end of file diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java index 4afc896..c1ee7d6 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/GetImportLogDetail.java @@ -22,6 +22,7 @@ package fr.ifremer.echobase.ui.actions.workingDb; */ import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; +import fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; import fr.ifremer.echobase.entities.data.Voyage; @@ -32,6 +33,7 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.nuiton.topia.persistence.metadata.TableMeta; import javax.inject.Inject; +import java.util.Collection; import java.util.Map; /** @@ -72,7 +74,12 @@ public class GetImportLogDetail extends EchoBaseActionSupport { Voyage voyage = userDbPersistenceService.getVoyage((String) data.get(ImportLog.PROPERTY_VOYAGE_ID)); decoratorService.decorateForeignKey(data, ImportLog.PROPERTY_VOYAGE_ID, voyage, null); + // get import files + Collection<ImportFile> importFiles = userDbPersistenceService.getImportFiles(importLogId); + data.put(ImportLog.PROPERTY_IMPORT_FILE, importFiles); + return SUCCESS; + } //------------------------------------------------------------------------// @@ -81,8 +88,10 @@ public class GetImportLogDetail extends EchoBaseActionSupport { @Inject protected transient UserDbPersistenceService userDbPersistenceService; + @Inject protected transient DbEditorService dbEditorService; + @Inject protected transient DecoratorService decoratorService; } diff --git a/echobase-ui/src/main/resources/config/struts-workingDb.xml b/echobase-ui/src/main/resources/config/struts-workingDb.xml index 538b439..4cb4d00 100644 --- a/echobase-ui/src/main/resources/config/struts-workingDb.xml +++ b/echobase-ui/src/main/resources/config/struts-workingDb.xml @@ -182,6 +182,18 @@ <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/dashboard.jsp</result> </action> + + <!-- Download import file --> + <action name="downloadImportFile" method="execute" + class="fr.ifremer.echobase.ui.actions.workingDb.DownloadImportFile"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result type="stream"> + <param name="contentType">${contentType}</param> + <param name="contentLength">${contentLength}</param> + <param name="contentDisposition">attachment; filename="${filename}"</param> + </result> + </action> + </package> </struts> 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 09c5889..ead8c9b 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 @@ -384,6 +384,7 @@ echobase.message.importData.result=Data import successful in %s \:\n%s echobase.message.no.row.selected=No data selected echobase.message.no.spatial.database.support=The working db you are using is not compatible with postgis 2. echobase.message.noEntrySelection=No field selected +echobase.message.noImportFilesFound=No import file found (import was done before version 2.8) echobase.message.noImportLogSelected=No import selected echobase.message.noVoyageSelected=No voyage selected echobase.message.removeData.result=Data import removalwas successful in %s\:\n%s @@ -417,6 +418,7 @@ echobase.title.importDb=Database import echobase.title.importDbProgress=Importing data echobase.title.importDbResult=Data import results echobase.title.importLog.detail=Import detail +echobase.title.importLog.files=Import files echobase.title.importLogs=Import logs echobase.title.importTable=Import a table echobase.title.login=Connection 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 1c92268..1bc5e2a 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 @@ -387,6 +387,7 @@ echobase.message.importData.result=Import de données réussi en %s \:\n%s echobase.message.no.row.selected=Aucune donnée sélectionnée echobase.message.no.spatial.database.support=La base de travail que vous utilisez ne possède pas de support spatiale. echobase.message.noEntrySelection=Pas de champ sélectionné +echobase.message.noImportFilesFound=Pas de fichiers conservés (import effectué avant la version 2.8) echobase.message.noImportLogSelected=Pas d'import sélectionné echobase.message.noVoyageSelected=Pas de campagne sélectionné echobase.message.removeData.result=La suppression de l'import s'est déroule avec succès en %s \:\n%s @@ -420,6 +421,7 @@ 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.importLog.detail=Détail d'un import +echobase.title.importLog.files=Fichiers d'import echobase.title.importLogs=Liste des imports echobase.title.importTable=Importer une table echobase.title.login=Connexion diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp index 75b4332..e9a75b0 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp @@ -40,8 +40,8 @@ dataType:"json", success:function (data, textStatus) { - $('#noImportLogDetail').hide(); - $('#importLogDetail').show(); + $('.noImportLogDetail').hide(); + $('.importLogDetail').show(); var json = data.data; if ($('#noVoyageDetail').is(":visible")) { @@ -55,11 +55,35 @@ $('#importLogUser').html(json['importUser']); $('#importLogDate').html(json['importDate']); $('#importLogImportType').html(json['importType']); + + loadImportFiles(json['importFile']); } }); return false; } + function loadImportFiles(importFiles) { + var importUrlPrefix ='<s:url action="downloadImportFile" namespace="/workingDb"/>'; + + var result=""; + $(importFiles).each(function () { + var importFile = this; + var importFileId = importFile['topiaId']; + var filename = importFile['name']; + var importUrl = encodeURI($.prepareUrl(importUrlPrefix , {importFileId:importFileId})); + + result += "<li><a href='"+importUrl+"' class='fontsize11'>" + filename + "</a></li>"; + }); + + if (result == "") { + result = "<s:text name='echobase.message.noImportFilesFound'/>"; + } + $('#importLogFiles').html(result); + } + + function downloadImportFile(importFileId) { + + } function loadVoyageDetail(voyageId) { $.ajax( { @@ -113,8 +137,8 @@ $.addClearSelectTopic('voyages', function (event) { - $('#noImportLogDetail').show(); - $('#importLogDetail').hide(); + $('.noImportLogDetail').show(); + $('.importLogDetail').hide(); $('#noVoyageDetail').show(); $('#voyageDetail').hide(); }); @@ -193,12 +217,12 @@ <fieldset> <legend><s:text name="echobase.title.importLog.detail"/></legend> - <div id="noImportLogDetail"> + <div class="noImportLogDetail"> <pre> <s:text name="echobase.message.noImportLogSelected"/> </pre> </div> - <div id="importLogDetail"> + <div class="importLogDetail"> <s:label key='echobase.common.importType' value=''/> <pre id='importLogImportType' style="font-weight: bold;"></pre> @@ -224,3 +248,20 @@ </div> </fieldset> + +<fieldset id="importLogFilesFieldset"> + <legend><s:text name="echobase.title.importLog.files"/></legend> + + <div class="noImportLogDetail"> + <pre> + <s:text name="echobase.message.noImportLogSelected"/> + </pre> + </div> + <div class="importLogDetail"> + + <ul id='importLogFiles' style="font-weight: bold;"></ul> + + </div> + + +</fieldset> diff --git a/echobase-ui/src/main/webapp/js/test.js b/echobase-ui/src/main/webapp/js/test.js deleted file mode 100644 index 6db29b2..0000000 --- a/echobase-ui/src/main/webapp/js/test.js +++ /dev/null @@ -1,65 +0,0 @@ -/* - * #%L - * EchoBase :: UI - * %% - * Copyright (C) 2011 - 2013 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% - */ -var statesData = { - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "id": "01", - "properties": {"name": "Alabama", "density": 94.65}, - "geometry": {"type": "Polygon", "coordinates": [ - [ - [-87.359296, 35.00118], - [-85.606675, 34.984749], - [-85.431413, 34.124869], - [-85.184951, 32.859696], - [-85.069935, 32.580372], - [-84.960397, 32.421541], - [-85.004212, 32.322956], - [-84.889196, 32.262709], - [-85.058981, 32.13674], - [-85.053504, 32.01077], - [-85.141136, 31.840985], - [-85.042551, 31.539753], - [-85.113751, 31.27686], - [-85.004212, 31.003013], - [-85.497137, 30.997536], - [-87.600282, 30.997536], - [-87.633143, 30.86609], - [-87.408589, 30.674397], - [-87.446927, 30.510088], - [-87.37025, 30.427934], - [-87.518128, 30.280057], - [-87.655051, 30.247195], - [-87.90699, 30.411504], - [-87.934375, 30.657966], - [-88.011052, 30.685351], - [-88.10416, 30.499135], - [-88.137022, 30.318396], - [-88.394438, 30.367688], - [-88.471115, 31.895754], - [-88.241084, 33.796253], - [-88.098683, 34.891641], - [-88.202745, 34.995703], - [-87.359296, 35.00118] - ] - ]}} - ]}; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.