- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Vérifier la présence ou ajouter un champ PS trip.homeid - Closes #1383
by Tony CHEMIT 06 Apr '20

06 Apr '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5b631f82 by tchemit at 2020-04-06T15:01:48+02:00 Vérifier la présence ou ajouter un champ PS trip.homeid - Closes #1383 - - - - - 12 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - dto/src/main/models/Observe.model - persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineEntityDtoBinder.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java - persistence/src/main/models/Observe.model - pom.xml - + test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.5.1/empty_h2.sql.gz - + test/src/main/resources/db/7.5.1/empty_pg.sql.gz - + test/src/main/resources/db/7.5.1/referentiel.sql.gz Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jaxx ===================================== @@ -157,6 +157,22 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { </cell> </row> +  + <row> + + <cell anchor='west'> + <JLabel id='homeIdLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <JPanel layout='{new BorderLayout()}'> + <JToolBar id='homeIdToolbar' constraints='BorderLayout.WEST'> + <JButton id='resetHomeId' styleClass='resetButton'/> + </JToolBar> + <JTextField id='homeId' constraints='BorderLayout.CENTER'/> + </JPanel> + </cell> + </row> +  <row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -77,6 +77,16 @@ NumberEditor { selectedItem:{bean.getLandingHarbour()}; } +#resetHomeId { + toolTipText:"observe.common.DataDto.action.reset.homeId.tip"; + _resetPropertyName: {TripSeineDto.PROPERTY_HOME_ID}; +} + +#homeId { + text:{getStringValue(bean.getHomeId())}; + _propertyName: {TripSeineDto.PROPERTY_HOME_ID}; +} + #resetErsId { toolTipText:"observe.common.DataDto.action.reset.ersId.tip"; _resetPropertyName:{TripSeineDto.PROPERTY_ERS_ID}; ===================================== dto/src/main/models/Observe.model ===================================== @@ -817,6 +817,7 @@ formsUrl + {*:1} String reportsUrl + {*:1} String historicalData + {*:1} boolean ersId + {*:1} String +homeId + {*:1} String routeCount + {*:1} int observer {*:0..1} fr.ird.observe.dto.referential.PersonReference | notNull captain {*:0..1} fr.ird.observe.dto.referential.PersonReference | mayNotNull ===================================== persistence/src/main/java/fr/ird/observe/binder/data/seine/TripSeineEntityDtoBinder.java ===================================== @@ -50,6 +50,7 @@ public class TripSeineEntityDtoBinder extends DataEntityDtoBinderSupport<TripSei entity.setFormsUrl(dto.getFormsUrl()); entity.setReportsUrl(dto.getReportsUrl()); entity.setErsId(dto.getErsId()); + entity.setHomeId(dto.getHomeId()); entity.setOcean(toEntity(dto.getOcean())); entity.setVessel(toEntity(dto.getVessel())); @@ -74,6 +75,7 @@ public class TripSeineEntityDtoBinder extends DataEntityDtoBinderSupport<TripSei dto.setFormsUrl(entity.getFormsUrl()); dto.setReportsUrl(entity.getReportsUrl()); dto.setErsId(entity.getErsId()); + dto.setHomeId(entity.getHomeId()); dto.setOcean(toReferentialReference(referentialLocale, entity.getOcean())); dto.setVessel(toReferentialReference(referentialLocale, entity.getVessel())); dto.setProgram(toReferentialReference(referentialLocale, entity.getProgram())); ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_5_1.java ===================================== @@ -0,0 +1,78 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.auto.service.AutoService; +import org.apache.commons.lang3.tuple.Pair; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.nuiton.version.Versions; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Set; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.5.1 + */ +(a)AutoService(MigrationVersionResource.class) +public class DataSourceMigrationForVersion_7_5_1 extends MigrationVersionResource { + + public DataSourceMigrationForVersion_7_5_1() { + super(Versions.valueOf("7.5.1")); + } + + @Override + public void generateSqlScript(MigrationVersionResourceExecutor executor) { + Set<Pair<String, String>> tripIdAndComment = executor.findMultipleResultAstSet(new TopiaSqlQuery<Pair<String, String>>() { + @SuppressWarnings("SqlDialectInspection") + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("SELECT topiaId, comment FROM observe_seine.trip WHERE comment LIKE '#%#%'"); + } + + @Override + public Pair<String, String> prepareResult(ResultSet set) throws SQLException { + return Pair.of(set.getString(1), set.getString(2)); + } + }); + + executor.writeSql("ALTER TABLE observe_seine.trip ADD COLUMN homeId VARCHAR(255)"); + + for (Pair<String, String> pair : tripIdAndComment) { + String tripId = pair.getKey(); + String comment = pair.getValue().trim(); + + int endIndex = comment.indexOf('#', 1); + String homeId = comment.substring(1, endIndex - 1); + String newComment = endIndex + 1 == comment.length() ? "NULL" : (String.format("'%s'", comment.substring(endIndex + 1).trim().replaceAll("'","''"))); + executor.writeSql(String.format("UPDATE observe_seine.trip t SET comment = %s, homeId = '%s', topiaVersion = topiaVersion + 1, lastUpdateDate = CURRENT_TIMESTAMP WHERE t.topiaId = '%s';", newComment, homeId, tripId)); + } + } + +} + ===================================== persistence/src/main/models/Observe.model ===================================== @@ -851,6 +851,7 @@ vessel {*:1} referentiel.Vessel seine.TripSeine > CommentableEntity >> Trip | entity dbName=Trip startDate + {*:1} Date | hibernateAttributeType.java.util.Date=date endDate + {*:1} Date | hibernateAttributeType.java.util.Date=date +homeId + {*:1} String checkLevel + {*:1} int formsUrl + {*:1} String reportsUrl + {*:1} String ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.14</version> + <version>2020.15</version> </parent> <groupId>fr.ird.observe</groupId> @@ -149,7 +149,7 @@ <devMode>true</devMode>  - <observe.model.version>7.5</observe.model.version> + <observe.model.version>7.5.1</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5.1/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5.1/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5.1/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5.1/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5.1/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.5.1/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5b631f82d7aca107b0b637f4c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/5b631f82d7aca107b0b637f4c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Mise à jour jaxx avec des améliorations sur les JTabbedPane
by Tony CHEMIT 06 Apr '20

06 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 518406b4 by tchemit at 2020-04-06T13:52:08+02:00 Mise à jour jaxx avec des améliorations sur les JTabbedPane - - - - - 512a6572 by tchemit at 2020-04-06T13:52:10+02:00 Lors d'un 'Rechargement de la source' ou d'un appel aux filtres d'affichage de l'arbre, afficher une barre de progression - Closes #1386 - - - - - b6185ba5 by tchemit at 2020-04-06T13:52:10+02:00 Fix NPE when reload ui callback - - - - - 27 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/resources/observe-ui.properties - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -627,6 +627,18 @@ key = ui.temperature.format type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat defaultValue = "C" +[option busyStateColor] +description = observe.config.ui.busyStateColor +key = ui.busyState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + +[option blockStateColor] +description = observe.config.ui.blockStateColor +key = ui.blockState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + [option focusBorderColor] description = observe.config.ui.focusBorderColor key = ui.focusBorder.color ===================================== client-configuration/src/main/i18n/getters/config.getter ===================================== @@ -92,6 +92,8 @@ observe.config.speciesList.seine.observation.targetCatch observe.config.swingSessionFile.description observe.config.temperature.format observe.config.ui.autoPopupNumberEditor +observe.config.ui.blockStateColor +observe.config.ui.busyStateColor observe.config.ui.changeSynchroSrc observe.config.ui.dcp.error.color observe.config.ui.dcp.not.editable.color ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -59,6 +59,7 @@ import org.nuiton.util.StringUtil; import org.nuiton.version.Version; import org.nuiton.version.Versions; +import javax.swing.UIManager; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -681,6 +682,8 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_common, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ps, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ll, dir); + UIManager.getDefaults().put("BlockingLayerUI.busyColor", getBusyStateColor()); + UIManager.getDefaults().put("BlockingLayerUI.blockColor", getBlockStateColor()); } private void loadUIConfigFile(ObserveClientResourceManager.Resource resource, File resourceDirectory) { ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -47,7 +47,7 @@ <ClientConfig id='config' initializer='getContextValue(ClientConfig.class)'/> <MainUIBodyContentManager id="mainUIBodyContentManager" initializer='getContextValue(MainUIBodyContentManager.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <script><![CDATA[ ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss ===================================== @@ -72,10 +72,7 @@ } #busyBlockLayerUI { - useIcon: false; - blockingColor: {UIManager.getColor("BlockingLayerUI.blockingColor")}; block: {model.isBusy()}; - acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } #serverMode { ===================================== client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -170,6 +170,8 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.SHOW_MNEMONIC); helper.addOption(ClientConfigOption.COORDINATE_FORMAT); + helper.addOption(ClientConfigOption.BUSY_STATE_COLOR); + helper.addOption(ClientConfigOption.BLOCK_STATE_COLOR); helper.addOption(ClientConfigOption.FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.NO_FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.FLOATING_OBJECT_MATERIAL_ERROR_COLOR); ===================================== client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.configuration.WithClientConfig; import fr.ird.observe.client.main.ObserveMainUI; +import fr.ird.observe.client.main.body.ClientConfigUI; import fr.ird.observe.client.main.body.NoBodyContentComponent; import io.ultreia.java4all.application.context.ApplicationContext; import org.nuiton.jaxx.runtime.swing.SwingUtil; @@ -71,44 +72,24 @@ public class ReloadUiCallback implements ObserveUICallback, WithClientConfig { // scan main ui -// ObserveSwingDataSource mainStorage = getObserveDataSourcesManager().getMainDataSource(); - //FIXME:BodyContent, cela doit être délégué au body content concerné Class<? extends JComponent> bodyContent = NoBodyContentComponent.class; if (ui != null) { + // Keep a reference on ui instance since it will be reset in close method + // FIXME Should use a closing state in application to improve this + ObserveMainUI ui = this.ui; bodyContent = ui.getMainUIBodyContentManager().getCurrentBodyType(); + if (ClientConfigUI.class.equals(bodyContent)) { + bodyContent = NoBodyContentComponent.class; + } ui.dispose(); - ui.setVisible(false); System.runFinalization(); } -// focusBorder = null; -// noFocusBorder = null; ui = clientUIContext.initUI(rootContext, config); - //FIXME:BodyContent : We must improve this, but for the moment, we could just open main ui empty... -// if (bodyContent == null) { -// if (mainStorage == null) { -// bodyContent = NoBodyContent.NoBodyContentComponent.class; -// } else { -// throw new IllegalStateException("Can't have a loaded database, but not loaded in gui..."); -// } -// } - ui.changeBodyContent(bodyContent); - //FIXME:BodyContent this will be done in data source editor body content -// if (oldMode == ObserveUIMode.DB) { -// -// // on met à jour le modèle de navigation -// NavigationTreeModel treeModel = ui.getNavigationUI().getTree().getModel(); -// treeModel.load(config); -// treeModel.populate(mainStorage); -// -// // selection du noeud d'ouverture -// ui.getNavigationUI().getTree().selectInitialNode(); -// } - // show ui clientUIContext.setMainUIVisible(ui, true); } ===================================== client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -172,3 +172,14 @@ BlockingLayerUI { acceptedComponentTypes: {javax.swing.JScrollBar.class}; } +.busyBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.busyColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} + +.blockBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.blockingColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -189,3 +189,4 @@ color.Table.lastRowColor=255,255,0 color.Table.emptyRowColor=255,255,0 color.Table.unvalidCellColor=255,0,0 color.BlockingLayerUI.blockingColor=50,50,50 +color.BlockingLayerUI.busyColor=50,50,50 ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss ===================================== @@ -92,7 +92,3 @@ columnHeaderView:{UIHelper.newLabel(t("observe.common.step.description") ,"information", 10)}; } -#busyBlockLayerUI{ - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx ===================================== @@ -37,13 +37,13 @@ <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/>  - <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/> + <ObserveBlockingLayerUI id='tabBusyBlockLayerUI' styleClass="busyBlockLayerUI"/>  - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/>  - <ObserveBlockingLayerUI id='configBlockLayerUI'/> + <ObserveBlockingLayerUI id='configBlockLayerUI' styleClass="blockBlockLayerUI"/> <script><![CDATA[ ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss ===================================== @@ -24,24 +24,12 @@ layout:{new BorderLayout()}; } -#tabBusyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; -} - #busyBlockLayerUI{ - useIcon:false; block:{WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED, WizardState.SUCCESSED, WizardState.FAILED)}; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #configBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isWasStarted() || WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED)}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #tabs { ===================================== client-datasource-editor-api/src/main/i18n/getters/java.getter ===================================== @@ -239,6 +239,7 @@ observe.tree.action.configure.tip observe.tree.action.expandAll.tip observe.tree.action.selectAll.tip observe.tree.action.unselectAll.tip +observe.ui.tree.navigation.loaded observe.ui.tree.referential.common observe.ui.tree.referential.ll.common observe.ui.tree.referential.ll.landing ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx ===================================== @@ -59,7 +59,7 @@ <String id='contentTitle' javaBean='null'/> - <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this"/> + <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <script><![CDATA[ public abstract ContentUIHandler getHandler(); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss ===================================== @@ -21,8 +21,6 @@ */ #blockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{body.isVisible() && !model.isEnabled()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx ===================================== @@ -64,7 +64,7 @@ <ListSelectionModel id='selectionModel' initializer='getModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>  - <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this"/> + <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <DataDto id='bean' initializer='getModel().getBean()'/> <DataDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss ===================================== @@ -42,8 +42,6 @@ } #editorBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{!tableModel.isEditable()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx ===================================== @@ -60,7 +60,7 @@ <java.lang.String id='pluralTypeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> <java.lang.String id='typeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> - <ObserveBlockingLayerUI id='editKeyTableLayerUI'/> + <ObserveBlockingLayerUI id='editKeyTableLayerUI' styleClass="blockBlockLayerUI"/> <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss ===================================== @@ -27,8 +27,6 @@ } #editKeyTableLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isUpdatingMode()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java ===================================== @@ -22,6 +22,8 @@ package fr.ird.observe.client.datasource.editor.tree.navigation.actions; * #L% */ +import fr.ird.observe.client.ClientUIContext; +import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.api.WithObserveDataSourcesManager; import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTree; @@ -29,19 +31,23 @@ import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTreeMod import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.ObserveServicesProvider; +import io.ultreia.java4all.lang.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.Icon; import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; +import static io.ultreia.java4all.i18n.I18n.t; + /** * Created by tchemit on 03/10/2018. * * @author Tony Chemit - dev(a)tchemit.fr */ -public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager { +public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager, WithClientUIContext { private static final Logger log = LogManager.getLogger(NavigationConfigUIToggleShowActionSupport.class); @@ -51,7 +57,17 @@ public abstract class NavigationConfigUIToggleShowActionSupport extends Navigati @Override protected void doActionPerformed(ActionEvent e, NavigationUI ui) { - tryToUpdateNavigationTree(ui); + ClientUIContext clientUIContext = getClientUIContext(); + clientUIContext.setBusy(true); + SwingUtilities.invokeLater(()->{ + try { + long t0 = System.nanoTime(); + tryToUpdateNavigationTree(ui); + clientUIContext.setUiStatus(t("observe.ui.tree.navigation.loaded", Strings.convertTime(System.nanoTime()-t0))); + } finally { + clientUIContext.setBusy(false); + } + }); } private void tryToUpdateNavigationTree(NavigationUI ui) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx ===================================== @@ -41,7 +41,7 @@ <StorageUIModel id='model' javaBean='getContextValue(StorageUIModel.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <JPanel visible="false"> <ChooseDbModeUI id='CHOOSE_DB_MODE' constructorParams='this'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss ===================================== @@ -32,11 +32,6 @@ StorageTabUI { layout:{new BorderLayout()}; } -#busyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} - #tabs { border:{BorderFactory.createEmptyBorder(6,6,6,6)}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -82,8 +82,6 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri @Override public void afterInit(TripUI ui) { - //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) - ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Species for target catc observe.config.swingSessionFile.description=Swing session file. observe.config.temperature.format=Default temperature format observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup +observe.config.ui.blockStateColor=Color of block state +observe.config.ui.busyStateColor=Color of busy state observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks observe.config.ui.dcp.error.color=Color to notify errors while validating floating object materials. observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes. @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.schoolEstimate=School estimates observe.ui.tree.data.ps.set.unsaved=New set observe.ui.tree.data.ps.trip.unsaved=New trip +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) observe.ui.tree.referential.common=Common Referential observe.ui.tree.referential.ll.common=Longline Referential - Common observe.ui.tree.referential.ll.landing=Longline Referential - Landing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Especies par las captur observe.config.swingSessionFile.description=Copia de seguridad del estado del UI. observe.config.temperature.format=Unidad de temperatura observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número +observe.config.ui.blockStateColor=Color of block state \#TODO +observe.config.ui.busyStateColor=Color of busy state \#TODO observe.config.ui.changeSynchroSrc=Para autorizar la seleción de la base fuente durante las operaciones sobre la base observe.config.ui.dcp.error.color=Color para notificar los errores sobre la composición de dcps observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes \#TODO @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Rutas observe.ui.tree.data.ps.schoolEstimate=Estimaciones banco observe.ui.tree.data.ps.set.unsaved=Nuevo lance observe.ui.tree.data.ps.trip.unsaved=Nueva marea +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) \#TODO observe.ui.tree.referential.common=Referencial commun observe.ui.tree.referential.ll.common=Referencial Palangre - Common \#TODO observe.ui.tree.referential.ll.landing=Referencial Palangre - Landing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Espèces pour les captu observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. observe.config.temperature.format=Unité de température observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre +observe.config.ui.blockStateColor=Couleur lorsque l'on bloque une partie de l'application +observe.config.ui.busyStateColor=Couleur lorsque l'application est occupée observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.dcp.error.color=Couleur pour notifier les erreurs sur la composition des dcps observe.config.ui.dcp.not.editable.color=Couleur pour notifier les nœuds non éditables dans l'arbre des matériaux de dcp. @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.schoolEstimate=Estimation banc observe.ui.tree.data.ps.set.unsaved=Nouvelle calée observe.ui.tree.data.ps.trip.unsaved=Nouvelle marée +observe.ui.tree.navigation.loaded=Arbre de navigation rechargé (en %s) observe.ui.tree.referential.common=Référentiel commun observe.ui.tree.referential.ll.common=Référentiel Palangre - Commun observe.ui.tree.referential.ll.landing=Référentiel Palangre - Débarquement ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.14</version> + <version>2020.15</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@   -  +    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ad63b3274dea5ea4034d12d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4ad63b3274dea5ea4034d12d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix NPE when reload ui callback
by Tony CHEMIT 06 Apr '20

06 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4ad63b32 by tchemit at 2020-04-06T13:00:35+02:00 Fix NPE when reload ui callback - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/main/callback/ReloadUiCallback.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.client.ClientUIContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.configuration.WithClientConfig; import fr.ird.observe.client.main.ObserveMainUI; +import fr.ird.observe.client.main.body.ClientConfigUI; import fr.ird.observe.client.main.body.NoBodyContentComponent; import io.ultreia.java4all.application.context.ApplicationContext; import org.nuiton.jaxx.runtime.swing.SwingUtil; @@ -71,44 +72,24 @@ public class ReloadUiCallback implements ObserveUICallback, WithClientConfig { // scan main ui -// ObserveSwingDataSource mainStorage = getObserveDataSourcesManager().getMainDataSource(); - //FIXME:BodyContent, cela doit être délégué au body content concerné Class<? extends JComponent> bodyContent = NoBodyContentComponent.class; if (ui != null) { + // Keep a reference on ui instance since it will be reset in close method + // FIXME Should use a closing state in application to improve this + ObserveMainUI ui = this.ui; bodyContent = ui.getMainUIBodyContentManager().getCurrentBodyType(); + if (ClientConfigUI.class.equals(bodyContent)) { + bodyContent = NoBodyContentComponent.class; + } ui.dispose(); - ui.setVisible(false); System.runFinalization(); } -// focusBorder = null; -// noFocusBorder = null; ui = clientUIContext.initUI(rootContext, config); - //FIXME:BodyContent : We must improve this, but for the moment, we could just open main ui empty... -// if (bodyContent == null) { -// if (mainStorage == null) { -// bodyContent = NoBodyContent.NoBodyContentComponent.class; -// } else { -// throw new IllegalStateException("Can't have a loaded database, but not loaded in gui..."); -// } -// } - ui.changeBodyContent(bodyContent); - //FIXME:BodyContent this will be done in data source editor body content -// if (oldMode == ObserveUIMode.DB) { -// -// // on met à jour le modèle de navigation -// NavigationTreeModel treeModel = ui.getNavigationUI().getTree().getModel(); -// treeModel.load(config); -// treeModel.populate(mainStorage); -// -// // selection du noeud d'ouverture -// ui.getNavigationUI().getTree().selectInitialNode(); -// } - // show ui clientUIContext.setMainUIVisible(ui, true); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4ad63b3274dea5ea4034d12dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4ad63b3274dea5ea4034d12dd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: improve log loading and some levels
by Tony CHEMIT 06 Apr '20

06 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 31e88a84 by tchemit at 2020-04-05T18:20:30+02:00 improve log loading and some levels - - - - - e9165033 by tchemit at 2020-04-05T19:03:31+02:00 Mise à jour jaxx avec des améliorations sur les JTabbedPane - - - - - dee693f3 by tchemit at 2020-04-06T12:22:28+02:00 Lors d'un 'Rechargement de la source' ou d'un appel aux filtres d'affichage de l'arbre, afficher une barre de progression - Closes #1386 - - - - - 28 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/resources/observe-ui.properties - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss - client-datasource-editor-api/src/main/i18n/getters/java.getter - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -627,6 +627,18 @@ key = ui.temperature.format type = org.nuiton.jaxx.widgets.temperature.TemperatureFormat defaultValue = "C" +[option busyStateColor] +description = observe.config.ui.busyStateColor +key = ui.busyState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + +[option blockStateColor] +description = observe.config.ui.blockStateColor +key = ui.blockState.color +type = java.awt.Color +defaultValue = "java.awt.Color[r=50,g=50,b=50]" + [option focusBorderColor] description = observe.config.ui.focusBorderColor key = ui.focusBorder.color ===================================== client-configuration/src/main/i18n/getters/config.getter ===================================== @@ -92,6 +92,8 @@ observe.config.speciesList.seine.observation.targetCatch observe.config.swingSessionFile.description observe.config.temperature.format observe.config.ui.autoPopupNumberEditor +observe.config.ui.blockStateColor +observe.config.ui.busyStateColor observe.config.ui.changeSynchroSrc observe.config.ui.dcp.error.color observe.config.ui.dcp.not.editable.color ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -59,6 +59,7 @@ import org.nuiton.util.StringUtil; import org.nuiton.version.Version; import org.nuiton.version.Versions; +import javax.swing.UIManager; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -215,7 +216,11 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener File logFile = getLogConfigurationFile(); - log.info("Chargement du fichier de de log4j depuis " + logFile); + if (isVersionSnapshot() || logFile.exists()) { + Files.deleteIfExists(logFile.toPath()); + } + + log.info(String.format("Loading user log file at %s", logFile)); ObserveUtil.loadLogConfiguration(ObserveClientResourceManager.Resource.LOG_CONFIGURATION_FILE.getUrl(), logFile.toPath(), this); @@ -677,6 +682,8 @@ public class ClientConfig extends GeneratedClientConfig implements TemplateGener loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_common, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ps, dir); loadUIConfigFile(ObserveClientResourceManager.Resource.ui_navigation_ll, dir); + UIManager.getDefaults().put("BlockingLayerUI.busyColor", getBusyStateColor()); + UIManager.getDefaults().put("BlockingLayerUI.blockColor", getBlockStateColor()); } private void loadUIConfigFile(ObserveClientResourceManager.Resource resource, File resourceDirectory) { ===================================== client-configuration/src/main/resources/log4j2.xml ===================================== @@ -51,10 +51,6 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.validator.swing.SwingValidator" level="error" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -63,10 +63,6 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - - - - <Logger name="org.hibernate" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -47,7 +47,7 @@ <ClientConfig id='config' initializer='getContextValue(ClientConfig.class)'/> <MainUIBodyContentManager id="mainUIBodyContentManager" initializer='getContextValue(MainUIBodyContentManager.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <script><![CDATA[ ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jcss ===================================== @@ -72,10 +72,7 @@ } #busyBlockLayerUI { - useIcon: false; - blockingColor: {UIManager.getColor("BlockingLayerUI.blockingColor")}; block: {model.isBusy()}; - acceptedComponentNames: {UIHelper.ACCEPTABLE_COMPONENTS}; } #serverMode { ===================================== client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -170,6 +170,8 @@ public class ClientConfigUI extends JXTitledPanel { helper.addOption(ClientConfigOption.SHOW_MNEMONIC); helper.addOption(ClientConfigOption.COORDINATE_FORMAT); + helper.addOption(ClientConfigOption.BUSY_STATE_COLOR); + helper.addOption(ClientConfigOption.BLOCK_STATE_COLOR); helper.addOption(ClientConfigOption.FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.NO_FOCUS_BORDER_COLOR); helper.addOption(ClientConfigOption.FLOATING_OBJECT_MATERIAL_ERROR_COLOR); ===================================== client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -172,3 +172,14 @@ BlockingLayerUI { acceptedComponentTypes: {javax.swing.JScrollBar.class}; } +.busyBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.busyColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} + +.blockBlockLayerUI { + useIcon: false; + blockingColor: {javax.swing.UIManager.getColor("BlockingLayerUI.blockingColor")}; + acceptedComponentNames: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS}; +} ===================================== client-core/src/main/resources/observe-ui.properties ===================================== @@ -189,3 +189,4 @@ color.Table.lastRowColor=255,255,0 color.Table.emptyRowColor=255,255,0 color.Table.unvalidCellColor=255,0,0 color.BlockingLayerUI.blockingColor=50,50,50 +color.BlockingLayerUI.busyColor=50,50,50 ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss ===================================== @@ -92,7 +92,3 @@ columnHeaderView:{UIHelper.newLabel(t("observe.common.step.description") ,"information", 10)}; } -#busyBlockLayerUI{ - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx ===================================== @@ -37,13 +37,13 @@ <AdminUIModel id='model' initializer='getContextValue(AdminUIModel.class)'/>  - <ObserveBlockingLayerUI id='tabBusyBlockLayerUI'/> + <ObserveBlockingLayerUI id='tabBusyBlockLayerUI' styleClass="busyBlockLayerUI"/>  - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/>  - <ObserveBlockingLayerUI id='configBlockLayerUI'/> + <ObserveBlockingLayerUI id='configBlockLayerUI' styleClass="blockBlockLayerUI"/> <script><![CDATA[ ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss ===================================== @@ -24,24 +24,12 @@ layout:{new BorderLayout()}; } -#tabBusyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; -} - #busyBlockLayerUI{ - useIcon:false; block:{WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED, WizardState.SUCCESSED, WizardState.FAILED)}; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #configBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isWasStarted() || WizardExtUtil.acceptStates(model.getModelState(), WizardState.CANCELED)}; - acceptedComponentNames:{UIHelper.ACCEPTABLE_COMPONENTS}; } #tabs { ===================================== client-datasource-editor-api/src/main/i18n/getters/java.getter ===================================== @@ -239,6 +239,7 @@ observe.tree.action.configure.tip observe.tree.action.expandAll.tip observe.tree.action.selectAll.tip observe.tree.action.unselectAll.tip +observe.ui.tree.navigation.loaded observe.ui.tree.referential.common observe.ui.tree.referential.ll.common observe.ui.tree.referential.ll.landing ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jaxx ===================================== @@ -59,7 +59,7 @@ <String id='contentTitle' javaBean='null'/> - <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this"/> + <ContentUIBlockingLayerUI id='blockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <script><![CDATA[ public abstract ContentUIHandler getHandler(); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUI.jcss ===================================== @@ -21,8 +21,6 @@ */ #blockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{body.isVisible() && !model.isEnabled()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jaxx ===================================== @@ -64,7 +64,7 @@ <ListSelectionModel id='selectionModel' initializer='getModel().getSelectionModel()' onValueChanged='getHandler().updateEditor(event)'/>  - <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this"/> + <ContentTableEditorLayerUI id='editorBlockLayerUI' constructorParams="this" styleClass="blockBlockLayerUI"/> <DataDto id='bean' initializer='getModel().getBean()'/> <DataDto id='tableEditBean' initializer='getModel().getTableEditBean()'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUI.jcss ===================================== @@ -42,8 +42,6 @@ } #editorBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{!tableModel.isEditable()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jaxx ===================================== @@ -60,7 +60,7 @@ <java.lang.String id='pluralTypeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> <java.lang.String id='typeI18nKey' initializer='t(ObserveI18nDecoratorHelper.getTypeI18nKey(bean.getClass()))'/> - <ObserveBlockingLayerUI id='editKeyTableLayerUI'/> + <ObserveBlockingLayerUI id='editKeyTableLayerUI' styleClass="blockBlockLayerUI"/> <CardLayout2Ext id='viewLayout' constructorParams='this, "body"'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferenceUI.jcss ===================================== @@ -27,8 +27,6 @@ } #editKeyTableLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; block:{model.isUpdatingMode()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/actions/NavigationConfigUIToggleShowActionSupport.java ===================================== @@ -22,6 +22,8 @@ package fr.ird.observe.client.datasource.editor.tree.navigation.actions; * #L% */ +import fr.ird.observe.client.ClientUIContext; +import fr.ird.observe.client.WithClientUIContext; import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.datasource.api.WithObserveDataSourcesManager; import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTree; @@ -29,19 +31,23 @@ import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTreeMod import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationUI; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.services.ObserveServicesProvider; +import io.ultreia.java4all.lang.Strings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import javax.swing.Icon; import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; +import static io.ultreia.java4all.i18n.I18n.t; + /** * Created by tchemit on 03/10/2018. * * @author Tony Chemit - dev(a)tchemit.fr */ -public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager { +public abstract class NavigationConfigUIToggleShowActionSupport extends NavigationConfigUIActionSupport implements WithObserveDataSourcesManager, WithClientUIContext { private static final Logger log = LogManager.getLogger(NavigationConfigUIToggleShowActionSupport.class); @@ -51,7 +57,17 @@ public abstract class NavigationConfigUIToggleShowActionSupport extends Navigati @Override protected void doActionPerformed(ActionEvent e, NavigationUI ui) { - tryToUpdateNavigationTree(ui); + ClientUIContext clientUIContext = getClientUIContext(); + clientUIContext.setBusy(true); + SwingUtilities.invokeLater(()->{ + try { + long t0 = System.nanoTime(); + tryToUpdateNavigationTree(ui); + clientUIContext.setUiStatus(t("observe.ui.tree.navigation.loaded", Strings.convertTime(System.nanoTime()-t0))); + } finally { + clientUIContext.setBusy(false); + } + }); } private void tryToUpdateNavigationTree(NavigationUI ui) { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jaxx ===================================== @@ -41,7 +41,7 @@ <StorageUIModel id='model' javaBean='getContextValue(StorageUIModel.class)'/> - <ObserveBlockingLayerUI id='busyBlockLayerUI'/> + <ObserveBlockingLayerUI id='busyBlockLayerUI' styleClass="busyBlockLayerUI"/> <JPanel visible="false"> <ChooseDbModeUI id='CHOOSE_DB_MODE' constructorParams='this'/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageUI.jcss ===================================== @@ -32,11 +32,6 @@ StorageTabUI { layout:{new BorderLayout()}; } -#busyBlockLayerUI { - useIcon:false; - blockingColor:{UIManager.getColor("BlockingLayerUI.blockingColor")}; -} - #tabs { border:{BorderFactory.createEmptyBorder(6,6,6,6)}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -82,8 +82,6 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri @Override public void afterInit(TripUI ui) { - //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) - ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Species for target catc observe.config.swingSessionFile.description=Swing session file. observe.config.temperature.format=Default temperature format observe.config.ui.autoPopupNumberEditor=Flag sets to true when number editor show automaticly popup +observe.config.ui.blockStateColor=Color of block state +observe.config.ui.busyStateColor=Color of busy state observe.config.ui.changeSynchroSrc=Flag sets to true if you can change local source in admin tasks observe.config.ui.dcp.error.color=Color to notify errors while validating floating object materials. observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes. @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.schoolEstimate=School estimates observe.ui.tree.data.ps.set.unsaved=New set observe.ui.tree.data.ps.trip.unsaved=New trip +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) observe.ui.tree.referential.common=Common Referential observe.ui.tree.referential.ll.common=Longline Referential - Common observe.ui.tree.referential.ll.landing=Longline Referential - Landing ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Especies par las captur observe.config.swingSessionFile.description=Copia de seguridad del estado del UI. observe.config.temperature.format=Unidad de temperatura observe.config.ui.autoPopupNumberEditor=Para mostrar automáticamente el editor numérico durante la edición de un número +observe.config.ui.blockStateColor=Color of block state \#TODO +observe.config.ui.busyStateColor=Color of busy state \#TODO observe.config.ui.changeSynchroSrc=Para autorizar la seleción de la base fuente durante las operaciones sobre la base observe.config.ui.dcp.error.color=Color para notificar los errores sobre la composición de dcps observe.config.ui.dcp.not.editable.color=Color to notify not editable floating object material nodes \#TODO @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Rutas observe.ui.tree.data.ps.schoolEstimate=Estimaciones banco observe.ui.tree.data.ps.set.unsaved=Nuevo lance observe.ui.tree.data.ps.trip.unsaved=Nueva marea +observe.ui.tree.navigation.loaded=Navigation tree reloaded (in %s) \#TODO observe.ui.tree.referential.common=Referencial commun observe.ui.tree.referential.ll.common=Referencial Palangre - Common \#TODO observe.ui.tree.referential.ll.landing=Referencial Palangre - Landing \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -543,6 +543,8 @@ observe.config.speciesList.seine.observation.targetCatch=Espèces pour les captu observe.config.swingSessionFile.description=Fichier de sauvegarde des états des UI. observe.config.temperature.format=Unité de température observe.config.ui.autoPopupNumberEditor=Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre +observe.config.ui.blockStateColor=Couleur lorsque l'on bloque une partie de l'application +observe.config.ui.busyStateColor=Couleur lorsque l'application est occupée observe.config.ui.changeSynchroSrc=Pour autoriser la sélection de la base source dans les opérations sur base observe.config.ui.dcp.error.color=Couleur pour notifier les erreurs sur la composition des dcps observe.config.ui.dcp.not.editable.color=Couleur pour notifier les nœuds non éditables dans l'arbre des matériaux de dcp. @@ -2962,6 +2964,7 @@ observe.ui.tree.data.ps.routes=Routes observe.ui.tree.data.ps.schoolEstimate=Estimation banc observe.ui.tree.data.ps.set.unsaved=Nouvelle calée observe.ui.tree.data.ps.trip.unsaved=Nouvelle marée +observe.ui.tree.navigation.loaded=Arbre de navigation rechargé (en %s) observe.ui.tree.referential.common=Référentiel commun observe.ui.tree.referential.ll.common=Référentiel Palangre - Commun observe.ui.tree.referential.ll.landing=Référentiel Palangre - Débarquement ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.14</version> + <version>2020.15</version> </parent> <groupId>fr.ird.observe</groupId> @@ -170,7 +170,7 @@   -  + <lib.version.java4all.jaxx>3.0-alpha-66-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e952eea0d6d57a46d024b84… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e952eea0d6d57a46d024b84… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [SFA] Système de recopie de champs lors de la création d'une nouvelle activité...
by Tony CHEMIT 04 Apr '20

04 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f6b5e80c by tchemit at 2020-04-04T16:40:21+02:00 [SFA] Système de recopie de champs lors de la création d'une nouvelle activité de pêche - Closes #1454 - - - - - 4e952eea by tchemit at 2020-04-04T16:40:23+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 7 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx ===================================== @@ -222,13 +222,6 @@ </cell> </row> -  - <row> - <cell columns="2" weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> - </cell> - </row> -  <row> <cell columns='2' fill='both' weighty="1"> @@ -238,7 +231,11 @@ </Table> </JScrollPane> </tab> - + <tab id='speciesTab' i18nProperty="skip"> + <JPanel layout="{new BorderLayout()}"> + <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> + </JPanel> + </tab> <tab id='observationsTab' i18nProperty=""> <Table fill="both"> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss ===================================== @@ -43,9 +43,17 @@ text:{getStringValue(bean.getNoOfDays())}; } +/* ***************************************************************************** */ +/* SPECIES TAB **************************************************************** */ +/* ***************************************************************************** */ + +#speciesTab { + title:{t("observe.data.ll.common.Trip.species")}; +} + #species { - showListLabel:true; - label:{t("observe.data.ll.common.Trip.species")}; + /*showListLabel:true; + label:{t("observe.data.ll.common.Trip.species")};*/ universeLabel:{t("observe.data.ll.common.Trip.species.universe")}; selectedLabel:{t("observe.data.ll.common.Trip.species.selected")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -82,6 +82,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri @Override public void afterInit(TripUI ui) { + //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) + ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Sample parts observe.data.ll.logbook.SamplePart.weight=Weight (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Weight measure method observe.data.ll.logbook.SamplePart.weightMeasureType=Weight measure type -observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values and save +observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values from last fishing operation and save observe.data.ll.logbook.Set.action.reset.homeId.tip=Reset home id observe.data.ll.logbook.Set.basketLineLength=Bakset line length (m) observe.data.ll.logbook.Set.basketsPerSectionCount=Baskets per section count ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Sample parts \#TODO observe.data.ll.logbook.SamplePart.weight=Peso (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Méthode de measure de poids \#TODO observe.data.ll.logbook.SamplePart.weightMeasureType=Type de mesure de poids \#TODO -observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values and save \#TODO +observe.data.ll.logbook.Set.action.copyValuesAndSave=Copy values from last fishing operation and save \#TODO observe.data.ll.logbook.Set.action.reset.homeId.tip=Reiniciar el id de negocio observe.data.ll.logbook.Set.basketLineLength=Bakset line length (m) \#TODO observe.data.ll.logbook.Set.basketsPerSectionCount=Número de cestas por sección ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1188,7 +1188,7 @@ observe.data.ll.logbook.SamplePart.types=Échantillons observe.data.ll.logbook.SamplePart.weight=Poids (kg) observe.data.ll.logbook.SamplePart.weightMeasureMethod=Méthode de mesure de poids observe.data.ll.logbook.SamplePart.weightMeasureType=Type de mesure de poids -observe.data.ll.logbook.Set.action.copyValuesAndSave=Recopier les propriétés et enregister +observe.data.ll.logbook.Set.action.copyValuesAndSave=Recopier les propriétés de la dernière opération de pêche et enregister observe.data.ll.logbook.Set.action.reset.homeId.tip=Réinitialiser l'id métier observe.data.ll.logbook.Set.basketLineLength=Longueur de la ligne par panier (m) observe.data.ll.logbook.Set.basketsPerSectionCount=Nombre de paniers par section ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -120,10 +120,34 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { entity.fromDto(getReferentialLocale(), globalCompositionToCopy); entity.fromDto(getReferentialLocale(), dto); + // caracteristics tab + + entity.setSettingVesselSpeed(entityToCopy.getSettingVesselSpeed()); + entity.setTimeBetweenHooks(entityToCopy.getTimeBetweenHooks()); entity.setTotalLineLength(entityToCopy.getTotalLineLength()); entity.setBasketLineLength(entityToCopy.getBasketLineLength()); entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines()); + entity.setShooterUsed(entityToCopy.getShooterUsed()); + entity.setShooterSpeed(entityToCopy.getShooterSpeed()); + entity.setMaxDepthTargeted(entityToCopy.getMaxDepthTargeted()); + entity.setTotalSectionsCount(entityToCopy.getTotalSectionsCount()); + entity.setBasketsPerSectionCount(entityToCopy.getBasketsPerSectionCount()); + entity.setTotalBasketsCount(entityToCopy.getTotalBasketsCount()); + entity.setBranchlinesPerBasketCount(entityToCopy.getBranchlinesPerBasketCount()); + entity.setTotalHooksCount(entityToCopy.getTotalHooksCount()); entity.setLineType(entityToCopy.getLineType()); + entity.setWeightedSwivel(entityToCopy.getWeightedSwivel()); + entity.setSwivelWeight(entityToCopy.getSwivelWeight()); + entity.setWeightedSnap(entityToCopy.getWeightedSnap()); + entity.setSnapWeight(entityToCopy.getSnapWeight()); + entity.setMonitored(entityToCopy.getMonitored()); + + // lightsticks tab + + entity.setLightsticksUsed(entityToCopy.getLightsticksUsed()); + entity.setTotalLightsticksCount(entityToCopy.getTotalLightsticksCount()); + entity.setLightsticksType(entityToCopy.getLightsticksType()); + entity.setLightsticksColor(entityToCopy.getLightsticksColor()); SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { @@ -153,6 +177,8 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { Set otherSetLongline = activityLongline.getSet(); if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) { SetStubDto otherSetDto = new SetStubDto(); + setLongline.toDto(getReferentialLocale(), otherSetDto); + otherSetDto.setId(otherSetLongline.getTopiaId()); otherSetDto.setHomeId(otherSetLongline.getHomeId()); otherSetDto.setNumber(otherSetLongline.getNumber()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2376757940eaba9cfe8b74c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2376757940eaba9cfe8b74c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Mise à jour simple de référentiel échoue en v7.5.0 - Closes #1461
by Tony CHEMIT 04 Apr '20

04 Apr '20

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3d070135 by tchemit at 2020-04-04T16:24:52+02:00 Mise à jour simple de référentiel échoue en v7.5.0 - Closes #1461 - - - - - 20 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java - dto/src/main/models/Observe.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java - persistence/src/main/models/Observe.model - test/src/main/resources/db/7.5/dataForTestLongline.sql.gz - test/src/main/resources/db/7.5/dataForTestSeine.sql.gz - test/src/main/resources/db/7.5/empty_h2.sql.gz - test/src/main/resources/db/7.5/empty_pg.sql.gz - test/src/main/resources/db/7.5/referentiel.sql.gz - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/longline/TdrDto-update-error-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -608,8 +608,8 @@ observe.common.TdrDto.dataLocation observe.common.TdrDto.dataLocation.tip observe.common.TdrDto.deleteData observe.common.TdrDto.deleteData.tip -observe.common.TdrDto.deployementEnd -observe.common.TdrDto.deployementStart +observe.common.TdrDto.deploymentEnd +observe.common.TdrDto.deploymentStart observe.common.TdrDto.enableTimestamp observe.common.TdrDto.enableTimestamp.tip observe.common.TdrDto.exportData @@ -628,9 +628,9 @@ observe.common.TdrDto.keyDataTab observe.common.TdrDto.localisationTab observe.common.TdrDto.locationOnLongline observe.common.TdrDto.maxFishingDepth -observe.common.TdrDto.meanDeployementDepth +observe.common.TdrDto.meanDeploymentDepth observe.common.TdrDto.meanFishingDepth -observe.common.TdrDto.medianDeployementDepth +observe.common.TdrDto.medianDeploymentDepth observe.common.TdrDto.medianFishingDepth observe.common.TdrDto.minFishingDepth observe.common.TdrDto.section ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jaxx ===================================== @@ -253,10 +253,10 @@ <Table id='timestampPanel' fill='both' constraints='BorderLayout.CENTER' insets="0"> -  +  <row> <cell weightx="1" fill="both"> - <DateTimeEditor id='deployementStart' constructorParams='this'/> + <DateTimeEditor id='deploymentStart' constructorParams='this'/> </cell> </row>  @@ -271,10 +271,10 @@ <DateTimeEditor id='fishingEnd' constructorParams='this'/> </cell> </row> -  +  <row> <cell> - <DateTimeEditor id='deployementEnd' constructorParams='this'/> + <DateTimeEditor id='deploymentEnd' constructorParams='this'/> </cell> </row> </Table> @@ -342,22 +342,22 @@ <NumberEditor id='medianFishingDepth' constructorParams='this' styleClass='float2'/> </cell> </row> -  +  <row> <cell> - <JLabel id='meanDeployementDepthLabel'/> + <JLabel id='meanDeploymentDepthLabel'/> </cell> <cell weightx='1' anchor='east'> - <NumberEditor id='meanDeployementDepth' constructorParams='this' styleClass='float2'/> + <NumberEditor id='meanDeploymentDepth' constructorParams='this' styleClass='float2'/> </cell> </row> -  +  <row> <cell> - <JLabel id='medianDeployementDepthLabel'/> + <JLabel id='medianDeploymentDepthLabel'/> </cell> <cell weightx='1' anchor='east'> - <NumberEditor id='medianDeployementDepth' constructorParams='this' styleClass='float2'/> + <NumberEditor id='medianDeploymentDepth' constructorParams='this' styleClass='float2'/> </cell> </row> </Table> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUI.jcss ===================================== @@ -154,14 +154,14 @@ visible:{enableTimestamp.isSelected()}; } -#deployementStart { - date:{tableEditBean.getDeployementStart()}; - propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_START}; +#deploymentStart { + date:{tableEditBean.getDeploymentStart()}; + propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_START}; } -#deployementEnd { - date:{tableEditBean.getDeployementEnd()}; - propertyDate: {TdrDto.PROPERTY_DEPLOYEMENT_END}; +#deploymentEnd { + date:{tableEditBean.getDeploymentEnd()}; + propertyDate: {TdrDto.PROPERTY_DEPLOYMENT_END}; } #fishingStart { @@ -192,14 +192,14 @@ numberValue:{tableEditBean.getFishingEndDepth()}; } -#meanDeployementDepth { - property:{TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH}; - numberValue:{tableEditBean.getMeanDeployementDepth()}; +#meanDeploymentDepth { + property:{TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH}; + numberValue:{tableEditBean.getMeanDeploymentDepth()}; } -#medianDeployementDepth { - property:{TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH}; - numberValue:{tableEditBean.getMedianDeployementDepth()}; +#medianDeploymentDepth { + property:{TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH}; + numberValue:{tableEditBean.getMedianDeploymentDepth()}; } #minFishingDepth { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIHandler.java ===================================== @@ -202,8 +202,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt POSITION_HELPER_ENTRY.setContextValue(ui, positionHelper); - ui.getDeployementStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); - ui.getDeployementEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeploymentStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); + ui.getDeploymentEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getFishingStart().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getFishingEnd().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -416,8 +416,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt boolean selected = !newValue; - getUi().getDeployementStart().getSliderHidor().setSelected(selected); - getUi().getDeployementStart().getSliderHidor().setTargetVisible(newValue); + getUi().getDeploymentStart().getSliderHidor().setSelected(selected); + getUi().getDeploymentStart().getSliderHidor().setTargetVisible(newValue); getUi().getFishingStart().getSliderHidor().setSelected(selected); getUi().getFishingStart().getSliderHidor().setTargetVisible(newValue); @@ -425,8 +425,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt getUi().getFishingEnd().getSliderHidor().setSelected(selected); getUi().getFishingEnd().getSliderHidor().setTargetVisible(newValue); - getUi().getDeployementEnd().getSliderHidor().setSelected(selected); - getUi().getDeployementEnd().getSliderHidor().setTargetVisible(newValue); + getUi().getDeploymentEnd().getSliderHidor().setSelected(selected); + getUi().getDeploymentEnd().getSliderHidor().setTargetVisible(newValue); } finally { @@ -440,8 +440,8 @@ public class TdrUIHandler extends ContentTableUIHandler<SetLonglineTdrDto, TdrDt private void setTimestamp(TdrDto bean, Date timestamp) { - bean.setDeployementStart(timestamp); - bean.setDeployementEnd(timestamp); + bean.setDeploymentStart(timestamp); + bean.setDeploymentEnd(timestamp); bean.setFishingStart(timestamp); bean.setFishingEnd(timestamp); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TdrUIModel.java ===================================== @@ -62,8 +62,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { public static final Set<String> TIMESTAMP_TAB_PROPERTIES = - ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYEMENT_START, - TdrDto.PROPERTY_DEPLOYEMENT_END, + ImmutableSet.<String>builder().add(TdrDto.PROPERTY_DEPLOYMENT_START, + TdrDto.PROPERTY_DEPLOYMENT_END, TdrDto.PROPERTY_FISHING_START, TdrDto.PROPERTY_FISHING_END ).build(); @@ -71,8 +71,8 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { public static final Set<String> KEY_DATA_TAB_PROPERTIES = ImmutableSet.<String>builder().add(TdrDto.PROPERTY_FISHING_START_DEPTH, TdrDto.PROPERTY_FISHING_END_DEPTH, - TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH, TdrDto.PROPERTY_MEAN_FISHING_DEPTH, TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, TdrDto.PROPERTY_MIN_FISHING_DEPTH, @@ -129,16 +129,16 @@ public class TdrUIModel extends ContentTableUIModel<SetLonglineTdrDto, TdrDto> { TdrDto.PROPERTY_FLOATLINE2_LENGTH, // timestamp tab - TdrDto.PROPERTY_DEPLOYEMENT_START, - TdrDto.PROPERTY_DEPLOYEMENT_END, + TdrDto.PROPERTY_DEPLOYMENT_START, + TdrDto.PROPERTY_DEPLOYMENT_END, TdrDto.PROPERTY_FISHING_START, TdrDto.PROPERTY_FISHING_END, // key data tab TdrDto.PROPERTY_FISHING_START_DEPTH, TdrDto.PROPERTY_FISHING_END_DEPTH, - TdrDto.PROPERTY_MEAN_DEPLOYEMENT_DEPTH, - TdrDto.PROPERTY_MEDIAN_DEPLOYEMENT_DEPTH, + TdrDto.PROPERTY_MEAN_DEPLOYMENT_DEPTH, + TdrDto.PROPERTY_MEDIAN_DEPLOYMENT_DEPTH, TdrDto.PROPERTY_MEAN_FISHING_DEPTH, TdrDto.PROPERTY_MEDIAN_FISHING_DEPTH, TdrDto.PROPERTY_MIN_FISHING_DEPTH, ===================================== dto/src/main/models/Observe.model ===================================== @@ -310,14 +310,14 @@ floatline1Length + {*:1} Float | strictlyPositiveNumber floatline2Length + {*:1} Float | strictlyPositiveNumber serialNo + {*:1} String hasData + {*:1} boolean -deployementStart + {*:1} Date -deployementEnd + {*:1} Date +deploymentStart + {*:1} Date +deploymentEnd + {*:1} Date fishingStart + {*:1} Date fishingEnd + {*:1} Date fishingStartDepth + {*:1} Float | strictlyPositiveNumber fishingEndDepth + {*:1} Float | strictlyPositiveNumber -meanDeployementDepth + {*:1} Float | strictlyPositiveNumber -medianDeployementDepth + {*:1} Float | strictlyPositiveNumber +meanDeploymentDepth + {*:1} Float | strictlyPositiveNumber +medianDeploymentDepth + {*:1} Float | strictlyPositiveNumber minFishingDepth + {*:1} Float | strictlyPositiveNumber maxFishingDepth + {*:1} Float | strictlyPositiveNumber meanFishingDepth + {*:1} Float | strictlyPositiveNumber ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Data location observe.common.TdrDto.delete.data.message=Confirm to delete saved data observe.common.TdrDto.deleteData=Delete observe.common.TdrDto.deleteData.tip=Delete data -observe.common.TdrDto.deployementEnd=Deployement end -observe.common.TdrDto.deployementStart=Deployement start +observe.common.TdrDto.deploymentEnd=Deployement end +observe.common.TdrDto.deploymentStart=Deployement start observe.common.TdrDto.enableTimestamp=Use timestamp observe.common.TdrDto.enableTimestamp.tip=Use timestamp for this recorder observe.common.TdrDto.exportData=Export @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Data keys observe.common.TdrDto.localisationTab=Localisation observe.common.TdrDto.locationOnLongline=Location on longline observe.common.TdrDto.maxFishingDepth=Maximum fishing depth (m) -observe.common.TdrDto.meanDeployementDepth=Mean deployement depth (m) +observe.common.TdrDto.meanDeploymentDepth=Mean deployement depth (m) observe.common.TdrDto.meanFishingDepth=Maximum fishing depth (m) -observe.common.TdrDto.medianDeployementDepth=Median deployement depth (m) +observe.common.TdrDto.medianDeploymentDepth=Median deployement depth (m) observe.common.TdrDto.medianFishingDepth=Median fishing depth (m) observe.common.TdrDto.minFishingDepth=Minimum fishing depth (m) observe.common.TdrDto.replace.data.message=Confirm to replace existing data file «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Weight must be bound between %s and %s. observe.validation.targetCatch.uniqueKey=Tuple (weight category - well) must be unique. observe.validation.targetDiscarded.uniqueKey=Tuple (species - category - reasonForDiscard - brought on deck) must be unique. observe.validation.targetLength.required.weight.or.taille=Weight or size must be filled. -observe.validation.tdr.deployementStart.before.fishingStart=fishing start time must be before deployement start time. -observe.validation.tdr.fishingEnd.before.deployementEnd=Deployement end time must be before fishing end time. +observe.validation.tdr.deploymentStart.before.fishingStart=fishing start time must be before deployement start time. +observe.validation.tdr.fishingEnd.before.deploymentEnd=Deployement end time must be before fishing end time. observe.validation.tdr.fishingStart.before.fishingEnd=Fishing end time must be before fishing start time. observe.validation.tdr.required.position=Position must be filled. observe.validation.technology.too.big=Field size can not exceed %s characters (actual length\: %s). ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Ubicación del archivo de datos observe.common.TdrDto.delete.data.message=Confirmar la eliminación del archivo de datos observe.common.TdrDto.deleteData=Eliminar observe.common.TdrDto.deleteData.tip=Eliminar el archivo de datos -observe.common.TdrDto.deployementEnd=Fin de despliegue -observe.common.TdrDto.deployementStart=Inicio de despliegue +observe.common.TdrDto.deploymentEnd=Fin de despliegue +observe.common.TdrDto.deploymentStart=Inicio de despliegue observe.common.TdrDto.enableTimestamp=Activar la FechaHora observe.common.TdrDto.enableTimestamp.tip=Activar la FechaHora para este registro observe.common.TdrDto.exportData=Exportar @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Datos clave observe.common.TdrDto.localisationTab=Localización observe.common.TdrDto.locationOnLongline=Localización sobre la línea observe.common.TdrDto.maxFishingDepth=Profundidad máxima de pesca (m) -observe.common.TdrDto.meanDeployementDepth=Profundidad media de despliegue (m) +observe.common.TdrDto.meanDeploymentDepth=Profundidad media de despliegue (m) observe.common.TdrDto.meanFishingDepth=Profundidad media de pesca (m) -observe.common.TdrDto.medianDeployementDepth=Profundidad mediana de despliegue (m) +observe.common.TdrDto.medianDeploymentDepth=Profundidad mediana de despliegue (m) observe.common.TdrDto.medianFishingDepth=Profundidad mediana de pesca (m) observe.common.TdrDto.minFishingDepth=Profundidad mínima de pesca (m) observe.common.TdrDto.replace.data.message=Confirmar la sustitución del archivo existente «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=El peso para esta especie debe estar com observe.validation.targetCatch.uniqueKey=El par categoría de peso-cuba debe ser único. observe.validation.targetDiscarded.uniqueKey=La serie especie / categoria / causa del descarte / izado a bordo debe ser única. Esta serie ya se ha usado observe.validation.targetLength.required.weight.or.taille=Al menos uno de los valores (talla / peso) debe ser registrado -observe.validation.tdr.deployementStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue -observe.validation.tdr.fishingEnd.before.deployementEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca +observe.validation.tdr.deploymentStart.before.fishingStart=La FechaHora de inicio de pesca debe llegar después de la FechaHora de inicio de despliegue +observe.validation.tdr.fishingEnd.before.deploymentEnd=La FechaHora de fin de despliegue debe ir después de la FechaHora de fin de pesca observe.validation.tdr.fishingStart.before.fishingEnd=La FechaHora de fin de pesca debe llegar después del inicio del de inicio de pesca observe.validation.tdr.required.position=Deben registrarse posiciones observe.validation.technology.too.big=El tamaño está limitado a %s caracteres (tamaño actual\: %s). ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1489,8 +1489,8 @@ observe.common.TdrDto.dataLocation.tip=Hébergement du fichier de données observe.common.TdrDto.delete.data.message=Confirmer la suppression du fichier de données observe.common.TdrDto.deleteData=Supprimer observe.common.TdrDto.deleteData.tip=Supprimer le fichier de données -observe.common.TdrDto.deployementEnd=Fin déploiement -observe.common.TdrDto.deployementStart=Début déploiement +observe.common.TdrDto.deploymentEnd=Fin déploiement +observe.common.TdrDto.deploymentStart=Début déploiement observe.common.TdrDto.enableTimestamp=Activer l'horodatage observe.common.TdrDto.enableTimestamp.tip=Activer l'horodatage pour cet enregistreur observe.common.TdrDto.exportData=Exporter @@ -1510,9 +1510,9 @@ observe.common.TdrDto.keyDataTab=Données clef observe.common.TdrDto.localisationTab=Localisation observe.common.TdrDto.locationOnLongline=Localisation sur la ligne observe.common.TdrDto.maxFishingDepth=Profondeur maximale de pêche (m) -observe.common.TdrDto.meanDeployementDepth=Profondeur moyenne de déploiement (m) +observe.common.TdrDto.meanDeploymentDepth=Profondeur moyenne de déploiement (m) observe.common.TdrDto.meanFishingDepth=Profondeur moyenne de pêche (m) -observe.common.TdrDto.medianDeployementDepth=Profondeur médiane de déploiement (m) +observe.common.TdrDto.medianDeploymentDepth=Profondeur médiane de déploiement (m) observe.common.TdrDto.medianFishingDepth=Profondeur médiane de pêche (m) observe.common.TdrDto.minFishingDepth=Profondeur minimale de pêche (m) observe.common.TdrDto.replace.data.message=Confirmer le remplacement du fichier de données déjà existant «%s» @@ -2312,8 +2312,8 @@ observe.validation.species.weight.bound=Le poids pour cette espèce doit être c observe.validation.targetCatch.uniqueKey=Le couple (catégorie poids - cuve) doit être unique. observe.validation.targetDiscarded.uniqueKey=Le tuple (espèce - catégorie - raison rejet - monté sur le pont) doit être unique. observe.validation.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. -observe.validation.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. -observe.validation.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. +observe.validation.tdr.deploymentStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. +observe.validation.tdr.fishingEnd.before.deploymentEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. observe.validation.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. observe.validation.tdr.required.position=Pas de position renseignée sur la palangre. observe.validation.technology.too.big=La taille du champs est limitée à %s caractères (taille actuelle %s). ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/TdrEntityDtoBinder.java ===================================== @@ -59,14 +59,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr> entity.setDataFilename(null); } entity.setDataLocation(dto.getDataLocation()); - entity.setDeployementStart(dto.getDeployementStart()); - entity.setDeployementEnd(dto.getDeployementEnd()); + entity.setDeploymentStart(dto.getDeploymentStart()); + entity.setDeploymentEnd(dto.getDeploymentEnd()); entity.setFishingStart(dto.getFishingStart()); entity.setFishingEnd(dto.getFishingEnd()); entity.setFishingStartDepth(dto.getFishingStartDepth()); entity.setFishingEndDepth(dto.getFishingEndDepth()); - entity.setMeanDeployementDepth(dto.getMeanDeployementDepth()); - entity.setMedianDeployementDepth(dto.getMedianDeployementDepth()); + entity.setMeanDeploymentDepth(dto.getMeanDeploymentDepth()); + entity.setMedianDeploymentDepth(dto.getMedianDeploymentDepth()); entity.setMinFishingDepth(dto.getMinFishingDepth()); entity.setMaxFishingDepth(dto.getMaxFishingDepth()); entity.setMeanFishingDepth(dto.getMeanFishingDepth()); @@ -96,14 +96,14 @@ public class TdrEntityDtoBinder extends DataEntityDtoBinderSupport<TdrDto, Tdr> // le champ data ne sert que pour l'upload du fichier si il a changé dto.setData(null); dto.setDataLocation(entity.getDataLocation()); - dto.setDeployementStart(entity.getDeployementStart()); - dto.setDeployementEnd(entity.getDeployementEnd()); + dto.setDeploymentStart(entity.getDeploymentStart()); + dto.setDeploymentEnd(entity.getDeploymentEnd()); dto.setFishingStart(entity.getFishingStart()); dto.setFishingEnd(entity.getFishingEnd()); dto.setFishingStartDepth(entity.getFishingStartDepth()); dto.setFishingEndDepth(entity.getFishingEndDepth()); - dto.setMeanDeployementDepth(entity.getMeanDeployementDepth()); - dto.setMedianDeployementDepth(entity.getMedianDeployementDepth()); + dto.setMeanDeploymentDepth(entity.getMeanDeploymentDepth()); + dto.setMedianDeploymentDepth(entity.getMedianDeploymentDepth()); dto.setMinFishingDepth(entity.getMinFishingDepth()); dto.setMaxFishingDepth(entity.getMaxFishingDepth()); dto.setMeanFishingDepth(entity.getMeanFishingDepth()); ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java ===================================== @@ -31,23 +31,23 @@ public class TdrImpl extends TdrAbstract { private static final long serialVersionUID = 1L; @Override - public Date getDeployementStartDate() { - return deployementStart == null ? null : DateUtil.getDay(deployementStart); + public Date getDeploymentStartDate() { + return deploymentStart == null ? null : DateUtil.getDay(deploymentStart); } @Override - public Date getDeployementStartTime() { - return deployementStart == null ? null : DateUtil.getTime(deployementStart, false, false); + public Date getDeploymentStartTime() { + return deploymentStart == null ? null : DateUtil.getTime(deploymentStart, false, false); } @Override - public Date getDeployementEndDate() { - return deployementEnd == null ? null : DateUtil.getDay(deployementEnd); + public Date getDeploymentEndDate() { + return deploymentEnd == null ? null : DateUtil.getDay(deploymentEnd); } @Override - public Date getDeployementEndTime() { - return deployementEnd == null ? null : DateUtil.getTime(deployementEnd, false, false); + public Date getDeploymentEndTime() { + return deploymentEnd == null ? null : DateUtil.getTime(deploymentEnd, false, false); } @Override @@ -71,34 +71,34 @@ public class TdrImpl extends TdrAbstract { } @Override - public void setDeployementStartDate(Date date) { - if (deployementStart != null) { - Date dateAndTime = DateUtil.getDateAndTime(date, deployementStart, true, false); - setDeployementStart(dateAndTime); + public void setDeploymentStartDate(Date date) { + if (deploymentStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deploymentStart, true, false); + setDeploymentStart(dateAndTime); } } @Override - public void setDeployementStartTime(Date time) { - if (deployementStart != null) { - Date dateAndTime = DateUtil.getDateAndTime(deployementStart, time, false, false); - setDeployementStart(dateAndTime); + public void setDeploymentStartTime(Date time) { + if (deploymentStart != null) { + Date dateAndTime = DateUtil.getDateAndTime(deploymentStart, time, false, false); + setDeploymentStart(dateAndTime); } } @Override - public void setDeployementEndDate(Date date) { - if (deployementEnd != null) { - Date dateAndTime = DateUtil.getDateAndTime(date, deployementEnd, true, false); - setDeployementEnd(dateAndTime); + public void setDeploymentEndDate(Date date) { + if (deploymentEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(date, deploymentEnd, true, false); + setDeploymentEnd(dateAndTime); } } @Override - public void setDeployementEndTime(Date time) { - if (deployementEnd != null) { - Date dateAndTime = DateUtil.getDateAndTime(deployementEnd, time, false, false); - setDeployementEnd(dateAndTime); + public void setDeploymentEndTime(Date time) { + if (deploymentEnd != null) { + Date dateAndTime = DateUtil.getDateAndTime(deploymentEnd, time, false, false); + setDeploymentEnd(dateAndTime); } } ===================================== persistence/src/main/models/Observe.model ===================================== @@ -291,7 +291,7 @@ longline.SizeMeasure > ObserveDataEntity | entity size + {*:1} Float | sqlType=numeric sizeMeasureType {*:1} referentiel.SizeMeasureType -longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime +longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deploymentStartDate,deploymentStartTime,deploymentEndDate,deploymentEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime homeId + {*:1} String floatline1Length + {*:1} Float | sqlType=numeric floatline2Length + {*:1} Float | sqlType=numeric @@ -299,14 +299,14 @@ serialNo + {*:1} String data + {*:1} !java.sql.Blob dataFilename + {*:1} String dataLocation + {*:1} String -deployementStart + {*:1} Date -deployementEnd + {*:1} Date +deploymentStart + {*:1} Date +deploymentEnd + {*:1} Date fishingStart + {*:1} Date fishingEnd + {*:1} Date fishingStartDepth + {*:1} Float fishingEndDepth + {*:1} Float -meanDeployementDepth + {*:1} Float -medianDeployementDepth + {*:1} Float +meanDeploymentDepth + {*:1} Float +medianDeploymentDepth + {*:1} Float minFishingDepth + {*:1} Float maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float @@ -319,18 +319,18 @@ section {*:0..1} longline.Section basket {*:0..1} longline.Basket itemHorizontalPosition {*:0..1} referentiel.longline.ItemHorizontalPosition itemVerticalPosition {*:0..1} referentiel.longline.ItemVerticalPosition -getDeployementStartDate() Date -getDeployementStartTime() Date -getDeployementEndDate() Date -getDeployementEndTime() Date +getDeploymentStartDate() Date +getDeploymentStartTime() Date +getDeploymentEndDate() Date +getDeploymentEndTime() Date getFishingStartDate() Date getFishingStartTime() Date getFishingEndDate() Date getFishingEndTime() Date -setDeployementStartDate(date Date) -setDeployementEndDate(date Date) -setDeployementStartTime(time Date) -setDeployementEndTime(time Date) +setDeploymentStartDate(date Date) +setDeploymentEndDate(date Date) +setDeploymentStartTime(time Date) +setDeploymentEndTime(time Date) setFishingStartDate(date Date) setFishingStartTime(time Date) setFishingEndDate(date Date) ===================================== test/src/main/resources/db/7.5/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.5/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.5/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.5/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_h2.sql.gz and b/test/src/main/resources/db/7.5/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.5/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/empty_pg.sql.gz and b/test/src/main/resources/db/7.5/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.5/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.5/referentiel.sql.gz and b/test/src/main/resources/db/7.5/referentiel.sql.gz differ ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -248,7 +248,7 @@ observe.common.TargetLengthDto.length observe.common.TargetLengthDto.weight observe.common.TdrDto.basket observe.common.TdrDto.branchline -observe.common.TdrDto.deployementEnd +observe.common.TdrDto.deploymentEnd observe.common.TdrDto.fishingEnd observe.common.TdrDto.fishingEndDepth observe.common.TdrDto.fishingStart @@ -258,9 +258,9 @@ observe.common.TdrDto.floatline2Length observe.common.TdrDto.itemHorizontalPosition observe.common.TdrDto.itemVerticalPosition observe.common.TdrDto.maxFishingDepth -observe.common.TdrDto.meanDeployementDepth +observe.common.TdrDto.meanDeploymentDepth observe.common.TdrDto.meanFishingDepth -observe.common.TdrDto.medianDeployementDepth +observe.common.TdrDto.medianDeploymentDepth observe.common.TdrDto.medianFishingDepth observe.common.TdrDto.minFishingDepth observe.common.TdrDto.section ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -56,8 +56,8 @@ observe.validation.species.weight.bound observe.validation.targetCatch.uniqueKey observe.validation.targetDiscarded.uniqueKey observe.validation.targetLength.required.weight.or.taille -observe.validation.tdr.deployementStart.before.fishingStart -observe.validation.tdr.fishingEnd.before.deployementEnd +observe.validation.tdr.deploymentStart.before.fishingStart +observe.validation.tdr.fishingEnd.before.deploymentEnd observe.validation.tdr.fishingStart.before.fishingEnd observe.validation.tdr.required.position observe.validation.technology.too.big ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TdrDto-update-error-validation.xml ===================================== @@ -24,12 +24,12 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="fishingStart"> -  +  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ deployementStart == null || fishingStart == null || deployementStart.time < fishingStart.time ]]> + <![CDATA[ deploymentStart == null || fishingStart == null || deploymentStart.time < fishingStart.time ]]> </param> - <message>observe.validation.tdr.deployementStart.before.fishingStart</message> + <message>observe.validation.tdr.deploymentStart.before.fishingStart</message> </field-validator> </field> <field name="fishingEnd"> @@ -41,13 +41,13 @@ <message>observe.validation.tdr.fishingStart.before.fishingEnd</message> </field-validator> </field> - <field name="deployementEnd"> -  + <field name="deploymentEnd"> +  <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ fishingEnd == null || deployementEnd == null || fishingEnd.time < deployementEnd.time ]]> + <![CDATA[ fishingEnd == null || deploymentEnd == null || fishingEnd.time < deploymentEnd.time ]]> </param> - <message>observe.validation.tdr.fishingEnd.before.deployementEnd</message> + <message>observe.validation.tdr.fishingEnd.before.deploymentEnd</message> </field-validator> </field> </validators> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3d070135f025d5eede0f1909a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3d070135f025d5eede0f1909a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [V8] Form marée, espèces ciblées - Closes #1426
by Tony CHEMIT 04 Apr '20

04 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 23767579 by tchemit at 2020-04-04T15:29:58+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 3 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx ===================================== @@ -222,13 +222,6 @@ </cell> </row> -  - <row> - <cell columns="2" weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> - </cell> - </row> -  <row> <cell columns='2' fill='both' weighty="1"> @@ -238,7 +231,11 @@ </Table> </JScrollPane> </tab> - + <tab id='speciesTab' i18nProperty="skip"> + <JPanel layout="{new BorderLayout()}"> + <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> + </JPanel> + </tab> <tab id='observationsTab' i18nProperty=""> <Table fill="both"> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss ===================================== @@ -43,9 +43,17 @@ text:{getStringValue(bean.getNoOfDays())}; } +/* ***************************************************************************** */ +/* SPECIES TAB **************************************************************** */ +/* ***************************************************************************** */ + +#speciesTab { + title:{t("observe.data.ll.common.Trip.species")}; +} + #species { - showListLabel:true; - label:{t("observe.data.ll.common.Trip.species")}; + /*showListLabel:true; + label:{t("observe.data.ll.common.Trip.species")};*/ universeLabel:{t("observe.data.ll.common.Trip.species.universe")}; selectedLabel:{t("observe.data.ll.common.Trip.species.selected")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -82,6 +82,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri @Override public void afterInit(TripUI ui) { + //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) + ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); super.afterInit(ui); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2376757940eaba9cfe8b74c75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2376757940eaba9cfe8b74c75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [SFA] Système de recopie de champs lors de la création d'une nouvelle activité...
by Tony CHEMIT 04 Apr '20

04 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a817585f by tchemit at 2020-04-04T15:26:04+02:00 [SFA] Système de recopie de champs lors de la création d'une nouvelle activité de pêche - Closes #1454 - - - - - 1e6321fb by tchemit at 2020-04-04T15:26:06+02:00 [V8] Form marée, espèces ciblées - Closes #1426 - - - - - 4 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx ===================================== @@ -222,13 +222,6 @@ </cell> </row> -  - <row> - <cell columns="2" weighty="1" weightx="1"> - <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> - </cell> - </row> -  <row> <cell columns='2' fill='both' weighty="1"> @@ -238,7 +231,11 @@ </Table> </JScrollPane> </tab> - + <tab id='speciesTab' i18nProperty="skip"> + <JPanel layout="{new BorderLayout()}"> + <FilterableDoubleList id='species' genericType='SpeciesReference' styleClass="skipI18n"/> + </JPanel> + </tab> <tab id='observationsTab' i18nProperty=""> <Table fill="both"> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jcss ===================================== @@ -43,9 +43,17 @@ text:{getStringValue(bean.getNoOfDays())}; } +/* ***************************************************************************** */ +/* SPECIES TAB **************************************************************** */ +/* ***************************************************************************** */ + +#speciesTab { + title:{t("observe.data.ll.common.Trip.species")}; +} + #species { - showListLabel:true; - label:{t("observe.data.ll.common.Trip.species")}; + /*showListLabel:true; + label:{t("observe.data.ll.common.Trip.species")};*/ universeLabel:{t("observe.data.ll.common.Trip.species.universe")}; selectedLabel:{t("observe.data.ll.common.Trip.species.selected")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java ===================================== @@ -84,6 +84,8 @@ class TripUIHandler extends ContentOpenableUIHandler<TripDto, TripReference, Tri public void afterInit(TripUI ui) { super.afterInit(ui); + //FIXME in jaxx (tabInfo is modified before registred in JTabbedPane...) + ui.getMainTabbedPane().setTitleAt(1, ui.getSpeciesTab().getTitle()); tripUIHelper = new TripUIHelper<TripUI>(ui, prefix) { @Override protected TripMapDto getMap(TripMapConfigDto tripMapConfig) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -120,10 +120,34 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { entity.fromDto(getReferentialLocale(), globalCompositionToCopy); entity.fromDto(getReferentialLocale(), dto); + // caracteristics tab + + entity.setSettingVesselSpeed(entityToCopy.getSettingVesselSpeed()); + entity.setTimeBetweenHooks(entityToCopy.getTimeBetweenHooks()); entity.setTotalLineLength(entityToCopy.getTotalLineLength()); entity.setBasketLineLength(entityToCopy.getBasketLineLength()); entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines()); + entity.setShooterUsed(entityToCopy.getShooterUsed()); + entity.setShooterSpeed(entityToCopy.getShooterSpeed()); + entity.setMaxDepthTargeted(entityToCopy.getMaxDepthTargeted()); + entity.setTotalSectionsCount(entityToCopy.getTotalSectionsCount()); + entity.setBasketsPerSectionCount(entityToCopy.getBasketsPerSectionCount()); + entity.setTotalBasketsCount(entityToCopy.getTotalBasketsCount()); + entity.setBranchlinesPerBasketCount(entityToCopy.getBranchlinesPerBasketCount()); + entity.setTotalHooksCount(entityToCopy.getTotalHooksCount()); entity.setLineType(entityToCopy.getLineType()); + entity.setWeightedSwivel(entityToCopy.getWeightedSwivel()); + entity.setSwivelWeight(entityToCopy.getSwivelWeight()); + entity.setWeightedSnap(entityToCopy.getWeightedSnap()); + entity.setSnapWeight(entityToCopy.getSnapWeight()); + entity.setMonitored(entityToCopy.getMonitored()); + + // lightsticks tab + + entity.setLightsticksUsed(entityToCopy.getLightsticksUsed()); + entity.setTotalLightsticksCount(entityToCopy.getTotalLightsticksCount()); + entity.setLightsticksType(entityToCopy.getLightsticksType()); + entity.setLightsticksColor(entityToCopy.getLightsticksColor()); SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { @@ -153,6 +177,8 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { Set otherSetLongline = activityLongline.getSet(); if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) { SetStubDto otherSetDto = new SetStubDto(); + setLongline.toDto(getReferentialLocale(), otherSetDto); + otherSetDto.setId(otherSetLongline.getTopiaId()); otherSetDto.setHomeId(otherSetLongline.getHomeId()); otherSetDto.setNumber(otherSetLongline.getNumber()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc1bf761060c0f5d0d8f23f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/adc1bf761060c0f5d0d8f23f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: fix ll logbook set haulingBreaks constraint strictlyPositiveNumber to positiveNumber
by Tony CHEMIT 04 Apr '20

04 Apr '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eadefbc7 by tchemit at 2020-04-01T14:43:33+02:00 fix ll logbook set haulingBreaks constraint strictlyPositiveNumber to positiveNumber - - - - - 1dbea9ea by tchemit at 2020-04-01T14:52:15+02:00 fix species validator - - - - - 57abb56f by tchemit at 2020-04-01T14:59:28+02:00 add missing landing delete action - - - - - 3a370fe2 by tchemit at 2020-04-01T15:24:30+02:00 reduce log level - - - - - f57dfbf7 by tchemit at 2020-04-01T15:24:33+02:00 add missing validation - - - - - adc1bf76 by tchemit at 2020-04-04T14:28:17+02:00 [SFA] Système de recopie de champs lors de la création d'une nouvelle activité de pêche - Closes #1454 - - - - - 15 changed files: - client-configuration/src/main/resources/observe-log4j2.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorLayerUI.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableEditorLayerUI.java - + client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/actions/LandingUIDelete.java - dto/src/main/models/Observe-30-data-ll-observation.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java - services-validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java - validation/src/main/i18n/getters/validation-fields.getter - validation/src/main/i18n/getters/validation-messages.getter - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml Changes: ===================================== client-configuration/src/main/resources/observe-log4j2.xml ===================================== @@ -63,10 +63,10 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> - <Logger name="org.nuiton.jaxx.runtime.swing.action.JAXXObjectActionSupport" level="info" additivity="false"> - <AppenderRef ref="console"/> - <AppenderRef ref="File"/> - </Logger> + + + + <Logger name="org.hibernate" level="warn" additivity="false"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorLayerUI.java ===================================== @@ -139,9 +139,9 @@ public class DataSourceEditorLayerUI extends AbstractLayerUI<JComponent> impleme // compute focus owner FocusTraversalPolicy focusTraversalPolicy = contentUI.getFocusTraversalPolicy(); focusComponent = Objects.requireNonNull(focusTraversalPolicy).getFirstComponent(contentUI); - log.info(String.format("compute new form focus owner: %s", focusComponent)); + log.debug(String.format("compute new form focus owner: %s", focusComponent)); } - log.info(String.format("Set focus on content: %s", focusComponent)); + log.debug(String.format("Set focus on content: %s", focusComponent)); // this will change the focus contentUI.getHandler().setFormFocusOwner(focusComponent); } finally { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java ===================================== @@ -770,15 +770,15 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe boolean force = Objects.equals(true, button.getClientProperty("forceNavigation")); if (!force) { if (!button.isEnabled()) { - log.info(String.format("%sReject (disabled) action: %s - %s", prefix, button.getName(), button.getText())); + log.debug(String.format("%sReject (disabled) action: %s - %s", prefix, button.getName(), button.getText())); continue; } if (!button.isShowing()) { - log.info(String.format("%sReject (hidden) action: %s - %s", prefix, button.getName(), button.getText())); + log.debug(String.format("%sReject (hidden) action: %s - %s", prefix, button.getName(), button.getText())); continue; } if (Objects.equals(true, button.getClientProperty("skipNavigation"))) { - log.info(String.format("%sReject (skip) action: %s - %s", prefix, button.getName(), button.getText())); + log.debug(String.format("%sReject (skip) action: %s - %s", prefix, button.getName(), button.getText())); continue; } @@ -790,11 +790,11 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } } if (!found) { - log.info(String.format("%sReject (out of zone) action: %s - %s", prefix, button.getName(), button.getText())); + log.debug(String.format("%sReject (out of zone) action: %s - %s", prefix, button.getName(), button.getText())); continue; } } - log.info(String.format("%sKeep action: %s - %s", prefix, button.getName(), button.getText())); + log.debug(String.format("%sKeep action: %s - %s", prefix, button.getName(), button.getText())); result.add(button); } } @@ -858,7 +858,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe if (SwingUtilities.getAncestorOfClass(ContentUI.class, newValue) != null) { // if (SwingUtilities.getAncestorNamed("body", newValue) != null) { // focus on content ui, let's keep it as the new form focus owner - log.info(String.format("%sSet content form focus owner: %s", prefix, newValue.getName())); + log.debug(String.format("%sSet content form focus owner: %s", prefix, newValue.getName())); focusAdjusting = true; try { getModel().setFormFocusOwner(newValue); @@ -872,7 +872,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe if (focusAdjusting) { return; } - log.info(String.format("%sFocus changed on form %s", prefix, focusComponent)); + log.debug(String.format("%sFocus changed on form %s", prefix, focusComponent)); if (getClientUIContext().getMainUIModel().isBlockFocus()) { return; } @@ -883,7 +883,7 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe // SwingUtilities.invokeLater(focusComponent::requestFocusInWindow); } - log.info(String.format("%sSet form focus on %s", prefix, focusComponent)); + log.debug(String.format("%sSet form focus on %s", prefix, focusComponent)); if (focusComponent != null) { focusAdjusting = true; SwingUtilities.invokeLater(() -> { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableEditorLayerUI.java ===================================== @@ -63,7 +63,7 @@ public class ContentTableEditorLayerUI extends ObserveBlockingLayerUI implements boolean focusOnTable = model.isFocusOnTable(); if (focusOnTable) { - log.info(String.format("Enter in table editor zone: %s", e)); + log.debug(String.format("Enter in table editor zone: %s", e)); model.setFocusOnTable(false); } } @@ -97,16 +97,16 @@ public class ContentTableEditorLayerUI extends ObserveBlockingLayerUI implements if (newValue) { return; } - log.info("Set focus on table editor"); + log.debug("Set focus on table editor"); Component focusComponent = editor.getModel().getFormFocusOwner(); - log.info(String.format("Set focus on table editor - initial form focus owner: %s", focusComponent)); + log.debug(String.format("Set focus on table editor - initial form focus owner: %s", focusComponent)); if (focusComponent == null) { // compute focus owner FocusTraversalPolicy focusTraversalPolicy = editor.getFocusTraversalPolicy(); focusComponent = Objects.requireNonNull(focusTraversalPolicy).getFirstComponent(editor); - log.info(String.format("compute new form focus owner: %s", focusComponent)); + log.debug(String.format("compute new form focus owner: %s", focusComponent)); } - log.info(String.format("Set focus on table editor: %s", focusComponent)); + log.debug(String.format("Set focus on table editor: %s", focusComponent)); // this will change the focus editor.getHandler().setFormFocusOwner(focusComponent); } finally { ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/actions/LandingUIDelete.java ===================================== @@ -0,0 +1,52 @@ +package fr.ird.observe.client.datasource.editor.content.data.ll.landing.actions; + +/*- + * #%L + * ObServe :: Client DataSource Editor LL + * %% + * Copyright (C) 2008 - 2020 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.content.data.ll.landing.LandingUI; +import fr.ird.observe.client.datasource.editor.content.data.open.actions.DeleteActionSupport; +import fr.ird.observe.dto.data.ll.landing.LandingDto; +import fr.ird.observe.dto.data.ll.landing.LandingReference; +import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +/** + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8 + */ +public class LandingUIDelete extends DeleteActionSupport<LandingDto, LandingReference, LandingUI> { + + private static final Logger log = LogManager.getLogger(LandingUIDelete.class); + + public LandingUIDelete() { + super(LandingDto.class); + } + + @Override + protected void doDelete(LandingUI ui, LandingDto bean, ObserveEditNode<LandingDto> editNode) { + log.info("Will delete Landing " + bean.getId()); + getServicesProvider().getLlLandingLandingService().delete(bean.getId()); + log.info("Delete done for Landing " + bean.getId()); + } + +} ===================================== dto/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -164,7 +164,7 @@ haulingStartLongitude + {*:1} Float | notNull haulingEndTimeStamp + {*:1} Date | notNull haulingEndLatitude + {*:1} Float | notNull haulingEndLongitude + {*:1} Float | notNull -haulingBreaks + {*:1} Integer | mayNotNull strictlyPositiveNumber +haulingBreaks + {*:1} Integer | mayNotNull positiveNumber monitored + {*:1} Boolean haulingStartQuadrant + {*:1} Integer | notNull haulingEndQuadrant + {*:1} Integer | notNull ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -970,6 +970,7 @@ observe.data.ll.logbook.Activity.currentDirection=Current direction (°) observe.data.ll.logbook.Activity.currentSpeed=Current Speed (kt) observe.data.ll.logbook.Activity.dataQuality=Data quality observe.data.ll.logbook.Activity.date=Date +observe.data.ll.logbook.Activity.endTime=End time observe.data.ll.logbook.Activity.endTimeStamp=End timestamp observe.data.ll.logbook.Activity.fpaZone=FPA Zone observe.data.ll.logbook.Activity.latitude=Latitude @@ -3012,7 +3013,9 @@ observe.validation.activity.speed.bound=Activity speed is %s nd, which is more t observe.validation.activity.speed.bound.inter=Speed between two activities can't exceed %1$s nd, (activity %2$s speed is %3$s). observe.validation.activityLongline.desactivated.fpaZone=Fpa zone is disabled. observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date +observe.validation.activityLongline.endDate.after.startDate=End date must be after start date observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date +observe.validation.activityLongline.endTime.after.startTime=End time must be after start time observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date observe.validation.baitsComposition.bound.individualSize=Size must be bound between %s and %s. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -970,6 +970,7 @@ observe.data.ll.logbook.Activity.currentDirection=Current direction (°) \#TODO observe.data.ll.logbook.Activity.currentSpeed=Current speed (kt) \#TODO observe.data.ll.logbook.Activity.dataQuality=Qualité de donnée \#TODO observe.data.ll.logbook.Activity.date=Día de observación +observe.data.ll.logbook.Activity.endTime=End time \#TODO observe.data.ll.logbook.Activity.endTimeStamp=End timstamp \#TODO observe.data.ll.logbook.Activity.fpaZone=ZEE observe.data.ll.logbook.Activity.latitude=Latitud @@ -3012,7 +3013,9 @@ observe.validation.activity.speed.bound=La velocidad de la actividad actual es % observe.validation.activity.speed.bound.inter=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zona FPA seleccionada está desactivada. observe.validation.activityLongline.endDate.after.currentTrip.startDate=End date must be after current trip start date \#TODO +observe.validation.activityLongline.endDate.after.startDate=End date must be after start date \#TODO observe.validation.activityLongline.endDate.before.currentTrip.endDate=End date must be before current trip end date \#TODO +observe.validation.activityLongline.endTime.after.startTime=End time must be after start time \#TODO observe.validation.activityLongline.startDate.after.currentTrip.startDate=Start date must be after current trip start date \#TODO observe.validation.activityLongline.startDate.before.currentTrip.endDate=Start date must be before current trip end date \#TODO observe.validation.baitsComposition.bound.individualSize=El tamaño debe ser entre %s y %s. @@ -3023,7 +3026,7 @@ observe.validation.baitsComposition.desactivated.baitType=El tipo de cebo selecc observe.validation.baitsComposition.required.baitType=La selección de un tipo es mandatorio. observe.validation.baitsComposition.required.proportion=La proporción está vacía. observe.validation.basket.bound.floatline1Length=La longitud del orinque 1 debe ser entre %1$s y %2$s. -observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s.& +observe.validation.basket.bound.floatline2Length=La longitud d'orinque 1 debe ser entre %1$s y %2$s. observe.validation.basket.required.settingIdentifier=El identificador de la calada es mandatorio. observe.validation.bound.currentDirection=La dirección actual debe ser un número comprendido entre %1$s y %2$s. observe.validation.bound.currentSpeed=La velocidad actual debe ser un número comprendido entre %1$s y %2$s ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -970,6 +970,7 @@ observe.data.ll.logbook.Activity.currentDirection=Direction du courant (°) observe.data.ll.logbook.Activity.currentSpeed=vitesse du courant (nd) observe.data.ll.logbook.Activity.dataQuality=Qualité de donnée observe.data.ll.logbook.Activity.date=Jour d'observation +observe.data.ll.logbook.Activity.endTime=Heure de fin observe.data.ll.logbook.Activity.endTimeStamp=Horodatage de fin observe.data.ll.logbook.Activity.fpaZone=Zone FPA observe.data.ll.logbook.Activity.latitude=Latitude @@ -3012,7 +3013,9 @@ observe.validation.activity.speed.bound=La vitesse de l'activité courante est d observe.validation.activity.speed.bound.inter=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). observe.validation.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. observe.validation.activityLongline.endDate.after.currentTrip.startDate=La date de fin doit être supérieure ou égale à la date de début de marée +observe.validation.activityLongline.endDate.after.startDate=La date de fin doit être supérieure ou égale à la date de début de l'activité observe.validation.activityLongline.endDate.before.currentTrip.endDate=La date de fin doit être inférieur ou égale à la date de fin de marée +observe.validation.activityLongline.endTime.after.startTime=L'heure de fin doit être supérieure ou égale à l'heure de début de l'activité observe.validation.activityLongline.startDate.after.currentTrip.startDate=La date doit être supérieure ou égale à la date de début de marée observe.validation.activityLongline.startDate.before.currentTrip.endDate=La date doit être inférieure ou égale à la date de fin de marée observe.validation.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. @@ -3023,7 +3026,7 @@ observe.validation.baitsComposition.desactivated.baitType=Le type d'appât séle observe.validation.baitsComposition.required.baitType=La sélection d'un type est obligatoire. observe.validation.baitsComposition.required.proportion=Proportion non renseignée. observe.validation.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. -observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& +observe.validation.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. observe.validation.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. observe.validation.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. observe.validation.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetServiceLocal.java ===================================== @@ -120,10 +120,34 @@ public class SetServiceLocal extends ObserveServiceLocal implements SetService { entity.fromDto(getReferentialLocale(), globalCompositionToCopy); entity.fromDto(getReferentialLocale(), dto); + // caracteristics tab + + entity.setSettingVesselSpeed(entityToCopy.getSettingVesselSpeed()); + entity.setTimeBetweenHooks(entityToCopy.getTimeBetweenHooks()); entity.setTotalLineLength(entityToCopy.getTotalLineLength()); entity.setBasketLineLength(entityToCopy.getBasketLineLength()); entity.setLengthBetweenBranchlines(entityToCopy.getLengthBetweenBranchlines()); + entity.setShooterUsed(entityToCopy.getShooterUsed()); + entity.setShooterSpeed(entityToCopy.getShooterSpeed()); + entity.setMaxDepthTargeted(entityToCopy.getMaxDepthTargeted()); + entity.setTotalSectionsCount(entityToCopy.getTotalSectionsCount()); + entity.setBasketsPerSectionCount(entityToCopy.getBasketsPerSectionCount()); + entity.setTotalBasketsCount(entityToCopy.getTotalBasketsCount()); + entity.setBranchlinesPerBasketCount(entityToCopy.getBranchlinesPerBasketCount()); + entity.setTotalHooksCount(entityToCopy.getTotalHooksCount()); entity.setLineType(entityToCopy.getLineType()); + entity.setWeightedSwivel(entityToCopy.getWeightedSwivel()); + entity.setSwivelWeight(entityToCopy.getSwivelWeight()); + entity.setWeightedSnap(entityToCopy.getWeightedSnap()); + entity.setSnapWeight(entityToCopy.getSnapWeight()); + entity.setMonitored(entityToCopy.getMonitored()); + + // lightsticks tab + + entity.setLightsticksUsed(entityToCopy.getLightsticksUsed()); + entity.setTotalLightsticksCount(entityToCopy.getTotalLightsticksCount()); + entity.setLightsticksType(entityToCopy.getLightsticksType()); + entity.setLightsticksColor(entityToCopy.getLightsticksColor()); SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { ===================================== services-validation/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== @@ -74,6 +74,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup private Float ratio; private String speciesField = "species"; private Bound bound; + private Bound boundWithRatio; private String getSpeciesField() { return speciesField; @@ -202,7 +203,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup return; } - Bound boundWithRatio = bound.applyRatio(ratio); + boundWithRatio = bound.applyRatio(ratio); if (log.isDebugEnabled()) { log.debug("Bound : " + bound); @@ -218,6 +219,14 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } } + public Float getMin() { + return boundWithRatio.getMin(); + } + + public Float getMax() { + return boundWithRatio.getMax(); + } + private Bound getBound(SpeciesDto species) { Float min = getBoundMin(species); ===================================== validation/src/main/i18n/getters/validation-fields.getter ===================================== @@ -48,6 +48,7 @@ observe.data.ll.landing.LandingPart.onBoardProcessing observe.data.ll.landing.LandingPart.weight observe.data.ll.logbook.Activity.currentDirection observe.data.ll.logbook.Activity.currentSpeed +observe.data.ll.logbook.Activity.endTime observe.data.ll.logbook.Activity.endTimeStamp observe.data.ll.logbook.Activity.fpaZone observe.data.ll.logbook.Activity.relatedObservedActivity ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -2,7 +2,9 @@ observe.validation.activity.duplicated.time observe.validation.activity.null.dcp observe.validation.activity.required.observedSystem.for.nonTargetCatch observe.validation.activityLongline.endDate.after.currentTrip.startDate +observe.validation.activityLongline.endDate.after.startDate observe.validation.activityLongline.endDate.before.currentTrip.endDate +observe.validation.activityLongline.endTime.after.startTime observe.validation.activityLongline.startDate.after.currentTrip.startDate observe.validation.activityLongline.startDate.before.currentTrip.endDate observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-create-error-validation.xml ===================================== @@ -77,6 +77,21 @@ </param> <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || startDate == null || startDate.time <= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endTime.after.startTime</message> + </field-validator> + </field> + + <field name="endTime"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endTime == null || startTime == null || startTime.time <= endTime.time ]]> + </param> + <message>observe.validation.activityLongline.endTime.after.startTime</message> + </field-validator> </field> <field name="seaSurfaceTemperature"> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityDto-update-error-validation.xml ===================================== @@ -88,6 +88,21 @@ </param> <message>observe.validation.activityLongline.endDate.after.currentTrip.startDate</message> </field-validator> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endDate == null || startDate == null || startDate.time <= endDate.time ]]> + </param> + <message>observe.validation.activityLongline.endDate.after.startDate</message> + </field-validator> + </field> + + <field name="endTime"> + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> + <![CDATA[ endTime == null || startTime == null || startTime.time <= endTime.time ]]> + </param> + <message>observe.validation.activityLongline.endTime.after.startTime</message> + </field-validator> </field> <field name="currentDirection"> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3e61f870af3a0e57f6cad81… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d3e61f870af3a0e57f6cad81… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.5.0
by Tony CHEMIT 01 Apr '20

01 Apr '20

Tony CHEMIT deleted branch release/7.5.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0