Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f714c30e by Tony Chemit at 2023-07-22T12:37:15+02:00 Fix Amélioration sur les deux formulaires de l'utilisation des champs fpa (See #2740) - - - - - 2 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java ===================================== @@ -66,12 +66,12 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { bean.removePropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); bean.removePropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); onOriginalDataModifiedChanged(bean.isOriginalDataModified()); + onFpaZoneChanged(bean.isChangedZoneOperation()); super.startEditUI(); bean.addPropertyChangeListener(ActivityDto.PROPERTY_ORIGINAL_DATA_MODIFIED, originalDataModifiedChanged); bean.addPropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); TripDto trip = getClientValidationContext().getCurrentPsCommonTrip(); getModel().getStates().setNumberEnabled(Objects.requireNonNull(trip.getActivitiesAcquisitionMode()).isByNumber()); - onFpaZoneChanged(bean.isChangedZoneOperation()); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java ===================================== @@ -65,9 +65,9 @@ public class ActivityUIHandler extends GeneratedActivityUIHandler { public void startEditUI() { ActivityDto bean = getModel().getStates().getBean(); bean.removePropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); + onFpaZoneChanged(bean.isChangedZoneOperation()); super.startEditUI(); bean.addPropertyChangeListener(ActivityDto.PROPERTY_CHANGED_ZONE_OPERATION, fpaZoneChangedChanged); - onFpaZoneChanged(bean.isChangedZoneOperation()); } void onFpaZoneChanged(boolean newValue) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f714c30e25ce61d969ed269bf8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f714c30e25ce61d969ed269bf8... You're receiving this email because of your account on gitlab.com.