Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 96d93595 by Tony Chemit at 2021-01-14T21:47:56+01:00 Souci de gestion sur 12h du champ 'Temps depuis déclenchement' - Closes #1757 - - - - - b2148594 by Tony Chemit at 2021-01-14T21:57:38+01:00 Problème d'enregistrement sur avançon depuis le formulaire capture - Closes #1755 - - - - - 2 changed files: - 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 Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIHandler.java ===================================== @@ -68,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.jaxx.widgets.datetime.TimeEditor; import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; @@ -823,7 +822,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } //tchemit-20191104 there is a bug on time editor, need to reset by hand the hour and minute editor - reset(ui.getTimeSinceContact()); + ui.getTimeSinceContact().reset(); CatchLonglineUI ui = getUi(); @@ -862,7 +861,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat if (timeSinceContact != null) { timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); } - } else { + } + if (timeSinceContactDate == null) { timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); } log.info("Set time since contact: " + timeSinceContactDate); @@ -874,12 +874,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } - private void reset(TimeEditor ui) { - ui.getHourEditor().setValue(new Date(0)); - ui.getMinuteEditor().setValue(new Date(0)); - ui.getModel().setTime(null); - } - private void onDepredatedChanged(Boolean newValue, CatchLonglineDto tableEditBean) { CatchLonglineUI ui = getUi(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineUIModel.java ===================================== @@ -194,9 +194,9 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt } public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) { -// Date oldValue = getBranchlineTimeSinceContact(); + Date oldValue = getBranchlineTimeSinceContact(); this.branchlineTimeSinceContact = branchlineTimeSinceContact; - firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, null, branchlineTimeSinceContact); + firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, oldValue, branchlineTimeSinceContact); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/be2566afad69329438f199823... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/be2566afad69329438f199823... You're receiving this email because of your account on gitlab.com.