Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 87301103 by Tony Chemit at 2020-06-29T08:40:43+02:00 L'ajout d'une caractéristique d'équipement plante - Closes #1516 - - - - - 1e710af4 by Tony Chemit at 2020-06-29T08:51:57+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 - - - - - 35d8e24e by Tony Chemit at 2020-06-29T09:44:03+02:00 Amélioration de l'onglet Sauvegarde (Actions longues) - Closes #1555 - - - - - 13 changed files: - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jcss - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/ChooseBackupDirectory.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/SelectDoBackup.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BasketTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java Changes: ===================================== client-datasource-actions/src/main/i18n/getters/java.getter ===================================== @@ -12,7 +12,6 @@ observe.action.config.export.required.write.data observe.action.continue observe.action.copy observe.action.copy.to.clipBoard -observe.action.do.backup observe.action.do.backup.tip observe.action.goto.next.stage observe.action.goto.next.stage.tip ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jcss ===================================== @@ -56,7 +56,7 @@ enabled:{stepModel.isDoBackup()}; } -#chooseBackupFile { +#chooseBackupDirectory { enabled:{stepModel.isDoBackup()}; } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/ChooseBackupDirectory.java ===================================== @@ -35,7 +35,7 @@ public class ChooseBackupDirectory extends SaveLocalUIActionSupport { public ChooseBackupDirectory() { - super(t("observe.action.continue"), t("observe.action.continue"), "fileChooser", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_CHOOSE_FILE); + super("", t("observe.action.choose.db.dump.directory"), "fileChooser", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_CHOOSE_FILE); } @Override @@ -46,6 +46,8 @@ public class ChooseBackupDirectory extends SaveLocalUIActionSupport { t("observe.action.choose.db.dump.directory"), new File(ui.getDirectoryText().getText()) ); - ui.getHandler().changeDirectory(f); + if (f != null) { + ui.getHandler().changeDirectory(f); + } } } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/save/actions/SelectDoBackup.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.actions.save.actions; * #L% */ +import fr.ird.observe.client.datasource.actions.save.SaveLocalModel; import fr.ird.observe.client.datasource.actions.save.SaveLocalUI; import fr.ird.observe.client.util.ObserveKeyStrokesSupport; @@ -32,11 +33,13 @@ import static io.ultreia.java4all.i18n.I18n.t; public class SelectDoBackup extends SaveLocalUIActionSupport { public SelectDoBackup() { - super(t("observe.action.do.backup"), t("observe.action.do.backup.tip"), null, ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_BACKUP); + super(t("observe.action.do.backup.tip"), t("observe.action.do.backup.tip"), "save", ObserveKeyStrokesSupport.KEY_STROKE_STORAGE_DO_BACKUP); } @Override protected void doActionPerformed(ActionEvent e, SaveLocalUI ui) { - ui.getStepModel().setDoBackup(ui.getStepModel().isDoBackup()); + SaveLocalModel stepModel = ui.getStepModel(); + boolean newValue = !stepModel.isDoBackup(); + stepModel.setDoBackup(newValue); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesMeasurementsTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.common; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.referential.common.GearCaracteristicReference; +import java.util.Date; + /** * Created on 4/7/15. * @@ -134,6 +137,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach @Override protected GearUseFeaturesMeasurementDto createNewRow() { - return new GearUseFeaturesMeasurementDto(); + return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/GearUseFeaturesUIHandler.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ll.common.TripGearUseFeaturesDto; @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -319,7 +321,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementLonglineDto = new GearUseFeaturesMeasurementDto(); + GearUseFeaturesMeasurementDto measurementLonglineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); measurementLonglineDto.setGearCaracteristic(input); if (input.getGearCaracteristicType().isBoolean()) { measurementLonglineDto.setMeasurementValue(Boolean.FALSE.toString()); ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BasketTableModel.java ===================================== @@ -22,9 +22,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.BasketDto; import fr.ird.observe.dto.data.ll.observation.SectionTemplate; +import java.util.Date; + /** * Created on 12/11/14. * @@ -40,7 +43,7 @@ public class BasketTableModel extends LonglineCompositionObsTableModelSupport<Ba @Override public BasketDto createNewRow() { - return new BasketDto(); + return IdDto.newDto(BasketDto.class, new Date()); } @Override ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineTableModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; * #L% */ +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import java.util.Date; @@ -49,7 +50,7 @@ public class BranchlineTableModel extends LonglineCompositionObsTableModelSuppor @Override public BranchlineDto createNewRow() { - BranchlineDto branchline = new BranchlineDto(); + BranchlineDto branchline = IdDto.newDto(BranchlineDto.class, new Date()); branchline.setTimerTimeOnBoard(defaultDate); branchline.setTimer(useTimer); return branchline; ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SizeMeasureTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto; import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; +import java.util.Date; + /** * Created on 12/3/14. * @@ -48,6 +51,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo @Override protected boolean isRowValid(SizeMeasureDto valid) { Float size = valid.getSize(); + //FIXME This is a hardcoded validation ? return !(valid.getSizeMeasureType() == null || size == null) && size > 0 && size < 1000; } @@ -97,7 +101,7 @@ public class SizeMeasureTableModel extends EditableTableWithCacheTableModelSuppo @Override protected SizeMeasureDto createNewRow() { - return new SizeMeasureDto(); + return IdDto.newDto(SizeMeasureDto.class, new Date()); } } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/WeightMeasureTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ll.observation; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto; import fr.ird.observe.dto.referential.common.WeightMeasureTypeReference; +import java.util.Date; + /** * Created on 12/3/14. * @@ -48,12 +51,13 @@ public class WeightMeasureTableModel extends EditableTableWithCacheTableModelSup @Override public boolean isRowValid(WeightMeasureDto valid) { Float weight = valid.getWeight(); + //FIXME This is a hardcoded validation ? return !(valid.getWeightMeasureType() == null || weight == null) && weight > 0 && weight < 1000; } @Override protected WeightMeasureDto createNewRow() { - return new WeightMeasureDto(); + return IdDto.newDto(WeightMeasureDto.class, new Date()); } @Override ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesMeasurementsTableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.common; */ import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableWithCacheTableModelSupport; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.referential.common.GearCaracteristicReference; +import java.util.Date; + /** * Created on 4/7/15. * @@ -129,6 +132,6 @@ public class GearUseFeaturesMeasurementsTableModel extends EditableTableWithCach @Override protected GearUseFeaturesMeasurementDto createNewRow() { - return new GearUseFeaturesMeasurementDto(); + return IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); } } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/GearUseFeaturesUIHandler.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUILayoutFocusTraversalPolicy; import fr.ird.observe.client.datasource.editor.content.ui.table.EditableTableModelSupport; import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesDto; import fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto; import fr.ird.observe.dto.data.ps.common.TripGearUseFeaturesDto; @@ -55,6 +56,7 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -152,7 +154,7 @@ public class GearUseFeaturesUIHandler extends ContentTableUIHandler<TripGearUseF return gearDto.getGearCaracteristic().stream() .map(input -> { - GearUseFeaturesMeasurementDto measurementSeineDto = new GearUseFeaturesMeasurementDto(); + GearUseFeaturesMeasurementDto measurementSeineDto = IdDto.newDto(GearUseFeaturesMeasurementDto.class, new Date()); if (input.getGearCaracteristicType().isBoolean()) { measurementSeineDto.setMeasurementValue(Boolean.FALSE.toString()); } ===================================== client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java ===================================== @@ -338,7 +338,7 @@ public class FloatingObjectUIHandler extends ContentEditUIHandler<FloatingObject if (transmittingBuoy == null) { - TransmittingBuoyHelper.copyTransmittingBuoyDto(new TransmittingBuoyDto(), editBean); + TransmittingBuoyHelper.copyTransmittingBuoyDto(TransmittingBuoyDto.newDto(TransmittingBuoyDto.class, new Date()), editBean); editBean.setCreateDate(new Date()); editBean.setTransmittingBuoyOperation(operation); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b49578350849a8311258b595... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b49578350849a8311258b595... You're receiving this email because of your account on gitlab.com.