- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 3 commits: L'ajout d'une caractéristique d'équipement plante - Closes #1516
by Tony CHEMIT 29 Jun '20

29 Jun '20

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/3b49578350849a8311258b59… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3b49578350849a8311258b59… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: L'ajout d'une caractéristique d'équipement plante - Closes #1516
by Tony CHEMIT 29 Jun '20

29 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daeeb76a by Tony Chemit at 2020-06-29T08:27:27+02:00 L'ajout d'une caractéristique d'équipement plante - Closes #1516 - - - - - 3b495783 by Tony Chemit at 2020-06-29T08:30:09+02:00 LL Observations / Echec d'enregistrement d'une capture - Closes #1519 - - - - - 4 changed files: - 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/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/GearUseFeaturesUIHandler.java Changes: ===================================== 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/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/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()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e94d30f6384c72165b201cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7e94d30f6384c72165b201cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 14 commits: Ajout d'une méthode de mesure de poids par défaut sur Estimations du banc - Closes #1510
by Tony CHEMIT 29 Jun '20

29 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3a5e6544 by Tony Chemit at 2020-06-29T08:10:32+02:00 Ajout d'une méthode de mesure de poids par défaut sur Estimations du banc - Closes #1510 - - - - - 9cb86fc5 by Tony Chemit at 2020-06-29T08:10:34+02:00 Renommer un onglet sur form Marée LL - Closes #1521 - - - - - c63f7620 by Tony Chemit at 2020-06-29T08:10:34+02:00 LL Observations / Capture / déprédation : libellé - Closes #1520 [LL][Logbook] opération de pêche / libellé - Closes #1526 - - - - - 45ad272d by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Logbooks] Besoin de pouvoir mettre les horodatages à NULL - Closes #1523 - - - - - 93bef350 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL Logbook Activity] Revoir finement l'activité observée associée à une activité logbook - See #1551 - - - - - 609bb0d3 by Tony Chemit at 2020-06-29T08:10:34+02:00 Revoir les barres de progressions - Closes #1417 - - - - - 576e1632 by Tony Chemit at 2020-06-29T08:10:34+02:00 Try a new RC and use stable toolkit - - - - - eb6c6450 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - 6595086f by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Echantillon logbook] Cosmétique échantillon dans l'arbre - Closes #1535 - - - - - 34c2f432 by Tony Chemit at 2020-06-29T08:10:34+02:00 [LL][Logbooks] Form Opération de pêche / Capture : champs actifs en fonction du mode de saisie - Closes #1534 - - - - - 24116d14 by Tony Chemit at 2020-06-29T08:10:34+02:00 [CALCULS] L'assistant calculs bloque après la sélection des marées - Closes #1547 - - - - - 52cdc0e1 by Tony Chemit at 2020-06-29T08:10:34+02:00 update changelog [skip ci] - - - - - cba750bc by Tony Chemit at 2020-06-29T08:10:34+02:00 Add a fixme to be done - - - - - 7e94d30f by Tony Chemit at 2020-06-29T08:10:34+02:00 Libellés référentiels - Closes #1509 - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/util/ProgressModel.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jcss - client-datasource-editor-ps/pom.xml - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIModel.java - client-runner/pom.xml - dto-spi/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e13843a4985bacf13fa2bbd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4e13843a4985bacf13fa2bbd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Libellés référentiels - Closes #1509
by Tony CHEMIT 29 Jun '20

29 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e13843a by Tony Chemit at 2020-06-29T08:06:35+02:00 Libellés référentiels - Closes #1509 - - - - - 3 changed files: - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -784,7 +784,7 @@ observe.data.Data.endDate=End date observe.data.Data.haulingIdentifier=Hauling identifier observe.data.Data.hookLost=Hook lost observe.data.Data.landingHarbour=Landing harbour -observe.data.Data.lengthMeasureMethod=Length measure method +observe.data.Data.lengthMeasureMethod=Size measure type observe.data.Data.message.historical.data=Historical data (can be closed, even if not valid) observe.data.Data.observer=Observer observe.data.Data.program=Program @@ -797,7 +797,7 @@ observe.data.Data.timerTimeOnBoard=Time on board observe.data.Data.traceCutOff=Trace cut off observe.data.Data.type=<html><body>Data of type %s observe.data.Data.vessel=Vessel -observe.data.Data.weightMeasureMethod=Weight measure method +observe.data.Data.weightMeasureMethod=Weight measure type observe.data.Openable.action.closeAndCreate=Close and create observe.data.Openable.action.closeAndCreate.tip=Close current element and create a new one observe.data.Openable.action.reopen=Re-open @@ -2459,8 +2459,8 @@ observe.referential.common.LengthLengthParameter.sex=Sex observe.referential.common.LengthLengthParameter.startDate=Start date observe.referential.common.LengthLengthParameter.type=Length length parameter observe.referential.common.LengthLengthParameter.types=Length length parameters -observe.referential.common.LengthMeasureMethod.type=Length measure method -observe.referential.common.LengthMeasureMethod.types=Length measure methods +observe.referential.common.LengthMeasureMethod.type=Size measure type +observe.referential.common.LengthMeasureMethod.types=Size measure types observe.referential.common.LengthWeightParameter.coefficients=Coefficients observe.referential.common.LengthWeightParameter.endDate=End date observe.referential.common.LengthWeightParameter.generalTab=General caracteristics @@ -2589,8 +2589,8 @@ observe.referential.common.VesselSizeCategory.type=Vessel size category observe.referential.common.VesselSizeCategory.types=Vessel size categories observe.referential.common.VesselType.type=Vessel type observe.referential.common.VesselType.types=Vessel types -observe.referential.common.WeightMeasureMethod.type=Weight measure method -observe.referential.common.WeightMeasureMethod.types=Weight measure methods +observe.referential.common.WeightMeasureMethod.type=Weight measure type +observe.referential.common.WeightMeasureMethod.types=Weight measure types observe.referential.common.WeightMeasureType.type=Weight measure type observe.referential.common.WeightMeasureType.types=Weight measure types observe.referential.common.Wind.speedRange=Speed range ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -784,7 +784,7 @@ observe.data.Data.endDate=Fecha de fin observe.data.Data.haulingIdentifier=Arrastre observe.data.Data.hookLost=Anzuelo erdido observe.data.Data.landingHarbour=Puerto de desembarque -observe.data.Data.lengthMeasureMethod=Méthode de mesure de taille \#TODO +observe.data.Data.lengthMeasureMethod=Método de medición del tamaño observe.data.Data.message.historical.data=Datos históricos (puede cerrarse incluso sin validar) observe.data.Data.observer=Observador observe.data.Data.program=Programa @@ -797,7 +797,7 @@ observe.data.Data.timerTimeOnBoard=Timestamp de subida a bordo observe.data.Data.traceCutOff=Bajo de línea cortada observe.data.Data.type=<html><body>Dato de tipo %s observe.data.Data.vessel=Buque -observe.data.Data.weightMeasureMethod=Méthode de mesure de poids \#TODO +observe.data.Data.weightMeasureMethod=Método de medición de peso observe.data.Openable.action.closeAndCreate=Cerrar y crear observe.data.Openable.action.closeAndCreate.tip=Cierre el elemento activo y crear un nuevo observe.data.Openable.action.reopen=Reabrir @@ -2459,8 +2459,8 @@ observe.referential.common.LengthLengthParameter.sex=Sexo observe.referential.common.LengthLengthParameter.startDate=Fecha de comienzo observe.referential.common.LengthLengthParameter.type=Relación Tamaño-Tamaño observe.referential.common.LengthLengthParameter.types=Relaciones Tamaño-Tamaño -observe.referential.common.LengthMeasureMethod.type=Méthode d'estimation de taille \#TODO -observe.referential.common.LengthMeasureMethod.types=Méthodes d'estimation de taille \#TODO +observe.referential.common.LengthMeasureMethod.type=Método de medición del tamaño +observe.referential.common.LengthMeasureMethod.types=Método de medición del tamaño observe.referential.common.LengthWeightParameter.coefficients=Coeficientes observe.referential.common.LengthWeightParameter.endDate=Fecha de fin observe.referential.common.LengthWeightParameter.generalTab=Características generales @@ -2589,8 +2589,8 @@ observe.referential.common.VesselSizeCategory.type=Categoría de buque observe.referential.common.VesselSizeCategory.types=Categorías de buque observe.referential.common.VesselType.type=Tipo de pesquería observe.referential.common.VesselType.types=Tipos de pesquería -observe.referential.common.WeightMeasureMethod.type=Méthode d'estimation de poids \#TODO -observe.referential.common.WeightMeasureMethod.types=Méthodes d'estimation de poids \#TODO +observe.referential.common.WeightMeasureMethod.type=Método de medición de peso +observe.referential.common.WeightMeasureMethod.types=Método de medición de peso observe.referential.common.WeightMeasureType.type=Tipo de medida de peso observe.referential.common.WeightMeasureType.types=Tipos de medida de peso observe.referential.common.Wind.speedRange=Texto velocidad del viento ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -2459,8 +2459,8 @@ observe.referential.common.LengthLengthParameter.sex=Sexe observe.referential.common.LengthLengthParameter.startDate=Début de validité observe.referential.common.LengthLengthParameter.type=Relation Taille-Taille observe.referential.common.LengthLengthParameter.types=Relations Taille-Taille -observe.referential.common.LengthMeasureMethod.type=Méthode d'estimation de taille -observe.referential.common.LengthMeasureMethod.types=Méthodes d'estimation de taille +observe.referential.common.LengthMeasureMethod.type=Méthode de mesure de taille +observe.referential.common.LengthMeasureMethod.types=Méthodes de mesure de taille observe.referential.common.LengthWeightParameter.coefficients=Coefficients observe.referential.common.LengthWeightParameter.endDate=Fin de validité observe.referential.common.LengthWeightParameter.generalTab=Caractéristiques générales @@ -2589,8 +2589,8 @@ observe.referential.common.VesselSizeCategory.type=Catégorie de bateau observe.referential.common.VesselSizeCategory.types=Catégories de bateau observe.referential.common.VesselType.type=Type de pêcherie observe.referential.common.VesselType.types=Types de pêcherie -observe.referential.common.WeightMeasureMethod.type=Méthode d'estimation de poids -observe.referential.common.WeightMeasureMethod.types=Méthodes d'estimation de poids +observe.referential.common.WeightMeasureMethod.type=Méthode de mesure de poids +observe.referential.common.WeightMeasureMethod.types=Méthodes de mesure de poids observe.referential.common.WeightMeasureType.type=Type de mesure de poids observe.referential.common.WeightMeasureType.types=Types de mesure de poids observe.referential.common.Wind.speedRange=Libellé vitesse vent View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4e13843a4985bacf13fa2bbd2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4e13843a4985bacf13fa2bbd2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update changelog [skip ci]
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f94b5b2f by Tony Chemit at 2020-06-27T20:02:45+02:00 update changelog [skip ci] - - - - - 29fb236f by Tony Chemit at 2020-06-27T20:02:58+02:00 Add a fixme to be done - - - - - 2 changed files: - CHANGELOG.md - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2020-06-22 19:14. + * Last generated at 2020-06-27 20:02. ## Version [8.0-RC-7](https://gitlab.com/ultreiaio/ird-observe/milestones/161) ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -39,6 +39,7 @@ import java.util.Comparator; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.3 */ +//FIXME This should not be a application component, but just something, somewhere else!!! @GenerateApplicationComponent( name = "Decoration service", dependencies = ReferentialLocaleConfig.class View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/eaed2fad340b9f7dcb181fb0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/eaed2fad340b9f7dcb181fb0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [CALCULS] L'assistant calculs bloque après la sélection des marées - Closes #1547
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: eaed2fad by Tony Chemit at 2020-06-27T19:54:57+02:00 [CALCULS] L'assistant calculs bloque après la sélection des marées - Closes #1547 - - - - - 1 changed file: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.decoration.DecoratorService; -import fr.ird.observe.dto.decoration.DecoratorServiceApplicationComponent; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.EntityHelper; @@ -54,6 +53,7 @@ import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.SchoolType; import fr.ird.observe.entities.referential.ps.common.SpeciesFate; import fr.ird.observe.entities.referential.ps.observation.ObjectMaterial; +import fr.ird.observe.services.local.ObserveServiceContextLocal; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; @@ -143,6 +143,13 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements } return ImmutableMap.copyOf(mappingBuilder); } + private DecoratorService decoratorService; + + @Override + public void setServiceContext(ObserveServiceContextLocal serviceContext) { + super.setServiceContext(serviceContext); + decoratorService = new DecoratorService(ConsolidateDataServiceLocal.this::getReferentialLocale); + } @Override public ConsolidateTripSeineDataResult consolidateTripSeine(SimplifiedObjectTypeSpecializedRules simplifiedObjectTypeSpecializedRules, ConsolidateTripSeineDataRequest request) { @@ -154,7 +161,6 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements SimplifiedObjectTypeManager simplifiedObjectTypeManager = newSimplifiedObjectTypeManager(simplifiedObjectTypeSpecializedRules); FloatingObjectConsolidateEngine floatingObjectConsolidateEngine = new FloatingObjectConsolidateEngine(simplifiedObjectTypeManager); - DecoratorService decoratorService = DecoratorServiceApplicationComponent.value(); Optional<ConsolidateTripSeineDataResult> consolidateTripSeineDataResult = consolidateTripSeine(decoratorService,referenceLocale, floatingObjectConsolidateEngine, request.getTripSeineId(), failIfLengthWeightParameterNotFound, failIfLengthLengthParameterNotFound); return consolidateTripSeineDataResult.orElse(null); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaed2fad340b9f7dcb181fb04… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/eaed2fad340b9f7dcb181fb04… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbooks] Form Opération de pêche / Capture : champs actifs en fonction...
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03b6f290 by Tony Chemit at 2020-06-27T19:16:58+02:00 [LL][Logbooks] Form Opération de pêche / Capture : champs actifs en fonction du mode de saisie - Closes #1534 - - - - - 1 changed file: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/CatchUIHandler.java ===================================== @@ -236,27 +236,24 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto, switch (newMode) { case GROUPED: if (createMode) { -// editBean.setTotalWeight(null); -// editBean.setWeightMeasureMethod(null); editBean.setCount(null); editBean.setTagNumber(null); + editBean.setNumber(null); } break; case INDIVIDUAL: if (createMode) { - editBean.setTotalWeight(null); - editBean.setWeightMeasureMethod(null); - - // on positionne le count à 1 (seule valeur possible) + // This is the only possible value editBean.setCount(1); } break; } boolean isGrouped = CatchAcquisitionMode.GROUPED.equals(newMode); - ui.getTotalWeight().setEnabled(isGrouped); - ui.getWeightMeasureMethod().setEnabled(isGrouped); + boolean isIndividual = !isGrouped; ui.getCount().setEnabled(isGrouped); + ui.getNumber().setEnabled(isIndividual); + ui.getTagNumber().setEnabled(isIndividual); } private void setTableModelCreate(Boolean oldValue, Boolean newValue) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03b6f2906654cd95c61c33113… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03b6f2906654cd95c61c33113… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: Ajout d'une méthode de mesure de poids par défaut sur Estimations du banc - Closes #1510
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f736a354 by Tony Chemit at 2020-06-27T18:27:25+02:00 Ajout d'une méthode de mesure de poids par défaut sur Estimations du banc - Closes #1510 - - - - - 2e8717c1 by Tony Chemit at 2020-06-27T18:27:31+02:00 Renommer un onglet sur form Marée LL - Closes #1521 - - - - - e41538d4 by Tony Chemit at 2020-06-27T18:27:31+02:00 LL Observations / Capture / déprédation : libellé - Closes #1520 [LL][Logbook] opération de pêche / libellé - Closes #1526 - - - - - 5c0ba0a2 by Tony Chemit at 2020-06-27T18:27:31+02:00 [LL][Logbooks] Besoin de pouvoir mettre les horodatages à NULL - Closes #1523 - - - - - 8528bf81 by Tony Chemit at 2020-06-27T18:27:31+02:00 [LL Logbook Activity] Revoir finement l'activité observée associée à une activité logbook - See #1551 - - - - - dc0ef653 by Tony Chemit at 2020-06-27T18:27:31+02:00 Revoir les barres de progressions - Closes #1417 - - - - - fa53931f by Tony Chemit at 2020-06-27T18:27:31+02:00 Try a new RC and use stable toolkit - - - - - 32e47ce5 by Tony Chemit at 2020-06-27T18:27:45+02:00 [LL] Appairement des activités : cosmétique - Closes #1537 - - - - - 0c5211fd by Tony Chemit at 2020-06-27T18:55:23+02:00 [LL][Echantillon logbook] Cosmétique échantillon dans l'arbre - Closes #1535 - - - - - 30 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/util/ProgressModel.java - client-datasource-actions/pom.xml - client-datasource-actions/src/main/i18n/getters/java.getter - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/ActivityLonglinePairingTreeTableModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client-datasource-editor-api/pom.xml - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java - client-datasource-editor-common/pom.xml - client-datasource-editor-ll/pom.xml - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jcss - client-datasource-editor-ps/pom.xml - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIModel.java - client-runner/pom.xml - dto-spi/pom.xml - dto/pom.xml - dto/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/280e3b1a6ca5e0b77a200220… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/280e3b1a6ca5e0b77a200220… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [LL Logbook Activity] Revoir finement l'activité observée associée à une...
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fc1319fd by Tony Chemit at 2020-06-27T17:57:42+02:00 [LL Logbook Activity] Revoir finement l'activité observée associée à une activité logbook - See #1551 - - - - - 280e3b1a by Tony Chemit at 2020-06-27T17:58:42+02:00 Revoir les barres de progressions - Closes #1417 - - - - - 19 changed files: - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/util/ProgressModel.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java - dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReference.java - dto/src/main/models/Observe-31-data-ll-logbook.model - pom.xml - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingEngine.java - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResult.java - services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.api; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListenerAdapter; +import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; @@ -44,7 +45,6 @@ import io.ultreia.java4all.application.context.spi.GenerateApplicationComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.swing.DefaultBoundedRangeModel; import java.io.Closeable; import java.io.File; import java.util.ArrayList; @@ -217,7 +217,7 @@ public class ObserveDataSourcesManager implements Closeable { try { //FIXME:BodyContent Review progress model, not linked to ui any more... if (getProgressModel() == null) { - setProgressModel(new DefaultBoundedRangeModel()); + setProgressModel(new ProgressModel()); } create(createDto); } catch (IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { ===================================== client-core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.configuration.WithClientConfig; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceEvent; import fr.ird.observe.client.datasource.api.event.ObserveSwingDataSourceListener; import fr.ird.observe.client.datasource.dcp.FloatingObjectPresetsManager; +import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.ObserveUtil; @@ -115,7 +116,7 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple private final Icon icon; private final ObserveServiceMainFactory serviceFactory; private ObserveDataSourceConnection connection; - private BoundedRangeModel progressModel; + private ProgressModel progressModel; // indique que la connexion a expiré mais que la source n'est pas complétement fermer private boolean expired; @@ -606,11 +607,11 @@ public class ObserveSwingDataSource extends ObserveServicesProviderSupport imple return servicesProvider.getService(serviceType); } - public BoundedRangeModel getProgressModel() { + public ProgressModel getProgressModel() { return progressModel; } - public void setProgressModel(BoundedRangeModel progressModel) { + public void setProgressModel(ProgressModel progressModel) { this.progressModel = progressModel; } ===================================== client-core/src/main/java/fr/ird/observe/client/util/ProgressModel.java ===================================== @@ -38,4 +38,7 @@ public class ProgressModel extends DefaultBoundedRangeModel { progressBar.setModel(this); } + public void increments() { + setValue(getValue() + 1); + } } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java ===================================== @@ -203,17 +203,17 @@ public abstract class AdminTabUIActionSupport extends JCom public WizardState prepareCopy(ProgressModel progressModel, ObserveSwingDataSource centralSource, String centralSourceLabel, ObserveSwingDataSource targetSource, String targetSourceLabel, Collection<String> idsToCopy) { - progressModel.setExtent(1); + progressModel.increments(); ReferentialService targetReferentialService = targetSource.getReferentialService(); ImmutableSetStringMap targetSourceReferential = targetReferentialService.getReferentialIds(); MissingReferentialRequest missingReferentialRequest = MissingReferentialRequest.of(targetSourceReferential, idsToCopy.toArray(new String[0])); MissingReferentialResult missingReferentialResult = centralSource.getReferentialService().computeMissingReferential(missingReferentialRequest); - progressModel.setExtent(1); + progressModel.increments(); if (missingReferentialResult == null) { - progressModel.setExtent(1); + progressModel.increments(); return WizardState.SUCCESSED; } @@ -250,7 +250,7 @@ public abstract class AdminTabUIActionSupport extends JCom sendMessage(t("observe.actions.exportData.message.add.missing.referential", decorator.toString(reference))); } } - progressModel.setExtent(1); + progressModel.increments(); targetReferentialService.insertMissingReferential(missingReferentialResult.getSqlCode()); return WizardState.SUCCESSED; } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java ===================================== @@ -100,7 +100,7 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> { ImmutableSet.Builder<ConsolidateTripSeineDataResult> resultsBuilder = ImmutableSet.builder(); for (String tripId : tripIds) { - progressModel.setExtent(1); + progressModel.increments(); sendMessage(t("observe.actions.consolidate.start.trip", ++index, nbTrips, tripId)); ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); @@ -131,7 +131,7 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> { ObserveUtil.cleanMemory(); } - progressModel.setExtent(1); + progressModel.increments(); ImmutableSet<ConsolidateTripSeineDataResult> results = resultsBuilder.build(); if (results.isEmpty()) { ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.java ===================================== @@ -94,12 +94,12 @@ public class Start extends ExportUIActionSupport { progressModel.setValue(0); - progressModel.setExtent(1); + progressModel.increments(); try (ObserveSwingDataSource localDataSource = openSource(stepModel.getSource())) { TripManagementService localTripManagementService = localDataSource.getTripManagementService(); - progressModel.setExtent(1); + progressModel.increments(); try (ObserveSwingDataSource centralDataSource = openSource(stepModel.getCentralSource())) { TripManagementService centralTripManagementService = centralDataSource.getTripManagementService(); @@ -113,7 +113,7 @@ public class Start extends ExportUIActionSupport { for (TripEntry tripEntry : tripEntries) { - progressModel.setExtent(1); + progressModel.increments(); ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.trip"), @@ -123,7 +123,7 @@ public class Start extends ExportUIActionSupport { tripEntry.getProgram(), tripEntry.getTrip()); - progressModel.setExtent(1); + progressModel.increments(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = centralTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.trip"), @@ -138,7 +138,7 @@ public class Start extends ExportUIActionSupport { } } - progressModel.setExtent(1); + progressModel.increments(); sendMessage(t("observe.actions.operation.message.done", new Date())); ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/actions/Prepare.java ===================================== @@ -105,7 +105,7 @@ public class Prepare extends ActivityLonglinePairingUIActionSupport { log.info(sendMessage(String.format("[Program %d/%d - Trip %d/%d] Found %d logbook activities.", programIndex, nbProgram, tripIndex, nbTrip, tripLonglinePairingResult.getItems().size()))); ActivityLonglinePairingTripNode activityLonglinePairingTripNode = new ActivityLonglinePairingTripNode(tripLonglinePairingResult); activityLonglinePairingProgramNode.add(activityLonglinePairingTripNode); - progressModel.setExtent(1); + progressModel.increments(); } } ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/longline/pairing/tree/node/ActivityLonglinePairingActivityNode.java ===================================== @@ -39,7 +39,7 @@ public class ActivityLonglinePairingActivityNode extends ActivityLonglinePairing ActivityLonglinePairingActivityNode(ActivityLonglinePairingResult userObject) { super(Objects.requireNonNull(userObject), false); - this.selectedValue = userObject.getRelatedObservedActivity(); + this.selectedValue = userObject.getSelectedRelatedObservedActivity(); if (selectedValue == null && !userObject.getItems().isEmpty()) { ActivityLonglinePairingResultItem activityLonglinePairingResultItem = userObject.getItems().get(0); setValueAt(activityLonglinePairingResultItem, 1); ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java ===================================== @@ -141,7 +141,7 @@ public class Apply extends DataSynchroUIActionSupport { TripAware trip = task.getTrip(); - progressModel.setExtent(1); + progressModel.increments(); if (task instanceof DeleteFromLeftDataSynchronizeTask) { executeDeleteTask(programDecorator, program, trip, @@ -223,7 +223,7 @@ public class Apply extends DataSynchroUIActionSupport { program, trip); - progressModel.setExtent(1); + progressModel.increments(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); ImportTripResult importTripResult = targetTripManagementService.importTrip(importTripRequest); logImportResult(n("observe.actions.synchro.data.result.import.trip"), ===================================== client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java ===================================== @@ -183,7 +183,7 @@ public class Start extends ValidateUIActionSupport { request.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); request.setValidationDisabledReferential(config.getValidationUseDisabledReferential()); - progressModel.setExtent(1); + progressModel.increments(); result = validateService.validateReferential(request); @@ -218,7 +218,7 @@ public class Start extends ValidateUIActionSupport { //noinspection unchecked sendMessage(t("observe.actions.validate.message.validate.trip", getDecoratorService().getDataReferenceDecorator((Class) dataReference.getReferenceType()).toString(dataReference))); - progressModel.setExtent(1); + progressModel.increments(); result = validateService.validateData(request); resultBuilder.addMessages(result.getData()); @@ -229,7 +229,7 @@ public class Start extends ValidateUIActionSupport { } else throw new IllegalStateException(); - progressModel.setExtent(1); + progressModel.increments(); dataSourceToValidate.close(); stepModel.setValidationResult(result); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorBodyContent.java ===================================== @@ -39,6 +39,7 @@ import fr.ird.observe.client.datasource.editor.menu.actions.ShowDataSourcePreset import fr.ird.observe.client.main.ObserveMainUI; import fr.ird.observe.client.main.body.HideBodyContentNotAcceptedException; import fr.ird.observe.client.main.body.MainUIBodyContent; +import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.busy.BusyModel; import fr.ird.observe.navigation.model.edit.ObserveEditModel; @@ -49,7 +50,6 @@ import io.ultreia.java4all.util.SingletonSupplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import javax.swing.BoundedRangeModel; import java.beans.PropertyChangeListener; import java.util.Set; import java.util.function.Supplier; @@ -143,7 +143,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi log.info(String.format("loading ui for storage %s: %s", dataSource.getLabel(), mainUI)); - BoundedRangeModel progressModel = dataSource.getProgressModel(); + ProgressModel progressModel = dataSource.getProgressModel(); ObserveEditModel navigationEditModel = null; try { @@ -180,7 +180,7 @@ public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEdi get().getHandler().loadNavigationUI(dataSource, progressModel); - progressModel.setExtent(1); + progressModel.increments(); } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java ===================================== @@ -33,9 +33,9 @@ import fr.ird.observe.client.datasource.editor.tree.navigation.NavigationTreeMod import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.client.datasource.editor.tree.navigation.nodes.StringNavigationTreeNodeSupport; -import fr.ird.observe.client.main.MainUIModel; import fr.ird.observe.client.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.client.util.ObserveValidatorMessageTableRenderer; +import fr.ird.observe.client.util.ProgressModel; import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.client.util.busy.BusyModel; import fr.ird.observe.client.util.session.WithObserveSwingSessionHelper; @@ -49,7 +49,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; -import javax.swing.BoundedRangeModel; import javax.swing.SwingUtilities; import javax.swing.event.TreeSelectionEvent; import javax.swing.tree.TreePath; @@ -251,13 +250,13 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit * @param servicesProvider services provider to load navigation model * @param progressModel the progress model to interact with ui */ - public void loadNavigationUI(ObserveServicesProvider servicesProvider, BoundedRangeModel progressModel) { + public void loadNavigationUI(ObserveServicesProvider servicesProvider, ProgressModel progressModel) { NavigationTree tree = ui.getNavigationUI().getTree(); NavigationTreeModel treeModel = tree.getModel(); treeModel.populate(servicesProvider); - progressModel.setExtent(1); + progressModel.increments(); // select initial node try { @@ -265,7 +264,7 @@ public class DataSourceEditorHandler implements UIHandler<DataSourceEditor>, Wit } catch (Exception e) { log.error("Could not load initial node", e); } - progressModel.setExtent(1); + progressModel.increments(); tree.setVisible(true); ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/wizard/StorageBackupUILauncher.java ===================================== @@ -158,11 +158,11 @@ public class StorageBackupUILauncher extends StorageUILauncher { ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId()); ExportTripResult exportTripResult = managementService.exportTrip(exportRequest); - progressModel.setExtent(1); + progressModel.increments(); ImportTripRequest importTripRequest = new ImportTripRequest(exportTripResult); tmpManagementService.importTrip(importTripRequest); - progressModel.setExtent(1); + progressModel.increments(); } @@ -175,13 +175,13 @@ public class StorageBackupUILauncher extends StorageUILauncher { } sourceToBackup.getDataSourceService().backup(backupFile); - progressModel.setExtent(1); + progressModel.increments(); } catch (DatabaseNotFoundException | DatabaseConnexionNotAuthorizedException | BabModelVersionException | IncompatibleDataSourceCreateConfigurationException | DataSourceCreateWithNoReferentialImportException e) { throw new ObserveSwingTechnicalException(e); } finally { - progressModel.setExtent(1); + progressModel.increments(); if (sourceToBackup != localSource) { sourceToBackup.close(); } ===================================== dto/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityReference.java ===================================== @@ -34,8 +34,8 @@ public class ActivityReference extends GeneratedActivityReference { private transient GPSPoint gpsPoint; - public ActivityReference(DtoReferenceAware dto, Date startTimeStamp, Date endTimeStamp, Float latitude, Float longitude, String vesselActivityId, String vesselActivityLabel, SetReference set, SampleReference sample, String activityId) { - super(dto, startTimeStamp, endTimeStamp, latitude, longitude, vesselActivityId, vesselActivityLabel, set, sample, activityId); + public ActivityReference(DtoReferenceAware dto, Date startTimeStamp, Date endTimeStamp, Float latitude, Float longitude, String vesselActivityId, String vesselActivityLabel, SetReference set, SampleReference sample, fr.ird.observe.dto.data.ll.observation.ActivityReference activity) { + super(dto, startTimeStamp, endTimeStamp, latitude, longitude, vesselActivityId, vesselActivityLabel, set, sample, activity); } public ActivityReference(DtoReferenceAware dto) { ===================================== dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -20,7 +20,7 @@ longitude + {*:1} Float quadrant + {*:1} Integer samplePart + {*} fr.ird.observe.dto.data.ll.logbook.SamplePartDto | ordered -data.ll.logbook.Activity > data.Openable >> data.ActivityAware | references=startTimeStamp,endTimeStamp,latitude,longitude,vesselActivityId,vesselActivityLabel,set,sample,relatedObservedActivityId +data.ll.logbook.Activity > data.Openable >> data.ActivityAware | references=startTimeStamp,endTimeStamp,latitude,longitude,vesselActivityId,vesselActivityLabel,set,sample,relatedObservedActivity startTimeStamp + {*:1} Date | notNull endTimeStamp + {*:1} Date | mayNotNull latitude + {*:1} Float | mayNotNull ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.34</version> + <version>2020.35</version> </parent> <groupId>fr.ird.observe</groupId> @@ -162,15 +162,15 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>4.33</lib.version.toolkit> + <lib.version.toolkit>4.34-SNAPSHOT</lib.version.toolkit> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <lib.version.h2>1.4.196</lib.version.h2> <lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>  -  - <lib.version.java4all.jaxx>3.0-alpha-72-SNAPSHOT</lib.version.java4all.jaxx> + +    ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingEngine.java ===================================== @@ -33,10 +33,8 @@ import fr.ird.observe.services.service.data.ll.logbook.ActivityService; import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.Set; -import java.util.concurrent.TimeUnit; /** * Created by tchemit on 15/10/2018. @@ -74,7 +72,7 @@ public class ActivityLonglinePairingEngine { ImmutableList<ActivityReference> activityLonglineObsList = context.getActivityLonglineObsList(activityLonglineLogbook); List<ActivityLonglinePairingResultItem> itemBuilder = new ArrayList<>(activityLonglineObsList.size()); for (ActivityReference activityLonglineObs : activityLonglineObsList) { - itemBuilder.add(toActivityResultItem(activityLonglineLogbook, activityLonglineObs)); + itemBuilder.add(ActivityLonglinePairingResultItem.create(activityLonglineLogbook, activityLonglineObs)); } itemBuilder.sort(ActivityLonglinePairingResult.COMPARATOR); fr.ird.observe.dto.data.ll.logbook.ActivityReference reference; @@ -86,12 +84,4 @@ public class ActivityLonglinePairingEngine { return new ActivityLonglinePairingResult(reference, ImmutableList.copyOf(itemBuilder)); } - private ActivityLonglinePairingResultItem toActivityResultItem(ActivityAware activityLonglineLogbook, ActivityReference activityLonglineObsReference) { - Date logbookTimeStamp = activityLonglineLogbook.getTimeStamp(); - Date obsTimeStamp = activityLonglineObsReference.getTimeStamp(); - long computedTime = TimeUnit.MINUTES.convert(logbookTimeStamp.getTime() - obsTimeStamp.getTime(), TimeUnit.MILLISECONDS); - double computedDistance = activityLonglineLogbook.getGPSPoint().getDistanceInKm(activityLonglineObsReference.getGPSPoint()); - return new ActivityLonglinePairingResultItem(activityLonglineObsReference, computedTime, computedDistance); - } - } ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResult.java ===================================== @@ -40,18 +40,21 @@ public class ActivityLonglinePairingResult implements ObserveDto { private final ActivityReference activityLonglineLogbook; private final ImmutableList<ActivityLonglinePairingResultItem> items; + private final ActivityLonglinePairingResultItem selectedRelatedObservedActivity; public ActivityLonglinePairingResult(ActivityReference activityLonglineLogbook, ImmutableList<ActivityLonglinePairingResultItem> items) { this.activityLonglineLogbook = Objects.requireNonNull(activityLonglineLogbook); this.items = Objects.requireNonNull(items); + fr.ird.observe.dto.data.ll.observation.ActivityReference relatedObservedActivity = activityLonglineLogbook.getRelatedObservedActivity(); + selectedRelatedObservedActivity = relatedObservedActivity == null + ? null + : items.stream().filter(s -> relatedObservedActivity.equals(s.getObservationActivity())) + .findFirst() + .orElse(ActivityLonglinePairingResultItem.create(activityLonglineLogbook, relatedObservedActivity)); } - public ActivityLonglinePairingResultItem getRelatedObservedActivity() { - String relatedObservedActivityId = activityLonglineLogbook.getRelatedObservedActivityId(); - if (relatedObservedActivityId != null) { - return items.stream().filter(s -> relatedObservedActivityId.equals(s.getObservationActivity().getId())).findFirst().orElseThrow(IllegalStateException::new); - } - return null; + public ActivityLonglinePairingResultItem getSelectedRelatedObservedActivity() { + return selectedRelatedObservedActivity; } public ActivityReference getActivityLonglineLogbook() { ===================================== services/src/main/java/fr/ird/observe/services/service/data/ll/pairing/ActivityLonglinePairingResultItem.java ===================================== @@ -22,10 +22,12 @@ package fr.ird.observe.services.service.data.ll.pairing; * #L% */ +import fr.ird.observe.dto.data.ActivityAware; import fr.ird.observe.dto.data.ll.observation.ActivityReference; import fr.ird.observe.dto.spi.SimpleDto; import io.ultreia.java4all.lang.Numbers; +import java.util.Date; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -43,7 +45,15 @@ public class ActivityLonglinePairingResultItem implements SimpleDto { private final float computedDistance; private String computedTimeStr; - public ActivityLonglinePairingResultItem(ActivityReference observationActivity, long computedTime, double computedDistance) { + public static ActivityLonglinePairingResultItem create(ActivityAware activityLonglineLogbook, ActivityReference activityLonglineObsReference) { + Date logbookTimeStamp = activityLonglineLogbook.getTimeStamp(); + Date obsTimeStamp = activityLonglineObsReference.getTimeStamp(); + long computedTime = TimeUnit.MINUTES.convert(logbookTimeStamp.getTime() - obsTimeStamp.getTime(), TimeUnit.MILLISECONDS); + double computedDistance = activityLonglineLogbook.getGPSPoint().getDistanceInKm(activityLonglineObsReference.getGPSPoint()); + return new ActivityLonglinePairingResultItem(activityLonglineObsReference, computedTime, computedDistance); + } + + protected ActivityLonglinePairingResultItem(ActivityReference observationActivity, long computedTime, double computedDistance) { this.observationActivity = observationActivity; this.computedTime = computedTime; this.computedDistance = Numbers.roundTwoDigits((float) computedDistance); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf70909191a2513dc7a2cdb9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bf70909191a2513dc7a2cdb9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL][Logbooks] Besoin de pouvoir mettre les horodatages à NULL - Closes #1523
by Tony CHEMIT 27 Jun '20

27 Jun '20

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf709091 by Tony Chemit at 2020-06-27T11:30:07+02:00 [LL][Logbooks] Besoin de pouvoir mettre les horodatages à NULL - Closes #1523 - - - - - 3 changed files: - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jcss - pom.xml Changes: ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivityUI.jcss ===================================== @@ -20,6 +20,10 @@ * #L% */ +DateTimeEditor { + showReset:true; +} + #body { layout:{new BorderLayout()}; } @@ -36,7 +40,6 @@ #endTimeStamp { propertyDayDate:{ActivityUIModel.PROPERTY_END_DATE}; propertyTimeDate:{ActivityUIModel.PROPERTY_END_TIME}; - showReset:true; } #coordinate { ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jcss ===================================== @@ -20,6 +20,10 @@ * #L% */ +DateTimeEditor { + showReset:true; +} + #extraActions { visible:{!model.isReadingMode()}; } ===================================== pom.xml ===================================== @@ -170,7 +170,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-72-SNAPSHOT</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf70909191a2513dc7a2cdb9a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf70909191a2513dc7a2cdb9a… You're receiving this email because of your account on gitlab.com.

1 0