branch feature/8180 updated (359a065 -> 7912ed8)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 359a065 Add translate new 7912ed8 Add moring support in remove import The 1 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 7912ed8a8928eca0cfbed5e5ff968ea2f933dbc3 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Jun 24 11:19:43 2016 +0200 Add moring support in remove import Summary of changes: .../echobase/ui/actions/dbeditor/GetEntities.java | 11 ++++++----- .../echobase/ui/actions/removeData/ImportLogs.java | 21 ++++++++++++++------- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../webapp/WEB-INF/jsp/removeData/importLogs.jsp | 21 ++++++++++++--------- echobase-ui/src/main/webapp/css/screen.css | 4 ++++ 6 files changed, 38 insertions(+), 21 deletions(-) -- 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 feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 7912ed8a8928eca0cfbed5e5ff968ea2f933dbc3 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Jun 24 11:19:43 2016 +0200 Add moring support in remove import --- .../echobase/ui/actions/dbeditor/GetEntities.java | 11 ++++++----- .../echobase/ui/actions/removeData/ImportLogs.java | 21 ++++++++++++++------- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../webapp/WEB-INF/jsp/removeData/importLogs.jsp | 21 ++++++++++++--------- echobase-ui/src/main/webapp/css/screen.css | 4 ++++ 6 files changed, 38 insertions(+), 21 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java index ac6083c..2e074de 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java @@ -119,17 +119,18 @@ public class GetEntities extends AbstractJSONPaginedAction { pager.setGroupOp(FilterRuleGroupOperator.AND); } execute(); - Map<String, String> importTypes = - decoratorService.decorateEnums(ImportType.values()); + Map<String, String> importTypes = decoratorService.decorateEnums(ImportType.values()); for (Map row : datas) { - String importType = (String) row.get(ImportLog.PROPERTY_IMPORT_TYPE); String importTypeToString = importTypes.get(importType); row.put(ImportLog.PROPERTY_IMPORT_TYPE, importTypeToString); - TopiaEntity entity = userDbPersistenceService.getEntity((String) row.get(ImportLog.PROPERTY_ENTITY_ID)); - decoratorService.decorateForeignKey(row, ImportLog.PROPERTY_ENTITY_ID, entity, null); + String entityId = (String) row.get(ImportLog.PROPERTY_ENTITY_ID); + if (entityId != null && !entityId.isEmpty()) { + TopiaEntity entity = userDbPersistenceService.getEntity(entityId); + decoratorService.decorateForeignKey(row, ImportLog.PROPERTY_ENTITY_ID, entity, null); + } } return SUCCESS; } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java index d9f8110..22079fd 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ImportLogs.java @@ -21,6 +21,7 @@ package fr.ifremer.echobase.ui.actions.removeData; * #L% */ +import fr.ifremer.echobase.entities.data.Mooring; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.service.UserDbPersistenceService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; @@ -40,24 +41,30 @@ public class ImportLogs extends EchoBaseActionSupport { protected Map<String, String> voyages; - protected String voyageId; - public Map<String, String> getVoyages() { return voyages; } - public String getVoyageId() { - return voyageId; + protected Map<String, String> moorings; + + public Map<String, String> getMoorings() { + return moorings; } + + protected String entityId; - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; + public String getEntityId() { + return entityId; } + public void setEntityId(String entityId) { + this.entityId = entityId; + } + @Override public String execute() throws Exception { - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + moorings = userDbPersistenceService.loadSortAndDecorate(Mooring.class); return SUCCESS; } 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 aa2a3f5..5c541f6 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 @@ -379,6 +379,7 @@ echobase.legend.importDb.configuration=Configure import echobase.legend.importDb.resume=Results of database import echobase.legend.libreOfficeQuery=Translate a SQL query from Libre Office echobase.legend.removeData.resume=Results of Import removal +echobase.legend.select=Filters echobase.legend.select.voyage=Voyage filter echobase.legend.showData.configure=Configure what to display echobase.legend.showData.result=Spatial result to display 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 d7bb28c..faea791 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 @@ -382,6 +382,7 @@ echobase.legend.importDb.configuration=Configuration de l'import echobase.legend.importDb.resume=Résumé de l'import de base de données echobase.legend.libreOfficeQuery=Traduire une requête SQL issue de Libre Office echobase.legend.removeData.resume=Résumé de la suppression d'un import +echobase.legend.select=Filtres echobase.legend.select.voyage=Filtre Campagne echobase.legend.showData.configure=Configurer les données à visualiser echobase.legend.showData.result=Résultats à visualiser diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp index b470b6d..9dddb99 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp @@ -35,10 +35,10 @@ jQuery(document).ready(function () { - $('[name="voyageId"]').change(function (event) { - reloadPage({'voyageId':this.value}); + $('[name="entityId"]').change(function (event) { + reloadPage({'entityId':this.value}); }); - + $.addClearSelectTopic('importLogs', function (event) { $(':checkbox[name^="jqg"]').each(function () { @@ -66,16 +66,19 @@ <title><s:text name="echobase.title.importLogs"/></title> <fieldset> - <legend><s:text name="echobase.legend.select.voyage"/></legend> - <s:select key="voyageId" cssStyle="font-size: 140%" + <legend><s:text name="echobase.legend.select"/></legend> + <s:select key="entityId" cssStyle="font-size: 140%" label="%{getText('echobase.common.voyage')}" - list="voyages" headerKey="" headerValue="" theme="simple"/> + list="voyages" headerKey="" headerValue=""/> + <s:select key="entityId" cssStyle="font-size: 140%" + label="%{getText('echobase.common.mooring')}" + list="moorings" headerKey="" headerValue=""/> </fieldset> <s:form method="post" namespace="/removeData" action="confirmDelete"> <s:url id="loadUrl" action="getImportLogs" namespace="/removeData" escapeAmp="false"> - <s:param name="voyageId" value="%{voyageId}"/> + <s:param name="entityId" value="%{entityId}"/> </s:url> <sjg:grid id="importLogs" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" @@ -89,8 +92,8 @@ <sjg:gridColumn name="id" title="id" hidden="true"/> <sjg:gridColumn name="importType" sortable="true" title="%{getText('echobase.common.importType')}"/> - <sjg:gridColumn name="voyageId_lbl" sortable="true" - title="%{getText('echobase.common.voyage')}"/> + <sjg:gridColumn name="entityId_lbl" sortable="true" + title="%{getText('echobase.common.importEntity')}"/> <sjg:gridColumn name="importDate" sortable="true" title="%{getText('echobase.common.importDate')}"/> <sjg:gridColumn name="importText" sortable="true" diff --git a/echobase-ui/src/main/webapp/css/screen.css b/echobase-ui/src/main/webapp/css/screen.css index f7f2ae9..e963343 100644 --- a/echobase-ui/src/main/webapp/css/screen.css +++ b/echobase-ui/src/main/webapp/css/screen.css @@ -767,3 +767,7 @@ input#login_echobase_action_login{ height: 800px; border: none; } + +td { + cursor: pointer; +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm