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

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.7
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed new branch release/7.6.7 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/7.6.7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/1254] 2 commits: Revert bad replaces
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch feature/1254 at ultreiaio / ird-observe Commits: 298645ca by Tony Chemit at 2021-01-20T14:51:45+01:00 Revert bad replaces - - - - - 0498c7e8 by Tony Chemit at 2021-01-20T15:34:02+01:00 Les tests passent jusqu'aux services :) Il ne reste plus qu'à modifier les ui (peace of cake) - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUI.jaxx - client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUINavigationNode.scope - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - doc/modelisation/zargo/v5/observe.ini - doc/modelisation/zargo/v7/observe.ini - models/dto-definition/src/main/models/Observe-20-data-ps-observation.model - models/dto/src/main/resources/observe-reports.properties - models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_9_0.java - models/persistence/src/main/models/Observe-20-data-ps-observation.model - + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-create-common.sql - models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-common.sql → models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-fill-common.sql - + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-finalize-common.sql - models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-H2.sql - models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-PG.sql - models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-1.properties - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-2.properties - models/persistence/src/test/resources/fixtures/persistence/count-data-seine-3.properties - models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties - models/persistence/src/test/resources/fixtures/persistence/count-referential-seine.properties - models/persistence/src/test/resources/fixtures/persistence/entity-associations-count-referential.properties - models/persistence/src/test/resources/fixtures/persistence/entity-paths-count.properties - models/persistence/src/test/resources/fixtures/persistence/entity-paths-links-count.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8727e7192185d6f1510a1f9b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8727e7192185d6f1510a1f9b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7)
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 32bd7168 by Tony Chemit at 2021-01-20T11:24:27+01:00 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7) formulaire composition détaillée - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.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 Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx ===================================== @@ -34,6 +34,7 @@ fr.ird.observe.client.ui.actions.content.BranchlineSetDefaultTimerTimeOnBoard fr.ird.observe.client.ui.util.JComment + fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor org.nuiton.jaxx.widgets.number.NumberEditor io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox @@ -122,7 +123,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <JCheckBox id='timer' styleClass="i18n"/> </cell> <cell columns="2"> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <UnlimitedTimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss ===================================== @@ -64,13 +64,13 @@ propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; time:{model.getTimeSinceContact()}; bean:{model}; - showTimeEditorSlider:false; + showReset:true; } #timerTimeOnBoard { date:{bean.getTimerTimeOnBoard()}; - showTimeEditorSlider:false; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; + showReset:true; } #topType { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java ===================================== @@ -32,24 +32,23 @@ import fr.ird.observe.client.ui.content.ObserveLayoutFocusTraversalPolicy; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.data.longline.BranchlineDto; import fr.ird.observe.dto.data.longline.BranchlineHelper; +import io.ultreia.java4all.i18n.I18n; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.decorator.Decorator; -import io.ultreia.java4all.i18n.I18n; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; import javax.swing.event.TableModelListener; import java.awt.Component; import java.awt.Container; -import java.util.Calendar; -import java.util.Date; +import java.beans.PropertyChangeListener; import java.util.HashSet; +import java.util.Objects; import java.util.Set; /** @@ -60,22 +59,23 @@ import java.util.Set; */ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, BranchlineUI> implements UIHandler<BranchlineUI> { - /** Logger */ + /** + * Logger + */ private static final Logger log = LogManager.getLogger(BranchlineUIHandler.class); // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - + private final PropertyChangeListener timerChanged; private Decorator<BranchlineDto> branchlineDecorator; public BranchlineUIHandler() { super(DataContextType.SetLongline, null); computeTabValidStateListener = e -> { - SwingValidatorMessageTableModel source = (SwingValidatorMessageTableModel) e.getSource(); computeTabValidState(source); - }; + timerChanged = evt -> onTimerChanged((Boolean) evt.getNewValue()); } @Override @@ -112,6 +112,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl evt -> getUi().getValidator().setChanged(true)); ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); + ui.getTimerTimeOnBoard().getSliderHidor().setVisible(false); ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); } @@ -127,10 +128,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineHelper.copyBranchlineDto(branchline, getBean()); if (branchline == null) { - - Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); - + model.setTimeSinceContact(null); // stop edit stopEditUI(); @@ -138,13 +136,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl if (BooleanUtils.isTrue(branchline.getTimer())) { Long timeSinceContact = branchline.getTimeSinceContact(); - if (timeSinceContact != null) { - Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); - } + model.setTimeSinceContact(timeSinceContact==null?null:timeSinceContact.intValue()); } else { - Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); - model.setTimeSinceContact(timeSinceContactDate); + model.setTimeSinceContact(null); } if (model.isEnabled() && !model.isEditing()) { @@ -203,9 +197,6 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl log.info("OpenUI: " + getModel()); } - getUi().getTimeSinceContact().getSliderHidor().setVisible(false); - getUi().getTimerTimeOnBoard().getSliderHidor().setVisible(false); - boolean canWrite = computeCanWrite(getDataSource()); getModel().setCanWrite(canWrite); @@ -258,10 +249,19 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineUI.BINDING_TIMER_TIME_ON_BOARD_DATE ); + ui.getBean().removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + ui.getBean().addPropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + model.setModified(false); } + @Override + public void stopEditUI() { + ui.getBean().removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); + super.stopEditUI(); + } + @Override protected boolean doSave(BranchlineDto bean) { @@ -270,18 +270,13 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl BranchlineHelper.copyBranchlineDto(bean, beanToSave); if (BooleanUtils.isTrue(bean.getTimer())) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(getModel().getTimeSinceContact()); - int minutes = calendar.get(Calendar.MINUTE); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - beanToSave.setTimeSinceContact(minutes + 60L * hours); + Integer timeSinceContact = getModel().getTimeSinceContact(); + beanToSave.setTimeSinceContact(timeSinceContact == null ? null : timeSinceContact.longValue()); } else { beanToSave.setTimeSinceContact(null); } - if (log.isInfoEnabled()) { - log.info("Time since contact: " + beanToSave.getTimeSinceContact()); - } + log.info(String.format("Save time since contact: %d", beanToSave.getTimeSinceContact())); // for external models getModel().fireSaved(); @@ -417,4 +412,13 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl } + void onTimerChanged(Boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getModel().setTimeSinceContact(0); + } else { + // without timer + ui.getModel().setTimeSinceContact(null); + } + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java ===================================== @@ -73,7 +73,7 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { private boolean hookAndBaitTabValid; - private Date timeSinceContact; + private Integer timeSinceContact; private Date haulingStartTimeStamp; public BranchlineUIModel() { @@ -106,13 +106,14 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { firePropertyChange(PROPERTY_HOOK_AND_BAIT_TAB_VALID, null, hookAndBaitTabValid); } - public Date getTimeSinceContact() { + public Integer getTimeSinceContact() { return timeSinceContact; } - public void setTimeSinceContact(Date timeSinceContact) { + public void setTimeSinceContact(Integer timeSinceContact) { + Integer oldValue = getTimeSinceContact(); this.timeSinceContact = timeSinceContact; - firePropertyChange(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, null, getTimeSinceContact()); + firePropertyChange(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, oldValue, getTimeSinceContact()); } // For external model known when a saved action was done ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -338,7 +338,6 @@ JCheckBox { date:{branchlineBean.getTimerTimeOnBoard()}; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; bean:{branchlineBean}; - showTimeEditorSlider:false; showReset:true; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -252,7 +252,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); ui.getTimerTimeOnBoard().getSliderHidor().setVisible(false); ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); -// ui.getTimeSinceContact().getReset().setVisible(true); } @Override ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=ObServe configuration +DateTimeEditor.action.reset.tip=Reset ObserveWebApplicationConfig.description=ObServe Web configuration TimeEditor.H=H observe.action.about=About ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=Configuración de ObServe +DateTimeEditor.action.reset.tip=Cancelar ObserveWebApplicationConfig.description=Configuración de Observe web TimeEditor.H=H observe.action.about=Acerca de ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1,4 +1,5 @@ ClientConfig.description=Configuration d'ObServe +DateTimeEditor.action.reset.tip=Réinitialiser la valeur ObserveWebApplicationConfig.description=Observe web Configuration TimeEditor.H=H observe.action.about=À propos View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32bd71682b812db55e4244c4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/32bd71682b812db55e4244c4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7)
by Tony CHEMIT Jan. 20, 2021

Jan. 20, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 117a98c1 by Tony Chemit at 2021-01-20T10:52:24+01:00 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 (on v7) - - - - - 17 changed files: - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/util/time/actions/UnlimitedTimeEditorResetAction.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 Changes: ===================================== client-core/pom.xml ===================================== @@ -372,6 +372,10 @@ <artifactId>class-mapping</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency> <dependency> <groupId>io.ultreia.java4all</groupId> <artifactId>java-lang</artifactId> @@ -380,6 +384,7 @@ <dependency> <groupId>io.ultreia.java4all</groupId> <artifactId>java-util</artifactId> + <scope>runtime</scope> </dependency>  ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -1,3 +1,4 @@ +DateTimeEditor.action.reset.tip aboutframe.changelog observe.action.about observe.action.about.tip ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -1,3 +1,4 @@ +TimeEditor.H observe.action.apply observe.action.auto.copy.to.clipboard observe.action.auto.copy.to.clipboard.tip ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -55,6 +55,10 @@ TimeEditor { i18nProperty:""; } +UnlimitedTimeEditor { + i18nProperty:""; +} + NumberEditor { autoPopup:{config.isAutoPopupNumberEditor()}; showPopupButton:{config.isShowNumberEditorButton()}; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.client.ui.actions.content.GoToTab6UIAction; import fr.ird.observe.client.ui.actions.content.GoToTabUIActionSupport; import fr.ird.observe.client.ui.util.BooleanEditor; import fr.ird.observe.client.ui.util.UIHelper; +import fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor; import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.client.validation.ObserveSwingValidator; import fr.ird.observe.dto.I18nEnumHelper; @@ -314,6 +315,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> } if (o instanceof TemperatureEditor) { init((TemperatureEditor) o); + }if (o instanceof UnlimitedTimeEditor) { + init((UnlimitedTimeEditor) o); } } @@ -353,6 +356,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> editor.setLabelFor((Component) objectById); } } + private void init(UnlimitedTimeEditor editor) { + editor.init(); + } protected void initBlockLayerUI(String... doNotBlockComponentIds) { // ui.getBlockLayerUI().setAcceptedComponentTypes(UIHelper.ACCEPTABLE_COMPONENTS_TYPE); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx ===================================== @@ -50,6 +50,7 @@ fr.ird.observe.client.ui.util.JComment fr.ird.observe.client.ui.actions.content.CatchSetDefaultTimerTimeOnBoard + fr.ird.observe.client.ui.util.time.UnlimitedTimeEditor org.nuiton.jaxx.widgets.number.NumberEditor io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox @@ -391,14 +392,14 @@ <tab id='branchlineTab' i18nProperty=""> - <JPanel layout="{new BorderLayout()}"> - <Table id='branchlineForm' fill='both' insets='3' constraints='BorderLayout.NORTH'> + <JPanel id='branchlinePanel' layout="{new BorderLayout()}"> + <Table id='branchlineForm' fill='both' constraints='BorderLayout.NORTH'>    <row> - <cell columns="3"> + <cell columns="2"> <JPanel layout="{new GridLayout()}"> <JCheckBox id='depthRecorder'/> <JCheckBox id='hookLost'/> @@ -414,16 +415,15 @@ <cell anchor='east'> <JCheckBox id='timer'/> </cell> - <cell columns="2"> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <cell> + <UnlimitedTimeEditor id='timeSinceContact'/> </cell> </row>  <row> + <cell/> <cell> - </cell> - <cell columns="3"> <DateTimeEditor id='timerTimeOnBoard' constructorParams='this'/> </cell> </row> @@ -433,22 +433,15 @@ <cell anchor='west'> <JLabel id='baitHaulingStatusLabel'/> </cell> - <cell anchor='east' weightx="1" fill="both" columns="2"> - <JaxxComboBox id='baitHaulingStatus' constructorParams='this' - genericType='BaitHaulingStatusReference'/> + <cell anchor='east' weightx="1" fill="both"> + <JaxxComboBox id='baitHaulingStatus' constructorParams='this' genericType='BaitHaulingStatusReference'/> </cell> </row> - - <row> - <cell columns="3"> - <JPanel id='branchlineActions' layout="{new GridLayout()}"> - <JButton id='resetBranchline' onActionPerformed='getHandler().resetBranchline()'/> - <JButton id='saveBranchline' onActionPerformed='getHandler().saveBranchline()'/> - </JPanel> - </cell> - </row> - </Table> + <JPanel id='branchlineActions' layout="{new GridLayout()}" constraints='BorderLayout.SOUTH'> + <JButton id='resetBranchline' onActionPerformed='getHandler().resetBranchline()'/> + <JButton id='saveBranchline' onActionPerformed='getHandler().saveBranchline()'/> + </JPanel> </JPanel> </tab> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -293,11 +293,15 @@ JCheckBox { enabled:{!tableModel.isCreate() && tableEditBean.getBranchline() != null}; } -#branchlineForm { +#branchlinePanel { border:{new TitledBorder( (String) null)}; visible:{!tableModel.isCreate() && tableEditBean.getBranchline() != null}; } +#branchlineForm { + visible:{!tableModel.isCreate() && tableEditBean.getBranchline() != null}; +} + #depthRecorder { horizontalTextPosition:{JCheckBox.LEFT}; _branchlineBeanPropertyName:{BranchlineDto.PROPERTY_DEPTH_RECORDER}; @@ -327,7 +331,7 @@ JCheckBox { bean:{model}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; time:{model.getBranchlineTimeSinceContact()}; - showTimeEditorSlider:false; + showReset:true; } #timerTimeOnBoard { @@ -335,6 +339,7 @@ JCheckBox { propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; bean:{branchlineBean}; showTimeEditorSlider:false; + showReset:true; } #baitHaulingStatus { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -60,7 +60,6 @@ import fr.ird.observe.dto.referential.longline.CatchFateLonglineReference; import fr.ird.observe.dto.referential.longline.HealthStatusReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.spi.DtoModelHelper; -import io.ultreia.java4all.util.Dates; import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -69,7 +68,6 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidator; import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -82,9 +80,7 @@ import java.awt.Component; import java.awt.Container; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Calendar; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -102,27 +98,45 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCatchDto, CatchLonglineDto, CatchLonglineUI> implements UIHandler<CatchLonglineUI> { - /** Logger */ + /** + * Logger + */ private static final Logger log = LogManager.getLogger(CatchLonglineUIHandler.class); - + private static final String GROUPED_TRIP_TYPE_ID = "fr.ird.observe.entities.referentiel.longline.TripType#1239832686136#0.1"; // Compute valid state of tab from the error table protected final TableModelListener computeTabValidStateListener; - private final PropertyChangeListener catchFateChanged; - private final PropertyChangeListener branchlineChanged; - private final PropertyChangeListener depredatedChanged; private final PropertyChangeListener timerChanged; - private final PropertyChangeListener sizeTableModelModified; - private final PropertyChangeListener weightTableModelModified; - private final JAXXContextEntryDef<LonglinePositionHelper<CatchLonglineDto>> POSITION_HELPER_ENTRY = UIHelper.newContextEntryDef("CatchLonglineUI-positionHelper", LonglinePositionHelper.class); - private static final String GROUPED_TRIP_TYPE_ID = "fr.ird.observe.entities.referentiel.longline.TripType#1239832686136#0.1"; + static class TablePopupSupport extends AutotSelectRowAndShowPopupActionSupport { + + private final CatchLonglineUI ui; + + TablePopupSupport(CatchLonglineUI ui) { + super(ui.getTableScrollPane(), ui.getTable(), ui.getTablePopup()); + this.ui = ui; + } + + @Override + protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) { + + CatchLonglineTableModel model = (CatchLonglineTableModel) getTable().getModel(); + + boolean canMoveUp = !ui.getModel().isCanSaveRow() && modelRowIndex > 0; + boolean canMoveDown = !ui.getModel().isCanSaveRow() && modelRowIndex < model.getRowCount() - 1; + + ui.getMoveUp().setEnabled(canMoveUp); + ui.getMoveDown().setEnabled(canMoveDown); + + } + + } CatchLonglineUIHandler() { super(DataContextType.SetLongline); @@ -236,7 +250,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat evt -> ui.getBranchlineValidator().setChanged(true)); ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); + ui.getTimerTimeOnBoard().getSliderHidor().setVisible(false); ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); +// ui.getTimeSinceContact().getReset().setVisible(true); } @Override @@ -248,9 +264,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat super.openUI(); - getUi().getTimeSinceContact().getSliderHidor().setVisible(false); - getUi().getTimerTimeOnBoard().getSliderHidor().setVisible(false); - // Reset all sections LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); getUi().getSection().setData(positionHelper.getSections()); @@ -276,36 +289,34 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat public void saveBranchline() { - if (log.isInfoEnabled()) { - log.info("Saved modified branchline"); - } + log.info("Saved modified branchline"); CatchLonglineUI ui = getUi(); BranchlineDto branchline = ui.getBranchlineBean(); + CatchLonglineUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(getModel().getBranchlineTimeSinceContact()); - int minutes = calendar.get(Calendar.MINUTE); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - branchline.setTimeSinceContact(minutes + 60L * hours); + Integer branchlineTimeSinceContact = model.getBranchlineTimeSinceContact(); + branchline.setTimeSinceContact(branchlineTimeSinceContact == null ? null : branchlineTimeSinceContact.longValue()); } else { branchline.setTimeSinceContact(null); } - if (log.isInfoEnabled()) { - log.info("Time since contact: " + branchline.getTimeSinceContact()); - } + log.info(String.format("Save with time since contact: %d", branchline.getTimeSinceContact())); String openSetLonglineId = getDataContext().getSelectedSetLonglineId(); SaveResultDto saveResult = getBranchlineService().save(openSetLonglineId, branchline); saveResult.toDto(branchline); + boolean modified = model.isModified(); // on recopie le last update car c'est le laste update de SetLongline qui est renvoyé. getBean().setLastUpdateDate(saveResult.getLastUpdateDate()); getUi().getBranchlineValidator().setChanged(false); - + if (!modified) { + ui.getValidator().setChanged(false); + model.setModified(false); + } } void updateCatchAcquisitionMode(CatchAcquisitionMode newMode) { @@ -488,7 +499,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ui.getMainTabbedPane().setSelectedIndex(0); NavigationTree treeHelper = getNavigationTree(); - NavigationTreeNodeSupport selectedNode = treeHelper.getSelectedNode(); + NavigationTreeNodeSupport<?> selectedNode = treeHelper.getSelectedNode(); while (!(selectedNode instanceof TripLonglineNavigationTreeNode)) { selectedNode = selectedNode.getParent(); } @@ -825,9 +836,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat return; } - //tchemit-20191104 there is a bug on time editor, need to reset by hand the hour and minute editor - ui.getTimeSinceContact().reset(); - CatchLonglineUI ui = getUi(); BranchlineDto branchline = ui.getBranchlineBean(); @@ -836,9 +844,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat CatchLonglineUIModel model = getModel(); if (newValue == null) { - if (log.isInfoEnabled()) { - log.info("Remove branchline"); - } + log.info("Remove branchline"); branchline.removePropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); branchlineValidator.setBean(null); branchline.clear(); @@ -846,9 +852,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } else { - if (log.isInfoEnabled()) { - log.info("Use branchline: " + newValue); - } + log.info(String.format("Use branchline: %s", newValue)); branchline.addPropertyChangeListener(BranchlineDto.PROPERTY_TIMER, timerChanged); String setLonglineId = getDataContext().getSelectedSetLonglineId(); @@ -859,18 +863,12 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ui.getValidator().setBean(getBean()); } - Date timeSinceContactDate = null; + Long timeSinceContact=null; if (Objects.equals(true, branchline.getTimer())) { - Long timeSinceContact = branchline.getTimeSinceContact(); - if (timeSinceContact != null) { - timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); - } - } - if (timeSinceContactDate == null) { - timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); + timeSinceContact = branchline.getTimeSinceContact(); } - log.info("Set time since contact: " + timeSinceContactDate); - model.setBranchlineTimeSinceContact(timeSinceContactDate); + log.info(String.format("Set time since contact: %d", timeSinceContact)); + model.setBranchlineTimeSinceContact(timeSinceContact==null?null:timeSinceContact.intValue()); branchlineValidator.setBean(branchline); } @@ -943,7 +941,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } - private void onSizeTableModelModified(Boolean newValue) { if (newValue) { @@ -1042,41 +1039,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat model.setBranchlineTabValid(branchlineTabValid); } + void onTimerChanged(Boolean newValue) { if (Objects.equals(true, newValue)) { // with timer - ui.getModel().setBranchlineTimeSinceContact(Dates.createDate(0, 0, 0, 0, 0, 0)); + ui.getModel().setBranchlineTimeSinceContact(0); } else { // without timer ui.getModel().setBranchlineTimeSinceContact(null); } } + @Override protected CatchLonglineTableModel getTableModel() { return (CatchLonglineTableModel) super.getTableModel(); } - - static class TablePopupSupport extends AutotSelectRowAndShowPopupActionSupport { - - private final CatchLonglineUI ui; - - TablePopupSupport(CatchLonglineUI ui) { - super(ui.getTableScrollPane(), ui.getTable(), ui.getTablePopup()); - this.ui = ui; - } - - @Override - protected void beforeOpenPopup(int modelRowIndex, int modelColumnIndex) { - - CatchLonglineTableModel model = (CatchLonglineTableModel) getTable().getModel(); - - boolean canMoveUp = !ui.getModel().isCanSaveRow() && modelRowIndex > 0; - boolean canMoveDown = !ui.getModel().isCanSaveRow() && modelRowIndex < model.getRowCount() - 1; - - ui.getMoveUp().setEnabled(canMoveUp); - ui.getMoveDown().setEnabled(canMoveDown); - - } - - } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIModel.java ===================================== @@ -111,7 +111,7 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt protected boolean branchlineTabValid; - protected Date branchlineTimeSinceContact; + protected Integer branchlineTimeSinceContact; public CatchLonglineUIModel(CatchLonglineUI ui) { super(SetLonglineCatchDto.class, CatchLonglineDto.class); @@ -189,31 +189,19 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt firePropertyChange(PROPERTY_BRANCHLINE_TAB_VALID, null, branchlineTabValid); } - public Date getBranchlineTimeSinceContact() { + public Integer getBranchlineTimeSinceContact() { return branchlineTimeSinceContact; } - public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) { - Date oldValue = getBranchlineTimeSinceContact(); + public void setBranchlineTimeSinceContact(Integer branchlineTimeSinceContact) { + Integer oldValue = getBranchlineTimeSinceContact(); this.branchlineTimeSinceContact = branchlineTimeSinceContact; firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, oldValue, branchlineTimeSinceContact); - } @Override protected CatchLonglineTableModel createTableModel(ObserveContentTableUI<SetLonglineCatchDto, CatchLonglineDto, ?> ui, List<ContentTableMeta<CatchLonglineDto>> contentTableMetas) { return new CatchLonglineTableModel(ui, contentTableMetas); } -// -// @Override -// protected BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> prepareChildLoador(String binderName) { -// -// BinderModelBuilder<CatchLonglineDto, CatchLonglineDto> builder = super.prepareChildLoador(binderName); -// -// builder.addCollectionStrategy(Binder.CollectionStrategy.duplicate, CatchLonglineDto.PROPERTY_PREDATOR); -// -// return builder; -// -// } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jaxx ===================================== @@ -0,0 +1,78 @@ + + +<JPanel layout='{new BorderLayout()}' implements='org.nuiton.jaxx.runtime.bean.BeanScopeAware'> + + <import> + java.util.Calendar + java.util.Date + java.awt.BorderLayout + </import> + +  + <UnlimitedTimeEditorModel id='model'/> + +  + <SpinnerNumberModel id="hourModel" constructorParams="0, 0, 100, 1"/> + +  + <SpinnerNumberModel id="minuteModel" constructorParams="0, 0, 59, 1"/> + +  + <Boolean id='showReset' javaBean='false'/> + + <script><![CDATA[ +public void init() { handler.init(this); } + +@Override +public Object getBean() { return model.getBean(); } + +@Override +public void setBean(Object bean) { model.setBean(bean); } + +public void setPropertyTime(String property) { model.setPropertyTime(property); } + +public void setTime(Integer time) { model.setTime(time); } + +public void setLabel(String label) { timeLabel.setText(label); } + +public void reset() { handler.reset(); } +]]> + </script> + + <BeanValidator id='validator' autoField='true' bean='model'> + <field name='time' component='editorPanel'/> + </BeanValidator> + <JPanel id='leftPanel' constraints='BorderLayout.WEST' layout='{new BorderLayout()}'> + <JLabel id='timeLabel' constraints='BorderLayout.WEST'/> + <JToolBar id='toolbarReset' constraints='BorderLayout.CENTER'> + <JButton id='reset'/> + </JToolBar> + </JPanel> + <JPanel id='editorPanel' constraints='BorderLayout.EAST'> + <JSpinner id='hourEditor' onStateChanged='model.setHours((Integer)((JSpinner)event.getSource()).getValue())'/> + <JLabel id='labelH'/> + <JSpinner id='minuteEditor' onStateChanged='model.setMinutes((Integer)((JSpinner)event.getSource()).getValue())'/> + <JToolBar id="sliderHidorToolBar"/> + </JPanel> + +</JPanel> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditor.jcss ===================================== @@ -0,0 +1,69 @@ +/* + * #%L + * JAXX :: Widgets DateTime + * %% + * Copyright (C) 2008 - 2014 CodeLutin + * %% + * 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% + */ + +JToolBar { + borderPainted:false; + floatable:false; + focusable:false; + opaque:false; +} + +JButton { + borderPainted:false; + opaque:false; + focusable:false; +} + +#title { + horizontalAlignment:center; +} + +#hourModel { + value:{model.getHours()}; +} + +#hourEditor { + model:{hourModel}; + enabled:{isEnabled()}; +} + +#labelH { + text:"TimeEditor.H"; + horizontalAlignment:center; +} + +#minuteModel { + value:{model.getMinutes()}; +} + +#minuteEditor { + model:{minuteModel}; + enabled:{isEnabled()}; +} + +#toolbarReset { + visible:{isShowReset()}; +} + +#reset { + enabled:{isEnabled()}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorHandler.java ===================================== @@ -0,0 +1,82 @@ +package fr.ird.observe.client.ui.util.time; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2021 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.ui.util.time.actions.UnlimitedTimeEditorResetAction; +import io.ultreia.java4all.lang.Setters; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.jaxx.runtime.spi.UIHandler; +import org.nuiton.jaxx.widgets.MutateOnConditionalPropertyChangeListener; + +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.function.Predicate; + +/** + * Created on 20/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.6.7 + */ +public class UnlimitedTimeEditorHandler implements UIHandler<UnlimitedTimeEditor> { + + private static final Logger log = LogManager.getLogger(UnlimitedTimeEditorHandler.class); + private UnlimitedTimeEditor ui; + + @Override + public void afterInit(UnlimitedTimeEditor ui) { + this.ui = Objects.requireNonNull(ui); + UnlimitedTimeEditorResetAction.init(ui, ui.getReset(), UnlimitedTimeEditorResetAction.class); + } + + public void init(UnlimitedTimeEditor ui) { + log.debug(String.format("%s - init UnlimitedTimeEditor", ui.getName())); + UnlimitedTimeEditorModel model = ui.getModel(); + String property = model.getPropertyTime(); + if (property == null || property.isEmpty()) { + ui.setPropertyTime(ui.getName()); + } + ui.setEnabled(true); + Predicate<UnlimitedTimeEditorModel> predicate = model.canUpdateBeanValuePredicate(); + + Object bean = ui.getBean(); + if (property != null && bean != null) { + + Method mutator = Setters.getMutator(bean, property); + Objects.requireNonNull(mutator, "could not find mutator for " + property); + + // When model time date changed, let's push it back in bean + model.addPropertyChangeListener( + UnlimitedTimeEditorModel.PROPERTY_TIME, + new MutateOnConditionalPropertyChangeListener<>(model, mutator, predicate)); + } + } + + public void reset() { + ui.getHourEditor().setValue(0); + ui.getMinuteEditor().setValue(0); + ui.getModel().setTime(null); + } + +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/time/UnlimitedTimeEditorModel.java ===================================== @@ -0,0 +1,166 @@ +package fr.ird.observe.client.ui.util.time; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2021 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.common.base.Preconditions; +import io.ultreia.java4all.bean.AbstractJavaBean; +import org.nuiton.jaxx.widgets.ModelToBean; + +import java.util.function.Predicate; + +/** + * Created on 20/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.6.7 + */ +public class UnlimitedTimeEditorModel extends AbstractJavaBean implements ModelToBean { + + public static final String PROPERTY_TIME = "time"; + public static final String PROPERTY_HOURS = "hours"; + public static final String PROPERTY_MINUTES = "minutes"; + public static final String PROPERTY_VALUE_IS_ADJUSTING = "valueIsAdjusting"; + /** + * State to be able to custom the model. will be pass to {@code false} by the {@link UnlimitedTimeEditorHandler#init(UnlimitedTimeEditor)}. + */ + protected final boolean fillState = true; + /** + * Optional bean where to push back dates. + */ + protected Object bean; + /** + * Optional bean property where to push back the time date. + */ + protected String propertyTime; + /** + * Time in minutes. + */ + protected Integer time = null; + /** + * To stop propagate events when we are doing some modifications on the model. + */ + protected boolean valueIsAdjusting; + + public String getPropertyTime() { + return propertyTime; + } + + public void setPropertyTime(String propertyTime) { + Preconditions.checkState(fillState, "cant change *propertyTimeDate* property once the fillState is off."); + this.propertyTime = propertyTime; + } + + @Override + public Object getBean() { + return bean; + } + + public void setBean(Object bean) { + Preconditions.checkState(fillState, "cant change *bean* property once the fillState is off."); + this.bean = bean; + } + + public Integer getTime() { + return time; + } + + public void setTime(Integer time) { + if (!isValueIsAdjusting()) { + Integer oldHours = getHours(); + Integer oldMinutes = getMinutes(); + setTime(getHours(time), getMinutes(time)); + firePropertyChange(PROPERTY_HOURS, oldHours, getHours()); + firePropertyChange(PROPERTY_MINUTES, oldMinutes, getMinutes()); + } + } + + public int getHours() { + return getHours(time); + } + + public void setHours(Integer hour) { + if (!isValueIsAdjusting()) { + Integer oldValue = getHours(); + setTime(hour, getMinutes()); + firePropertyChange(PROPERTY_HOURS, oldValue, hour); + + } + } + + public int getMinutes() { + return getMinutes(time); + } + + public void setMinutes(Integer minutes) { + if (!isValueIsAdjusting()) { + Integer oldValue = getMinutes(); + setTime(getHours(), minutes); + firePropertyChange(PROPERTY_MINUTES, oldValue, minutes); + } + } + + public boolean isValueIsAdjusting() { + return valueIsAdjusting; + } + + public void setValueIsAdjusting(boolean valueIsAdjusting) { + boolean oldValue = isValueIsAdjusting(); + this.valueIsAdjusting = valueIsAdjusting; + fireValueIsAdjusting(oldValue); + } + + public int getHours(Integer time) { + return time == null ? 0 : time / 60; + } + + public int getMinutes(Integer time) { + return time == null ? 0 : time % 60; + } + + protected void setTime(Integer hour, Integer minute) { + Integer oldTime = getTime(); + setValueIsAdjusting(true); + try { + if (hour == null || minute == null) { + this.time = null; + } else { + this.time = hour * 60 + minute; + } + } finally { + setValueIsAdjusting(false); + fireTime(oldTime); + } + } + + protected void fireTime(Integer oldTime) { + firePropertyChange(PROPERTY_TIME, oldTime, getTime()); + } + + protected void fireValueIsAdjusting(boolean oldValue) { + firePropertyChange(PROPERTY_VALUE_IS_ADJUSTING, oldValue, isValueIsAdjusting()); + } + + protected Predicate<UnlimitedTimeEditorModel> canUpdateBeanValuePredicate() { + return input -> !isValueIsAdjusting(); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/time/actions/UnlimitedTimeEditorResetAction.java ===================================== @@ -0,0 +1,54 @@ +package fr.ird.observe.client.ui.util.time.actions; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2021 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.ui.util.time.UnlimitedTimeEditor; +import org.nuiton.jaxx.runtime.swing.SwingUtil; +import org.nuiton.jaxx.runtime.swing.action.JComponentActionSupport; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.n; + +/** + * Created on 20/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.6.7 + */ +public class UnlimitedTimeEditorResetAction extends JComponentActionSupport<UnlimitedTimeEditor> { + + public UnlimitedTimeEditorResetAction() { + super(null, n("DateTimeEditor.action.reset.tip"), "combobox-reset", SwingUtil.findKeyStroke("beancombobox.reset", "ctrl pressed D")); + } + + @Override + protected void doActionPerformed(ActionEvent e, UnlimitedTimeEditor ui) { + ui.reset(); + } + + @Override + public void init() { + defaultInit(ui.getInputMap(UnlimitedTimeEditor.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), ui.getActionMap()); + } +} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1,5 +1,6 @@ ClientConfig.description=ObServe configuration ObserveWebApplicationConfig.description=ObServe Web configuration +TimeEditor.H=H observe.action.about=About observe.action.about.tip=About ObServe... observe.action.admin.cancel=Cancel wizard ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1,5 +1,6 @@ ClientConfig.description=Configuración de ObServe ObserveWebApplicationConfig.description=Configuración de Observe web +TimeEditor.H=H observe.action.about=Acerca de observe.action.about.tip=Acerca de ObServe... observe.action.admin.cancel=Anular el asistente ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1,5 +1,6 @@ ClientConfig.description=Configuration d'ObServe ObserveWebApplicationConfig.description=Observe web Configuration +TimeEditor.H=H observe.action.about=À propos observe.action.about.tip=À propos d'ObServe... observe.action.admin.cancel=Annulation de l'assistant View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/117a98c11ab5df423cb400080… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/117a98c11ab5df423cb400080… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [LL][Observations] Horodatage hook timers par défaut - Closes #1625
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3276c422 by Tony Chemit at 2021-01-19T15:12:40+01:00 [LL][Observations] Horodatage hook timers par défaut - Closes #1625 Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754 Problème dans la gestion des onglets du formulaire 'Avançon' - Closes #1756 - - - - - 20 changed files: - client-core/src/main/i18n/getters/java.getter - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/BranchlineSetDefaultTimerTimeOnBoard.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/CatchSetDefaultTimerTimeOnBoard.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/SetDefaultTimerTimeOnBoard.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.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/SetLonglineCatchEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineDetailCompositionEntityDtoBinder.java Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -713,6 +713,7 @@ observe.content.map.west observe.converter.error.float.format observe.converter.error.no.convertor observe.converter.error.noValue +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip observe.entity.message.updating observe.error.can.not.create.directory observe.error.storage.could.not.backup.unsane.local.db ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/BranchlineSetDefaultTimerTimeOnBoard.java ===================================== @@ -0,0 +1,54 @@ +package fr.ird.observe.client.ui.actions.content; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2021 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.content.data.longline.BranchlineUI; +import fr.ird.observe.dto.data.longline.BranchlineDto; + +import java.util.Date; + +/** + * Created on 19/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.6.7 + */ +public class BranchlineSetDefaultTimerTimeOnBoard extends SetDefaultTimerTimeOnBoard<BranchlineUI> { + + public static final String ACTION_NAME = BranchlineSetDefaultTimerTimeOnBoard.class.getName(); + + public BranchlineSetDefaultTimerTimeOnBoard(ObserveMainUI mainUI) { + super(mainUI,ACTION_NAME); + } + + @Override + protected Date getHaulingStartTimeStamp(BranchlineUI ui) { + return ui.getModel().getHaulingStartTimeStamp(); + } + + @Override + protected BranchlineDto getBranchlineBean(BranchlineUI ui) { + return ui.getBean(); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/CatchSetDefaultTimerTimeOnBoard.java ===================================== @@ -0,0 +1,54 @@ +package fr.ird.observe.client.ui.actions.content; + +/*- + * #%L + * ObServe :: Client core + * %% + * Copyright (C) 2008 - 2021 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.content.data.longline.CatchLonglineUI; +import fr.ird.observe.dto.data.longline.BranchlineDto; + +import java.util.Date; + +/** + * Created on 19/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 7.6.7 + */ +public class CatchSetDefaultTimerTimeOnBoard extends SetDefaultTimerTimeOnBoard<CatchLonglineUI> { + + public static final String ACTION_NAME = CatchSetDefaultTimerTimeOnBoard.class.getName(); + + public CatchSetDefaultTimerTimeOnBoard(ObserveMainUI mainUI) { + super(mainUI,ACTION_NAME); + } + + @Override + protected Date getHaulingStartTimeStamp(CatchLonglineUI ui) { + return ui.getBean().getHaulingStartTimeStamp(); + } + + @Override + protected BranchlineDto getBranchlineBean(CatchLonglineUI ui) { + return ui.getBranchlineBean(); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/SetDefaultTimerTimeOnBoard.java ===================================== @@ -0,0 +1,58 @@ +package fr.ird.observe.client.ui.actions.content; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: LL + * %% + * Copyright (C) 2008 - 2021 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.ui.ObserveMainUI; +import fr.ird.observe.client.ui.content.ContentUI; +import fr.ird.observe.dto.data.longline.BranchlineDto; + +import javax.swing.KeyStroke; +import java.util.Date; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created on 15/01/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 8.0.3 + */ +abstract class SetDefaultTimerTimeOnBoard extends AbstractContentUIAction { + + SetDefaultTimerTimeOnBoard(ObserveMainUI mainUI, String actionName) { + super(mainUI, actionName, "", t("observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip"), "combobox-reset2", KeyStroke.getKeyStroke("alt pressed G")); + } + + protected abstract Date getHaulingStartTimeStamp(U ui); + + protected abstract BranchlineDto getBranchlineBean(U ui); + + @Override + protected void actionPerformed(ContentUI<?, ?> contentUI) { + U ui = (U) contentUI; + BranchlineDto branchlineBean = getBranchlineBean(ui); + Date haulingStartTimeStamp = getHaulingStartTimeStamp(ui); + branchlineBean.setTimerTimeOnBoard(haulingStartTimeStamp); + } +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jaxx ===================================== @@ -31,6 +31,7 @@ fr.ird.observe.dto.referential.longline.BaitSettingStatusReference fr.ird.observe.dto.referential.longline.HookSizeReference fr.ird.observe.dto.referential.longline.HookTypeReference + fr.ird.observe.client.ui.actions.content.BranchlineSetDefaultTimerTimeOnBoard fr.ird.observe.client.ui.util.JComment @@ -109,6 +110,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <JCheckBox id='depthRecorder' styleClass="i18n"/> <JCheckBox id='hookLost' styleClass="i18n"/> <JCheckBox id='traceCutOff' styleClass="i18n"/> + <JButton id='setDefaultTimerTimeOnBoard'/> </JPanel> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUI.jcss ===================================== @@ -68,7 +68,6 @@ } #timerTimeOnBoard { - enabled:{BooleanUtils.isTrue(bean.getTimer())}; date:{bean.getTimerTimeOnBoard()}; showTimeEditorSlider:false; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; @@ -145,3 +144,7 @@ property:{BranchlineDto.PROPERTY_BAIT_TYPE}; selectedItem:{bean.getBaitType()}; } + +#setDefaultTimerTimeOnBoard { + _observeAction:{BranchlineSetDefaultTimerTimeOnBoard.ACTION_NAME}; +} \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIHandler.java ===================================== @@ -110,6 +110,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto, Branchl getModel().addPropertyChangeListener(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, evt -> getUi().getValidator().setChanged(true)); + + ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); + ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); } public void edit(BranchlineDto branchline) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineUIModel.java ===================================== @@ -74,6 +74,7 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { private boolean hookAndBaitTabValid; private Date timeSinceContact; + private Date haulingStartTimeStamp; public BranchlineUIModel() { super(BranchlineDto.class); @@ -119,4 +120,13 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { firePropertyChange(PROPERTY_SAVED, null, true); } + public Date getHaulingStartTimeStamp() { + return haulingStartTimeStamp; + } + + public void setHaulingStartTimeStamp(Date haulingStartTimeStamp) { + Date oldValue = this.haulingStartTimeStamp; + this.haulingStartTimeStamp = haulingStartTimeStamp; + firePropertyChange("haulingStartTimeStamp", oldValue, haulingStartTimeStamp); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesTableModel.java ===================================== @@ -24,8 +24,6 @@ package fr.ird.observe.client.ui.content.data.longline; import fr.ird.observe.dto.data.longline.BranchlineDto; -import java.util.Date; - /** * Created on 12/11/14. * @@ -36,23 +34,16 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport< private static final long serialVersionUID = 1L; - protected Date defaultDate; - private boolean useTimer; public BranchlinesTableModel(LonglineDetailCompositionUIModel model) { super(model); } - public void setDefaultDate(Date defaultDate) { - this.defaultDate = defaultDate; - } - @Override public BranchlineDto createNewRow() { BranchlineDto branchline = new BranchlineDto(); - branchline.setTimerTimeOnBoard(defaultDate); branchline.setTimer(useTimer); return branchline; ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jaxx ===================================== @@ -49,6 +49,8 @@ fr.ird.observe.client.ui.util.BooleanEditor fr.ird.observe.client.ui.util.JComment + fr.ird.observe.client.ui.actions.content.CatchSetDefaultTimerTimeOnBoard + org.nuiton.jaxx.widgets.number.NumberEditor io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox org.nuiton.jaxx.widgets.select.FilterableDoubleList @@ -401,6 +403,7 @@ <JCheckBox id='depthRecorder'/> <JCheckBox id='hookLost'/> <JCheckBox id='traceCutOff'/> + <JButton id='setDefaultTimerTimeOnBoard'/> </JPanel> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUI.jcss ===================================== @@ -360,3 +360,7 @@ JCheckBox { actionIcon:"save"; enabled:{branchlineValidator.isChanged() && branchlineValidator.isValid()}; } + +#setDefaultTimerTimeOnBoard { + _observeAction:{CatchSetDefaultTimerTimeOnBoard.ACTION_NAME}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -235,6 +235,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat model.addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, evt -> ui.getBranchlineValidator().setChanged(true)); + ui.getTimerTimeOnBoard().getSliderHidorToolBar().setVisible(true); + ui.getTimerTimeOnBoard().getSliderHidorToolBar().add(ui.getSetDefaultTimerTimeOnBoard()); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/LonglineDetailCompositionUIHandler.java ===================================== @@ -383,6 +383,7 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong Form<BranchlineDto> branchlineDtoForm = Form.newFormDto(BranchlineDto.class, null); BranchlineUIModel branchlineUIModel = getUi().getBranchlineDetailUI().getModel(); + branchlineUIModel.setHaulingStartTimeStamp(bean.getHaulingStartTimeStamp()); // branchlineUIModel.setReferentialReferenceSets(getModel().getReferentialReferenceSets()); Optional<FormDefinition<BranchlineDto>> optionalFormDefinition = DtoModelHelper.getOptionalFormDefinition(BranchlineDto.class); @@ -390,11 +391,6 @@ public class LonglineDetailCompositionUIHandler extends ContentUIHandler<SetLong branchlineUIModel.setForm(branchlineDtoForm); - //FIXME Validate this default date - if (log.isInfoEnabled()) { - log.info("Use as default branchline timer date: " + bean.getSettingStartTimeStamp()); - } - getBranchlinesTableModel().setDefaultDate(bean.getSettingStartTimeStamp()); getBranchlinesTableModel().setUseTimer(BooleanUtils.isTrue(bean.getMonitored())); // by default, can generate if there is no section in database ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -49,6 +49,8 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer; import org.nuiton.jaxx.widgets.error.ErrorDialogUI; import org.nuiton.jaxx.widgets.file.JaxxFileChooser; +import javax.swing.AbstractButton; +import javax.swing.Action; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JOptionPane; @@ -697,4 +699,16 @@ public class UIHelper extends SwingUtil { editor.getInputMap() .put(KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), "none"); } + + public static void setAction(AbstractButton editor, Action action) { + String text = editor.getText(); + String toolTipText = editor.getToolTipText(); + editor.setAction(action); + if (text != null) { + editor.setText(text); + } + if (toolTipText != null) { + editor.setToolTipText(toolTipText); + } + } } ===================================== dto/src/main/models/Observe.model ===================================== @@ -266,13 +266,14 @@ lightsticksColor {*:0..1} fr.ird.observe.dto.referential.longline.LightsticksCol otherSets {*} data.longline.SetLonglineStub data.longline.SetLonglineCatch > data.Data >> data.longline.LonglinePositionSetDto | form=data.longline.CatchLongline +haulingStartTimeStamp + {*:1} Date catchLongline {*} data.longline.CatchLongline | ordered sections {*:*} fr.ird.observe.dto.data.longline.SectionReference baskets {*:*} fr.ird.observe.dto.data.longline.BasketReference branchlines {*:*} fr.ird.observe.dto.data.longline.BranchlineReference data.longline.SetLonglineDetailComposition > data.Data -settingStartTimeStamp + {*:1} Date +haulingStartTimeStamp + {*:1} Date monitored + {*:1} Boolean totalSectionsCount + {*:1} Integer | positiveNumber basketsPerSectionCount + {*:1} Integer | positiveNumber ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Please select a node in the navigation tree > observe.converter.error.float.format=Decimal format not correct for value %s observe.converter.error.no.convertor=could not convert decimal %s using convertor %s observe.converter.error.noValue=No value to convert using convertor %s +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Set hauling start timestamp observe.entity.message.updating=object '%1$s' is in editing mode. observe.error.DuplicateLengthLengthParameterException=Found multiple length length relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s observe.error.DuplicateLengthWeightParameterException=Found multiple length weight paramters for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Seleccione un nodo de conexión en el árbol d observe.converter.error.float.format=Formato de decimal incorrecto para el valor %s observe.converter.error.no.convertor=Impossible de convertir el decimal %s con el convertidor %s observe.converter.error.noValue=Ningún valor necesita ser convertida con el convertidor %s +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Set hauling start timestamp \#TODO observe.entity.message.updating=Se está modificando el objeto actual '%1$s'. observe.error.DuplicateLengthLengthParameterException=Found multiple length length relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO observe.error.DuplicateLengthWeightParameterException=Found multiple length weight relation for species\: %s, ocean\: %s, sex\: %s, date\: %s \:\n * %s \#TODO ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1950,6 +1950,7 @@ observe.content.selection.empty=< Veuillez sélectionner un nœud dans l'arbre d observe.converter.error.float.format=Format de décimal incorrecte pour la valeur %s observe.converter.error.no.convertor=Impossible de convertir le décimal %s depuis le convertisseur %s observe.converter.error.noValue=Aucune valeur à convertir pour le convertisseur %s +observe.data.ll.observation.Branchline.setDefaultTimerTimeOnBoard.tip=Utiliser l'horodatage de début de filage observe.entity.message.updating=L'objet '%1$s' est en cours de modification. observe.error.DuplicateLengthLengthParameterException=Plusieurs relations taille-taille ont été trouvées pour l'espèce\: %s, l'ocean\: %s, le sexe\: %s et la date\: %s \:\n * %s observe.error.DuplicateLengthWeightParameterException=Plusieurs relations taille-poids ont été trouvées pour l'espèce\: %s, l'ocean\: %s, le sexe\: %s et la date\: %s \:\n * %s ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineCatchEntityDtoBinder.java ===================================== @@ -54,6 +54,6 @@ public class SetLonglineCatchEntityDtoBinder extends DataEntityDtoBinderSupport< copyEntityDataFieldsToDto(entity, dto); dto.setCatchLongline(toListData(referentialLocale, entity.getCatchLongline())); - + dto.setHaulingStartTimeStamp(entity.getHaulingStartTimeStamp()); } } ===================================== persistence/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineDetailCompositionEntityDtoBinder.java ===================================== @@ -44,7 +44,6 @@ public class SetLonglineDetailCompositionEntityDtoBinder extends DataEntityDtoBi copyDtoDataFieldsToEntity(dto, entity); entity.setSection(toEntitySet(referentialLocale, dto.getSection(), entity.getSection())); - entity.setSettingStartTimeStamp(dto.getSettingStartTimeStamp()); entity.setMonitored(dto.getMonitored()); entity.setTotalSectionsCount(dto.getTotalSectionsCount()); entity.setBasketsPerSectionCount(dto.getBasketsPerSectionCount()); @@ -60,7 +59,7 @@ public class SetLonglineDetailCompositionEntityDtoBinder extends DataEntityDtoBi copyEntityDataFieldsToDto(entity, dto); dto.setSection(toLinkedHashSetData(referentialLocale, entity.getSection())); - dto.setSettingStartTimeStamp(entity.getSettingStartTimeStamp()); + dto.setHaulingStartTimeStamp(entity.getHaulingStartTimeStamp()); dto.setMonitored(entity.getMonitored()); dto.setTotalSectionsCount(entity.getTotalSectionsCount()); dto.setBasketsPerSectionCount(entity.getBasketsPerSectionCount()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3276c4226e5f155c092fe77f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3276c4226e5f155c092fe77f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 89d829f0 by 166231 at 2021-01-19T11:43:34+00:00 Site checkin for project ObServe - - - - - 7 changed files: - administration-web.html - architecture-logicielle.html - index.html - install-serverPG.html - install.html - referential-filter.html - synchro-referential.html Changes: ===================================== administration-web.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -103,7 +103,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0.3.log # logs de l'application + | `-- observeweb-8.0.4.log # logs de l'application |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== index.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== referential-filter.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">List of specialized referential filters used in GUI</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== synchro-referential.html ===================================== @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a>»</li> <li class="active ">Synchronisation avancée du référentiel</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-18</li> - <li id="projectVersion" class="pull-right">|Version: 8.0.3</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2021-01-19</li> + <li id="projectVersion" class="pull-right">|Version: 8.0.4</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/89d829f0ce7f420410b86fddb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/89d829f0ce7f420410b86fddb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0.4
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0.4
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

Tony CHEMIT pushed new tag v8.0.4 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v8.0.4 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0.4] [jgitflow-maven-plugin]updating poms for branch'release/8.0.4' with non-snapshot versions[skip ci]
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

Tony CHEMIT pushed to branch release/8.0.4 at ultreiaio / ird-observe Commits: 1c9cd2dd by Tony Chemit at 2021-01-19T11:21:15+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.4' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto-definition/pom.xml - models/dto/pom.xml - models/persistence/pom.xml - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/local-impl/pom.xml - services/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1c9cd2dd66825342b5c2e45a4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/1c9cd2dd66825342b5c2e45a4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 7 commits: [jgitflow-maven-plugin]updating poms for 8.0.4-SNAPSHOT development[skip ci]
by Tony CHEMIT Jan. 19, 2021

Jan. 19, 2021

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 2047abd0 by Tony Chemit at 2021-01-18T17:55:51+01:00 [jgitflow-maven-plugin]updating poms for 8.0.4-SNAPSHOT development[skip ci] - - - - - 399f5c00 by Tony Chemit at 2021-01-18T18:07:59+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 62ea5470 by Tony Chemit at 2021-01-18T18:07:59+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - b4631c03 by Tony Chemit at 2021-01-18T18:08:00+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - c0297045 by Tony Chemit at 2021-01-19T10:44:24+01:00 Problème de digit TargetLength.weight à 1 au lieu de 3 - Closes #1762 - - - - - 1c9cd2dd by Tony Chemit at 2021-01-19T11:21:15+01:00 [jgitflow-maven-plugin]updating poms for branch'release/8.0.4' with non-snapshot versions[skip ci] - - - - - 7123ab14 by Tony Chemit at 2021-01-19T11:32:01+01:00 [jgitflow-maven-plugin]merging 'release/8.0.4' into 'master' - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/dto-definition/pom.xml - models/dto/pom.xml - models/persistence/pom.xml - models/persistence/src/main/models/Observe-20-data-ps-observation.model - models/pom.xml - observe/pom.xml - pom.xml - server/configuration/pom.xml - server/core/pom.xml - server/i18n/pom.xml - server/pom.xml - server/runner/pom.xml - services/api/pom.xml - services/client-impl/pom.xml - services/i18n/pom.xml - services/local-impl/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa617bb3c87e0134e7bdfb6f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa617bb3c87e0134e7bdfb6f… You're receiving this email because of your account on gitlab.com.

1 0