Author: tchemit Date: 2014-02-28 18:45:12 +0100 (Fri, 28 Feb 2014) New Revision: 964 Url: http://codelutin.com/projects/echobase/repository/revisions/964 Log: refs #4194: Visualisation des donn?\195?\169es spatiales Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp Removed: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/DisplaySpatialData.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/GetVoyageDataMetadata.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Save.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showData.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showDataMap.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java 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/CreateMission.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 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/decorators.xml trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/js/gridHelper.js trunk/pom.xml Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-02-28 17:45:12 UTC (rev 964) @@ -121,4 +121,28 @@ } } } + + /** + * To update all posgis materialized views.. + * + * @since 2.6 + */ + public void updatePostgisViews() { + + if (isSpatialAware()) { + + // try the update only for postgresql + try { + if (log.isInfoEnabled()) { + log.info("Will try to refresh all spatial views..."); + } + persistenceService.executeSQL("SELECT echobase_refresh_views();"); + persistenceService.commit(); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not refresh spatial views", e); + } + } + } + } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2014-02-28 17:45:12 UTC (rev 964) @@ -37,7 +37,7 @@ public String execute() throws Exception { if (!getEchoBaseSession().isWorkingDbSelected()) { - addFlashMessage(_("echobase.info.no.workingDb.selected")); + addFlashMessage(t("echobase.info.no.workingDb.selected")); } return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2014-02-28 17:45:12 UTC (rev 964) @@ -85,7 +85,7 @@ if (entityType == null) { // no table selected - addFlashMessage(_("echobase.info.no.table.selected")); + addFlashMessage(t("echobase.info.no.table.selected")); } else { // load table metas Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ImportTable.java 2014-02-28 17:45:12 UTC (rev 964) @@ -143,7 +143,7 @@ false); error = eee; - addFlashError(_("echobase.info.import.failed")); + addFlashError(t("echobase.info.import.failed")); if (log.isErrorEnabled()) { log.error("Error while import ", eee); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2014-02-28 17:45:12 UTC (rev 964) @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.services.service.DbEditorService; +import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.struts2.interceptor.ParameterAware; import org.nuiton.topia.persistence.TopiaEntity; @@ -92,6 +93,10 @@ properties, getEchoBaseSession().getUser()); + if (spatialService.isSpatialAware()) { + addFlashMessage(t("echobase.info.reload.spatialData")); + } + return SUCCESS; } @@ -108,5 +113,8 @@ @Inject protected transient DbEditorService dbEditorService; + + @Inject + protected transient SpatialService spatialService; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2014-02-28 17:45:12 UTC (rev 964) @@ -49,24 +49,24 @@ @Override protected String getSuccesMessage() { - return _("echobase.info.createEmbedded.succeded"); + return t("echobase.info.createEmbedded.succeded"); } @Override protected String getErrorMessage() { - return _("echobase.info.createEmbedded.failed"); + return t("echobase.info.createEmbedded.failed"); } @Override protected String getResultMessage(EmbeddedApplicationConfiguration model) { - String result = _("echobase.message.createEmbedded.result", + String result = t("echobase.message.createEmbedded.result", model.getActionTime()); return result; } @Override public String getActionResumeTitle() { - return _("echobase.legend.createEmbedded.resume"); + return t("echobase.legend.createEmbedded.resume"); } @Override Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2014-02-28 17:45:12 UTC (rev 964) @@ -80,7 +80,7 @@ // gets war location File warLocation = configuration.getWarLocation(); if (!warLocation.exists()) { - addFlashError(_("echobase.error.warlocation.notFound", + addFlashError(t("echobase.error.warlocation.notFound", warLocation)); } model.setWarLocation(warLocation); @@ -88,7 +88,7 @@ voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); if (MapUtils.isEmpty(voyages)) { - addFlashMessage(_("echobase.info.no.voyagee.found")); + addFlashMessage(t("echobase.info.no.voyagee.found")); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2014-02-28 17:45:12 UTC (rev 964) @@ -80,13 +80,13 @@ getEchoBaseSession().getActionConfiguration(EmbeddedApplicationConfiguration.class); if (model == null) { - addFlashError(_("echobase.error.no.embeddedApplication.configurationFound")); + addFlashError(t("echobase.error.no.embeddedApplication.configurationFound")); return ERROR; } File file = model.getEmbeddedApplicationFile(); if (file == null) { - addFlashError(_("echobase.error.no.embeddedApplication.exportFileFound")); + addFlashError(t("echobase.error.no.embeddedApplication.exportFileFound")); return ERROR; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2014-02-28 17:45:12 UTC (rev 964) @@ -76,13 +76,13 @@ getEchoBaseSession().getActionConfiguration(ExportDbConfiguration.class); if (model == null) { - addFlashError(_("echobase.error.no.exportDb.configurationFound")); + addFlashError(t("echobase.error.no.exportDb.configurationFound")); return ERROR; } File exportFile = model.getExportFile(); if (exportFile == null) { - addFlashError(_("echobase.error.no.exportDb.exportFileFound")); + addFlashError(t("echobase.error.no.exportDb.exportFileFound")); return ERROR; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/AbstractEditExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -98,7 +98,7 @@ if (isNewQuery()) { // new query in progress - addFlashMessage(_("echobase.info.new.sqlQuery.inprogress")); + addFlashMessage(t("echobase.info.new.sqlQuery.inprogress")); } return INPUT; } @@ -118,10 +118,10 @@ if (!hasFieldErrors()) { if (!exportQueryService.isQueryNameValid(getQuery())) { addFieldError("query.name", - _("echobase.error.query.invalid.name")); + t("echobase.error.query.invalid.name")); } else if (!exportQueryService.isQueryNameAvailable(getQuery())) { addFieldError("query.name", - _("echobase.error.query.name.already.exists")); + t("echobase.error.query.name.already.exists")); } else { try { exportQueryService.testSql(getQuery().getSqlQuery()); @@ -131,7 +131,7 @@ log.warn("Invalid sql ", cause); } addFieldError("query.sqlQuery", - _("echobase.error.invalid.sql", cause.getMessage())); + t("echobase.error.invalid.sql", cause.getMessage())); } } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CloneExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -64,7 +64,7 @@ } String result = super.execute(); - addFlashMessage(_("echobase.info.query.cloned")); + addFlashMessage(t("echobase.info.query.cloned")); return result; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/CreateNewExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -85,7 +85,7 @@ queries = exportQueryService.loadSortAndDecorate(ExportQuery.class); // new query in progress - addFlashMessage(_("echobase.info.new.sqlQuery.inprogress")); + addFlashMessage(t("echobase.info.new.sqlQuery.inprogress")); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/DeleteExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -65,7 +65,7 @@ } exportQueryService.delete(getQuery().getTopiaId()); query = null; - addFlashMessage(_("echobase.info.query.removed")); + addFlashMessage(t("echobase.info.query.removed")); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/EditExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -100,7 +100,7 @@ // this user can not update selected query addFlashMessage( - _("echobase.info.sqlQuery.not.modifiable")); + t("echobase.info.sqlQuery.not.modifiable")); } // test query @@ -121,7 +121,7 @@ log.warn("Invalid sql ", cause); } addFieldError("query.sqlQuery", - _("echobase.error.invalid.sql", cause.getMessage())); + t("echobase.error.invalid.sql", cause.getMessage())); result = false; } return result; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/SaveExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -58,9 +58,9 @@ String result = super.execute(); if (newQuery) { - addFlashMessage(_("echobase.info.query.created")); + addFlashMessage(t("echobase.info.query.created")); } else { - addFlashMessage(_("echobase.info.query.saved")); + addFlashMessage(t("echobase.info.query.saved")); } return result; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportQuery/ShowExportQuery.java 2014-02-28 17:45:12 UTC (rev 964) @@ -88,7 +88,7 @@ if (queries.isEmpty()) { // no query saved - addFlashMessage(_("echobase.info.no.sqlQuery.saved")); + addFlashMessage(t("echobase.info.no.sqlQuery.saved")); } return SUCCESS; } 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 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractLaunchImport.java 2014-02-28 17:45:12 UTC (rev 964) @@ -25,10 +25,14 @@ import fr.ifremer.echobase.services.service.importdata.AbstractImportConfiguration; import fr.ifremer.echobase.services.service.importdata.AbstractImportDataService; +import fr.ifremer.echobase.services.service.importdb.ImportDbMode; +import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.inject.Inject; + /** * Abstract action to launch an data import. * @@ -42,23 +46,26 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AbstractLaunchImport.class); + @Inject + protected transient SpatialService spatialService; + protected AbstractLaunchImport(Class<M> modelType, Class<S> serviceType) { super(modelType, serviceType); } @Override protected String getSuccesMessage() { - return _("echobase.info.importData.succeded"); + return t("echobase.info.importData.succeded"); } @Override protected String getErrorMessage() { - return _("echobase.info.importData.failed"); + return t("echobase.info.importData.failed"); } @Override protected String getResultMessage(M model) { - String message = _("echobase.message.importData.result", + String message = t("echobase.message.importData.result", model.getActionTime(), model.getResultMessage()); if (log.isInfoEnabled()) { log.info("Result: " + message); @@ -68,7 +75,7 @@ @Override public String getActionResumeTitle() { - return _("echobase.legend.importData.result.resume"); + return t("echobase.legend.importData.result.resume"); } @Override @@ -84,6 +91,9 @@ @Override protected void closeAction(M model) throws Exception { destroyModel(model); + if (spatialService.isSpatialAware()) { + addFlashMessage(t("echobase.info.reload.spatialData")); + } } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMission.java 2014-02-28 17:45:12 UTC (rev 964) @@ -71,11 +71,11 @@ log.info("Created mission : " + missionSaved.getTopiaId()); } addFlashMessage( - _("echobase.information.mission.created", missionSaved.getName())); + t("echobase.information.mission.created", missionSaved.getName())); result = SUCCESS; } catch (MissionNameAlreadyExistException e) { addFieldError("mission.name", - _("echobase.error.mission.name.already.exist")); + t("echobase.error.mission.name.already.exist")); } return result; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2014-02-28 17:45:12 UTC (rev 964) @@ -25,6 +25,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.services.service.importdb.ImportDbConfiguration; +import fr.ifremer.echobase.services.service.importdb.ImportDbMode; import fr.ifremer.echobase.services.service.importdb.ImportDbService; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; @@ -49,12 +50,12 @@ @Override protected String getSuccesMessage() { - return _("echobase.info.importDb.succeded"); + return t("echobase.info.importDb.succeded"); } @Override protected String getErrorMessage() { - return _("echobase.info.importDb.failed"); + return t("echobase.info.importDb.failed"); } @Override @@ -62,12 +63,12 @@ String message; switch (model.getImportDbMode()) { case REFERENTIAL: - message = _("echobase.importDb.referentialResult", + message = t("echobase.importDb.referentialResult", model.getActionTime()); break; case FREE: - message = _("echobase.importDb.freeResult", + message = t("echobase.importDb.freeResult", model.getActionTime()); break; default: @@ -81,7 +82,7 @@ @Override public String getActionResumeTitle() { - return _("echobase.legend.importDb.resume"); + return t("echobase.legend.importDb.resume"); } @Override Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2014-02-28 17:45:12 UTC (rev 964) @@ -92,7 +92,7 @@ String voyage = decorator.toString(voyageEntity); String importType = importTypes.get(importLog.getImportType().name()); - String result = _("echobase.common.importLogToDelete", + String result = t("echobase.common.importLogToDelete", voyage, importType, importLog.getImportDate()); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/Delete.java 2014-02-28 17:45:12 UTC (rev 964) @@ -25,10 +25,13 @@ import fr.ifremer.echobase.services.service.removedata.RemoveDataConfiguration; import fr.ifremer.echobase.services.service.removedata.RemoveDataService; +import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.inject.Inject; + /** * Delete a selected import Log. * @@ -42,23 +45,26 @@ /** Logger. */ private static final Log log = LogFactory.getLog(Delete.class); + @Inject + protected transient SpatialService spatialService; + public Delete() { super(RemoveDataConfiguration.class, RemoveDataService.class); } @Override protected String getSuccesMessage() { - return _("echobase.info.removeData.succeded"); + return t("echobase.info.removeData.succeded"); } @Override protected String getErrorMessage() { - return _("echobase.info.removeData.failed"); + return t("echobase.info.removeData.failed"); } @Override protected String getResultMessage(RemoveDataConfiguration model) { - String message = _("echobase.message.removeData.result", + String message = t("echobase.message.removeData.result", model.getActionTime(), model.getResultMessage()); if (log.isInfoEnabled()) { log.info("Result: " + message); @@ -68,7 +74,7 @@ @Override public String getActionResumeTitle() { - return _("echobase.legend.removeData.resume"); + return t("echobase.legend.removeData.resume"); } @Override @@ -83,5 +89,9 @@ @Override protected void closeAction(RemoveDataConfiguration model) throws Exception { destroyModel(model); + + if (spatialService.isSpatialAware()) { + addFlashMessage(t("echobase.info.reload.spatialData")); + } } } Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/DisplaySpatialData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/DisplaySpatialData.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/DisplaySpatialData.java 2014-02-28 17:45:12 UTC (rev 964) @@ -1,52 +0,0 @@ -package fr.ifremer.echobase.ui.actions.spatial; - -/* - * #%L - * EchoBase :: UI - * $Id$ - * $HeadURL$ - * %% - * 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% - */ - -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; - -/** - * To display only the spatial data map. - * <p/> - * This action will be reused to raster spatial data maps. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.2 - */ -public class DisplaySpatialData extends EchoBaseActionSupport { - - private static final long serialVersionUID = 1L; - - protected final ShowSpatialModel model = new ShowSpatialModel(); - - public ShowSpatialModel getModel() { - return model; - } - - @Override - public String execute() throws Exception { - - - return SUCCESS; - } -} Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/GetVoyageDataMetadata.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/GetVoyageDataMetadata.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/GetVoyageDataMetadata.java 2014-02-28 17:45:12 UTC (rev 964) @@ -1,91 +0,0 @@ -package fr.ifremer.echobase.ui.actions.spatial; - -/* - * #%L - * EchoBase :: UI - * $Id$ - * $HeadURL$ - * %% - * 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% - */ - -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.services.service.UserDbPersistenceService; -import fr.ifremer.echobase.services.service.spatial.SpatialService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang3.StringUtils; - -import javax.inject.Inject; -import java.util.Map; - -/** - * Obtain all dataMetadata used for a given voyage. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.2 - */ -public class GetVoyageDataMetadata extends EchoBaseActionSupport { - - private static final long serialVersionUID = 1L; - - /** Selected voyage id. */ - protected String voyageId; - - /** Universe of result. */ - protected Map<String, String> data; - - public void setVoyageId(String voyageId) { - this.voyageId = voyageId; - } - - public Map<String, String> getData() { - return data; - } - - @Override - public String execute() throws Exception { - - if (StringUtils.isEmpty(voyageId)) { - data = Maps.newLinkedHashMap(); - - } else { - - Voyage voyage = userDbPersistenceService.getVoyage(voyageId); - - Preconditions.checkNotNull( - voyage, - "Could not find voyage with id " + voyageId); - - data = userDbPersistenceService.loadSortAndDecorate(DataMetadata.class); - } - - return SUCCESS; - } - - //------------------------------------------------------------------------// - //-- Injected objects // - //------------------------------------------------------------------------// - - @Inject - protected transient UserDbPersistenceService userDbPersistenceService; - - @Inject - protected transient SpatialService spatialService; -} \ No newline at end of file Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java 2014-02-28 17:45:12 UTC (rev 964) @@ -0,0 +1,28 @@ +package fr.ifremer.echobase.ui.actions.spatial; + +import fr.ifremer.echobase.services.service.spatial.SpatialService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import javax.inject.Inject; + +/** + * Created on 2/28/14. + * + * @author Tony Chemit <chemit@codelutin.com> + * @since 2.6 + */ +public class RefreshSpatialViews extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + @Inject + protected transient SpatialService spatialService; + + @Override + public String execute() throws Exception { + + spatialService.updatePostgisViews(); + + return SUCCESS; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/RefreshSpatialViews.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Save.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Save.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Save.java 2014-02-28 17:45:12 UTC (rev 964) @@ -1,36 +0,0 @@ -package fr.ifremer.echobase.ui.actions.spatial; - -/* - * #%L - * EchoBase :: UI - * $Id$ - * $HeadURL$ - * %% - * 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% - */ - -/** - * To save the selected spatial data. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.2 - */ -public class Save { - - protected final ShowSpatialModel model = new ShowSpatialModel(); - -} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java (from rev 956, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/Show.java 2014-02-28 17:45:12 UTC (rev 964) @@ -0,0 +1,84 @@ +package fr.ifremer.echobase.ui.actions.spatial; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * 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% + */ + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.service.UserDbPersistenceService; +import fr.ifremer.echobase.services.service.spatial.SpatialService; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; + +import javax.inject.Inject; +import java.util.Map; + +/** + * To configure and show spatial datas. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.2 + */ +public class Show extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + @Inject + protected transient UserDbPersistenceService userDbPersistenceService; + + @Inject + protected transient SpatialService spatialService; + + protected final ShowSpatialModel model = new ShowSpatialModel(); + + public ShowSpatialModel getModel() { + return model; + } + + protected boolean canAddSpatial; + + /** Universe of existing voyages. */ + protected Map<String, String> voyages; + + public Map<String, String> getVoyages() { + return voyages; + } + + public boolean isCanAddSpatial() { + return canAddSpatial; + } + + @Override + public String execute() throws Exception { + + voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); + + model.setJdbcUrl(getServiceContext().getUserDbUrl()); + model.setWithSpatial(spatialService.isSpatialAware()); + + // can add postgis if working db is postgresql and has still no echobase + // spatial db + canAddSpatial = !model.isWithSpatial() && spatialService.isPostgresql(); + + return SUCCESS; + } + +} Copied: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java (from rev 956, trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/DisplaySpatialData.java) =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-02-28 17:45:12 UTC (rev 964) @@ -0,0 +1,59 @@ +package fr.ifremer.echobase.ui.actions.spatial; + +/* + * #%L + * EchoBase :: UI + * $Id$ + * $HeadURL$ + * %% + * 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% + */ + +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * To display only the spatial data map. + * <p/> + * This action will be reused to raster spatial data maps. + * + * @author tchemit <chemit@codelutin.com> + * @since 2.2 + */ +public class ShowMap extends EchoBaseActionSupport { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(ShowMap.class); + + protected final ShowSpatialModel model = new ShowSpatialModel(); + + public ShowSpatialModel getModel() { + return model; + } + + @Override + public String execute() throws Exception { + + if (log.isInfoEnabled()) { + log.info("Loading spatial view for voyage: " + model.getVoyageId()); + } + return SUCCESS; + } +} Deleted: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialData.java 2014-02-28 17:45:12 UTC (rev 964) @@ -1,101 +0,0 @@ -package fr.ifremer.echobase.ui.actions.spatial; - -/* - * #%L - * EchoBase :: UI - * $Id$ - * $HeadURL$ - * %% - * 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% - */ - -import com.opensymphony.xwork2.Preparable; -import com.opensymphony.xwork2.interceptor.annotations.InputConfig; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.service.UserDbPersistenceService; -import fr.ifremer.echobase.services.service.spatial.SpatialService; -import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; - -import javax.inject.Inject; -import java.util.Map; - -/** - * To configure and show spatial datas. - * - * @author tchemit <chemit@codelutin.com> - * @since 2.2 - */ -public class ShowSpatialData extends EchoBaseActionSupport implements Preparable { - - private static final long serialVersionUID = 1L; - - protected final ShowSpatialModel model = new ShowSpatialModel(); - - public ShowSpatialModel getModel() { - return model; - } - - protected boolean canAddSpatial; - - /** Universe of existing voyages. */ - protected Map<String, String> voyages; - - public Map<String, String> getVoyages() { - return voyages; - } - - public boolean isCanAddSpatial() { - return canAddSpatial; - } - - @Override - public void prepare() throws Exception { - voyages = userDbPersistenceService.loadSortAndDecorate(Voyage.class); - - model.setJdbcUrl(getServiceContext().getUserDbUrl()); - model.setWithSpatial(spatialService.isSpatialAware()); - - // can add postgis if working db is postgresql and has still no echobase - // spatial db - canAddSpatial = !model.isWithSpatial() && spatialService.isPostgresql(); - } - - @Override - public String input() throws Exception { - - model.setWithData(false); - return SUCCESS; - } - - @InputConfig(methodName = "input") - @Override - public String execute() throws Exception { - getModel().setWithData(true); - - return SUCCESS; - } - - //------------------------------------------------------------------------// - //-- Injected objects // - //------------------------------------------------------------------------// - - @Inject - protected transient UserDbPersistenceService userDbPersistenceService; - - @Inject - protected transient SpatialService spatialService; -} Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2014-02-28 17:45:12 UTC (rev 964) @@ -66,7 +66,7 @@ userService.createOrUpdate(userToCreate); // add info message - addFlashMessage(_("echobase.info.user.create", userEmail)); + addFlashMessage(t("echobase.info.user.create", userEmail)); return SUCCESS; } @@ -81,7 +81,7 @@ // empty user login addFieldError("user.email", - _("echobase.error.required.email")); + t("echobase.error.required.email")); } else { // check login not already used @@ -96,7 +96,7 @@ } if (login != null) { addFieldError("user.email", - _("echobase.error.email.already.used")); + t("echobase.error.email.already.used")); } } @@ -105,7 +105,7 @@ // empty user password addFieldError("user.password", - _("echobase.error.required.password")); + t("echobase.error.required.password")); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2014-02-28 17:45:12 UTC (rev 964) @@ -85,7 +85,7 @@ userService.delete(userToDelete); // add info message - addFlashMessage(_("echobase.info.user.delete", userEmail)); + addFlashMessage(t("echobase.info.user.delete", userEmail)); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2014-02-28 17:45:12 UTC (rev 964) @@ -69,7 +69,7 @@ userService.createOrUpdate(userToUpdate); // add info message - addFlashMessage(_("echobase.info.user.update", userEmail)); + addFlashMessage(t("echobase.info.user.update", userEmail)); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AbstractWorkingDbAction.java 2014-02-28 17:45:12 UTC (rev 964) @@ -95,7 +95,7 @@ // no conf saved addFlashMessage( - _("echobase.info.no.workingDbConfiguration.saved")); + t("echobase.info.no.workingDbConfiguration.saved")); } String[] ids = parameters.get("conf.topiaId"); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/AddSpatial.java 2014-02-28 17:45:12 UTC (rev 964) @@ -44,7 +44,7 @@ spatialService.addSpatialSupport(); - addFlashMessage(_("echobase.info.workingDbconfiguration.spatialStructureAdded")); + addFlashMessage(t("echobase.info.workingDbconfiguration.spatialStructureAdded")); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2014-02-28 17:45:12 UTC (rev 964) @@ -72,7 +72,7 @@ try { EchoBaseEntityHelper.checkJDBCConnection(jdbcConf); getEchoBaseSession().initUserDb(jdbcConf, true); - addFlashMessage(_("echobase.info.workingDbconfiguration.connected", + addFlashMessage(t("echobase.info.workingDbconfiguration.connected", conf.getUrl())); result = SUCCESS; @@ -80,11 +80,11 @@ jdbcConf = null; addFieldError( "login", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); addFieldError( "password", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); } @@ -105,11 +105,11 @@ jdbcConf = null; addFieldError( "login", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); addFieldError( "password", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2014-02-28 17:45:12 UTC (rev 964) @@ -45,7 +45,7 @@ // new workingDbConfiguration in progress addFlashMessage( - _("echobase.info.new.workingDbConfiguration.inprogress")); + t("echobase.info.new.workingDbConfiguration.inprogress")); return INPUT; } @@ -56,7 +56,7 @@ // new workingDbConfiguration in progress addFlashMessage( - _("echobase.info.new.workingDbConfiguration.inprogress")); + t("echobase.info.new.workingDbConfiguration.inprogress")); return INPUT; } @@ -67,8 +67,8 @@ conf = workingDbConfigurationService.create(getConf()); - addFlashMessage(_("echobase.info.workingDbconfiguration.created", - conf.getUrl())); + addFlashMessage(t("echobase.info.workingDbconfiguration.created", + conf.getUrl())); return SUCCESS; } @@ -79,7 +79,7 @@ if (StringUtils.isBlank(getConf().getUrl())) { addFieldError( "conf.url", - _("echobase.error.workingDbConfiguration.url.required")); + t("echobase.error.workingDbConfiguration.url.required")); } else { if (!isConfExists()) { @@ -90,7 +90,7 @@ boolean urlUsed = workingDbConfigurationService.isUrlAlreadyUsed(getConf().getUrl()); if (urlUsed) { addFieldError("conf.url", - _("echobase.error.workingDbConfiguration.url.already.exists")); + t("echobase.error.workingDbConfiguration.url.already.exists")); } } } @@ -98,7 +98,7 @@ if (StringUtils.isBlank(getConf().getDescription())) { addFieldError( "conf.description", - _("echobase.error.workingDbConfiguration.description.required")); + t("echobase.error.workingDbConfiguration.description.required")); } } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/CreatePostgresDb.java 2014-02-28 17:45:12 UTC (rev 964) @@ -83,7 +83,7 @@ // connect to new database getEchoBaseSession().initUserDb(jdbcConf, true); - addFlashMessage(_("echobase.info.workingDb.created", conf.getUrl())); + addFlashMessage(t("echobase.info.workingDb.created", conf.getUrl())); } catch (Exception e) { @@ -106,7 +106,7 @@ if (!DriverType.POSTGRESQL.equals(getConf().getDriverType())) { addFieldError( "conf.driverType", - _("echobase.error.workingDbConfiguration.createOnlyOnPostgresql")); + t("echobase.error.workingDbConfiguration.createOnlyOnPostgresql")); } else { jdbcConf = JdbcConfiguration.newConfig( getConf().getDriverType(), getConf().getUrl(), @@ -122,11 +122,11 @@ jdbcConf = null; addFieldError( "login", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); addFieldError( "password", - _("echobase.error.workingDbConfiguration.couldNotConnect", + t("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Delete.java 2014-02-28 17:45:12 UTC (rev 964) @@ -51,8 +51,8 @@ String result = INPUT; try { workingDbConfigurationService.delete(getConf().getTopiaId()); - addFlashMessage(_("echobase.info.workingDbconfiguration.deleted", - conf.getUrl())); + addFlashMessage(t("echobase.info.workingDbconfiguration.deleted", + conf.getUrl())); conf = null; result = SUCCESS; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Disconnect.java 2014-02-28 17:45:12 UTC (rev 964) @@ -41,7 +41,7 @@ JdbcConfiguration sessionConf = getEchoBaseSession().getWorkingDbConfiguration(); getEchoBaseSession().releaseUserDb(); - addFlashMessage(_("echobase.info.workingDbconfiguration.disconnected", + addFlashMessage(t("echobase.info.workingDbconfiguration.disconnected", sessionConf.getUrl())); return SUCCESS; } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/ShowList.java 2014-02-28 17:45:12 UTC (rev 964) @@ -42,7 +42,7 @@ // no workingDbConfiguration selected addFlashMessage( - _("echobase.info.no.workingDbConfiguration.selected")); + t("echobase.info.no.workingDbConfiguration.selected")); } return SUCCESS; Modified: trunk/echobase-ui/src/main/resources/config/struts-spatial.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/resources/config/struts-spatial.xml 2014-02-28 17:45:12 UTC (rev 964) @@ -30,53 +30,38 @@ <package name="spatial" extends="logguedAndWithDb" namespace="/spatial"> - <!-- Configure show spatial data --> - <action name="configure" method="input" - class="fr.ifremer.echobase.ui.actions.spatial.ShowSpatialData"> + <!-- Show spatial data page --> + <action name="show" + class="fr.ifremer.echobase.ui.actions.spatial.Show"> <interceptor-ref name="basicStackLogguedWithdb"/> - <result>/WEB-INF/jsp/spatial/showData.jsp</result> + <result>/WEB-INF/jsp/spatial/show.jsp</result> </action> - <!-- Reconfigure show spatial data --> - <action name="reconfigure" method="input" - class="fr.ifremer.echobase.ui.actions.spatial.ShowSpatialData"> - <interceptor-ref name="basicStackLogguedWithdb"/> - <result type="redirectAction"> - <param name="namespace">/spatial</param> - <param name="actionName">configure</param> - </result> + <!-- show spatial map from the given selected data --> + <action name="showMap" + class="fr.ifremer.echobase.ui.actions.spatial.ShowMap"> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> + <result>/WEB-INF/jsp/spatial/showMap.jsp</result> </action> <!-- Add echobase spatial tables, functions and triggers to working db --> <action name="addSpatial" class="fr.ifremer.echobase.ui.actions.workingDb.AddSpatial"> <result type="redirectAction"> - <param name="actionName">configure</param> <param name="namespace">/spatial</param> + <param name="actionName">show</param> </result> </action> - <!-- Show spatial map from the given selected data --> - <action name="showSpatial" - class="fr.ifremer.echobase.ui.actions.spatial.ShowSpatialData"> - <interceptor-ref name="prepareParamsStackLogguedWithDb"/> - <result>/WEB-INF/jsp/spatial/showData.jsp</result> + <!-- Refresh echobase spatial views --> + <action name="refreshSpatialViews" + class="fr.ifremer.echobase.ui.actions.spatial.RefreshSpatialViews"> + <result type="redirectAction"> + <param name="namespace">/spatial</param> + <param name="actionName">show</param> + </result> </action> - <!-- display spatial map from the given selected data --> - <action name="displaySpatial" - class="fr.ifremer.echobase.ui.actions.spatial.DisplaySpatialData"> - <interceptor-ref name="prepareParamsStackLogguedWithDb"/> - <result>/WEB-INF/jsp/spatial/showDataMap.jsp</result> - </action> - - <!-- Get medata for the selected voyage --> - <action name="getVoyageDataMetadata" - class="fr.ifremer.echobase.ui.actions.spatial.GetVoyageDataMetadata"> - <interceptor-ref name="basicStackLogguedWithdb"/> - <result type="json"/> - </action> - </package> </struts> 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 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2014-02-28 17:45:12 UTC (rev 964) @@ -28,6 +28,7 @@ echobase.action.logout=Disconnect echobase.action.newQuery=New query echobase.action.newWorkingDbContiguration=New working database configuration +echobase.action.reloadSpatialData=Reload spatial data echobase.action.reloadSqlQuery=Cancel changes echobase.action.reset=Cancel echobase.action.return=Back @@ -37,7 +38,7 @@ echobase.action.show.exportDb.documentation=How to export a database echobase.action.show.import.documentation=How to import data echobase.action.show.importDb.documentation=How to import a database -echobase.action.show.showData.documentation=How to display spatial data +echobase.action.show.showSpatialData.documentation=How to display spatial data echobase.action.show.workingDb.documentation=How to connect to a working database echobase.action.toEnglish=English echobase.action.toFrench=French @@ -281,6 +282,7 @@ echobase.info.query.created=Query created echobase.info.query.removed=Query removed echobase.info.query.saved=Query saved +echobase.info.reload.spatialData=Remember to refresh spatial data in the spatial data view page\! echobase.info.removeData.failed=Import removal failed echobase.info.removeData.succeded=Successful data import removal echobase.info.reportBug=Bug report @@ -375,6 +377,7 @@ echobase.message.warnExportInProgress=Please do not close the window to access the export file echobase.message.warnImportInProgress=Please do not close the window to access the imported file echobase.message.warnRemoveDataInProgress=Please do not close the window to access remove data result +echobase.spatialView.loading=Loading data... echobase.title.confirm.deleteImportLogs=Delete data echobase.title.confirm.deleteQuery=Delete a query echobase.title.confirm.deleteWorkingDbConfiguration=Delete a configuration 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 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2014-02-28 17:45:12 UTC (rev 964) @@ -28,6 +28,7 @@ echobase.action.logout=Déconnexion echobase.action.newQuery=Nouvelle requête echobase.action.newWorkingDbContiguration=Nouvelle configuration de base de travail +echobase.action.reloadSpatialData=Recharger les données spatiales echobase.action.reloadSqlQuery=Annuler les modifications echobase.action.reset=Annuler echobase.action.return=Retour @@ -37,7 +38,7 @@ echobase.action.show.exportDb.documentation=Comment exporter une base echobase.action.show.import.documentation=Comment importer des données echobase.action.show.importDb.documentation=Comment importer une base -echobase.action.show.showData.documentation=Comment visualiser des données +echobase.action.show.showSpatialData.documentation=Comment visualiser des données spatiales echobase.action.show.workingDb.documentation=Comment se connecter à une base de travail echobase.action.toEnglish=En anglais echobase.action.toFrench=En français @@ -281,6 +282,7 @@ echobase.info.query.created=Requête créée echobase.info.query.removed=Requête supprimée echobase.info.query.saved=Requête mise à jour +echobase.info.reload.spatialData=Pensez à recharger les données spatiales dans la page de visualisation des données spatiales\! echobase.info.removeData.failed=La suppresion de l'import a échoué echobase.info.removeData.succeded=La suppresion de l'import a réussi echobase.info.reportBug=Rapport de bug @@ -375,6 +377,7 @@ echobase.message.warnExportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'export echobase.message.warnImportInProgress=Merci de ne pas fermer la fenêtre pour pouvoir accéder aux résultats de l'import echobase.message.warnRemoveDataInProgress=Merci de ne pas fermer la fenètre pour pouvoir accéder aux résultats de la suppression de l'import +echobase.spatialView.loading=Chargement des données... echobase.title.confirm.deleteImportLogs=Supprimer des données echobase.title.confirm.deleteQuery=Supprimer une requête echobase.title.confirm.deleteWorkingDbConfiguration=Supprimer la configuration Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators.xml 2014-02-28 17:45:12 UTC (rev 964) @@ -36,11 +36,9 @@ <pattern>/exportQuery/newLibreOfficeQuery*</pattern> <pattern>/exportQuery/confirmDelete*</pattern> <pattern>/importData/get*</pattern> - <pattern>/spatial/get*</pattern> - <pattern>/spatial/displaySpatial*</pattern> + <pattern>/spatial/showMap*</pattern> <pattern>/workingDb/confirmDelete*</pattern> <pattern>/workingDb/get*</pattern> - <!--<pattern>/removeData/confirmDelete*</pattern>--> </excludes> <decorator name="layout-default" page="layout-default.jsp"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2014-02-28 17:45:12 UTC (rev 964) @@ -118,7 +118,7 @@ </s:a> </li> <li> - <s:a action="configure" namespace="/spatial" cssClass="spatial"> + <s:a action="show" namespace="/spatial" cssClass="spatial"> <span> <s:text name="echobase.menu.showSpatialData"/> </span> @@ -170,7 +170,7 @@ </s:a> </li> <li> - <s:a action="configure" namespace="/spatial" cssClass="info"> + <s:a action="show" namespace="/spatial" cssClass="info"> <span> <s:text name="echobase.menu.showSpatialData"/> </span> Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp (from rev 956, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showData.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/show.jsp 2014-02-28 17:45:12 UTC (rev 964) @@ -0,0 +1,144 @@ +<%-- + #%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<title> + <s:text name="echobase.title.show.spatial"/> +</title> + +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<s:if test="model.withSpatial"> + + <script type="text/javascript"> + + jQuery(document).ready(function () { + + var voyageComboBox = $('[name="model.voyageId"]'); + + var loadvoyageData = function(voyageId) { + + var spatialView = $('#spatialViewContainer'); + var spatialViewContent = $('#spatialViewContent'); + if (voyageId!='') { + + // load spatial view + spatialViewContent.html('<s:text name="echobase.spatialView.loading"/>'); + spatialView.show(); + console.info('Load spatial view '+voyageId); + + + jQuery.get( + '<s:url action="showMap" namespace="/spatial"/>', + { + "model.voyageId": voyageComboBox.val() + }, + function (result) { + + // inject result + spatialViewContent.html(result); + }); + } else { + + // hide spatial view + spatialView.hide(); + spatialViewContent.html(""); + } + }; + + voyageComboBox.change(function () { + loadvoyageData(this.value); + }); + + loadvoyageData('<s:property value="model.voyageId"/>'); + + }); + </script> + + <s:form namespace="/spatial" method="POST" enctype="multipart/form-data"> + + <div class="toolbar"> + <ul class="toolbar floatRight"> + <li> + <s:submit action='refreshSpatialViews' key="echobase.action.reloadSpatialData"/> + </li> + </ul> + </div> + + <fieldset> + <legend> + <s:text name="echobase.legend.showData.configure"/> + </legend> + + <div class="cleanBoth help"> + <s:a href="%{getDocumentation('showSpatialData.html', null)}" target="doc"> + <s:text name="echobase.action.show.showSpatialData.documentation"/> + </s:a> + </div> + <br/> + + <s:select key="model.voyageId" requiredLabel="true" + label='%{getText("echobase.common.voyage")}' + list="voyages" headerKey="" headerValue=""/> + + <s:hidden key="model.withSpatial" label=' '/> + + </fieldset> + + + <div id="spatialViewContainer"> + <fieldset> + <legend> + <s:text name="echobase.legend.showData.result"/> + </legend> + + <div id="spatialViewContent"></div> + </fieldset> + </div> + + </s:form> +</s:if> +<s:else> + + <p> + <s:text name="echobase.message.no.spatial.database.support"/> + </p> + + <s:if test="canAddSpatial"> + <br/> + <s:form id="createForm" namespace="/spatial"> + <ul class="toolbar floatLeft"> + + <li> + <s:submit theme="simple" action="addSpatial" + key="echobase.action.workingDbconfiguration.addSpatial"/> + </li> + + </ul> + </s:form> + </s:if> +</s:else> + + Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showData.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showData.jsp 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showData.jsp 2014-02-28 17:45:12 UTC (rev 964) @@ -1,229 +0,0 @@ -<%-- - #%L - EchoBase :: UI - $Id$ - $HeadURL$ - %% - 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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<title> - <s:text name="echobase.title.show.spatial"/> -</title> - -<script type="text/javascript" - src="<s:url value='/js/gridHelper.js' />"></script> - -<s:if test="model.withSpatial"> - - <script type="text/javascript"> - - jQuery(document).ready(function () { - - var getVoyage = $('[name="model.voyageId"]'); - - $.autoSelectVoyageAndDataMetadata( - getVoyage, - $('[name="model.dataMetadataIdForEsduData"]'), - '<s:url action="getVoyageDataMetadata" namespace="/spatial"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.dataMetadataIdForEsduData"/>' - ); - - $.autoSelectVoyageAndDataMetadata( - getVoyage, - $('[name="model.dataMetadataIdForEsduResult"]'), - '<s:url action="getVoyageDataMetadata" namespace="/spatial"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.dataMetadataIdForEsduResult"/>' - ); - - $.autoSelectVoyageAndDataMetadata( - getVoyage, - $('[name="model.dataMetadataIdForMapData"]'), - '<s:url action="getVoyageDataMetadata" namespace="/spatial"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.dataMetadataIdForMapData"/>' - ); - - $.autoSelectVoyageAndDataMetadata( - getVoyage, - $('[name="model.dataMetadataIdForMapResult"]'), - '<s:url action="getVoyageDataMetadata" namespace="/spatial"/>', - '<s:property value="model.voyageId"/>', - '<s:property value="model.dataMetadataIdForMapResult"/>' - ); - - $.showSpatialLayer("model.showCellEsduDataLayer", "cellEsduDataLayer", "model.dataMetadataIdForEsduData", <s:property value="model.showCellEsduDataLayer"/>); - $.showSpatialLayer("model.showCellEsduResultLayer", "cellEsduResultLayer", "model.dataMetadataIdForEsduResult", <s:property value="model.showCellEsduResultLayer"/>); - $.showSpatialLayer("model.showCellMapDataLayer", "cellMapDataLayer", "model.dataMetadataIdForMapData", <s:property value="model.showCellMapDataLayer"/>); - $.showSpatialLayer("model.showCellMapResultLayer", "cellMapResultLayer", "model.dataMetadataIdForMapResult", <s:property value="model.showCellMapResultLayer"/>); - - var showOptions = function(show) { - - var config = $('#withSelectedVoyage'); - - if (show!='') { - config.show(); - } else { - config.hide(); - } - }; - - getVoyage.change(function () { - showOptions(this.value); - }); - - showOptions('<s:property value="model.voyageId"/>'); - - - <s:if test="model.withData"> - - console.info("LOAD DATA!"); - /* - jQuery.get( - '<s:url action="displaySpatial" namespace="/spatial"/>', - { - "model.voyageId": '<s:property value="model.voyageId"/>', - "model.dataMetadataIdForEsduData": '<s:property value="model.dataMetadataIdForEsduData"/>', - "model.dataMetadataIdForEsduResult": '<s:property value="model.dataMetadataIdForEsduResult"/>', - "model.dataMetadataIdForMapData": '<s:property value="model.dataMetadataIdForMapData"/>', - "model.dataMetadataIdForMapResult": '<s:property value="model.dataMetadataIdForMapResult"/>', - "model.showOperationLayer": '<s:property value="model.showOperationLayer"/>', - "model.showCellEsduDataLayer": '<s:property value="model.showCellEsduDataLayer"/>', - "model.showCellEsduResultLayer": '<s:property value="model.showCellEsduResultLayer"/>', - "model.showCellMapDataLayer": '<s:property value="model.showCellMapDataLayer"/>', - "model.showCellMapResultLayer": '<s:property value="model.showCellMapResultLayer"/>' - }, - function (result) { - - // inject result - $('#dataPanel').html(result); - });*/ - </s:if> - }); - </script> - - <s:form namespace="/spatial" method="POST" enctype="multipart/form-data"> - - <fieldset> - <legend> - <s:text name="echobase.legend.showData.configure"/> - </legend> - - <div class="cleanBoth help"> - <s:a href="%{getDocumentation('showData.html', null)}" target="doc"> - <s:text name="echobase.action.show.showData.documentation"/> - </s:a> - </div> - <br/> - - <s:select key="model.voyageId" requiredLabel="true" - label='%{getText("echobase.common.voyage")}' - list="voyages" headerKey="" headerValue=""/> - - <div id="withSelectedVoyage"> - <s:checkbox key="model.showOperationLayer" label='%{getText("echobase.common.showOperationLayer")}'/> - - <s:checkbox key="model.showCellEsduDataLayer" label='%{getText("echobase.common.showCellEsduDataLayer")}'/> - <div class="cellEsduDataLayer"> - <sj:select key="model.dataMetadataIdForEsduData" requiredLabel="true" - label='%{getText("echobase.common.dataMetadata.forEsduDataLayer")}' - headerKey="" headerValue=""/> - </div> - - <s:checkbox key="model.showCellEsduResultLayer" label='%{getText("echobase.common.showCellEsduResultLayer")}'/> - <div class="cellEsduResultLayer"> - <sj:select key="model.dataMetadataIdForEsduResult" requiredLabel="true" - label='%{getText("echobase.common.dataMetadata.forEsduResultLayer")}' - headerKey="" headerValue=""/> - </div> - - <s:checkbox key="model.showCellMapDataLayer" label='%{getText("echobase.common.showCellMapDataLayer")}'/> - <div class="cellMapDataLayer"> - <sj:select key="model.dataMetadataIdForMapData" requiredLabel="true" - label='%{getText("echobase.common.dataMetadata.forMapDataLayer")}' - headerKey="" headerValue=""/> - </div> - <s:checkbox key="model.showCellMapResultLayer" label='%{getText("echobase.common.showCellMapResultLayer")}'/> - <div class="cellMapResultLayer"> - <sj:select key="model.dataMetadataIdForMapResult" requiredLabel="true" - label='%{getText("echobase.common.dataMetadata.forMapResultLayer")}' - headerKey="" headerValue=""/> - </div> - - </div> - - <s:hidden key="model.withData" label=' '/> - <s:hidden key="model.withSpatial" label=' '/> - - </fieldset> - <br/> - - <div class="toolbar"> - <ul class="toolbar floatRight"> - <li> - <s:submit action='reconfigure' key="echobase.action.reset"/> - </li> - <li> - <s:submit action='save' key="echobase.action.save"/> - </li> - <li> - <s:submit action="showSpatial" key='echobase.action.display'/> - </li> - </ul> - </div> - - <s:if test="model.withData"> - - <fieldset> - <legend> - <s:text name="echobase.legend.showData.result"/> - </legend> - - <div id="dataPanel"> - <center>Loading...</center> - </div> - </fieldset> - </s:if> - - </s:form> -</s:if> -<s:else> - - <p> - <s:text name="echobase.message.no.spatial.database.support"/> - </p> - - <s:if test="canAddSpatial"> - <br/> - <s:form id="createForm" namespace="/spatial"> - <ul class="toolbar floatLeft"> - - <li> - <s:submit theme="simple" action="addSpatial" - key="echobase.action.workingDbconfiguration.addSpatial"/> - </li> - - </ul> - </s:form> - </s:if> -</s:else> - - Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showDataMap.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showDataMap.jsp 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showDataMap.jsp 2014-02-28 17:45:12 UTC (rev 964) @@ -1,80 +0,0 @@ -<%-- - #%L - EchoBase :: UI - $Id$ - $HeadURL$ - %% - 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% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.css" /> -<!--[if lte IE 8]> -<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.ie.css" /> -<![endif]--> - -<sj:head jqueryui="true" jquerytheme="echobase-theme" debug="true" compressed="false" /> - -<%--<script type="text/javascript"--%> - <%--src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>--%> -<script type="text/javascript" - src="<s:url value='/js/leaflet-src.js' />"></script> - -<%--<script type="text/javascript"--%> - <%--src="<s:url value='/js/gridHelper.js' />"></script>--%> - -<script type="text/javascript"> - - jQuery(document).ready(function () { - - console.info("LL2= "+L); - - jQuery.getJSON( - '<s:url action="getSpatialData" namespace="/spatial"/>', - { - "model.voyageId": '<s:property value="model.voyageId"/>', - "model.dataMetadataId": '<s:property value="model.dataMetadataId"/>', - "model.speciesId": '<s:property value="model.speciesId"/>', - "model.echotypeId": '<s:property value="model.echotypeId"/>' - }, - function (result) { - - console.info("LL3= "+L); - - // create a map in the "map" div, set the view to a given place and zoom - var map = L.map('map').setView([51.505, -0.09], 13); - - // add an OpenStreetMap tile layer - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { - attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors' - }).addTo(map); - - // get geoJson object - var geoJson = result.data; - - // add it to map - L.geoJson(geoJson).addTo(map); - }); - - }); -</script> -<div id="map"> -Loading... -</div> - Copied: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp (from rev 956, trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showDataMap.jsp) =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp 2014-02-28 17:45:12 UTC (rev 964) @@ -0,0 +1,41 @@ +<%-- + #%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + 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% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<sj:head jqueryui="true" jquerytheme="echobase-theme" debug="true" compressed="false" /> + +<script type="text/javascript" + src="<s:url value='/js/leaflet-src.js' />"></script> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + }); +</script> +<div id="map"> +Loading... +</div> + Modified: trunk/echobase-ui/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/echobase-ui/src/main/webapp/js/gridHelper.js 2014-02-28 17:45:12 UTC (rev 964) @@ -240,90 +240,8 @@ } ); } - }, - - // auto-selection des voyages - dataMetadata - autoSelectVoyageAndDataMetadata: function (voyageSelectBox, datapMetadataSelectBox, getUrl, voyageId, dataMetadataId) { - - voyageSelectBox.change({datapMetadataSelectBox: datapMetadataSelectBox, - getUrl: getUrl}, function (event) { - - $.updateSelectBoxContent(event.data.getUrl, - {voyageId: this.value}, - 'data', - event.data.datapMetadataSelectBox - ); - }); - - if (voyageId) { - - voyageSelectBox.change(voyageId); - - $.updateSelectBoxContent(getUrl, - {voyageId: voyageId}, - 'data', - datapMetadataSelectBox, function () { - - if (dataMetadataId) { - - datapMetadataSelectBox.val(dataMetadataId); - } - } - ); - } - }, - - // auto-selection des voyages - species - autoSelectVoyageAndSpecies: function (voyageSelectBox, speciesSelectBox, getUrl, voyageId, speciesId) { - - voyageSelectBox.change({speciesSelectBox: speciesSelectBox, - getUrl: getUrl}, function (event) { - - $.updateSelectBoxContent(event.data.getUrl, - {voyageId: this.value}, - 'data', - event.data.speciesSelectBox - ); - }); - - if (voyageId) { - - voyageSelectBox.change(voyageId); - - $.updateSelectBoxContent(getUrl, - {voyageId: voyageId}, - 'data', - speciesSelectBox, function () { - - if (speciesId) { - - speciesSelectBox.val(speciesId); - } - } - ); - } - }, - - // affichage ou non des options d'un layer spatial - showSpatialLayer: function (checkboxId, configCssClass, selectBoxId, defaultValue) { - - var f = function(show) { - var config = $('[class~="' + configCssClass + '"]'); - var selectBox = $('[name="' + selectBoxId + '"]') - if (show) { - selectBox.removeAttr('disabled'); - config.show(); - } else { - selectBox.attr('disabled', true); - config.hide(); - } - }; - $('[name="' + checkboxId + '"]').change(function () { - f($(this).is(':checked')); - }); - f(!!defaultValue); } - }); + }); $.extend({ addRowSelectTopic: function (gridId, callback) { @@ -366,15 +284,6 @@ }, autoSelectVoyageAndDataProcessing: function (voyageSelectBox, dataProcessingSelectBox, getUrl, voyageId, dataProcessingId) { return $(document).autoSelectVoyageAndDataProcessing(voyageSelectBox, dataProcessingSelectBox, getUrl, voyageId, dataProcessingId); - }, - autoSelectVoyageAndDataMetadata: function (voyageSelectBox, dataMetadataSelectBox, getUrl, voyageId, dataMetadataId) { - return $(document).autoSelectVoyageAndDataMetadata(voyageSelectBox, dataMetadataSelectBox, getUrl, voyageId, dataMetadataId); - }, - autoSelectVoyageAndSpecies: function (voyageSelectBox, speciesSelectBox, getUrl, voyageId, speciesId) { - return $(document).autoSelectVoyageAndSpecies(voyageSelectBox, speciesSelectBox, getUrl, voyageId, speciesId); - }, - showSpatialLayer: function (checkboxId, configCssClass, selectBoxId, defaultValue) { - return $(document).showSpatialLayer(checkboxId, configCssClass, selectBoxId, defaultValue); } }); })(jQuery); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-28 14:08:22 UTC (rev 963) +++ trunk/pom.xml 2014-02-28 17:45:12 UTC (rev 964) @@ -141,7 +141,7 @@ <topiaVersion>3.0-alpha-11</topiaVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion> - <nuitonWebVersion>1.15-alpha-3</nuitonWebVersion> + <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <h2Version>1.3.174</h2Version>