GitLab

at 2023-02-14T11:12:55+01:00

Sur le formulaire Captures, le champs méthode de mesure de poids doit être accessible uniquement si le poids est renseigné et non calculé - Closes #2627

   _focusComponent:{species};

 }

 

+#weightMeasureMethod {

+  enabled: {tableEditBean.getCatchWeight() != null && tableEditBean.getCatchWeightComputedSource() == null};

+}
             CatchDto source = (CatchDto) evt.getSource();

             source.setTotalCountComputedSource(null);

         };

-        catchWeightChanged = evt -> {

-            CatchDto source = (CatchDto) evt.getSource();

-            source.setCatchWeightComputedSource(null);

-        };

+        catchWeightChanged = evt -> onWeightChanged((Float) evt.getNewValue(), !ui.getStates().isResetEdit());

         meanWeightChanged = evt -> {

             CatchDto source = (CatchDto) evt.getSource();

             source.setMeanWeightComputedSource(null);

 

     @Override

     protected void onSelectedRowChanged(SetCatchUI ui, int editingRow, CatchDto tableEditBean, CatchDto previousRowBean, boolean notPersisted, boolean newRow) {

+

         super.onSelectedRowChanged(ui, editingRow, tableEditBean, previousRowBean, notPersisted, newRow);

 

         tableEditBean.removePropertyChangeListener(CatchDto.PROPERTY_TOTAL_COUNT, totalCountChanged);

         // No specific message

         return null;

     }

+

+    protected void onWeightChanged(Float newValue, boolean realChange) {

+        CatchDto tableEditBean = getTableEditBean();

+        if (realChange) {

+            tableEditBean.setCatchWeightComputedSource(null);

+        }

+        if (newValue == null) {

+            tableEditBean.setWeightMeasureMethod(null);

+        }

+    }

 }

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

Commits:

2 changed files:

Changes: