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