Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 90297d09 by Tony Chemit at 2020-07-02T11:39:45+02:00 [LL] Onglet Composition détaillée / Détail avançon / Hameçon et appât non consultable - Closes #1558 (report v8) - - - - - b514a97e by Tony Chemit at 2020-07-02T11:39:46+02:00 Requêtes de synthèse PS - Closes #1529 (report v8) - - - - - 97719eaa by Tony Chemit at 2020-07-02T11:39:46+02:00 update pom - - - - - 9b10570d by Tony Chemit at 2020-07-02T11:39:46+02:00 [PS][Observations] Activité : contrôle trop strict - Closes #1552 (report v8) - - - - - 12 changed files: - client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/main/models/Observe-25-data-ps.model - dto/src/main/models/Observe-30-data-ll-observation.model - dto/src/main/models/Observe-31-data-ll-logbook.model - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java - services/src/main/resources/observe-reports.properties - test/src/main/resources/fixtures/validate-service-referential.properties Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/util/UIHelper.java ===================================== @@ -50,8 +50,10 @@ import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.InputMap; import javax.swing.JComponent; import javax.swing.JOptionPane; +import javax.swing.JScrollBar; import javax.swing.JScrollPane; import javax.swing.JSplitPane; +import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTree; import javax.swing.KeyStroke; @@ -171,6 +173,10 @@ public class UIHelper extends SwingUtil { "fr.ird.observe.client.ui.admin.actions.CopyToClipBoard" }; + public static final Class<?>[] ACCEPTABLE_COMPONENTS_TYPE = { + JScrollBar.class, JTabbedPane.class + }; + static private final Logger log = LogManager.getLogger(UIHelper.class); private static final String CLIENT_PROPERTY_SKIP_BINDING_TO_BEAN = "skipBindingToBean"; private static final String CLIENT_PROPERTY_SKIP_BINDING_FROM_BEAN = "skipBindingFromBean"; ===================================== client-core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -166,7 +166,7 @@ UrlEditor { } BlockingLayerUI { - acceptedComponentTypes: {javax.swing.JScrollBar.class}; + acceptedComponentTypes: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS_TYPE}; } .busyBlockLayerUI { ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java ===================================== @@ -369,7 +369,7 @@ public class ContentUIInitializer<UI extends ContentUI> implements WithClientCon } } - private final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{Objects2.forName("fr.ird.observe.client.datasource.editor.content.data.trip.map.ObserveMapPane"), JScrollBar.class}; + private final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{Objects2.forName("fr.ird.observe.client.datasource.editor.content.data.trip.map.ObserveMapPane"), JScrollBar.class, JTabbedPane.class}; protected void initBlockLayerUI(String... doNotBlockComponentIds) { ui.getBlockLayerUI().setAcceptedComponentTypes(acceptedClassesInBlockingLayer); ===================================== dto/src/main/models/Observe-01-referential-common.model ===================================== @@ -144,7 +144,7 @@ species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | ordered m referential.common.Vessel > referential.I18nReferential | references=code,label,uri,vesselTypeId keelCode + {*:1} Integer | strictlyPositiveNumber changeDate + {*:1} Date | mayNotNull -yearService + {*:1} Integer | strictlyPositiveNumber +yearService + {*:1} Integer | positiveNumber length + {*:1} Float | strictlyPositiveNumber capacity + {*:1} Float | strictlyPositiveNumber power + {*:1} Integer | strictlyPositiveNumber ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -55,13 +55,13 @@ data.ps.observation.FloatingObjectSchoolEstimate > data.Commentable | form=data. objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate data.ps.observation.NonTargetCatch > data.Commentable | references=speciesLabel,speciesFateLabel -catchWeight + {*:1} Float | strictlyPositiveNumber +catchWeight + {*:1} Float | positiveNumber catchWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource -meanWeight + {*:1} Float | strictlyPositiveNumber +meanWeight + {*:1} Float | positiveNumber meanWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource -meanLength + {*:1} Float | strictlyPositiveNumber +meanLength + {*:1} Float | positiveNumber meanLengthComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource -totalCount + {*:1} Integer | strictlyPositiveNumber +totalCount + {*:1} Integer | positiveNumber totalCountComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource hasSample + {*:1} boolean well + {*:1} String @@ -73,7 +73,7 @@ weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasure lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference data.ps.observation.NonTargetCatchRelease > data.Commentable | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length -length + {*:1} Float | strictlyPositiveNumber +length + {*:1} Float | positiveNumber count + {*:1} Integer | notNull strictlyPositiveNumber acquisitionMode + {*:1} int status {*:1} !fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleaseStatusReference | notNull @@ -85,12 +85,12 @@ releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatch lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length,sexLabel -length + {*:1} Float | strictlyPositiveNumber +length + {*:1} Float | positiveNumber isLengthComputed + {*:1} boolean picturesReferences + {*:1} String -weight + {*:1} Float | strictlyPositiveNumber +weight + {*:1} Float | positiveNumber isWeightComputed + {*:1} boolean -count + {*:1} Integer | notNull strictlyPositiveNumber +count + {*:1} Integer | notNull positiveNumber acquisitionMode + {*:1} int tagNumber + {*:1} String species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull @@ -104,12 +104,12 @@ data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observatio nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count -count + {*:1} Integer | notNull strictlyPositiveNumber +count + {*:1} Integer | notNull positiveNumber speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference | notNull species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull data.ps.observation.ObjectSchoolEstimate > data.Data | references=speciesLabel,totalWeight -totalWeight + {*:1} Integer | notNull strictlyPositiveNumber +totalWeight + {*:1} Integer | notNull positiveNumber species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference @@ -126,8 +126,8 @@ startLogValue + {*:1} Float endLogValue + {*:1} Float data.ps.observation.SchoolEstimate > data.Data | references=speciesLabel,meanWeight,totalWeight -totalWeight + {*:1} Integer | strictlyPositiveNumber -meanWeight + {*:1} Integer | strictlyPositiveNumber +totalWeight + {*:1} Integer | positiveNumber +meanWeight + {*:1} Integer | positiveNumber species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference @@ -135,14 +135,14 @@ data.ps.observation.Set > data.Commentable | references=comment constants=target startTime + {*:1} Date endPursingTimeStamp + {*:1} Date endSetTimeStamp + {*:1} Date -maxGearDepth + {*:1} Integer | strictlyPositiveNumber -currentSpeed + {*:1} Float | strictlyPositiveNumber -currentDirection + {*:1} Integer | mayNotNull strictlyPositiveNumber +maxGearDepth + {*:1} Integer | positiveNumber +currentSpeed + {*:1} Float | positiveNumber +currentDirection + {*:1} Integer | mayNotNull positiveNumber schoolTopDepth + {*:1} Integer | positiveNumber -schoolMeanDepth + {*:1} Integer | strictlyPositiveNumber -schoolThickness + {*:1} Integer | strictlyPositiveNumber +schoolMeanDepth + {*:1} Integer | positiveNumber +schoolThickness + {*:1} Integer | positiveNumber supportVesselName + {*:1} String -currentMeasureDepth + {*:1} Integer | strictlyPositiveNumber +currentMeasureDepth + {*:1} Integer | positiveNumber schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference targetCatchCompositionEstimatedByObserver + {*:1} boolean targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean @@ -165,7 +165,7 @@ targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean targetCatch {*} data.ps.observation.TargetCatch | ordered data.ps.observation.TargetCatch > data.Commentable | references=speciesLabel,well,catchWeight -catchWeight + {*:1} Float | notNull strictlyPositiveNumber +catchWeight + {*:1} Float | notNull positiveNumber well + {*:1} String broughtOnDeck + {*:1} Boolean discarded + {*:1} boolean @@ -176,10 +176,10 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference data.ps.observation.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight -length + {*:1} Float | strictlyPositiveNumber +length + {*:1} Float | positiveNumber isLengthComputed + {*:1} boolean count + {*:1} Integer | notNull positiveNumber -weight + {*:1} Float | strictlyPositiveNumber +weight + {*:1} Float | positiveNumber isWeightComputed + {*:1} boolean acquisitionMode + {*:1} int tagNumber + {*:1} String ===================================== dto/src/main/models/Observe-25-data-ps.model ===================================== @@ -5,7 +5,7 @@ measurementValue + {*:1} String gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference data.ps.common.GearUseFeatures > data.Commentable | references=number,usedInTrip -number + {*:1} Integer | notNull strictlyPositiveNumber +number + {*:1} Integer | notNull positiveNumber usedInTrip + {*:1} Boolean gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull ===================================== dto/src/main/models/Observe-30-data-ll-observation.model ===================================== @@ -31,16 +31,16 @@ hasSet + {*:1} Boolean data.ll.observation.BaitsComposition > data.Data | references=baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight,proportion proportion + {*:1} Integer | notNull strictlyPositiveNumber -individualSize + {*:1} Integer | strictlyPositiveNumber -individualWeight + {*:1} Float | strictlyPositiveNumber +individualSize + {*:1} Integer | positiveNumber +individualWeight + {*:1} Float | positiveNumber baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull data.ll.observation.Basket > data.Data >> data.ll.observation.LonglineCompositionDto | references=settingIdentifier,haulingIdentifier,sectionId settingIdentifier + {*:1} Integer haulingIdentifier + {*:1} Integer -floatline1Length + {*:1} Float | strictlyPositiveNumber -floatline2Length + {*:1} Float | strictlyPositiveNumber +floatline1Length + {*:1} Float | positiveNumber +floatline2Length + {*:1} Float | positiveNumber branchline + {*} data.ll.observation.Branchline | ordered unique section + {*:1} fr.ird.observe.dto.data.ll.observation.SectionReference @@ -51,13 +51,13 @@ depthRecorder + {*:1} Boolean timer + {*:1} Boolean timeSinceContact + {*:1} Long | positiveNumber hookOffset + {*:1} Integer | positiveNumber -branchlineLength + {*:1} Float | strictlyPositiveNumber +branchlineLength + {*:1} Float | positiveNumber weightedSwivel + {*:1} Boolean timerTimeOnBoard + {*:1} Date weightedSnap + {*:1} Boolean -swivelWeight + {*:1} Float | strictlyPositiveNumber -snapWeight + {*:1} Float | strictlyPositiveNumber -tracelineLength + {*:1} Float | strictlyPositiveNumber +swivelWeight + {*:1} Float | positiveNumber +snapWeight + {*:1} Float | positiveNumber +tracelineLength + {*:1} Float | positiveNumber hookLost + {*:1} Boolean traceCutOff + {*:1} Boolean baitSettingStatus {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference @@ -70,19 +70,19 @@ baitType {*:0..1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference basket + {*:1} fr.ird.observe.dto.data.ll.observation.BasketReference data.ll.observation.BranchlinesComposition > data.Data | references=topTypeLabel,tracelineTypeLabel,length,proportion -length + {*:1} Float | notNull strictlyPositiveNumber +length + {*:1} Float | notNull positiveNumber proportion + {*:1} Integer | notNull strictlyPositiveNumber -tracelineLength + {*:1} Float | strictlyPositiveNumber +tracelineLength + {*:1} Float | positiveNumber topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull data.ll.observation.Catch > data.Commentable >> data.ll.observation.LonglinePositionAwareDto | references=homeId -count + {*:1} Integer | strictlyPositiveNumber -totalWeight + {*:1} Float | strictlyPositiveNumber +count + {*:1} Integer | positiveNumber +totalWeight + {*:1} Float | positiveNumber hookWhenDiscarded + {*:1} Boolean depredated + {*:1} Boolean -beatDiameter + {*:1} Float | strictlyPositiveNumber -gonadeWeight + {*:1} Float | strictlyPositiveNumber +beatDiameter + {*:1} Float | positiveNumber +gonadeWeight + {*:1} Float | positiveNumber photoReferences + {*:1} String number + {*:1} Integer acquisitionMode + {*:1} int @@ -104,25 +104,25 @@ sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference data.ll.observation.Encounter > data.Data | references=encounterTypeLabel,speciesLabel -distance + {*:1} Float | mayNotNull strictlyPositiveNumber -count + {*:1} Integer | mayNotNull strictlyPositiveNumber +distance + {*:1} Float | mayNotNull positiveNumber +count + {*:1} Integer | mayNotNull positiveNumber species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull encounterType {*:1} fr.ird.observe.dto.referential.ll.observation.EncounterTypeReference | notNull data.ll.observation.FloatlinesComposition > data.Data | references=lineTypeLabel,length,proportion -length + {*:1} Float | notNull strictlyPositiveNumber +length + {*:1} Float | notNull positiveNumber proportion + {*:1} Integer | notNull strictlyPositiveNumber lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull data.ll.observation.HooksComposition > data.Data | references=hookTypeLabel,hookSizeLabel,hookOffset,proportion proportion + {*:1} Integer | notNull strictlyPositiveNumber -hookOffset + {*:1} Integer | strictlyPositiveNumber +hookOffset + {*:1} Integer | positiveNumber hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference data.ll.observation.Section > data.Data >> data.ll.observation.LonglineCompositionDto | references=settingIdentifier,haulingIdentifier -settingIdentifier + {*:1} Integer | notNull strictlyPositiveNumber -haulingIdentifier + {*:1} Integer | strictlyPositiveNumber +settingIdentifier + {*:1} Integer | notNull positiveNumber +haulingIdentifier + {*:1} Integer | positiveNumber basket + {*} data.ll.observation.Basket | ordered unique data.ll.observation.SensorUsed > data.Data | references=sensorTypeLabel @@ -135,21 +135,21 @@ sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandRefer data {*:0..1} data.DataFile data.ll.observation.Set > data.Commentable | references=homeId -number + {*:1} Integer | strictlyPositiveNumber +number + {*:1} Integer | positiveNumber basketsPerSectionCount + {*:1} Integer | notNull strictlyPositiveNumber -branchlinesPerBasketCount + {*:1} Integer | notNull strictlyPositiveNumber -totalSectionsCount + {*:1} Integer | notNull strictlyPositiveNumber -totalBasketsCount + {*:1} Integer | strictlyPositiveNumber -totalHooksCount + {*:1} Integer | strictlyPositiveNumber +branchlinesPerBasketCount + {*:1} Integer | notNull positiveNumber +totalSectionsCount + {*:1} Integer | notNull positiveNumber +totalBasketsCount + {*:1} Integer | positiveNumber +totalHooksCount + {*:1} Integer | positiveNumber weightedSnap + {*:1} Boolean -snapWeight + {*:1} Float | strictlyPositiveNumber +snapWeight + {*:1} Float | positiveNumber weightedSwivel + {*:1} Boolean -swivelWeight + {*:1} Float | strictlyPositiveNumber +swivelWeight + {*:1} Float | positiveNumber lightsticksPerBasketCount + {*:1} Integer timeBetweenHooks + {*:1} Long | positiveNumber shooterUsed + {*:1} Boolean -shooterSpeed + {*:1} Float | strictlyPositiveNumber -maxDepthTargeted + {*:1} Integer | strictlyPositiveNumber +shooterSpeed + {*:1} Float | positiveNumber +maxDepthTargeted + {*:1} Integer | positiveNumber settingStartTimeStamp + {*:1} Date | notNull settingStartLatitude + {*:1} Float | notNull settingStartLongitude + {*:1} Float | notNull @@ -185,9 +185,9 @@ branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference data.ll.observation.SetDetailComposition > data.Data | mainDto=data.ll.observation.Set settingStartTimeStamp + {*:1} Date monitored + {*:1} Boolean -totalSectionsCount + {*:1} Integer | strictlyPositiveNumber -basketsPerSectionCount + {*:1} Integer | strictlyPositiveNumber -branchlinesPerBasketCount + {*:1} Integer | strictlyPositiveNumber +totalSectionsCount + {*:1} Integer | positiveNumber +basketsPerSectionCount + {*:1} Integer | positiveNumber +branchlinesPerBasketCount + {*:1} Integer | positiveNumber haulingDirectionSameAsSetting + {*:1} Boolean haulingBreaks + {*:1} Integer section + {*} data.ll.observation.Section | ordered unique @@ -211,13 +211,13 @@ baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference data.ll.observation.SizeMeasure > data.Data | references=sizeMeasureTypeLabel,size -size + {*:1} Float | strictlyPositiveNumber +size + {*:1} Float | positiveNumber sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference data.ll.observation.Tdr > data.Data >> data.ll.observation.LonglinePositionAwareDto | references=homeId -floatline1Length + {*:1} Float | strictlyPositiveNumber -floatline2Length + {*:1} Float | strictlyPositiveNumber +floatline1Length + {*:1} Float | positiveNumber +floatline2Length + {*:1} Float | positiveNumber serialNo + {*:1} String hasData + {*:1} boolean deploymentStart + {*:1} Date @@ -246,6 +246,6 @@ data.ll.observation.TripActivityStub > data.Data | mainDto=data.ll.observation.A timeStamp + {*:1} Date data.ll.observation.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weight -weight + {*:1} Float | strictlyPositiveNumber +weight + {*:1} Float | positiveNumber weightMeasureType {*:1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference ===================================== dto/src/main/models/Observe-31-data-ll-logbook.model ===================================== @@ -1,9 +1,9 @@ package fr.ird.observe.dto.data.ll.logbook | form=self packagePriority=31 data.ll.logbook.SamplePart > data.Data | references=speciesLabel,length,weight -length + {*:1} Float | strictlyPositiveNumber -weight + {*:1} Float | strictlyPositiveNumber -count + {*:1} Integer | notNull strictlyPositiveNumber +length + {*:1} Float | positiveNumber +weight + {*:1} Float | positiveNumber +count + {*:1} Integer | notNull positiveNumber acquisitionMode + {*:1} int tagNumber + {*:1} String species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull @@ -77,9 +77,9 @@ haulingEndLatitude + {*:1} Float haulingEndLongitude + {*:1} Float haulingBreaks + {*:1} Integer | mayNotNull monitored + {*:1} Boolean -totalLineLength + {*:1} Integer | strictlyPositiveNumber -basketLineLength + {*:1} Integer | strictlyPositiveNumber -lengthBetweenBranchlines + {*:1} Integer | strictlyPositiveNumber +totalLineLength + {*:1} Integer | positiveNumber +basketLineLength + {*:1} Integer | positiveNumber +lengthBetweenBranchlines + {*:1} Integer | positiveNumber haulingStartQuadrant + {*:1} Integer haulingEndQuadrant + {*:1} Integer settingStartQuadrant + {*:1} Integer | notNull @@ -108,35 +108,35 @@ branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition data.ll.logbook.BaitsComposition > data.Data | references=baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight,proportion proportion + {*:1} Integer | notNull positiveNumber -individualSize + {*:1} Integer | strictlyPositiveNumber -individualWeight + {*:1} Float | strictlyPositiveNumber +individualSize + {*:1} Integer | positiveNumber +individualWeight + {*:1} Float | positiveNumber baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull data.ll.logbook.BranchlinesComposition > data.Data | references=topTypeLabel,tracelineTypeLabel,length,proportion -length + {*:1} Float | notNull strictlyPositiveNumber +length + {*:1} Float | notNull positiveNumber proportion + {*:1} Integer | notNull strictlyPositiveNumber -tracelineLength + {*:1} Float | strictlyPositiveNumber +tracelineLength + {*:1} Float | positiveNumber topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull data.ll.logbook.FloatlinesComposition > data.Data | references=lineTypeLabel,length,proportion -length + {*:1} Float | notNull strictlyPositiveNumber +length + {*:1} Float | notNull positiveNumber proportion + {*:1} Integer | notNull strictlyPositiveNumber lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull data.ll.logbook.HooksComposition > data.Data | references=hookTypeLabel,hookSizeLabel,hookOffset,proportion proportion + {*:1} Integer | notNull strictlyPositiveNumber -hookOffset + {*:1} Integer | strictlyPositiveNumber +hookOffset + {*:1} Integer | positiveNumber hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference data.ll.logbook.Catch > data.Commentable | references=homeId -count + {*:1} Integer | strictlyPositiveNumber -totalWeight + {*:1} Float | strictlyPositiveNumber +count + {*:1} Integer | positiveNumber +totalWeight + {*:1} Float | positiveNumber hookWhenDiscarded + {*:1} Boolean depredated + {*:1} Boolean -beatDiameter + {*:1} Float | strictlyPositiveNumber +beatDiameter + {*:1} Float | positiveNumber photoReferences + {*:1} String number + {*:1} Integer acquisitionMode + {*:1} int ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2020.35</version> + <version>2020.36</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportDcpUsageTest.java ===================================== @@ -32,7 +32,9 @@ import org.junit.Ignore; * * @author Tony Chemit - dev@tchemit.fr * @since 1.9 + * FIXME Use new report for FOB (see https://gitlab.com/ultreiaio/ird-observe/-/issues/1529) */ +@Ignore public class ReportDcpUsageTest extends AbstractReportServiceLocalTest { @Override ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -119,158 +119,394 @@ report.dailySetAndCatch.request.1=0,0|row|\ Group By r.date \ Order By r.date ################################################################################ -## Utilisation des FOB +## Utilisation des FOB, tableau simplifie ################################################################################ -report.dcpUsage.modelType=PS -report.dcpUsage.name=Utilisation des FOB -report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de FOB visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es -report.dcpUsage.columns=Type de FOB (Tableau 8),Visit\u00e9s sans p\u00eache,P\u00each\u00e9s,Mis \u00e0 l\u2019eau seuls,Modifi\u00e9s ou renforc\u00e9s,Retir\u00e9s,Abandonn\u00e9s (sans balise ou non d\u00e9truit ou non coul\u00e9),Coul\u00e9s,Remplac\u00e9s,Autre (p\u00e9ciser dans les notes),Tortues associ\u00e9es -report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ +report.fobUsageMinimal.modelType=PS +report.fobUsageMinimal.name=Utilisation des FOB, tableau simplifi\u00e9e +report.fobUsageMinimal.description=Tableau r\u00e9capitulatif des FOB rencontr\u00e9s, par types CECOFAD et types d\u2019actions regroup\u00e9s (rencontr\u00e9s et p\u00each\u00e9s, rencontr\u00e9s non p\u00each\u00e9s, d\u00e9ploy\u00e9s), et nombres de tortues observ\u00e9es +report.fobUsageMinimal.columns=Type de FOB, \ + Rencontr\u00e9s p\u00each\u00e9s, \ + Rencontr\u00e9s non p\u00each\u00e9s, \ + D\u00e9ploy\u00e9s, \ + Tortues associ\u00e9es + +# liste des types CECOFAD en presence sur les donnees selectionnees +report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\ Select distinct (om.standardCode) \ From ObjectMaterialImpl om \ Where standardCode is not null \ And standardCode != '' \ And (Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ ) > 0 -report.dcpUsage.request.1=0,0|row|\ +report.fobUsageMinimal.request.1=0,0|row|\ Select concat(str(om.standardCode) , ' - ', om.label2) \ From ObjectMaterialImpl om \ Where \ om.standardCode = :typeObjetId \ And om.status != 0 -report.dcpUsage.request.1.repeat=typeObjetId|column -# visite -report.dcpUsage.request.2=1,0|row|\ +report.fobUsageMinimal.request.1.repeat=typeObjetId|column + +# rencontres + peches +report.fobUsageMinimal.request.2=1,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \ - and a.vesselActivity.id != 'fr.ird.referential.ps.observation.VesselActivity#1239832675369#0.12552908048322586' -report.dcpUsage.request.2.repeat=typeObjetId|column -# peche -report.dcpUsage.request.3=2,0|row|\ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') +report.fobUsageMinimal.request.2.repeat=typeObjetId|column + +# rencontres - peches +report.fobUsageMinimal.request.3=2,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and (dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#3' Or a.vesselActivity.id = 'fr.ird.referential.ps.observation.VesselActivity#1239832675369#0.12552908048322586') -report.dcpUsage.request.3.repeat=typeObjetId|column -# mis a l'eau -report.dcpUsage.request.4=3,0|row|\ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') +report.fobUsageMinimal.request.3.repeat=typeObjetId|column + +# deployes +report.fobUsageMinimal.request.4=3,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1' -report.dcpUsage.request.4.repeat=typeObjetId|column -# modification ou renforcement -#FIXME Supprime de la requete du dessous -#FIXME and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \ -report.dcpUsage.request.5=4,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' +report.fobUsageMinimal.request.4.repeat=typeObjetId|column + +# Nombre de tortues +report.fobUsageMinimal.request.5=4,0|row| \ + Select Sum(efo.count) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Join dcp.objectObservedSpecies efo \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' +report.fobUsageMinimal.request.5.repeat=typeObjetId|column +################################################################################ +## Utilisation des FOB, tableau detaille +################################################################################ +report.fobUsageExtended.modelType=PS +report.fobUsageExtended.name=Utilisation des FOB, tableau d\u00e9taill\u00e9 +report.fobUsageExtended.description=Tableau r\u00e9capitulatif des FOB rencontr\u00e9s, par types CECOFAD et types d\u2019actions (d\u00e9ploiements, simples visites, modifications, diverses modalit\u00e9s de retraits), avec et sans p\u00eache, et nombres de tortues observ\u00e9es +report.fobUsageExtended.columns=Type de FOB, \ + Visit\u00e9s P\u00each\u00e9s, \ + Visit\u00e9s non P\u00each\u00e9s, \ + D\u00e9ploiement apr\u00e8s P\u00eaches, \ + D\u00e9ploiement seul, \ + Modifi\u00e9s P\u00each\u00e9s, \ + Modifi\u00e9s non P\u00each\u00e9s, \ + Retir\u00e9s P\u00each\u00e9s, \ + Retir\u00e9s non P\u00each\u00e9s, \ + Abandonn\u00e9s P\u00each\u00e9s, \ + Abandonn\u00e9s non P\u00each\u00e9s, \ + Coul\u00e9s P\u00each\u00e9s, \ + Coul\u00e9s non P\u00each\u00e9s, \ + Remplac\u00e9s P\u00each\u00e9s, \ + Remplac\u00e9s non P\u00each\u00e9s, \ + Autre P\u00each\u00e9s, \ + Autre non P\u00each\u00e9s, \ + Tortues associ\u00e9es + +report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\ + Select distinct (om.standardCode) \ + From ObjectMaterialImpl om \ + Where standardCode is not null \ + And standardCode != '' \ + And (Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \ + ) > 0 +report.fobUsageExtended.request.1=0,0|row|\ + Select concat(str(om.standardCode) , ' - ', om.label2) \ + From ObjectMaterialImpl om \ + Where \ + om.standardCode = :typeObjetId \ + And om.status != 0 +report.fobUsageExtended.request.1.repeat=typeObjetId|column + +# visite + peche +report.fobUsageExtended.request.2=1,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8' -report.dcpUsage.request.5.repeat=typeObjetId|column -# Retrait -report.dcpUsage.request.6=5,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.2.repeat=typeObjetId|column + +# visite - peche +report.fobUsageExtended.request.3=2,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4' -report.dcpUsage.request.6.repeat=typeObjetId|column -# abondonne -report.dcpUsage.request.7=6,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.3.repeat=typeObjetId|column + +# Deploiement + peche +report.fobUsageExtended.request.4=3,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.4.repeat=typeObjetId|column + +# Deploiement - peche +report.fobUsageExtended.request.5=4,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.5.repeat=typeObjetId|column + +# Modifie + peche +report.fobUsageExtended.request.6=5,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5' -report.dcpUsage.request.7.repeat=typeObjetId|column -# coule -report.dcpUsage.request.8=7,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.6.repeat=typeObjetId|column + +# Modifie - peche +report.fobUsageExtended.request.7=6,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7' -report.dcpUsage.request.8.repeat=typeObjetId|column -# remplacement -report.dcpUsage.request.9=8,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.7.repeat=typeObjetId|column + +# Retire + peche +report.fobUsageExtended.request.8=7,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#09' -report.dcpUsage.request.9.repeat=typeObjetId|column -# autre -report.dcpUsage.request.10=9,0|row|\ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.8.repeat=typeObjetId|column + +# Retire - peche +report.fobUsageExtended.request.9=8,0|row|\ Select Count(dcp) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.9.repeat=typeObjetId|column + +# Abandonne + peche +report.fobUsageExtended.request.10=9,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.10.repeat=typeObjetId|column + +# Abandonne - peche +report.fobUsageExtended.request.11=10,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.11.repeat=typeObjetId|column + +# Coule + peche +report.fobUsageExtended.request.12=11,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.12.repeat=typeObjetId|column + +# Coule - peche +report.fobUsageExtended.request.13=12,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10' -report.dcpUsage.request.10.repeat=typeObjetId|column -# tortues -report.dcpUsage.request.11=10,0|row| \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.13.repeat=typeObjetId|column + +# Remplace + peche +report.fobUsageExtended.request.14=13,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.14.repeat=typeObjetId|column + +# Remplace - peche +report.fobUsageExtended.request.15=14,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.15.repeat=typeObjetId|column + +# Autre ou ancien peche + peche +report.fobUsageExtended.request.16=15,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ + and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.16.repeat=typeObjetId|column + +# Autre ou ancien peche - peche +report.fobUsageExtended.request.17=16,0|row|\ + Select Count(dcp) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Where \ + m.id In :tripId \ + and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \ + or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \ + and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' +report.fobUsageExtended.request.17.repeat=typeObjetId|column + +# Nombre de tortues +report.fobUsageExtended.request.18=17,0|row| \ Select Sum(efo.count) \ - From TripImpl m \ + From TripSeineImpl m \ Join m.route r \ - Join r.activity a \ + Join r.activitySeine a \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ m.id In :tripId \ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \ - and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461' -report.dcpUsage.request.11.repeat=typeObjetId|column - + and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' +report.fobUsageExtended.request.18.repeat=typeObjetId|column ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== @@ -59,7 +59,7 @@ ReasonForNullSetDto=3 FpaZoneDto=5 NonTargetCatchReleasingTimeDto=1 EncounterTypeDto=1 -VesselDto=11 +VesselDto=10 MitigationTypeDto=1 VesselSizeCategoryDto=1 SizeMeasureTypeDto=3 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e44a87b972ea3a8158604e05c... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e44a87b972ea3a8158604e05c... You're receiving this email because of your account on gitlab.com.