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

Commits:

6 changed files:

Changes:

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java
    ... ... @@ -108,7 +108,7 @@ public class ChangeModeExecutor<U extends ContentUI> {
    108 108 
                 previousOpenedNode.refreshToRoot();
    109 109 
             }
    110 110 
             NavigationNode selectedNode = tree.getSelectedNode();
    111 
    -        tree.getSelectedNode().nodeChanged(true, true);
    111 
    +        selectedNode.nodeChanged(true, true);
    112 112 
             if (previousOpenedNode == null || !Objects.equals(previousOpenedNode.getParent(), selectedNode.getParent())) {
    113 113 
                 selectedNode.getParent().refreshToRoot();
    114 114 
             }

  • client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java
    ... ... @@ -340,7 +340,7 @@ public abstract class NavigationNode extends DefaultMutableTreeNode implements W
    340 340
    341 341 
         public final void nodeChanged(boolean refreshFromParent, boolean refreshChildren) {
    342 342 
             if (refreshFromParent) {
    343 
    -            getParent().nodeChanged(false, refreshChildren);
    343 
    +            getParent().nodeChanged(false, false);
    344 344 
             }
    345 345 
             if (refreshChildren) {
    346 346 
                 nodeChangedDeep();

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss
    ... ... @@ -136,12 +136,11 @@
    136 136
    137 137 
     #timeSinceContact {
    138 138 
       enabled:{Objects.equals(true, branchlineBean.getTimer())};
    139 
    -  showTimeEditorSlider:false;
    139 
    +  _showTimeEditorSlider:false;
    140 140 
     }
    141 141
    142 142 
     #timerTimeOnBoard {
    143 
    -  enabled:{Objects.equals(true, branchlineBean.getTimer())};
    144 
    -  showTimeEditorSlider:false;
    143 
    +  _showTimeEditorSlider:false;
    145 144 
     }
    146 145
    147 146 
     #branchlineActions {

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java
    ... ... @@ -285,7 +285,8 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler {
    285 285 
                     if (timeSinceContact != null) {
    286 286 
                         timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0);
    287 287 
                     }
    288 
    -            } else {
    288 
    +            }
    289 
    +            if (timeSinceContactDate == null) {
    289 290 
                     timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0);
    290 291 
                 }
    291 292 
                 log.info(String.format("%s Set time since contact: %s", prefix, timeSinceContactDate));

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java
    ... ... @@ -119,9 +119,9 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates {
    119 119 
         }
    120 120
    121 121 
         public void setTimeSinceContact(Date timeSinceContact) {
    122 
    -//        Date oldValue = getBranchlineTimeSinceContact();
    122 
    +        Date oldValue = getTimeSinceContact();
    123 123 
             this.timeSinceContact = timeSinceContact;
    124 
    -        firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, null, timeSinceContact);
    124 
    +        firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, oldValue, timeSinceContact);
    125 125 
         }
    126 126
    127 127 
         public void resetPosition(CatchDto dto) {

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/actions/SetCatchUISaveBranchline.java
    ... ... @@ -26,6 +26,7 @@ import fr.ird.observe.client.datasource.editor.api.content.actions.ContentUIActi
    26 26 
     import fr.ird.observe.client.datasource.editor.ll.ObserveLLKeyStrokes;
    27 27 
     import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI;
    28 28 
     import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModel;
    29 
    +import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModelStates;
    29 30 
     import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
    30 31 
     import fr.ird.observe.dto.result.SaveResultDto;
    31 32 
     import org.apache.logging.log4j.LogManager;
    ... ... @@ -54,23 +55,24 @@ public class SetCatchUISaveBranchline extends ContentUIActionSupport<SetCatchUI>
    54 55 
         protected void doActionPerformed(ActionEvent e, SetCatchUI ui) {
    55 56 
             SetCatchUIModel model = ui.getModel();
    56 57 
             String prefix = model.getPrefix();
    57 
    -        log.info(prefix + "Saved modified branchline");
    58 
    +        log.info(String.format("%sSaved modified branchline", prefix));
    58 59 
             BranchlineDto branchline = ui.getBranchlineBean();
    60 
    +        SetCatchUIModelStates states = model.getStates();
    59 61 
             if (Objects.equals(true, branchline.getTimer())) {
    60 62 
                 Calendar calendar = Calendar.getInstance();
    61 
    -            calendar.setTime(model.getStates().getTimeSinceContact());
    63 
    +            calendar.setTime(states.getTimeSinceContact());
    62 64 
                 int minutes = calendar.get(Calendar.MINUTE);
    63 65 
                 int hours = calendar.get(Calendar.HOUR_OF_DAY);
    64 66 
                 branchline.setTimeSinceContact(minutes + 60L * hours);
    65 67 
             } else {
    66 68 
                 branchline.setTimeSinceContact(null);
    67 69 
             }
    68 
    -        log.debug(prefix + "Time since contact: " + branchline.getTimeSinceContact());
    70 
    +        log.info(String.format("%sTime since contact to keep: %d", prefix, branchline.getTimeSinceContact()));
    69 71 
             SaveResultDto saveResult = getServicesProvider().getLlObservationBranchlineService().save(branchline);
    70 72 
             saveResult.toDto(branchline);
    71 73
    72 74 
             // on recopie le last update car c'est le last update de Set qui est renvoyé.
    73 
    -        model.getStates().getBean().setLastUpdateDate(saveResult.getLastUpdateDate());
    75 
    +        states.getBean().setLastUpdateDate(saveResult.getLastUpdateDate());
    74 76 
             ui.getBranchlineValidator().setChanged(false);
    75 77 
         }
    76 78 
     }

    • —
    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.