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

Commits:

5 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java
    ... ... @@ -36,6 +36,7 @@ import fr.ird.observe.client.ui.util.ProgressModel;
    36 36 
     import fr.ird.observe.dto.reference.DataDtoReference;
    37 37 
     import fr.ird.observe.dto.referential.common.ProgramReference;
    38 38 
     import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingConfig;
    39 
    +import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResult;
    39 40 
     import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingResultItem;
    40 41 
     import fr.ird.observe.services.service.data.ll.pairing.ActivityLonglinePairingService;
    41 42 
     import fr.ird.observe.services.service.data.ll.pairing.TripLonglinePairingResult;
    ... ... @@ -139,7 +140,9 @@ public class ActivityLonglinePairingUIHandler extends AdminTabUIHandler<Activity
    139 140 
             }
    140 141
    141 142 
             ui.getTable().openTable(rootNode);
    142 
    -        stepModel.setModified(false);
    143 
    +        rootNode.setValueAt(true,2);
    144 
    +
    145 
    +        stepModel.recomputeSelectedValues();
    143 146
    144 147 
             return WizardState.NEED_FIX;
    145 148 
         }

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java
    ... ... @@ -261,19 +261,26 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable {
    261 261 
                 TableCellRenderer renderer = objectRenderer;
    262 262
    263 263 
                 Object newValue = value;
    264 
    +            boolean enabled = true;
    264 265 
                 switch (column) {
    266 
    +                case 0:
    267 
    +                    enabled = node.isSelected();
    268 
    +                    break;
    265 269 
                     case 1:
    266 270 
                         if (node instanceof ActivityLonglinePairingActivityNode) {
    267 271 
                             ActivityLonglinePairingResultItem selectedValue = ((ActivityLonglinePairingActivityNode) node).getSelectedValue();
    268 272 
                             newValue = selectedValue == null ? "" : decorator.toString(selectedValue);
    269 273 
                         }
    274 
    +                    enabled = node.isSelected();
    270 275 
                         break;
    271 276 
                     case 2:
    272 277 
                         newValue = value == null ? null : Boolean.valueOf(String.valueOf(value));
    273 278 
                         renderer = booleanInclusiveRenderer;
    274 279 
                         break;
    275 280 
                 }
    276 
    -            return renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column);
    281 
    +            Component component = renderer.getTableCellRendererComponent(table, newValue, isSelected, hasFocus, row, column);
    282 
    +            component.setEnabled(enabled);
    283 
    +            return component;
    277 284 
             }
    278 285 
         }
    279 286
    ... ... @@ -294,7 +301,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable {
    294 301 
                 this.programDecorator = decoratorService.getReferentialReferenceDecorator(ProgramReference.class);
    295 302 
                 this.tripDecorator = decoratorService.getDataReferenceDecorator(TripLonglineReference.class);
    296 303 
                 this.activityDecorator = decoratorService.getDataReferenceDecorator(ActivityLonglineLogbookReference.class);
    297 
    -            this.programIcon = UIManager.getIcon("navigation.referential.Program");
    304 
    +            this.programIcon = UIManager.getIcon("navigation.referential.common.Program");
    298 305 
                 this.tripIcon = UIManager.getIcon("navigation.data.Trip");
    299 306 
                 this.activityIcon = UIManager.getIcon("navigation.data.Activity");
    300 307 
             }
    ... ... @@ -304,6 +311,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable {
    304 311 
                 ActivityLonglinePairingNodeSupport node = (ActivityLonglinePairingNodeSupport) value;
    305 312 
                 DtoReference valueAt = (DtoReference) node.getValueAt(0);
    306 313 
                 Icon icon = null;
    314 
    +            boolean enabled=node.isSelected();
    307 315 
                 if (value instanceof ActivityLonglinePairingProgramNode) {
    308 316 
                     value = programDecorator.toString(valueAt);
    309 317 
                     icon = programIcon;
    ... ... @@ -316,6 +324,7 @@ public class ActivityLonglinePairingTreeTable extends JXTreeTable {
    316 324 
                 }
    317 325 
                 Component treeCellRendererComponent = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
    318 326 
                 setIcon(icon);
    327 
    +            treeCellRendererComponent.setEnabled(enabled);
    319 328 
                 return treeCellRendererComponent;
    320 329 
             }
    321 330 
         }

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java
    ... ... @@ -60,7 +60,7 @@ public class ActivityLonglinePairingTreeTableModel extends DefaultTreeTableModel
    60 60
    61 61 
         @Override
    62 62 
         public boolean isCellEditable(Object node, int column) {
    63 
    -        return column == 2 || (column == 1 && node instanceof ActivityLonglinePairingActivityNode);
    63 
    +        return column == 2 || (column == 1 && node instanceof ActivityLonglinePairingActivityNode && (boolean) getValueAt(node, 2));
    64 64 
         }
    65 65
    66 66 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java
    ... ... @@ -37,9 +37,16 @@ public class ActivityLonglinePairingActivityNode extends ActivityLonglinePairing
    37 37
    38 38 
         private ActivityLonglinePairingResultItem selectedValue;
    39 39
    40 
    -    public ActivityLonglinePairingActivityNode(ActivityLonglinePairingResult userObject) {
    40 
    +    ActivityLonglinePairingActivityNode(ActivityLonglinePairingResult userObject) {
    41 41 
             super(Objects.requireNonNull(userObject), false);
    42 42 
             this.selectedValue = userObject.getRelatedObservedActivity();
    43 
    +        if (selectedValue == null || !userObject.getItems().isEmpty()) {
    44 
    +            ActivityLonglinePairingResultItem activityLonglinePairingResultItem = userObject.getItems().get(0);
    45 
    +//            setValueAt(activityLonglinePairingResultItem, 1);
    46 
    +            if (activityLonglinePairingResultItem.isDistanceValid() || activityLonglinePairingResultItem.isTimeValid()) {
    47 
    +                setValueAt(activityLonglinePairingResultItem, 1);
    48 
    +            }
    49 
    +        }
    43 50 
         }
    44 51
    45 52 
         @Override

  • client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/node/ActivityLonglinePairingRootNode.java
    ... ... @@ -41,6 +41,13 @@ public class ActivityLonglinePairingRootNode extends ActivityLonglinePairingNode
    41 41 
             return null;
    42 42 
         }
    43 43
    44 
    +    @Override
    45 
    +    public void setValueAt(Object aValue, int column) {
    46 
    +        if (column == 2) {
    47 
    +            applySelected((Boolean) aValue);
    48 
    +        }
    49 
    +    }
    50 
    +
    44 51 
         public List<ActivityLonglinePairingActivityNode> getSelectedNodes() {
    45 52 
             List<ActivityLonglinePairingActivityNode> result = new LinkedList<>();
    46 53 
             collectSelectedNodes(result);

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