Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

2 changed files:

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;
    68 68 
     import org.nuiton.jaxx.validator.swing.SwingValidator;
    69 69 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
    70 70 
     import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
    71 
    -import org.nuiton.jaxx.widgets.datetime.TimeEditor;
    72 71 
     import org.nuiton.util.DateUtil;
    73 72 
     import org.nuiton.validator.NuitonValidatorScope;
    74 73
    ... ... @@ -823,7 +822,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
    823 822 
             }
    824 823
    825 824 
             //tchemit-20191104 there is a bug on time editor, need to reset by hand the hour and minute editor
    826 
    -        reset(ui.getTimeSinceContact());
    825 
    +        ui.getTimeSinceContact().reset();
    827 826
    828 827 
             CatchLonglineUI ui = getUi();
    829 828
    ... ... @@ -862,7 +861,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
    862 861 
                     if (timeSinceContact != null) {
    863 862 
                         timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0);
    864 863 
                     }
    865 
    -            } else {
    864 
    +            }
    865 
    +            if (timeSinceContactDate == null) {
    866 866 
                     timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0);
    867 867 
                 }
    868 868 
                 log.info("Set time since contact: " + timeSinceContactDate);
    ... ... @@ -874,12 +874,6 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat
    874 874
    875 875 
         }
    876 876
    877 
    -    private void reset(TimeEditor ui) {
    878 
    -        ui.getHourEditor().setValue(new Date(0));
    879 
    -        ui.getMinuteEditor().setValue(new Date(0));
    880 
    -        ui.getModel().setTime(null);
    881 
    -    }
    882 
    -
    883 877 
         private void onDepredatedChanged(Boolean newValue, CatchLonglineDto tableEditBean) {
    884 878
    885 879 
             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
    194 194 
         }
    195 195
    196 196 
         public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) {
    197 
    -//        Date oldValue = getBranchlineTimeSinceContact();
    197 
    +        Date oldValue = getBranchlineTimeSinceContact();
    198 198 
             this.branchlineTimeSinceContact = branchlineTimeSinceContact;
    199 
    -        firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, null, branchlineTimeSinceContact);
    199 
    +        firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, oldValue, branchlineTimeSinceContact);
    200 200
    201 201 
         }
    202 202

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.