[Git][ultreiaio/ird-observe][develop] 4 commits: Optimisation de l'arbre de sélection et navigation - See #1750 - Observe-commits

14 Jan 2021


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


Commits:
d28d1be5 by Tony Chemit at 2021-01-14T19:24:59+01:00
 Optimisation de l'arbre de sélection et navigation - See #1750
 Ne pas recharger l'apparence des fils du parent (ce n'est pas nécessaire)

- - - - -
3ffeb6ee by Tony Chemit at 2021-01-14T19:25:07+01:00
clean code

- - - - -
10362d83 by Tony Chemit at 2021-01-14T22:01:03+01:00
 Problème d'enregistrement sur avançon depuis le formulaire capture - Closes #1755

- - - - -
dbc89a2d by Tony Chemit at 2021-01-14T22:39:19+01:00
  Découplage case 'Horloge' et champ 'Horodatage de montée à bord' - Closes #1754

- - - - -


6 changed files:

- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeModeExecutor.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationNode.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/actions/SetCatchUISaveBranchline.java


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> {
             previousOpenedNode.refreshToRoot();
         }
         NavigationNode selectedNode = tree.getSelectedNode();
-        tree.getSelectedNode().nodeChanged(true, true);
+        selectedNode.nodeChanged(true, true);
         if (previousOpenedNode == null || !Objects.equals(previousOpenedNode.getParent(), selectedNode.getParent())) {
             selectedNode.getParent().refreshToRoot();
         }


=====================================
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
 
     public final void nodeChanged(boolean refreshFromParent, boolean refreshChildren) {
         if (refreshFromParent) {
-            getParent().nodeChanged(false, refreshChildren);
+            getParent().nodeChanged(false, false);
         }
         if (refreshChildren) {
             nodeChangedDeep();


=====================================
client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss
=====================================
@@ -136,12 +136,11 @@
 
 #timeSinceContact {
   enabled:{Objects.equals(true, branchlineBean.getTimer())};
-  showTimeEditorSlider:false;
+  _showTimeEditorSlider:false;
 }
 
 #timerTimeOnBoard {
-  enabled:{Objects.equals(true, branchlineBean.getTimer())};
-  showTimeEditorSlider:false;
+  _showTimeEditorSlider:false;
 }
 
 #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 {
                 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(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 {
     }
 
     public void setTimeSinceContact(Date timeSinceContact) {
-//        Date oldValue = getBranchlineTimeSinceContact();
+        Date oldValue = getTimeSinceContact();
         this.timeSinceContact = timeSinceContact;
-        firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, null, timeSinceContact);
+        firePropertyChange(PROPERTY_TIME_SINCE_CONTACT, oldValue, timeSinceContact);
     }
 
     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
 import fr.ird.observe.client.datasource.editor.ll.ObserveLLKeyStrokes;
 import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUI;
 import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModel;
+import fr.ird.observe.client.datasource.editor.ll.data.observation.SetCatchUIModelStates;
 import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
 import fr.ird.observe.dto.result.SaveResultDto;
 import org.apache.logging.log4j.LogManager;
@@ -54,23 +55,24 @@ public class SetCatchUISaveBranchline extends ContentUIActionSupport<SetCatchUI>
     protected void doActionPerformed(ActionEvent e, SetCatchUI ui) {
         SetCatchUIModel model = ui.getModel();
         String prefix = model.getPrefix();
-        log.info(prefix + "Saved modified branchline");
+        log.info(String.format("%sSaved modified branchline", prefix));
         BranchlineDto branchline = ui.getBranchlineBean();
+        SetCatchUIModelStates states = model.getStates();
         if (Objects.equals(true, branchline.getTimer())) {
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(model.getStates().getTimeSinceContact());
+            calendar.setTime(states.getTimeSinceContact());
             int minutes = calendar.get(Calendar.MINUTE);
             int hours = calendar.get(Calendar.HOUR_OF_DAY);
             branchline.setTimeSinceContact(minutes + 60L * hours);
         } else {
             branchline.setTimeSinceContact(null);
         }
-        log.debug(prefix + "Time since contact: " + branchline.getTimeSinceContact());
+        log.info(String.format("%sTime since contact to keep: %d", prefix, branchline.getTimeSinceContact()));
         SaveResultDto saveResult = getServicesProvider().getLlObservationBranchlineService().save(branchline);
         saveResult.toDto(branchline);
 
         // on recopie le last update car c'est le last update de Set qui est renvoyé.
-        model.getStates().getBean().setLastUpdateDate(saveResult.getLastUpdateDate());
+        states.getBean().setLastUpdateDate(saveResult.getLastUpdateDate());
         ui.getBranchlineValidator().setChanged(false);
     }
 }



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2462e0f4bd8e53079c81533c8...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2462e0f4bd8e53079c81533c8...
You're receiving this email because of your account on gitlab.com.

    

[Git][ultreiaio/ird-observe][develop] 4 commits: Optimisation de l'arbre de sélection et navigation - See #1750

Tony CHEMIT

tags

participants (1)