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

[Git][ultreiaio/ird-observe][develop] 3 commits: [i18n] quelques améliorations demandées - See #2907#note_2097858285
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1029f6c9 by Tony Chemit at 2024-09-13T15:06:00+02:00 [i18n] quelques améliorations demandées - See #2907#note_2097858285 - - - - - 38d521fa by Tony Chemit at 2024-09-13T15:06:05+02:00 [client] use a default weight measure method in create mode - See #2907 - - - - - 98d9ac32 by Tony Chemit at 2024-09-13T15:17:36+02:00 [services-test] update report fixtures (tck was changed) - - - - - 15 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleMeasures.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSet.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasures.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasuresCount.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties Changes: ===================================== client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -224,15 +224,12 @@ observe.data.ll.observation.Set.monitored observe.data.ll.observation.Set.number observe.data.ll.observation.Set.settingCharacteristicsTab observe.data.ll.observation.Set.settingTab -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.generateTab observe.data.ll.observation.SetDetailComposition.hookAndBaitTab observe.data.ll.observation.SetDetailComposition.noBranchlineSelected -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.templateInformation observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab observe.data.ll.observation.SetGlobalComposition.branchlinesCompositionTab ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -261,6 +261,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { editBean.setSection(null); editBean.setBasket(null); editBean.setBranchline(null); + editBean.setWeightMeasureMethod(ui.getModel().getStates().getDefaultWeightMeasureMethod()); } break; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; */ import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; @@ -36,6 +37,7 @@ import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SetCatchDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference; import fr.ird.observe.dto.referential.ll.common.CatchFateReference; import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; @@ -48,6 +50,18 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { * Branchline edit bean. */ private final BranchlineDto branchlineBean; + /** + * Default acquisition mode to use. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> + */ + private final CatchAcquisitionMode defaultAcquisitionMode; + /** + * Default weight measure method to use for new data. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2907">issue 2907</a> + */ + private final WeightMeasureMethodReference defaultWeightMeasureMethod; /** * Position helper. */ @@ -57,16 +71,15 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { */ protected boolean showIndividualTabs; - /** - * Default acquisition mode to use. - * <p> - * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> - */ - private CatchAcquisitionMode defaultAcquisitionMode; - public SetCatchUIModelStates(GeneratedSetCatchUIModel model) { super(model); this.branchlineBean = new BranchlineDto(); + ObserveSwingDataSource mainDataSource = model.getSource().getContext().getMainDataSource(); + this.defaultWeightMeasureMethod = mainDataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIdsLl.LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + TripUINavigationNode tripNode = (TripUINavigationNode) model.getSource().upToReferenceNode(TripReference.class); + TripReference tripReference = tripNode.getReference(); + String observationMethodId = tripReference.getObservationMethodId(); + this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -74,10 +87,10 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { super.init(ui, initializerResult); SetCatchUI ui1 = (SetCatchUI) ui; positionHelper = new LonglinePositionHelper<>(ui1.getSection(), ui1.getBasket(), ui1.getBranchline(), ui1.getTableEditBean()); - TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); - TripReference tripReference = tripNode.getReference(); - String observationMethodId = tripReference.getObservationMethodId(); - this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; +// TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); +// TripReference tripReference = tripNode.getReference(); +// String observationMethodId = tripReference.getObservationMethodId(); +// this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -103,12 +116,17 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { public void initDefault(CatchDto newTableBean) { super.initDefault(newTableBean); newTableBean.setAcquisitionMode(defaultAcquisitionMode.ordinal()); + newTableBean.setWeightMeasureMethod(defaultWeightMeasureMethod); } public CatchAcquisitionMode getDefaultAcquisitionMode() { return defaultAcquisitionMode; } + public WeightMeasureMethodReference getDefaultWeightMeasureMethod() { + return defaultWeightMeasureMethod; + } + public BranchlineDto getBranchlineBean() { return branchlineBean; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -73,7 +73,7 @@ EditableTable { } #sectionsPanel { - i18nProperty:sections; + i18nProperty:section; _doNotTranslateFieldName: true; } @@ -86,11 +86,11 @@ EditableTableModel { } #basketsPanel { - i18nProperty:baskets; + i18nProperty:basket; } #branchlinesPanel { - i18nProperty:branchlines; + i18nProperty:branchline; } /* ***************************************************************************** */ ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -750,11 +750,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount @@ -765,7 +763,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message observe.data.ll.observation.SetDetailComposition.section.cant.delete.title observe.data.ll.observation.SetDetailComposition.section.delete.message observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate observe.data.ll.observation.SetDetailComposition.type observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Thu Sep 12 13:39:42 CEST 2024 +#Fri Sep 13 14:33:58 CEST 2024 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -953,7 +953,9 @@ observe.data.ll.observation.SetCatch.version=observe.Common.version observe.data.ll.observation.SetDetailComposition.baitHaulingStatus=observe.Common.baitHaulingStatus observe.data.ll.observation.SetDetailComposition.baitSettingStatus=observe.Common.baitSettingStatus observe.data.ll.observation.SetDetailComposition.baitType=observe.Common.baitType +observe.data.ll.observation.SetDetailComposition.basket=observe.Common.basket observe.data.ll.observation.SetDetailComposition.basketsPerSectionCount=observe.Common.basketsPerSectionCount +observe.data.ll.observation.SetDetailComposition.branchline=observe.Common.branchline observe.data.ll.observation.SetDetailComposition.branchlinesPerBasketCount=observe.Common.branchlinesPerBasketCount observe.data.ll.observation.SetDetailComposition.comment=observe.Common.comment observe.data.ll.observation.SetDetailComposition.createDate=observe.Common.createDate ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java ===================================== @@ -35,6 +35,7 @@ public interface ProtectedIdsLl { String LL_COMMON_ACTIVITY_HARBOUR_ID = "fr.ird.referential.ll.common.VesselActivity#666#03"; String LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID = "fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1"; + String LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#03"; String LL_OBSERVATION_CATCH_DISCARDED_CATCH_FATE_ID = "fr.ird.referential.ll.common.CatchFate#1239832686125#0.3"; String LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#1"; String LL_LOGBOOK_LANDING_PART_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#5"; ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=The current basket can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Can't delete basket observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s) -observe.data.ll.observation.SetDetailComposition.baskets=Baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=The current branchline can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Can't delete branchline observe.data.ll.observation.SetDetailComposition.branchlineTab=Branchline detail -observe.data.ll.observation.SetDetailComposition.branchlines=Branchlines observe.data.ll.observation.SetDetailComposition.canGenerate=Can generate observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Template %s is not compliant with the number of baskets per section (%s) @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=The observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Can't delete section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirm to delete all sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirm to delete current template. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Can't use the first template while generating observe.data.ll.observation.SetDetailComposition.type=Detailed composition observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Baits ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=La cesta no puede ser eliminada porque está uilizada en los datos. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de eliminar la cesta observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Cestas observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=El arponcillo no puede ser eliminado porque está uilizado en los datos. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de eliminar el arponcillo observe.data.ll.observation.SetDetailComposition.branchlineTab=Detalle del arponcillo -observe.data.ll.observation.SetDetailComposition.branchlines=Arponcillos observe.data.ll.observation.SetDetailComposition.canGenerate=Autorizar la generación observe.data.ll.observation.SetDetailComposition.compositionTab=Composición observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=el template a utilizar %s no es compatible con el número de cestas por sección (%s) @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de eliminar la sección observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmar la eliminación de todas las secciones. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmar la eliminación del template seleccionada. -observe.data.ll.observation.SetDetailComposition.sections=Secciones observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación observe.data.ll.observation.SetDetailComposition.type=Composiciones detalladas observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Cebos ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -105,8 +105,8 @@ observe.Common.description=Description observe.Common.destination=Destination observe.Common.destination.short=Destination observe.Common.directory=Répertoire -observe.Common.discardHealthStatus=Santé au rejet -observe.Common.discardHealthStatus.short=Santé au rejet +observe.Common.discardHealthStatus=État au rejet +observe.Common.discardHealthStatus.short=État au rejet observe.Common.distance=Distance (m) observe.Common.distance.short=Distance (m) observe.Common.enabled=Actif @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=Le panier ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de supprimer le panier observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Paniers observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=L'avançon ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de supprimer l'avançon observe.data.ll.observation.SetDetailComposition.branchlineTab=Détail avançon -observe.data.ll.observation.SetDetailComposition.branchlines=Avançons observe.data.ll.observation.SetDetailComposition.canGenerate=Autoriser la génération observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s) @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de supprimer la section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmer la suppression de toutes les sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmer la suppression du patron sélectionné. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération observe.data.ll.observation.SetDetailComposition.type=Composition détaillée observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Appâts ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleMeasures.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10 +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10 result.columns=16 result.rows=1 syntax.columns=16 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSet.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^30/03/2019^15:12^1^3.0^-4.0^null^1.2 +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^30/03/2019^15:12^1^3.0^-4.0^null^1.2 result.columns=18 result.rows=1 syntax.columns=18 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasures.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10 +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10 result.columns=16 result.rows=1 syntax.columns=16 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasuresCount.properties ===================================== @@ -19,7 +19,7 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^10^12^12 +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^10^12^12 result.columns=15 result.rows=1 syntax.columns=15 ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -49,7 +49,7 @@ data.ll.observation.Section=basket,haulingIdentifier,settingIdentifier,sectionTe data.ll.observation.SectionTemplate=floatlineLengths,id,validation.invalid.pattern,validation.required.id,validation.required.pattern data.ll.observation.SensorUsed=sensorBrand,sensorDataFormat,sensorSerialNo,sensorType,hasData.short data.ll.observation.Set=basketsPerSectionCount,branchlinesPerBasketCount,haulingBreaks,haulingDirectionSameAsSetting,haulingEndLatitude,haulingEndLongitude,haulingEndQuadrant,haulingEndTimeStamp,haulingEndDate,haulingStartLatitude,haulingStartLongitude,haulingStartQuadrant,haulingStartTimeStamp,haulingStartDate,lightsticksColor,lightsticksPerBasketCount,lightsticksType,lineType,maxDepthTargeted,monitored,number,settingEndLatitude,settingEndLongitude,settingEndQuadrant,settingEndTimeStamp,settingEndDate,settingShape,settingStartLatitude,settingStartLongitude,settingStartQuadrant,settingStartTimeStamp,settingStartDate,settingVesselSpeed,shooterSpeed,shooterUsed,snapWeight,swivelWeight,timeBetweenHooks,totalBasketsCount,totalHooksCount,totalSectionsCount,weightedSnap,weightedSwivel,haulingTab,settingCharacteristicsTab,settingTab -data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,baskets,branchlines,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,sections,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate +data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,basket,branchline,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate data.ll.observation.SetGlobalComposition=mitigationType,baitsCompositionTab,branchlinesCompositionTab,floatlinesCompositionTab,hooksCompositionTab,mitigationTypeTab,mitigationType.available,mitigationType.selected data.ll.observation.SizeMeasure=size,sizeMeasureType data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingEnd,fishingEndDepth,fishingStart,fishingStartDepth,floatline1Length,floatline2Length,itemHorizontalPosition,itemVerticalPosition,maxFishingDepth,meanDeploymentDepth,meanFishingDepth,medianDeploymentDepth,medianFishingDepth,minFishingDepth,section,sensorBrand,serialNo,species,characteristicsTab,enableTimestamp,enableTimestamp.tip,hasData.short,keyDataTab,localisationTab,speciesTab,timestampTab,species.available,species.selected View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/74622168e4a29aaf3a5be907… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/74622168e4a29aaf3a5be907… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2907] 10 commits: Downgrade log4j version (need to understand new warnings)
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT pushed to branch feature/issue-2907 at ultreiaio / ird-observe Commits: 4be41afb by Tony Chemit at 2024-09-11T15:16:58+02:00 Downgrade log4j version (need to understand new warnings) - - - - - c928e6ce by Tony Chemit at 2024-09-11T15:49:04+02:00 Fix observe.Common.tracelineLength I18n value - - - - - e2d5e24c by Tony Chemit at 2024-09-11T17:51:44+02:00 Fix consolidation printResult on SampleActivity - - - - - 2c7121a6 by Tony Chemit at 2024-09-12T14:31:37+02:00 [services-test] Add default validation factory name in DataEntityServiceLocalWriteTest - - - - - 37dcbbaf by Tony Chemit at 2024-09-13T13:42:32+02:00 update pom - - - - - 66ca96c0 by Tony Chemit at 2024-09-13T15:03:51+02:00 [i18n] quelques améliorations demandées - See #2907#note_2097858285 - - - - - a065e178 by Tony Chemit at 2024-09-13T15:03:56+02:00 [client] use a default weight measure method in create mode - See #2907 - - - - - 9dc471ea by Tony Chemit at 2024-09-13T15:07:00+02:00 Fix decorator in table for location on branchline - - - - - 258364d5 by Tony Chemit at 2024-09-13T15:07:00+02:00 New design of form - - - - - 8200828c by Tony Chemit at 2024-09-13T15:07:00+02:00 Fix focus owner to number (but should review this in Focus session) - - - - - 17 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - core/services/local/src/test/java/fr/ird/observe/services/local/service/api/DataEntityServiceLocalWriteTest.java - model/src/main/models/Observe/dto/class/i18nLabels.properties - pom.xml Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java ===================================== @@ -37,6 +37,7 @@ import fr.ird.observe.dto.ProgressionModel; import fr.ird.observe.dto.ToolkitIdModifications; import fr.ird.observe.dto.data.TripAware; import fr.ird.observe.dto.data.ps.localmarket.BatchDto; +import fr.ird.observe.dto.data.ps.logbook.SampleActivityDto; import fr.ird.observe.dto.data.ps.observation.CatchDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -195,7 +196,7 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> { printResult(activityResult); } for (ToolkitIdModifications modifications : result.getLogbookSampleActivityResults()) { - printResult(BatchDto.class, modifications); + printResult(SampleActivityDto.class, modifications); } for (ToolkitIdModifications batchResult : result.getLocalmarketBatchResults()) { printResult(BatchDto.class, batchResult); ===================================== client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -224,15 +224,12 @@ observe.data.ll.observation.Set.monitored observe.data.ll.observation.Set.number observe.data.ll.observation.Set.settingCharacteristicsTab observe.data.ll.observation.Set.settingTab -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.generateTab observe.data.ll.observation.SetDetailComposition.hookAndBaitTab observe.data.ll.observation.SetDetailComposition.noBranchlineSelected -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.templateInformation observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab observe.data.ll.observation.SetGlobalComposition.branchlinesCompositionTab ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx ===================================== @@ -120,17 +120,27 @@ <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicTab' i18nProperty=""> <Table id='editForm' fill='both' insets='1'> - <row> - <cell columns="2"> -  + <cell columns="2" rows="2"> <JPanel id='acquisitionMode'> <JRadioButton id='acquisitionModeIndividual'/> <JRadioButton id='acquisitionModeGrouped'/> </JPanel> </cell> - <cell columns="2" rows="2"> -  + <cell> + <JLabel id='numberLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <NumberEditor id='number' styleClass="int6"/> + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + </row> + <row> + <cell columns="2" rows="4"> <Table id="locationOnLonglinePanel"> <row> <cell anchor="west"> @@ -158,9 +168,6 @@ </row> </Table> </cell> - </row> -  - <row> <cell> <JLabel id='speciesLabel'/> </cell> @@ -168,16 +175,7 @@ <FilterableComboBox id='species' genericType='SpeciesReference'/> </cell> </row> - -  -  <row> - <cell anchor='west'> - <JLabel id='tagNumberLabel'/> - </cell> - <cell anchor='east' weightx="1" fill="both"> - <NormalTextEditor id='tagNumber'/> - </cell> <cell> <JLabel id='countLabel'/> </cell> @@ -185,22 +183,6 @@ <NumberEditor id='count' styleClass="int6"/> </cell> </row> - -  - <row> - <cell> - <JLabel id='numberLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='number' styleClass="int6"/> - </cell> - <cell columns="2"> - <JPanel/> - </cell> - </row> - -  -  <row> <cell> <JLabel id='totalWeightLabel'/> @@ -208,6 +190,8 @@ <cell weightx='1' anchor='east'> <NumberEditor id='totalWeight' styleClass="float3"/> </cell> + </row> + <row> <cell> <JLabel id='weightMeasureMethodLabel'/> </cell> @@ -215,9 +199,6 @@ <FilterableComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> - -  -  <row> <cell> <JLabel id='catchHealthStatusLabel'/> @@ -225,16 +206,7 @@ <cell weightx='1' anchor='east'> <FilterableComboBox id='catchHealthStatus' genericType='HealthStatusReference'/> </cell> - <cell> - <JLabel id='hookPositionLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <FilterableComboBox id='hookPosition' genericType='HookPositionReference'/> - </cell> </row> - -  -  <row> <cell> <JLabel id='catchFateLabel'/> @@ -249,24 +221,44 @@ <FilterableComboBox id='discardHealthStatus' genericType='HealthStatusReference'/> </cell> </row> - -  -  <row> + <cell> + <JLabel id='hookPositionLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <FilterableComboBox id='hookPosition' genericType='HookPositionReference'/> + </cell> <cell anchor="west"> <JLabel id='hookWhenDiscardedLabel'/> </cell> <cell anchor='west' fill="both"> <BooleanEditor id='hookWhenDiscarded'/> </cell> + </row> + <row> <cell anchor='west'> <JLabel id='photoReferencesLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> <NormalTextEditor id='photoReferences'/> </cell> + <cell columns="2"/> +  +  +  +  +  +  </row> + <row> + <cell anchor='west'> + <JLabel id='tagNumberLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='tagNumber'/> + </cell> + </row> </Table> </tab> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss ===================================== @@ -26,7 +26,7 @@ } #mainTabbedPane { - _focusComponent:{newComponentArray(acquisitionModeIndividual,depredated,beatDiameter)}; + _focusComponent:{newComponentArray(number,depredated,beatDiameter)}; } /* ***************************************************************************** */ ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -43,7 +43,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.AbstractAction; -import javax.swing.JComponent; import javax.swing.JToolBar; import java.awt.Component; import java.awt.event.ActionEvent; @@ -74,19 +73,20 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { @Override protected Component getFocusComponentOnSelectedRow(SetCatchUI ui, boolean notPersisted, boolean newRow, CatchDto tableEditBean, CatchDto previousRowBean) { - JComponent requestFocus; - if (newRow) { - requestFocus = ui.getSpecies(); - } else { - int acquisitionMode = tableEditBean.getAcquisitionMode(); - CatchAcquisitionMode acquisitionModeEnum = CatchAcquisitionMode.valueOf(acquisitionMode); - if (acquisitionModeEnum.equals(CatchAcquisitionMode.GROUPED)) { - requestFocus = ui.getCount(); - } else { - requestFocus = ui.getCatchHealthStatus(); - } - } - return requestFocus; + //FIXME Review this on Focus clean session +// JComponent requestFocus; +// if (newRow) { +// requestFocus = ui.getNumber(); +// } else { +// int acquisitionMode = tableEditBean.getAcquisitionMode(); +// CatchAcquisitionMode acquisitionModeEnum = CatchAcquisitionMode.valueOf(acquisitionMode); +// if (acquisitionModeEnum.equals(CatchAcquisitionMode.GROUPED)) { +// requestFocus = ui.getCount(); +// } else { +// requestFocus = ui.getCatchHealthStatus(); +// } +// } + return ui.getNumber(); } @Override @@ -261,6 +261,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { editBean.setSection(null); editBean.setBasket(null); editBean.setBranchline(null); + editBean.setWeightMeasureMethod(ui.getModel().getStates().getDefaultWeightMeasureMethod()); } break; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; */ import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; @@ -36,6 +37,7 @@ import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SetCatchDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference; import fr.ird.observe.dto.referential.ll.common.CatchFateReference; import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; @@ -48,6 +50,18 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { * Branchline edit bean. */ private final BranchlineDto branchlineBean; + /** + * Default acquisition mode to use. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> + */ + private final CatchAcquisitionMode defaultAcquisitionMode; + /** + * Default weight measure method to use for new data. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2907">issue 2907</a> + */ + private final WeightMeasureMethodReference defaultWeightMeasureMethod; /** * Position helper. */ @@ -57,16 +71,15 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { */ protected boolean showIndividualTabs; - /** - * Default acquisition mode to use. - * <p> - * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> - */ - private CatchAcquisitionMode defaultAcquisitionMode; - public SetCatchUIModelStates(GeneratedSetCatchUIModel model) { super(model); this.branchlineBean = new BranchlineDto(); + ObserveSwingDataSource mainDataSource = model.getSource().getContext().getMainDataSource(); + this.defaultWeightMeasureMethod = mainDataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIdsLl.LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + TripUINavigationNode tripNode = (TripUINavigationNode) model.getSource().upToReferenceNode(TripReference.class); + TripReference tripReference = tripNode.getReference(); + String observationMethodId = tripReference.getObservationMethodId(); + this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -74,10 +87,10 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { super.init(ui, initializerResult); SetCatchUI ui1 = (SetCatchUI) ui; positionHelper = new LonglinePositionHelper<>(ui1.getSection(), ui1.getBasket(), ui1.getBranchline(), ui1.getTableEditBean()); - TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); - TripReference tripReference = tripNode.getReference(); - String observationMethodId = tripReference.getObservationMethodId(); - this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; +// TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); +// TripReference tripReference = tripNode.getReference(); +// String observationMethodId = tripReference.getObservationMethodId(); +// this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -103,12 +116,17 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { public void initDefault(CatchDto newTableBean) { super.initDefault(newTableBean); newTableBean.setAcquisitionMode(defaultAcquisitionMode.ordinal()); + newTableBean.setWeightMeasureMethod(defaultWeightMeasureMethod); } public CatchAcquisitionMode getDefaultAcquisitionMode() { return defaultAcquisitionMode; } + public WeightMeasureMethodReference getDefaultWeightMeasureMethod() { + return defaultWeightMeasureMethod; + } + public BranchlineDto getBranchlineBean() { return branchlineBean; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUITableModel.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; */ import fr.ird.observe.client.util.table.EditableListProperty; +import fr.ird.observe.client.util.table.renderer.DecoratorTableRenderer; import fr.ird.observe.dto.data.CatchAcquisitionMode; import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SizeMeasureDto; @@ -30,6 +31,8 @@ import fr.ird.observe.dto.data.ll.observation.WeightMeasureDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import javax.swing.JTable; +import javax.swing.table.TableColumnModel; import java.util.Collection; import java.util.List; @@ -79,6 +82,15 @@ public class SetCatchUITableModel extends GeneratedSetCatchUITableModel { return weightMeasuresTableModel; } + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + TableColumnModel columnModel = table.getColumnModel(); + ((DecoratorTableRenderer) columnModel.getColumn(2).getCellRenderer()).getDecorator().setIndex(1); + ((DecoratorTableRenderer) columnModel.getColumn(3).getCellRenderer()).getDecorator().setIndex(1); + ((DecoratorTableRenderer) columnModel.getColumn(4).getCellRenderer()).getDecorator().setIndex(1); + } + @Override protected void onBeforeResetRow(int row) { super.onBeforeResetRow(row); ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -73,7 +73,7 @@ EditableTable { } #sectionsPanel { - i18nProperty:sections; + i18nProperty:section; _doNotTranslateFieldName: true; } @@ -86,11 +86,11 @@ EditableTableModel { } #basketsPanel { - i18nProperty:baskets; + i18nProperty:basket; } #branchlinesPanel { - i18nProperty:branchlines; + i18nProperty:branchline; } /* ***************************************************************************** */ ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -749,11 +749,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount @@ -764,7 +762,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message observe.data.ll.observation.SetDetailComposition.section.cant.delete.title observe.data.ll.observation.SetDetailComposition.section.delete.message observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate observe.data.ll.observation.SetDetailComposition.type observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Tue Aug 27 18:04:46 CEST 2024 +#Fri Sep 13 14:33:58 CEST 2024 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -952,7 +952,9 @@ observe.data.ll.observation.SetCatch.version=observe.Common.version observe.data.ll.observation.SetDetailComposition.baitHaulingStatus=observe.Common.baitHaulingStatus observe.data.ll.observation.SetDetailComposition.baitSettingStatus=observe.Common.baitSettingStatus observe.data.ll.observation.SetDetailComposition.baitType=observe.Common.baitType +observe.data.ll.observation.SetDetailComposition.basket=observe.Common.basket observe.data.ll.observation.SetDetailComposition.basketsPerSectionCount=observe.Common.basketsPerSectionCount +observe.data.ll.observation.SetDetailComposition.branchline=observe.Common.branchline observe.data.ll.observation.SetDetailComposition.branchlinesPerBasketCount=observe.Common.branchlinesPerBasketCount observe.data.ll.observation.SetDetailComposition.comment=observe.Common.comment observe.data.ll.observation.SetDetailComposition.createDate=observe.Common.createDate ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java ===================================== @@ -35,6 +35,7 @@ public interface ProtectedIdsLl { String LL_COMMON_ACTIVITY_HARBOUR_ID = "fr.ird.referential.ll.common.VesselActivity#666#03"; String LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID = "fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1"; + String LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#03"; String LL_OBSERVATION_CATCH_DISCARDED_CATCH_FATE_ID = "fr.ird.referential.ll.common.CatchFate#1239832686125#0.3"; String LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#1"; String LL_LOGBOOK_LANDING_PART_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#5"; ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Total number of lightsticks observe.Common.totalLineLength=Total line length observe.Common.totalSectionsCount=Total sections observe.Common.traceCutOff=Trace cut off -observe.Common.tracelineLength=Traceline length (m) +observe.Common.tracelineLength=Traceline length observe.Common.tracelineLength.short=Traceline length (m) observe.Common.tracelineType=Traceline type observe.Common.tracelineType.short=Traceline type @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=The current basket can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Can't delete basket observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s) -observe.data.ll.observation.SetDetailComposition.baskets=Baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=The current branchline can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Can't delete branchline observe.data.ll.observation.SetDetailComposition.branchlineTab=Branchline detail -observe.data.ll.observation.SetDetailComposition.branchlines=Branchlines observe.data.ll.observation.SetDetailComposition.canGenerate=Can generate observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Template %s is not compliant with the number of baskets per section (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=The observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Can't delete section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirm to delete all sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirm to delete current template. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Can't use the first template while generating observe.data.ll.observation.SetDetailComposition.type=Detailed composition observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Baits ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Número total de barras de luz observe.Common.totalLineLength=Total line length\#TODO observe.Common.totalSectionsCount=totalSectionsCount \#TODO observe.Common.traceCutOff=Bajo de línea cortada -observe.Common.tracelineLength=Parte baja (m) +observe.Common.tracelineLength=Parte baja observe.Common.tracelineLength.short=Parte baja (m) observe.Common.tracelineType=Tipo bajo de línea observe.Common.tracelineType.short=Tipo bajo de línea @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=La cesta no puede ser eliminada porque está uilizada en los datos. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de eliminar la cesta observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Cestas observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=El arponcillo no puede ser eliminado porque está uilizado en los datos. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de eliminar el arponcillo observe.data.ll.observation.SetDetailComposition.branchlineTab=Detalle del arponcillo -observe.data.ll.observation.SetDetailComposition.branchlines=Arponcillos observe.data.ll.observation.SetDetailComposition.canGenerate=Autorizar la generación observe.data.ll.observation.SetDetailComposition.compositionTab=Composición observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=el template a utilizar %s no es compatible con el número de cestas por sección (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de eliminar la sección observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmar la eliminación de todas las secciones. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmar la eliminación del template seleccionada. -observe.data.ll.observation.SetDetailComposition.sections=Secciones observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación observe.data.ll.observation.SetDetailComposition.type=Composiciones detalladas observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Cebos ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -105,8 +105,8 @@ observe.Common.description=Description observe.Common.destination=Destination observe.Common.destination.short=Destination observe.Common.directory=Répertoire -observe.Common.discardHealthStatus=Santé au rejet -observe.Common.discardHealthStatus.short=Santé au rejet +observe.Common.discardHealthStatus=État au rejet +observe.Common.discardHealthStatus.short=État au rejet observe.Common.distance=Distance (m) observe.Common.distance.short=Distance (m) observe.Common.enabled=Actif @@ -374,7 +374,7 @@ observe.Common.totalLightsticksCount=Nombre total de cyalumes observe.Common.totalLineLength=Longueur totale de la ligne observe.Common.totalSectionsCount=Nombre total de sections observe.Common.traceCutOff=Bas de ligne coupé -observe.Common.tracelineLength=Longueur bas de ligne (m) +observe.Common.tracelineLength=Longueur bas de ligne observe.Common.tracelineLength.short=Longueur bas de ligne (m) observe.Common.tracelineType=Type bas de ligne observe.Common.tracelineType.short=Type bas de ligne @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=Le panier ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de supprimer le panier observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Paniers observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=L'avançon ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de supprimer l'avançon observe.data.ll.observation.SetDetailComposition.branchlineTab=Détail avançon -observe.data.ll.observation.SetDetailComposition.branchlines=Avançons observe.data.ll.observation.SetDetailComposition.canGenerate=Autoriser la génération observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de supprimer la section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmer la suppression de toutes les sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmer la suppression du patron sélectionné. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération observe.data.ll.observation.SetDetailComposition.type=Composition détaillée observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Appâts ===================================== core/services/local/src/test/java/fr/ird/observe/services/local/service/api/DataEntityServiceLocalWriteTest.java ===================================== @@ -33,7 +33,10 @@ import fr.ird.observe.services.service.data.ps.common.TripService; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; +import io.ultreia.java4all.validation.api.NuitonValidatorProviders; +import io.ultreia.java4all.validation.impl.java.NuitonValidatorProviderFactoryImpl; import org.junit.Assert; +import org.junit.BeforeClass; import org.junit.Test; import java.util.Collection; @@ -42,6 +45,11 @@ import java.util.Map; import java.util.Objects; public class DataEntityServiceLocalWriteTest extends GeneratedDataEntityServiceLocalWriteTest { + @BeforeClass + public static void beforeClass() { + NuitonValidatorProviders.setDefaultFactoryName(NuitonValidatorProviderFactoryImpl.PROVIDER_NAME); + } + @Override public void setUp() throws Exception { TOPIA_TEST_CLASS_RESOURCE.getServiceInitializerConfig().setValidationMode(DataSourceValidationMode.STRONG); ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -49,7 +49,7 @@ data.ll.observation.Section=basket,haulingIdentifier,settingIdentifier,sectionTe data.ll.observation.SectionTemplate=floatlineLengths,id,validation.invalid.pattern,validation.required.id,validation.required.pattern data.ll.observation.SensorUsed=sensorBrand,sensorDataFormat,sensorSerialNo,sensorType,hasData.short data.ll.observation.Set=basketsPerSectionCount,branchlinesPerBasketCount,haulingBreaks,haulingDirectionSameAsSetting,haulingEndLatitude,haulingEndLongitude,haulingEndQuadrant,haulingEndTimeStamp,haulingEndDate,haulingStartLatitude,haulingStartLongitude,haulingStartQuadrant,haulingStartTimeStamp,haulingStartDate,lightsticksColor,lightsticksPerBasketCount,lightsticksType,lineType,maxDepthTargeted,monitored,number,settingEndLatitude,settingEndLongitude,settingEndQuadrant,settingEndTimeStamp,settingEndDate,settingShape,settingStartLatitude,settingStartLongitude,settingStartQuadrant,settingStartTimeStamp,settingStartDate,settingVesselSpeed,shooterSpeed,shooterUsed,snapWeight,swivelWeight,timeBetweenHooks,totalBasketsCount,totalHooksCount,totalSectionsCount,weightedSnap,weightedSwivel,haulingTab,settingCharacteristicsTab,settingTab -data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,baskets,branchlines,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,sections,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate +data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,basket,branchline,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate data.ll.observation.SetGlobalComposition=mitigationType,baitsCompositionTab,branchlinesCompositionTab,floatlinesCompositionTab,hooksCompositionTab,mitigationTypeTab,mitigationType.available,mitigationType.selected data.ll.observation.SizeMeasure=size,sizeMeasureType data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingEnd,fishingEndDepth,fishingStart,fishingStartDepth,floatline1Length,floatline2Length,itemHorizontalPosition,itemVerticalPosition,maxFishingDepth,meanDeploymentDepth,meanFishingDepth,medianDeploymentDepth,medianFishingDepth,minFishingDepth,section,sensorBrand,serialNo,species,characteristicsTab,enableTimestamp,enableTimestamp.tip,hasData.short,keyDataTab,localisationTab,speciesTab,timestampTab,species.available,species.selected ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.38</version> + <version>2024.39</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -112,6 +112,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate>  + <lib.version.log4j2>2.23.1</lib.version.log4j2> <plugin.version.site>4.0.0-M13</plugin.version.site> <lib.version.ognl>3.1.29</lib.version.ognl>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e6b88c9b10e3c97ed170aee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5e6b88c9b10e3c97ed170aee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.3.x] 3 commits: update pom
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT pushed to branch develop-9.3.x at ultreiaio / ird-observe Commits: 37dcbbaf by Tony Chemit at 2024-09-13T13:42:32+02:00 update pom - - - - - 66ca96c0 by Tony Chemit at 2024-09-13T15:03:51+02:00 [i18n] quelques améliorations demandées - See #2907#note_2097858285 - - - - - a065e178 by Tony Chemit at 2024-09-13T15:03:56+02:00 [client] use a default weight measure method in create mode - See #2907 - - - - - 12 changed files: - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties - model/src/main/models/Observe/dto/class/i18nLabels.properties - pom.xml Changes: ===================================== client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -224,15 +224,12 @@ observe.data.ll.observation.Set.monitored observe.data.ll.observation.Set.number observe.data.ll.observation.Set.settingCharacteristicsTab observe.data.ll.observation.Set.settingTab -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.generateTab observe.data.ll.observation.SetDetailComposition.hookAndBaitTab observe.data.ll.observation.SetDetailComposition.noBranchlineSelected -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.templateInformation observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab observe.data.ll.observation.SetGlobalComposition.branchlinesCompositionTab ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -261,6 +261,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { editBean.setSection(null); editBean.setBasket(null); editBean.setBranchline(null); + editBean.setWeightMeasureMethod(ui.getModel().getStates().getDefaultWeightMeasureMethod()); } break; ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation; */ import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource; import fr.ird.observe.client.datasource.api.cache.ReferencesCache; import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper; import fr.ird.observe.client.datasource.editor.api.content.ContentUI; @@ -36,6 +37,7 @@ import fr.ird.observe.dto.data.ll.observation.BranchlineDto; import fr.ird.observe.dto.data.ll.observation.CatchDto; import fr.ird.observe.dto.data.ll.observation.SetCatchDto; import fr.ird.observe.dto.form.Form; +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference; import fr.ird.observe.dto.referential.ll.common.CatchFateReference; import fr.ird.observe.navigation.id.Project; import fr.ird.observe.services.ObserveServicesProvider; @@ -48,6 +50,18 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { * Branchline edit bean. */ private final BranchlineDto branchlineBean; + /** + * Default acquisition mode to use. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> + */ + private final CatchAcquisitionMode defaultAcquisitionMode; + /** + * Default weight measure method to use for new data. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2907">issue 2907</a> + */ + private final WeightMeasureMethodReference defaultWeightMeasureMethod; /** * Position helper. */ @@ -57,16 +71,15 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { */ protected boolean showIndividualTabs; - /** - * Default acquisition mode to use. - * <p> - * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a> - */ - private CatchAcquisitionMode defaultAcquisitionMode; - public SetCatchUIModelStates(GeneratedSetCatchUIModel model) { super(model); this.branchlineBean = new BranchlineDto(); + ObserveSwingDataSource mainDataSource = model.getSource().getContext().getMainDataSource(); + this.defaultWeightMeasureMethod = mainDataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIdsLl.LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new); + TripUINavigationNode tripNode = (TripUINavigationNode) model.getSource().upToReferenceNode(TripReference.class); + TripReference tripReference = tripNode.getReference(); + String observationMethodId = tripReference.getObservationMethodId(); + this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -74,10 +87,10 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { super.init(ui, initializerResult); SetCatchUI ui1 = (SetCatchUI) ui; positionHelper = new LonglinePositionHelper<>(ui1.getSection(), ui1.getBasket(), ui1.getBranchline(), ui1.getTableEditBean()); - TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); - TripReference tripReference = tripNode.getReference(); - String observationMethodId = tripReference.getObservationMethodId(); - this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; +// TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class); +// TripReference tripReference = tripNode.getReference(); +// String observationMethodId = tripReference.getObservationMethodId(); +// this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL; } @Override @@ -103,12 +116,17 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates { public void initDefault(CatchDto newTableBean) { super.initDefault(newTableBean); newTableBean.setAcquisitionMode(defaultAcquisitionMode.ordinal()); + newTableBean.setWeightMeasureMethod(defaultWeightMeasureMethod); } public CatchAcquisitionMode getDefaultAcquisitionMode() { return defaultAcquisitionMode; } + public WeightMeasureMethodReference getDefaultWeightMeasureMethod() { + return defaultWeightMeasureMethod; + } + public BranchlineDto getBranchlineBean() { return branchlineBean; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -73,7 +73,7 @@ EditableTable { } #sectionsPanel { - i18nProperty:sections; + i18nProperty:section; _doNotTranslateFieldName: true; } @@ -86,11 +86,11 @@ EditableTableModel { } #basketsPanel { - i18nProperty:baskets; + i18nProperty:basket; } #branchlinesPanel { - i18nProperty:branchlines; + i18nProperty:branchline; } /* ***************************************************************************** */ ===================================== core/api/dto-decoration/src/main/i18n/getters/labels.getter ===================================== @@ -749,11 +749,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length -observe.data.ll.observation.SetDetailComposition.baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title observe.data.ll.observation.SetDetailComposition.branchlineTab -observe.data.ll.observation.SetDetailComposition.branchlines observe.data.ll.observation.SetDetailComposition.canGenerate observe.data.ll.observation.SetDetailComposition.compositionTab observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount @@ -764,7 +762,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message observe.data.ll.observation.SetDetailComposition.section.cant.delete.title observe.data.ll.observation.SetDetailComposition.section.delete.message observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete -observe.data.ll.observation.SetDetailComposition.sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate observe.data.ll.observation.SetDetailComposition.type observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Tue Aug 27 18:04:46 CEST 2024 +#Fri Sep 13 14:33:58 CEST 2024 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -952,7 +952,9 @@ observe.data.ll.observation.SetCatch.version=observe.Common.version observe.data.ll.observation.SetDetailComposition.baitHaulingStatus=observe.Common.baitHaulingStatus observe.data.ll.observation.SetDetailComposition.baitSettingStatus=observe.Common.baitSettingStatus observe.data.ll.observation.SetDetailComposition.baitType=observe.Common.baitType +observe.data.ll.observation.SetDetailComposition.basket=observe.Common.basket observe.data.ll.observation.SetDetailComposition.basketsPerSectionCount=observe.Common.basketsPerSectionCount +observe.data.ll.observation.SetDetailComposition.branchline=observe.Common.branchline observe.data.ll.observation.SetDetailComposition.branchlinesPerBasketCount=observe.Common.branchlinesPerBasketCount observe.data.ll.observation.SetDetailComposition.comment=observe.Common.comment observe.data.ll.observation.SetDetailComposition.createDate=observe.Common.createDate ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java ===================================== @@ -35,6 +35,7 @@ public interface ProtectedIdsLl { String LL_COMMON_ACTIVITY_HARBOUR_ID = "fr.ird.referential.ll.common.VesselActivity#666#03"; String LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID = "fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1"; + String LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#03"; String LL_OBSERVATION_CATCH_DISCARDED_CATCH_FATE_ID = "fr.ird.referential.ll.common.CatchFate#1239832686125#0.3"; String LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#1"; String LL_LOGBOOK_LANDING_PART_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#5"; ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=The current basket can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Can't delete basket observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s) -observe.data.ll.observation.SetDetailComposition.baskets=Baskets observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=The current branchline can not be deleted since it used by other data. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Can't delete branchline observe.data.ll.observation.SetDetailComposition.branchlineTab=Branchline detail -observe.data.ll.observation.SetDetailComposition.branchlines=Branchlines observe.data.ll.observation.SetDetailComposition.canGenerate=Can generate observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Template %s is not compliant with the number of baskets per section (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=The observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Can't delete section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirm to delete all sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirm to delete current template. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Can't use the first template while generating observe.data.ll.observation.SetDetailComposition.type=Detailed composition observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Baits ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=La cesta no puede ser eliminada porque está uilizada en los datos. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de eliminar la cesta observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Cestas observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=El arponcillo no puede ser eliminado porque está uilizado en los datos. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de eliminar el arponcillo observe.data.ll.observation.SetDetailComposition.branchlineTab=Detalle del arponcillo -observe.data.ll.observation.SetDetailComposition.branchlines=Arponcillos observe.data.ll.observation.SetDetailComposition.canGenerate=Autorizar la generación observe.data.ll.observation.SetDetailComposition.compositionTab=Composición observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=el template a utilizar %s no es compatible con el número de cestas por sección (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de eliminar la sección observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmar la eliminación de todas las secciones. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmar la eliminación del template seleccionada. -observe.data.ll.observation.SetDetailComposition.sections=Secciones observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación observe.data.ll.observation.SetDetailComposition.type=Composiciones detalladas observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Cebos ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -105,8 +105,8 @@ observe.Common.description=Description observe.Common.destination=Destination observe.Common.destination.short=Destination observe.Common.directory=Répertoire -observe.Common.discardHealthStatus=Santé au rejet -observe.Common.discardHealthStatus.short=Santé au rejet +observe.Common.discardHealthStatus=État au rejet +observe.Common.discardHealthStatus.short=État au rejet observe.Common.distance=Distance (m) observe.Common.distance.short=Distance (m) observe.Common.enabled=Actif @@ -905,11 +905,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=Le panier ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de supprimer le panier observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s) -observe.data.ll.observation.SetDetailComposition.baskets=Paniers observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=L'avançon ne peut pas être supprimé car il est utilisé dans des données. observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de supprimer l'avançon observe.data.ll.observation.SetDetailComposition.branchlineTab=Détail avançon -observe.data.ll.observation.SetDetailComposition.branchlines=Avançons observe.data.ll.observation.SetDetailComposition.canGenerate=Autoriser la génération observe.data.ll.observation.SetDetailComposition.compositionTab=Composition observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s) @@ -920,7 +918,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de supprimer la section observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmer la suppression de toutes les sections. observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmer la suppression du patron sélectionné. -observe.data.ll.observation.SetDetailComposition.sections=Sections observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération observe.data.ll.observation.SetDetailComposition.type=Composition détaillée observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Appâts ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -49,7 +49,7 @@ data.ll.observation.Section=basket,haulingIdentifier,settingIdentifier,sectionTe data.ll.observation.SectionTemplate=floatlineLengths,id,validation.invalid.pattern,validation.required.id,validation.required.pattern data.ll.observation.SensorUsed=sensorBrand,sensorDataFormat,sensorSerialNo,sensorType,hasData.short data.ll.observation.Set=basketsPerSectionCount,branchlinesPerBasketCount,haulingBreaks,haulingDirectionSameAsSetting,haulingEndLatitude,haulingEndLongitude,haulingEndQuadrant,haulingEndTimeStamp,haulingEndDate,haulingStartLatitude,haulingStartLongitude,haulingStartQuadrant,haulingStartTimeStamp,haulingStartDate,lightsticksColor,lightsticksPerBasketCount,lightsticksType,lineType,maxDepthTargeted,monitored,number,settingEndLatitude,settingEndLongitude,settingEndQuadrant,settingEndTimeStamp,settingEndDate,settingShape,settingStartLatitude,settingStartLongitude,settingStartQuadrant,settingStartTimeStamp,settingStartDate,settingVesselSpeed,shooterSpeed,shooterUsed,snapWeight,swivelWeight,timeBetweenHooks,totalBasketsCount,totalHooksCount,totalSectionsCount,weightedSnap,weightedSwivel,haulingTab,settingCharacteristicsTab,settingTab -data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,baskets,branchlines,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,sections,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate +data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,basket,branchline,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate data.ll.observation.SetGlobalComposition=mitigationType,baitsCompositionTab,branchlinesCompositionTab,floatlinesCompositionTab,hooksCompositionTab,mitigationTypeTab,mitigationType.available,mitigationType.selected data.ll.observation.SizeMeasure=size,sizeMeasureType data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingEnd,fishingEndDepth,fishingStart,fishingStartDepth,floatline1Length,floatline2Length,itemHorizontalPosition,itemVerticalPosition,maxFishingDepth,meanDeploymentDepth,meanFishingDepth,medianDeploymentDepth,medianFishingDepth,minFishingDepth,section,sensorBrand,serialNo,species,characteristicsTab,enableTimestamp,enableTimestamp.tip,hasData.short,keyDataTab,localisationTab,speciesTab,timestampTab,species.available,species.selected ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.38</version> + <version>2024.39</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c7121a6a96e565453530f80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2c7121a6a96e565453530f80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 18 commits: update pom
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ebc590e by Tony Chemit at 2024-09-13T13:42:22+02:00 update pom - - - - - 4dc13f29 by Tony Chemit at 2024-09-13T13:42:52+02:00 [model] update model - - - - - 0a3074ad by Tony Chemit at 2024-09-13T13:42:52+02:00 [api-dto-decoration] update i18n labels - - - - - 420cac36 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-java] update generated mappings and models - - - - - e1e6ae6e by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 4bc6f1c0 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-resources] update generated resources - - - - - 5d055f4f by Tony Chemit at 2024-09-13T13:42:52+02:00 [services-i18n] update i18n stuff - - - - - 84725dda by Tony Chemit at 2024-09-13T13:42:52+02:00 [client] Add new field on Form and create action for it - - - - - 70053013 by Tony Chemit at 2024-09-13T13:42:52+02:00 [validation] Weights are no more mandatory - - - - - a53992f1 by Tony Chemit at 2024-09-13T13:42:52+02:00 [test] update fixtures - - - - - 4e4e007c by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 03d61b3e by Tony Chemit at 2024-09-13T13:42:52+02:00 [api] Review consolidate request and result to add new Sample consolidation - - - - - 4f596e36 by Tony Chemit at 2024-09-13T13:42:52+02:00 Review consolidate engine to add new Sample consolidation and implements the new consolidation action - - - - - 93463773 by Tony Chemit at 2024-09-13T13:42:53+02:00 [test] Update consolidation test - - - - - f3c90a1c by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Add new configuration option to store the species list used in new consolidation action - - - - - e5cd4634 by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Review consolidation ui action - - - - - 8b4de0af by Tony Chemit at 2024-09-13T13:42:53+02:00 [doc] Update consolidation documentation - - - - - 74622168 by Tony Chemit at 2024-09-13T13:43:14+02:00 Merge branch 'feature/feature/issue-2669' into develop Automatiser la calcul des sample.minus10Weight et sample.plus10Weight par sommation des lots du plan de cuves - Closes #2669 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeightsComputed.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-xwork2.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/43282691864818d528b6b893… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/43282691864818d528b6b893… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/feature/issue-2669
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT deleted branch feature/feature/issue-2669 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/feature/issue-2669] 17 commits: update pom
by Tony CHEMIT (＠tchemit) 13 Sep '24

13 Sep '24

Tony CHEMIT pushed to branch feature/feature/issue-2669 at ultreiaio / ird-observe Commits: 9ebc590e by Tony Chemit at 2024-09-13T13:42:22+02:00 update pom - - - - - 4dc13f29 by Tony Chemit at 2024-09-13T13:42:52+02:00 [model] update model - - - - - 0a3074ad by Tony Chemit at 2024-09-13T13:42:52+02:00 [api-dto-decoration] update i18n labels - - - - - 420cac36 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-java] update generated mappings and models - - - - - e1e6ae6e by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 4bc6f1c0 by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-resources] update generated resources - - - - - 5d055f4f by Tony Chemit at 2024-09-13T13:42:52+02:00 [services-i18n] update i18n stuff - - - - - 84725dda by Tony Chemit at 2024-09-13T13:42:52+02:00 [client] Add new field on Form and create action for it - - - - - 70053013 by Tony Chemit at 2024-09-13T13:42:52+02:00 [validation] Weights are no more mandatory - - - - - a53992f1 by Tony Chemit at 2024-09-13T13:42:52+02:00 [test] update fixtures - - - - - 4e4e007c by Tony Chemit at 2024-09-13T13:42:52+02:00 [persistence-migration] add migration - - - - - 03d61b3e by Tony Chemit at 2024-09-13T13:42:52+02:00 [api] Review consolidate request and result to add new Sample consolidation - - - - - 4f596e36 by Tony Chemit at 2024-09-13T13:42:52+02:00 Review consolidate engine to add new Sample consolidation and implements the new consolidation action - - - - - 93463773 by Tony Chemit at 2024-09-13T13:42:53+02:00 [test] Update consolidation test - - - - - f3c90a1c by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Add new configuration option to store the species list used in new consolidation action - - - - - e5cd4634 by Tony Chemit at 2024-09-13T13:42:53+02:00 [client] Review consolidation ui action - - - - - 8b4de0af by Tony Chemit at 2024-09-13T13:42:53+02:00 [doc] Update consolidation documentation - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/i18n/getters/jaxx.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateConfigUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeightsComputed.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-xwork2.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a502e4d0f7fcfa03ac3cb1f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a502e4d0f7fcfa03ac3cb1f4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/feature/issue-2669] stash consolidation updates
by Tony CHEMIT (＠tchemit) 12 Sep '24

12 Sep '24

Tony CHEMIT pushed to branch feature/feature/issue-2669 at ultreiaio / ird-observe Commits: a502e4d0 by Tony Chemit at 2024-09-12T19:13:49+02:00 stash consolidation updates - - - - - 15 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateContext.java - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateEngine.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateActions.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateContext.java - + core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateEngine.java - core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataServiceFixtures.java - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/ConsolidateDataService.properties Changes: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java ===================================== @@ -38,6 +38,7 @@ import fr.ird.observe.dto.ToolkitIdModifications; import fr.ird.observe.dto.data.TripAware; import fr.ird.observe.dto.data.ps.localmarket.BatchDto; import fr.ird.observe.dto.data.ps.logbook.SampleActivityDto; +import fr.ird.observe.dto.data.ps.logbook.SampleDto; import fr.ird.observe.dto.data.ps.observation.CatchDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.SampleMeasureDto; @@ -195,8 +196,8 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> { for (fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult activityResult : result.getActivityLogbookResults()) { printResult(activityResult); } - for (ToolkitIdModifications modifications : result.getLogbookSampleActivityResults()) { - printResult(SampleActivityDto.class, modifications); + for (fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult sampleResult : result.getLogbookSampleResults()) { + printResult(sampleResult); } for (ToolkitIdModifications batchResult : result.getLocalmarketBatchResults()) { printResult(BatchDto.class, batchResult); @@ -234,6 +235,19 @@ public class Start extends AdminTabUIActionSupport<ConsolidateUI> { } } + void printResult(fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult sampleResult) { + if (sampleResult.withModifications()) { + sendMessage(" " + t("observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.modification", sampleResult.getSampleId(), sampleResult.getSampleLabel())); + } + if (sampleResult.withWarnings()) { + sendMessage(" " + t("observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.warning", sampleResult.getSampleId(), sampleResult.getSampleLabel())); + } + printResult(SampleDto.class, sampleResult.getModifications()); + for (ToolkitIdModifications modification : sampleResult.getSampleActivityModifications()) { + printResult(SampleActivityDto.class, modification); + } + } + private void printResult(Class<? extends BusinessDto> dataType, ToolkitIdModifications modifications) { if (modifications == null) { return; ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -510,6 +510,8 @@ observe.ui.datasource.editor.actions.consolidate.description=Consolidate observe observe.ui.datasource.editor.actions.consolidate.end.trip=End consolidate data on trip %s / %s (%s) [duration\: %s] observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.modification=Some data were computed for Logbook activity [%s] %s observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.warning=Some warnings were found for Logbook activity [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.modification=Some data were computed for Logbook sample [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.warning=Some warnings were found for Logbook sample [%s] %s observe.ui.datasource.editor.actions.consolidate.message.modifications.modification=%d change(s) for data of type %s [%s] %s observe.ui.datasource.editor.actions.consolidate.message.modifications.property=Property %s, old value\: %s - new value\: %s observe.ui.datasource.editor.actions.consolidate.message.modifications.warning=%d warning(s) for data of type %s [%s] %s ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -508,11 +508,13 @@ observe.ui.datasource.editor.actions.consolidate=Calcular los datos observe.ui.datasource.editor.actions.consolidate.config=Consolidate data configuration observe.ui.datasource.editor.actions.consolidate.description=Calcular los datos que no fueron observados observe.ui.datasource.editor.actions.consolidate.end.trip=End consolidate data on trip %s / %s (%s) [duration\: %s] \#TODO -observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.modification=Some data were computed for Logbook activity [%s] %s -observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.warning=Some warnings were found for Logbook activity [%s] %s -observe.ui.datasource.editor.actions.consolidate.message.modifications.modification=%d change(s) for data of type %s [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.modification=Some data were computed for Logbook sample [%s] %s \#TODO +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.warning=Some warnings were found for Logbook sample [%s] %s \#TODO +observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.modification=Some data were computed for Logbook activity [%s] %s \#TODO +observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.warning=Some warnings were found for Logbook activity [%s] %s \#TODO +observe.ui.datasource.editor.actions.consolidate.message.modifications.modification=%d change(s) for data of type %s [%s] %s \#TODO observe.ui.datasource.editor.actions.consolidate.message.modifications.property=Property %s, old value\: %s - new value\: %s \#TODO -observe.ui.datasource.editor.actions.consolidate.message.modifications.warning=%d warning(s) for data of type %s [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.modifications.warning=%d warning(s) for data of type %s [%s] %s \#TODO observe.ui.datasource.editor.actions.consolidate.message.noChanges=No modificación de datos. observe.ui.datasource.editor.actions.consolidate.message.observation.activity.modification=Some data were computed for Observations activity [%s] %s observe.ui.datasource.editor.actions.consolidate.message.observation.activity.warning=Some warnings were found for Observations activity [%s] %s ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -509,7 +509,9 @@ observe.ui.datasource.editor.actions.consolidate.config=Configuration de la cons observe.ui.datasource.editor.actions.consolidate.description=Calculer les données non observées observe.ui.datasource.editor.actions.consolidate.end.trip=Consolidation terminée pour la marée %s / %s (%s) [durée \: %s] observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.modification=Des données ont été calculées pour l'activité (Livre de bord) [%s] %s -observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.warning=Des avertissements ont été détectés pour l'activité (Livre de bord) [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.activity.warning=Des avertissements ont été détectés pour l'échantillon (Livre de bord) [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.modification=Des données ont été calculées pour l'échantillon (Livre de bord) [%s] %s +observe.ui.datasource.editor.actions.consolidate.message.logbook.sample.warning=Des avertissements ont été détectés pour l'activité (Livre de bord) [%s] %s observe.ui.datasource.editor.actions.consolidate.message.modifications.modification=%d modification(s) pour la donnée de type %s [%s] %s observe.ui.datasource.editor.actions.consolidate.message.modifications.property=Propriété %s, ancienne valeur \: %s - nouvelle valeur \: %s observe.ui.datasource.editor.actions.consolidate.message.modifications.warning=%d avertissement(s) pour la donnée de type %s [%s] %s ===================================== core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java ===================================== @@ -49,6 +49,8 @@ public class TripConsolidateRequest implements JsonAware { private String speciesListForLogbookSampleActivityWeightedWeight; + private String speciesListForLogbookSampleWeights; + public boolean isFailIfLengthWeightParameterNotFound() { return failIfLengthWeightParameterNotFound; } @@ -80,4 +82,12 @@ public class TripConsolidateRequest implements JsonAware { public void setSpeciesListForLogbookSampleActivityWeightedWeight(String speciesListForLogbookSampleActivityWeightedWeight) { this.speciesListForLogbookSampleActivityWeightedWeight = speciesListForLogbookSampleActivityWeightedWeight; } + + public String getSpeciesListForLogbookSampleWeights() { + return speciesListForLogbookSampleWeights; + } + + public void setSpeciesListForLogbookSampleWeights(String speciesListForLogbookSampleWeights) { + this.speciesListForLogbookSampleWeights = speciesListForLogbookSampleWeights; + } } ===================================== core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java ===================================== @@ -23,6 +23,8 @@ package fr.ird.observe.consolidation.data.ps.common; */ +import fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult; +import fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult; import fr.ird.observe.dto.ToolkitIdModifications; import io.ultreia.java4all.util.json.JsonAware; @@ -54,9 +56,9 @@ public class TripConsolidateResult implements JsonAware { */ protected final Set<fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult> activityLogbookResults; /** - * Logbook sample activities results. + * Logbook sample results. */ - private final Set<ToolkitIdModifications> logbookSampleActivityResults; + private final Set<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> logbookSampleResults; /** * Local market batches results. */ @@ -64,15 +66,15 @@ public class TripConsolidateResult implements JsonAware { public TripConsolidateResult(String tripId, String tripLabel, - Set<fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult> activityObservationResults, + Set<ActivityConsolidateResult> activityObservationResults, Set<fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult> activityLogbookResults, - Set<ToolkitIdModifications> logbookSampleActivityResults, + Set<SampleConsolidateResult> logbookSampleResults, Set<ToolkitIdModifications> localmarketBatchResults) { this.tripId = tripId; this.tripLabel = tripLabel; this.activityObservationResults = activityObservationResults; this.activityLogbookResults = activityLogbookResults; - this.logbookSampleActivityResults = logbookSampleActivityResults; + this.logbookSampleResults = logbookSampleResults; this.localmarketBatchResults = localmarketBatchResults; } @@ -92,8 +94,8 @@ public class TripConsolidateResult implements JsonAware { return activityLogbookResults; } - public Set<ToolkitIdModifications> getLogbookSampleActivityResults() { - return logbookSampleActivityResults; + public Set<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> getLogbookSampleResults() { + return logbookSampleResults; } public Set<ToolkitIdModifications> getLocalmarketBatchResults() { @@ -103,14 +105,14 @@ public class TripConsolidateResult implements JsonAware { public boolean withModifications() { return activityObservationResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult::withModifications) || activityLogbookResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult::withModifications) || - logbookSampleActivityResults.stream().anyMatch(ToolkitIdModifications::withModifications) || + logbookSampleResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult::withModifications) || localmarketBatchResults.stream().anyMatch(ToolkitIdModifications::withModifications); } public boolean withWarnings() { return activityObservationResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult::withWarnings) || activityLogbookResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult::withWarnings) || - logbookSampleActivityResults.stream().anyMatch(ToolkitIdModifications::withWarnings) || + logbookSampleResults.stream().anyMatch(fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult::withWarnings) || localmarketBatchResults.stream().anyMatch(ToolkitIdModifications::withWarnings); } } ===================================== core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResult.java ===================================== @@ -0,0 +1,118 @@ +package fr.ird.observe.consolidation.data.ps.logbook; + +/*- + * #%L + * ObServe Core :: API :: Dto Consolidation + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.ToolkitIdModifications; +import io.ultreia.java4all.util.json.JsonAware; + +import java.util.Set; + +/** + * Created at 12/09/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class SampleConsolidateResult implements JsonAware { + + /** + * Id of sample. + */ + protected String sampleId; + + /** + * Label of sample. + */ + private String sampleLabel; + + + /** + * All modifications on the sample (can be null if there is no modification on it). + */ + private ToolkitIdModifications modifications; + /** + * All modification on sample activities. + */ + private Set<ToolkitIdModifications> sampleActivityModifications; + + public String getSampleId() { + return sampleId; + } + + public void setSampleId(String sampleId) { + this.sampleId = sampleId; + } + + public String getSampleLabel() { + return sampleLabel; + } + + public void setSampleLabel(String sampleLabel) { + this.sampleLabel = sampleLabel; + } + + public ToolkitIdModifications getModifications() { + return modifications; + } + + public void setModifications(ToolkitIdModifications modifications) { + this.modifications = modifications; + } + + public Set<ToolkitIdModifications> getSampleActivityModifications() { + return sampleActivityModifications; + } + + public void setSampleActivityModifications(Set<ToolkitIdModifications> sampleActivityModifications) { + this.sampleActivityModifications = sampleActivityModifications; + } + + public boolean withModifications() { + if (getModifications()!=null) { + return getModifications().withModifications(); + } + if (getSampleActivityModifications() != null) { + for (ToolkitIdModifications modifications : getSampleActivityModifications()) { + if (modifications.withModifications()) { + return true; + } + } + } + return false; + } + + public boolean withWarnings() { + if (getModifications()!=null) { + return getModifications().withWarnings(); + } + if (getSampleActivityModifications() != null) { + for (ToolkitIdModifications modifications : getSampleActivityModifications()) { + if (modifications.withWarnings()) { + return true; + } + } + } + return false; + } +} + ===================================== core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java ===================================== @@ -0,0 +1,70 @@ +package fr.ird.observe.consolidation.data.ps.logbook; + +/*- + * #%L + * ObServe Core :: API :: Dto Consolidation + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.dto.ToolkitIdModifications; + +import java.util.LinkedHashSet; +import java.util.Optional; +import java.util.Set; + +/** + * Created at 12/09/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class SampleConsolidateResultBuilder { + private final Set<ToolkitIdModifications> sampleActivityModificationBuilder = new LinkedHashSet<>(); + private final String sampleLabel; + private final String sampleId; + private ToolkitIdModifications modifications; + + public SampleConsolidateResultBuilder(String sampleId, String sampleLabel) { + this.sampleId = sampleId; + this.sampleLabel = sampleLabel; + } + + public Optional<SampleConsolidateResult> build() { + boolean noModification = sampleActivityModificationBuilder.isEmpty() && modifications == null; + if (noModification) { + return Optional.empty(); + } + SampleConsolidateResult result = new SampleConsolidateResult(); + result.setSampleId(sampleId); + result.setSampleLabel(sampleLabel); + result.setModifications(modifications); + result.setSampleActivityModifications(sampleActivityModificationBuilder); + return Optional.of(result); + } + + public void flushModification(ToolkitIdModifications modifications) { + this.modifications = modifications; + } + + public void flushSampleActivityModification(ToolkitIdModifications modifications) { + sampleActivityModificationBuilder.add(modifications); + } + +} + ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateEngine.java ===================================== @@ -33,7 +33,6 @@ import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.localmarket.Batch; -import fr.ird.observe.entities.data.ps.logbook.SampleActivity; import fr.ird.observe.entities.referential.common.LengthLengthParameterCache; import fr.ird.observe.entities.referential.common.LengthWeightParameterCache; import fr.ird.observe.entities.referential.common.Species; @@ -66,7 +65,7 @@ public class TripConsolidateEngine { private final BatchConsolidateEngine localmarketBatchEngine; private final fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateEngine observationActivityConsolidateEngine; private final fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateEngine logbookActivityConsolidateEngine; - private final fr.ird.observe.consolidation.data.ps.logbook.SampleActivityConsolidateEngine logbookSampleActivityConsolidateEngine; + private final fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateEngine logbookSampleConsolidateEngine; public TripConsolidateEngine(ServiceContext context, SimplifiedObjectTypeManager simplifiedObjectTypeManager) { this.context = context; @@ -77,7 +76,7 @@ public class TripConsolidateEngine { lengthWeightParameterCache, lengthLengthParameterCache); this.logbookActivityConsolidateEngine = new fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateEngine(context, simplifiedObjectTypeManager); - this.logbookSampleActivityConsolidateEngine = new fr.ird.observe.consolidation.data.ps.logbook.SampleActivityConsolidateEngine(context.getDecoratorService()); + this.logbookSampleConsolidateEngine = new fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateEngine(context.getDecoratorService()); this.localmarketBatchEngine = new BatchConsolidateEngine(new GetOptionalRtpMeanWeightImpl(context, lengthWeightParameterCache), context.getDecoratorService()); } @@ -91,22 +90,26 @@ public class TripConsolidateEngine { Trip trip = Trip.loadEntity(context, tripId); - String speciesListId = request.getSpeciesListForLogbookSampleActivityWeightedWeight(); - SpeciesList speciesList = SpeciesList.loadEntity(context, speciesListId); - Set<String> speciesListForLogbookSampleActivityWeightedWeight = speciesList.getSpecies().stream().map(Species ::getId).collect(Collectors.toSet()); - Set<ToolkitIdModifications> logbookSampleActivityResults = consolidateLogbookSampleActivities(trip, speciesListForLogbookSampleActivityWeightedWeight); + String sampleActivitySpeciesListId = request.getSpeciesListForLogbookSampleActivityWeightedWeight(); + String sampleSpeciesListId = request.getSpeciesListForLogbookSampleWeights(); + SpeciesList sampleActivitySpeciesList = SpeciesList.loadEntity(context, sampleActivitySpeciesListId); + SpeciesList sampleSpeciesList = SpeciesList.loadEntity(context, sampleSpeciesListId); + Set<String> speciesListForLogbookSampleActivityWeightedWeight = sampleActivitySpeciesList.getSpecies().stream().map(Species ::getId).collect(Collectors.toSet()); + Set<String> speciesListForLogbookSampleWeights = sampleSpeciesList.getSpecies().stream().map(Species ::getId).collect(Collectors.toSet()); + + Set<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> logbookSampleResults = consolidateLogbookSamples(trip, speciesListForLogbookSampleActivityWeightedWeight, speciesListForLogbookSampleWeights); Set<ToolkitIdModifications> localmarketBatchResults = consolidateLocalmarketBatches(trip, failIfLengthWeightParameterNotFound); Set<fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult> observationActivityConsolidateResults = consolidateObservationActivities(trip, failIfLengthWeightParameterNotFound, failIfLengthLengthParameterNotFound); Set<fr.ird.observe.consolidation.data.ps.logbook.ActivityConsolidateResult> logbookActivityConsolidateResults = consolidateLogbookActivities(trip); - if (logbookSampleActivityResults.isEmpty() && observationActivityConsolidateResults.isEmpty() && localmarketBatchResults.isEmpty() && logbookActivityConsolidateResults.isEmpty()) { + if (logbookSampleResults.isEmpty() && observationActivityConsolidateResults.isEmpty() && localmarketBatchResults.isEmpty() && logbookActivityConsolidateResults.isEmpty()) { // no modification, nor warning on this trip return Optional.empty(); } decoratorService.installDecorator(Trip.class, trip); String tripLabel = trip.toString(); - TripConsolidateResult result = new TripConsolidateResult(tripId, tripLabel, observationActivityConsolidateResults, logbookActivityConsolidateResults, logbookSampleActivityResults, localmarketBatchResults); + TripConsolidateResult result = new TripConsolidateResult(tripId, tripLabel, observationActivityConsolidateResults, logbookActivityConsolidateResults, logbookSampleResults, localmarketBatchResults); boolean withModifications = result.withModifications(); if (withModifications) { log.info(String.format("Found some modifications on trip: %s - %s", tripId, result.getTripLabel())); @@ -131,23 +134,14 @@ public class TripConsolidateEngine { try (ToolkitIdModificationsToSql toolkitIdModificationsToSql = new ToolkitIdModificationsToSql(scriptPath, context.timestampNow(), entitySqlModel)) { observationActivityConsolidateEngine.toSql(result.getActivityObservationResults(), toolkitIdModificationsToSql); logbookActivityConsolidateEngine.toSql(result.getActivityLogbookResults(), toolkitIdModificationsToSql); + logbookSampleConsolidateEngine.toSql(result.getLogbookSampleResults(), toolkitIdModificationsToSql); toolkitIdModificationsToSql.toSql(Batch.SPI, result.getLocalmarketBatchResults()); - toolkitIdModificationsToSql.toSql(SampleActivity.SPI, result.getLogbookSampleActivityResults()); return toolkitIdModificationsToSql.build(); } catch (IOException e) { throw new IllegalStateException("Could not produce sql script to " + scriptPath, e); } } - private Set<ToolkitIdModifications> consolidateLogbookSampleActivities(Trip trip, Set<String> speciesListForLogbookSampleActivityWeightedWeight) { - Set<ToolkitIdModifications> result = new LinkedHashSet<>(); - if (trip.isWellEmpty() || trip.isSampleEmpty()) { - return result; - } - logbookSampleActivityConsolidateEngine.consolidateTrip(trip,speciesListForLogbookSampleActivityWeightedWeight, result); - return result; - } - private Set<ToolkitIdModifications> consolidateLocalmarketBatches(Trip trip, boolean failIfLengthWeightParameterNotFound) { ReferentialLocale referenceLocale = context.getReferentialLocale(); Set<ToolkitIdModifications> result = new LinkedHashSet<>(); @@ -237,4 +231,25 @@ public class TripConsolidateEngine { return result; } + private Set<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> consolidateLogbookSamples(Trip trip, Set<String> speciesListForLogbookSampleActivityWeightedWeight, Set<String> speciesListForLogbookSampleWeights) { + Set<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> result = new LinkedHashSet<>(); + if (trip.isWellEmpty() || trip.isSampleEmpty()) { + return result; + } + int sampleIndex = 0; + int sampleMax = trip.getSampleSize(); + Decorator sampleDecorator = context.getDecoratorService().getDecoratorByType(fr.ird.observe.entities.data.ps.logbook.Sample.class); + for (fr.ird.observe.entities.data.ps.logbook.Sample sample : trip.getSample()) { + sample.registerDecorator(sampleDecorator); + String routePrefix = String.format("Logbook - Sample %s [%s/%s] ", sample, ++sampleIndex, sampleMax); + log.debug("{} Start consolidate sample: {}", routePrefix, sample.getTopiaId()); + Optional<fr.ird.observe.consolidation.data.ps.logbook.SampleConsolidateResult> sampleResult = logbookSampleConsolidateEngine.consolidateSample(trip, + sample, + speciesListForLogbookSampleActivityWeightedWeight, + speciesListForLogbookSampleWeights); + sampleResult.ifPresent(result::add); + } + return result; + } + } ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateContext.java ===================================== @@ -48,13 +48,13 @@ public class SampleActivityConsolidateContext implements ConsolidateContext<Samp private final Decorator decorator; private final Set<Well> tripWell; private final Set<String> speciesListForLogbookSampleActivityWeightedWeight; - private final Set<ToolkitIdModifications> resultBuilder; + private final SampleConsolidateResultBuilder resultBuilder; private final java.util.Set<String> warnings = new LinkedHashSet<>(); private final Set<String> sampledWellIds; private Sample sample; private SampleActivity datum; - public SampleActivityConsolidateContext(JavaBeanMonitor monitor, Decorator decorator, Trip trip, Set<String> speciesListForLogbookSampleActivityWeightedWeight, Set<ToolkitIdModifications> resultBuilder) { + public SampleActivityConsolidateContext(JavaBeanMonitor monitor, Decorator decorator, Trip trip, Set<String> speciesListForLogbookSampleActivityWeightedWeight, SampleConsolidateResultBuilder resultBuilder) { this.monitor = monitor; this.decorator = decorator; this.tripWell = trip.getWell(); @@ -80,10 +80,10 @@ public class SampleActivityConsolidateContext implements ConsolidateContext<Samp public void flush() { if (monitor.wasModified()) { datum.registerDecorator(decorator); - monitor.toModifications(modifications -> new ToolkitIdModifications(datum, modifications, warnings.isEmpty() ? null : warnings)).ifPresent(resultBuilder::add); + monitor.toModifications(modifications -> new ToolkitIdModifications(datum, modifications, warnings.isEmpty() ? null : warnings)).ifPresent(resultBuilder::flushSampleActivityModification); } else if (!warnings.isEmpty()) { datum.registerDecorator(decorator); - resultBuilder.add(new ToolkitIdModifications(datum, java.util.Set.of(), java.util.Set.copyOf(warnings))); + resultBuilder.flushSampleActivityModification(new ToolkitIdModifications(datum, java.util.Set.of(), java.util.Set.copyOf(warnings))); } monitor.setBean(null); this.datum = null; ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleActivityConsolidateEngine.java → core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateActions.java ===================================== @@ -4,7 +4,7 @@ package fr.ird.observe.consolidation.data.ps.logbook; * #%L * ObServe Core :: Persistence :: Consolidation * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * Copyright (C) 2008 - 2024 IRD, Ultreia.io * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -22,45 +22,43 @@ package fr.ird.observe.consolidation.data.ps.logbook; * #L% */ -import fr.ird.observe.decoration.DecoratorService; -import fr.ird.observe.dto.ToolkitIdModifications; -import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.consolidation.AtomicConsolidateAction; import fr.ird.observe.entities.data.ps.logbook.Sample; -import fr.ird.observe.entities.data.ps.logbook.SampleActivity; -import io.ultreia.java4all.bean.monitor.JavaBeanMonitor; -import io.ultreia.java4all.decoration.Decorator; +import java.util.List; import java.util.Set; /** - * Created on 14/04/2023. + * Created at 12/09/2024. * * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.1.0 + * @since 9.4.0 */ -public class SampleActivityConsolidateEngine { - private final JavaBeanMonitor monitor; - private final Decorator decorator; +public enum SampleConsolidateActions implements AtomicConsolidateAction<SampleConsolidateContext, Sample> { - public SampleActivityConsolidateEngine(DecoratorService decoratorService) { - this.monitor = new JavaBeanMonitor(SampleActivity.PROPERTY_WEIGHTED_WEIGHT, SampleActivity.PROPERTY_WEIGHTED_WEIGHT_COMPUTED); - this.decorator = decoratorService.getDecoratorByType(SampleActivity.class); - } + /** + * Compute {@code Sample#weights}. + */ + ComputeWeights() { + @Override + public List<String> fieldNames() { + return List.of(Sample.PROPERTY_BIGS_WEIGHT, Sample.PROPERTY_SMALLS_WEIGHT, Sample.PROPERTY_TOTAL_WEIGHT, Sample.PROPERTY_WEIGHTS_COMPUTED); + } - public void consolidateTrip(Trip trip, Set<String> speciesListForLogbookSampleActivityWeightedWeight, Set<ToolkitIdModifications> resultBuilder) { - SampleActivityConsolidateContext context = new SampleActivityConsolidateContext(monitor, decorator, trip, speciesListForLogbookSampleActivityWeightedWeight,resultBuilder); - for (Sample sample : trip.getSample()) { - if (sample.isSampleActivityEmpty()) { - continue; - } - for (SampleActivity sampleActivity : sample.getSampleActivity()) { - try { - context.watch(sample, sampleActivity); - SampleActivityConsolidateActions.ComputeWeightedWeight.execute(context, sampleActivity); - } finally { - context.flush(); - } - } + @Override + public boolean test(SampleConsolidateContext context, Sample datum) { + return datum.isWeightsComputed() || (datum.getBigsWeight() == null && datum.getSmallsWeight() == null && datum.getTotalWeight() == null); } + + @Override + public void accept(SampleConsolidateContext context, Sample datum) { + Set<String> speciesList = context.getSpeciesListForLogbookSampleWeights(); + //datum.setWeightsComputed(true); + } + }; + + @Override + public String toString() { + return "ps.logbook." + SampleConsolidateActions.class.getSimpleName() + "." + name(); } } ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateContext.java ===================================== @@ -0,0 +1,107 @@ +package fr.ird.observe.consolidation.data.ps.logbook; + +/*- + * #%L + * ObServe Core :: Persistence :: Consolidation + * %% + * Copyright (C) 2008 - 2024 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.consolidation.ConsolidateContext; +import fr.ird.observe.dto.ToolkitIdModifications; +import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.entities.data.ps.logbook.Sample; +import fr.ird.observe.entities.data.ps.logbook.Well; +import io.ultreia.java4all.bean.monitor.JavaBeanMonitor; +import io.ultreia.java4all.decoration.Decorator; + +import java.util.LinkedHashSet; +import java.util.Objects; +import java.util.Set; +import java.util.function.ToDoubleFunction; +import java.util.stream.Collectors; + +/** + * Created at 12/09/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + */ +public class SampleConsolidateContext implements ConsolidateContext<Sample> { + private final JavaBeanMonitor monitor; + private final Decorator decorator; + private final Set<Well> tripWell; + private final Set<String> speciesListForLogbookSampleWeights; + private final SampleConsolidateResultBuilder resultBuilder; + private final java.util.Set<String> warnings = new LinkedHashSet<>(); + private final Set<String> sampledWellIds; + private Sample datum; + + public SampleConsolidateContext(JavaBeanMonitor monitor, + Decorator decorator, + Trip trip, + Set<String> speciesListForLogbookSampleWeights, + SampleConsolidateResultBuilder resultBuilder) { + this.monitor = monitor; + this.decorator = decorator; + this.tripWell = trip.getWell(); + this.sampledWellIds = trip.getSample().stream().map(Sample::getWell).collect(Collectors.toSet()); + this.speciesListForLogbookSampleWeights = speciesListForLogbookSampleWeights; + this.resultBuilder = resultBuilder; + } + + public Set<String> getSampledWellIds() { + return sampledWellIds; + } + + public Set<String> getSpeciesListForLogbookSampleWeights() { + return speciesListForLogbookSampleWeights; + } + + public void watch(Sample datum) { + this.datum = Objects.requireNonNull(datum); + monitor.setBean(datum); + } + + public void flush() { + if (monitor.wasModified()) { + datum.registerDecorator(decorator); + monitor.toModifications(modifications -> new ToolkitIdModifications(datum, modifications, warnings.isEmpty() ? null : warnings)).ifPresent(resultBuilder::flushModification); + } else if (!warnings.isEmpty()) { + datum.registerDecorator(decorator); + resultBuilder.flushModification(new ToolkitIdModifications(datum, java.util.Set.of(), java.util.Set.copyOf(warnings))); + } + monitor.setBean(null); + this.datum = null; + warnings.clear(); + } + + public double sumOnTripWell(ToDoubleFunction<Well> function) { + return tripWell.stream().mapToDouble(function).sum(); + } + + @Override + public JavaBeanMonitor monitor() { + return monitor; + } + + @Override + public Class<Sample> dataType() { + return Sample.class; + } +} ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateEngine.java ===================================== @@ -0,0 +1,105 @@ +package fr.ird.observe.consolidation.data.ps.logbook; + +/*- + * #%L + * ObServe Core :: Persistence :: Consolidation + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.decoration.DecoratorService; +import fr.ird.observe.entities.data.ps.common.Trip; +import fr.ird.observe.entities.data.ps.logbook.Sample; +import fr.ird.observe.entities.data.ps.logbook.SampleActivity; +import fr.ird.observe.spi.consolidation.ToolkitIdModificationsToSql; +import io.ultreia.java4all.bean.monitor.JavaBeanMonitor; +import io.ultreia.java4all.decoration.Decorator; + +import java.util.Optional; +import java.util.Set; + +/** + * Created on 14/04/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.1.0 + */ +public class SampleConsolidateEngine { + private final JavaBeanMonitor sampleMonitor; + private final JavaBeanMonitor sampleActivityMonitor; + private final Decorator sampleDecorator; + private final Decorator sampleActivityDecorator; + + public SampleConsolidateEngine(DecoratorService decoratorService) { + this.sampleMonitor = new JavaBeanMonitor(Sample.PROPERTY_BIGS_WEIGHT, Sample.PROPERTY_SMALLS_WEIGHT, Sample.PROPERTY_TOTAL_WEIGHT, Sample.PROPERTY_WEIGHTS_COMPUTED); + this.sampleActivityMonitor = new JavaBeanMonitor(SampleActivity.PROPERTY_WEIGHTED_WEIGHT, SampleActivity.PROPERTY_WEIGHTED_WEIGHT_COMPUTED); + this.sampleDecorator = decoratorService.getDecoratorByType(Sample.class); + this.sampleActivityDecorator = decoratorService.getDecoratorByType(SampleActivity.class); + } + + public void toSql(java.util.Set<SampleConsolidateResult> samplesResults, ToolkitIdModificationsToSql toolkitIdModificationsToSql) { + for (SampleConsolidateResult sampleConsolidateResult : samplesResults) { + toolkitIdModificationsToSql.toSql(Sample.SPI, sampleConsolidateResult.getModifications()); + toolkitIdModificationsToSql.toSql(SampleActivity.SPI, sampleConsolidateResult.getSampleActivityModifications()); + } + } + + public Optional<SampleConsolidateResult> consolidateSample(Trip trip, + Sample sample, + Set<String> speciesListForLogbookSampleActivityWeightedWeight, + Set<String> speciesListForLogbookSampleWeights) { + SampleConsolidateResultBuilder resultBuilder = new SampleConsolidateResultBuilder(sample.getId(), sampleDecorator.decorate(sample)); + SampleConsolidateContext sampleConsolidateContext = new SampleConsolidateContext(sampleMonitor, + sampleDecorator, + trip, + speciesListForLogbookSampleWeights, + resultBuilder); + consolidateSample(sampleConsolidateContext, sample); + if (sample.isSampleActivityNotEmpty()) { + SampleActivityConsolidateContext sampleActivityConsolidateContext = new SampleActivityConsolidateContext(sampleActivityMonitor, + sampleActivityDecorator, + trip, + speciesListForLogbookSampleActivityWeightedWeight, + resultBuilder); + + for (SampleActivity sampleActivity : sample.getSampleActivity()) { + consolidateSampleActivity(sampleActivityConsolidateContext, sample, sampleActivity); + } + } + return resultBuilder.build(); + } + + private void consolidateSample(SampleConsolidateContext context, Sample sample) { + try { + context.watch(sample); + SampleConsolidateActions.ComputeWeights.execute(context, sample); + } finally { + context.flush(); + } + } + + private void consolidateSampleActivity(SampleActivityConsolidateContext context, Sample sample, SampleActivity sampleActivity) { + + try { + context.watch(sample, sampleActivity); + SampleActivityConsolidateActions.ComputeWeightedWeight.execute(context, sampleActivity); + } finally { + context.flush(); + } + } +} ===================================== core/services/test/src/main/java/fr/ird/observe/services/service/data/ps/ConsolidateDataServiceFixtures.java ===================================== @@ -206,14 +206,15 @@ public class ConsolidateDataServiceFixtures extends GeneratedConsolidateDataServ request.setTripId(getProperty("consolidateTrip.id")); request.setFailIfLengthWeightParameterNotFound(false); request.setSpeciesListForLogbookSampleActivityWeightedWeight(getProperty("consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight")); + request.setSpeciesListForLogbookSampleWeights(getProperty("consolidateTrip.speciesListForLogbookSampleWeights")); TripConsolidateResult actual = service.consolidateTrip(simplifiedObjectTypeSpecializedRules, request); Assert.assertNotNull(actual); Assert.assertNotNull(actual.getActivityObservationResults()); Assert.assertNotNull(actual.getActivityLogbookResults()); - Assert.assertNotNull(actual.getLogbookSampleActivityResults()); + Assert.assertNotNull(actual.getLogbookSampleResults()); Assert.assertEquals(getIntegerProperty("consolidateTrip.logbookActivity.count"), actual.getActivityLogbookResults().size()); - Assert.assertEquals(getIntegerProperty("consolidateTrip.logbookSampleActivity.count"), actual.getLogbookSampleActivityResults().size()); + Assert.assertEquals(getIntegerProperty("consolidateTrip.logbookSampleActivity.count"), actual.getLogbookSampleResults().size()); Assert.assertEquals(getIntegerProperty("consolidateTrip.observationsActivityResult.count"), actual.getActivityObservationResults().size()); Assert.assertEquals(getIntegerProperty("consolidateTrip.observationsActivityResult.withModifications.count"), actual.getActivityObservationResults().stream().filter(fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult::withModifications).count()); Assert.assertEquals(getIntegerProperty("consolidateTrip.observationsActivityResult.withWarnings.count"), actual.getActivityObservationResults().stream().filter(fr.ird.observe.consolidation.data.ps.observation.ActivityConsolidateResult::withWarnings).count()); ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/data/ps/ConsolidateDataService.properties ===================================== @@ -30,3 +30,4 @@ consolidateTrip.observationsActivityResult.count=4 consolidateTrip.observationsActivityResult.withModifications.count=4 consolidateTrip.observationsActivityResult.withWarnings.count=4 consolidateTrip.speciesListForLogbookSampleActivityWeightedWeight=fr.ird.referential.common.SpeciesList#1464000000000#100 +consolidateTrip.speciesListForLogbookSampleWeights=fr.ird.referential.common.SpeciesList#1464000000000#101 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a502e4d0f7fcfa03ac3cb1f43… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a502e4d0f7fcfa03ac3cb1f43… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/feature/issue-2669] 7 commits: [persistence-migration] add migration
by Tony CHEMIT (＠tchemit) 12 Sep '24

12 Sep '24

Tony CHEMIT pushed to branch feature/feature/issue-2669 at ultreiaio / ird-observe Commits: e014a873 by Tony Chemit at 2024-09-12T17:45:38+02:00 [persistence-migration] add migration - - - - - a5fb4969 by Tony Chemit at 2024-09-12T17:45:38+02:00 [persistence-resources] update generated resources - - - - - 44e2d046 by Tony Chemit at 2024-09-12T17:45:38+02:00 [services-i18n] update i18n stuff - - - - - b3c87330 by Tony Chemit at 2024-09-12T17:45:38+02:00 [client] Add new field on Form and create action for it - - - - - 1ae69c89 by Tony Chemit at 2024-09-12T17:45:38+02:00 [validation] Weights are no more mandatory - - - - - cc56350f by Tony Chemit at 2024-09-12T18:55:28+02:00 [test] update fixtures - - - - - 279a1fee by Tony Chemit at 2024-09-12T18:56:49+02:00 stash consolidation updates - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeightsComputed.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java - core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/logbook/SampleConsolidateResultBuilder.java - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-xwork2.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-warning-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-update-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-update-warning-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/SampleDto-update-warning-validation.xml - core/api/validation/src/main/validation/META-INF/validation/files.json - core/api/validation/src/main/validation/META-INF/validation/model-default.json - core/api/validation/src/main/validation/META-INF/validation/model-xwork2.json - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-warning-validation.json - + core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/logbook/SampleDto-create-warning-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7ee01f1e68a86d70c39478b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7ee01f1e68a86d70c39478b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/feature/issue-2669
by Tony CHEMIT (＠tchemit) 12 Sep '24

12 Sep '24

Tony CHEMIT pushed new branch feature/feature/issue-2669 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/feature/issue-2669 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 21 commits: [model] update model
by Tony CHEMIT (＠tchemit) 12 Sep '24

12 Sep '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: edaf6fbe by Tony Chemit at 2024-09-12T14:31:53+02:00 [model] update model - - - - - c8419d2f by Tony Chemit at 2024-09-12T14:31:53+02:00 [model] add generated tag values - - - - - c56acdb8 by Tony Chemit at 2024-09-12T14:31:53+02:00 [model] update generated models - - - - - 7235585e by Tony Chemit at 2024-09-12T14:31:53+02:00 [model] update fixtures - - - - - 1f412168 by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-dto-decoration] update i18n labels and add generated decorators - - - - - 5bc99902 by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-services] update generated model - - - - - 60064768 by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-tree] update generated models - - - - - 4d1d539c by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-tree] update fixtures - - - - - ccae85e5 by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-validation] update generated validators - - - - - 8af6fcb7 by Tony Chemit at 2024-09-12T14:31:54+02:00 [api-validation] update fixtures - - - - - c74e927e by Tony Chemit at 2024-09-12T14:31:54+02:00 [persistence-java] update generated mappings and models - - - - - dd67ed81 by Tony Chemit at 2024-09-12T14:31:54+02:00 [persistence-decoration] add generated decorator - - - - - efaeb40d by Tony Chemit at 2024-09-12T14:31:54+02:00 [persistence-migration] add migration - - - - - 7550dd32 by Tony Chemit at 2024-09-12T14:31:54+02:00 [persistence-resources] update generated resources - - - - - 2142ad1e by Tony Chemit at 2024-09-12T14:31:54+02:00 [persistence-test] update fixtures - - - - - e25a53ea by Tony Chemit at 2024-09-12T14:31:54+02:00 [services-i18n] update i18n stuff - - - - - 17230292 by Tony Chemit at 2024-09-12T14:31:54+02:00 [services-test] update fixtures - - - - - 96121993 by Tony Chemit at 2024-09-12T14:36:10+02:00 [server] Update generated mapping - - - - - 78b5e87d by Tony Chemit at 2024-09-12T14:54:43+02:00 [client] Add new UI and update Vessel one - - - - - 3e876a69 by Tony Chemit at 2024-09-12T14:54:43+02:00 [client] Update generated resources - - - - - 43282691 by Tony Chemit at 2024-09-12T14:56:11+02:00 Merge branch 'feature/feature/issue-2818' into develop Ajouter 2 tables de référence et 2 références à ces tables dans Vessel - Closes #2818 - - - - - 30 changed files: - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/i18n/getters/navigation.getter - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/EngineMakeUI.jaxx - + client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/HullMaterialUI.jaxx - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - + client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/EngineMakeUINavigationNode.scope - + client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/HullMaterialUINavigationNode.scope - client/datasource/editor/common/src/main/resources/fr/ird/observe/client/datasource/editor/common/referential/common/ReferentialHomeUINavigationNode.scope - core/api/dto-decoration/src/main/i18n/getters/labels.getter - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/EngineMakeDtoDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/EngineMakeReferenceDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/HullMaterialDtoDecoratorDefinition.java - + core/api/dto-decoration/src/main/java/fr/ird/observe/dto/referential/common/HullMaterialReferenceDecoratorDefinition.java - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToNavigationTreePathMapping.json - core/api/tree/src/main/resources/META-INF/mapping/ObserveDtoToSelectionTreePathMapping.json - core/api/tree/src/test/resources/fixtures/api-tree.properties - core/api/validation/src/main/filtered-resources/META-INF/validation/files.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/filtered-resources/META-INF/validation/model-xwork2.json - core/api/validation/src/main/i18n/getters/eugene.getter - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-create-error-validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-create-warning-validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-update-error-validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-update-warning-validation.json - + core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/EngineMakeDto-update-warning-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/42b4df1eb9bc3fb33a393458… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/42b4df1eb9bc3fb33a393458… You're receiving this email because of your account on gitlab.com.

1 0