Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
90297d09
by Tony Chemit at 2020-07-02T11:39:45+02:00
-
b514a97e
by Tony Chemit at 2020-07-02T11:39:46+02:00
-
97719eaa
by Tony Chemit at 2020-07-02T11:39:46+02:00
-
9b10570d
by Tony Chemit at 2020-07-02T11:39:46+02:00
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:
| ... | ... | @@ -50,8 +50,10 @@ import org.nuiton.jaxx.widgets.number.NumberCellEditor; |
| 50 | 50 |
import javax.swing.InputMap;
|
| 51 | 51 |
import javax.swing.JComponent;
|
| 52 | 52 |
import javax.swing.JOptionPane;
|
| 53 |
+import javax.swing.JScrollBar;
|
|
| 53 | 54 |
import javax.swing.JScrollPane;
|
| 54 | 55 |
import javax.swing.JSplitPane;
|
| 56 |
+import javax.swing.JTabbedPane;
|
|
| 55 | 57 |
import javax.swing.JTable;
|
| 56 | 58 |
import javax.swing.JTree;
|
| 57 | 59 |
import javax.swing.KeyStroke;
|
| ... | ... | @@ -171,6 +173,10 @@ public class UIHelper extends SwingUtil { |
| 171 | 173 |
"fr.ird.observe.client.ui.admin.actions.CopyToClipBoard"
|
| 172 | 174 |
};
|
| 173 | 175 |
|
| 176 |
+ public static final Class<?>[] ACCEPTABLE_COMPONENTS_TYPE = {
|
|
| 177 |
+ JScrollBar.class, JTabbedPane.class
|
|
| 178 |
+ };
|
|
| 179 |
+ |
|
| 174 | 180 |
static private final Logger log = LogManager.getLogger(UIHelper.class);
|
| 175 | 181 |
private static final String CLIENT_PROPERTY_SKIP_BINDING_TO_BEAN = "skipBindingToBean";
|
| 176 | 182 |
private static final String CLIENT_PROPERTY_SKIP_BINDING_FROM_BEAN = "skipBindingFromBean";
|
| ... | ... | @@ -166,7 +166,7 @@ UrlEditor { |
| 166 | 166 |
}
|
| 167 | 167 |
|
| 168 | 168 |
BlockingLayerUI {
|
| 169 |
- acceptedComponentTypes: {javax.swing.JScrollBar.class};
|
|
| 169 |
+ acceptedComponentTypes: {fr.ird.observe.client.util.UIHelper.ACCEPTABLE_COMPONENTS_TYPE};
|
|
| 170 | 170 |
}
|
| 171 | 171 |
|
| 172 | 172 |
.busyBlockLayerUI {
|
| ... | ... | @@ -369,7 +369,7 @@ public class ContentUIInitializer<UI extends ContentUI> implements WithClientCon |
| 369 | 369 |
}
|
| 370 | 370 |
|
| 371 | 371 |
}
|
| 372 |
- private final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{Objects2.forName("fr.ird.observe.client.datasource.editor.content.data.trip.map.ObserveMapPane"), JScrollBar.class};
|
|
| 372 |
+ private final Class<?>[] acceptedClassesInBlockingLayer = new Class[]{Objects2.forName("fr.ird.observe.client.datasource.editor.content.data.trip.map.ObserveMapPane"), JScrollBar.class, JTabbedPane.class};
|
|
| 373 | 373 |
|
| 374 | 374 |
protected void initBlockLayerUI(String... doNotBlockComponentIds) {
|
| 375 | 375 |
ui.getBlockLayerUI().setAcceptedComponentTypes(acceptedClassesInBlockingLayer);
|
| ... | ... | @@ -144,7 +144,7 @@ species {*:*} fr.ird.observe.dto.referential.common.SpeciesReference | ordered m |
| 144 | 144 |
referential.common.Vessel > referential.I18nReferential | references=code,label,uri,vesselTypeId
|
| 145 | 145 |
keelCode + {*:1} Integer | strictlyPositiveNumber
|
| 146 | 146 |
changeDate + {*:1} Date | mayNotNull
|
| 147 |
-yearService + {*:1} Integer | strictlyPositiveNumber
|
|
| 147 |
+yearService + {*:1} Integer | positiveNumber
|
|
| 148 | 148 |
length + {*:1} Float | strictlyPositiveNumber
|
| 149 | 149 |
capacity + {*:1} Float | strictlyPositiveNumber
|
| 150 | 150 |
power + {*:1} Integer | strictlyPositiveNumber
|
| ... | ... | @@ -55,13 +55,13 @@ data.ps.observation.FloatingObjectSchoolEstimate > data.Commentable | form=data. |
| 55 | 55 |
objectSchoolEstimate {*} data.ps.observation.ObjectSchoolEstimate
|
| 56 | 56 |
|
| 57 | 57 |
data.ps.observation.NonTargetCatch > data.Commentable | references=speciesLabel,speciesFateLabel
|
| 58 |
-catchWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 58 |
+catchWeight + {*:1} Float | positiveNumber
|
|
| 59 | 59 |
catchWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource
|
| 60 |
-meanWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 60 |
+meanWeight + {*:1} Float | positiveNumber
|
|
| 61 | 61 |
meanWeightComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource
|
| 62 |
-meanLength + {*:1} Float | strictlyPositiveNumber
|
|
| 62 |
+meanLength + {*:1} Float | positiveNumber
|
|
| 63 | 63 |
meanLengthComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource
|
| 64 |
-totalCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 64 |
+totalCount + {*:1} Integer | positiveNumber
|
|
| 65 | 65 |
totalCountComputedSource + {*:1} !fr.ird.observe.dto.data.ps.NonTargetCatchComputedValueSource
|
| 66 | 66 |
hasSample + {*:1} boolean
|
| 67 | 67 |
well + {*:1} String
|
| ... | ... | @@ -73,7 +73,7 @@ weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasure |
| 73 | 73 |
lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
|
| 74 | 74 |
|
| 75 | 75 |
data.ps.observation.NonTargetCatchRelease > data.Commentable | references=speciesLabel,speciesGroupReleaseModeLabel,statusLabel,conformityLabel,releasingTimeLabel,length
|
| 76 |
-length + {*:1} Float | strictlyPositiveNumber
|
|
| 76 |
+length + {*:1} Float | positiveNumber
|
|
| 77 | 77 |
count + {*:1} Integer | notNull strictlyPositiveNumber
|
| 78 | 78 |
acquisitionMode + {*:1} int
|
| 79 | 79 |
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 |
| 85 | 85 |
lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
|
| 86 | 86 |
|
| 87 | 87 |
data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length,sexLabel
|
| 88 |
-length + {*:1} Float | strictlyPositiveNumber
|
|
| 88 |
+length + {*:1} Float | positiveNumber
|
|
| 89 | 89 |
isLengthComputed + {*:1} boolean
|
| 90 | 90 |
picturesReferences + {*:1} String
|
| 91 |
-weight + {*:1} Float | strictlyPositiveNumber
|
|
| 91 |
+weight + {*:1} Float | positiveNumber
|
|
| 92 | 92 |
isWeightComputed + {*:1} boolean
|
| 93 |
-count + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 93 |
+count + {*:1} Integer | notNull positiveNumber
|
|
| 94 | 94 |
acquisitionMode + {*:1} int
|
| 95 | 95 |
tagNumber + {*:1} String
|
| 96 | 96 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
|
| ... | ... | @@ -104,12 +104,12 @@ data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observatio |
| 104 | 104 |
nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered
|
| 105 | 105 |
|
| 106 | 106 |
data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count
|
| 107 |
-count + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 107 |
+count + {*:1} Integer | notNull positiveNumber
|
|
| 108 | 108 |
speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference | notNull
|
| 109 | 109 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
|
| 110 | 110 |
|
| 111 | 111 |
data.ps.observation.ObjectSchoolEstimate > data.Data | references=speciesLabel,totalWeight
|
| 112 |
-totalWeight + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 112 |
+totalWeight + {*:1} Integer | notNull positiveNumber
|
|
| 113 | 113 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
|
| 114 | 114 |
weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
|
| 115 | 115 |
|
| ... | ... | @@ -126,8 +126,8 @@ startLogValue + {*:1} Float |
| 126 | 126 |
endLogValue + {*:1} Float
|
| 127 | 127 |
|
| 128 | 128 |
data.ps.observation.SchoolEstimate > data.Data | references=speciesLabel,meanWeight,totalWeight
|
| 129 |
-totalWeight + {*:1} Integer | strictlyPositiveNumber
|
|
| 130 |
-meanWeight + {*:1} Integer | strictlyPositiveNumber
|
|
| 129 |
+totalWeight + {*:1} Integer | positiveNumber
|
|
| 130 |
+meanWeight + {*:1} Integer | positiveNumber
|
|
| 131 | 131 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
|
| 132 | 132 |
weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
|
| 133 | 133 |
|
| ... | ... | @@ -135,14 +135,14 @@ data.ps.observation.Set > data.Commentable | references=comment constants=target |
| 135 | 135 |
startTime + {*:1} Date
|
| 136 | 136 |
endPursingTimeStamp + {*:1} Date
|
| 137 | 137 |
endSetTimeStamp + {*:1} Date
|
| 138 |
-maxGearDepth + {*:1} Integer | strictlyPositiveNumber
|
|
| 139 |
-currentSpeed + {*:1} Float | strictlyPositiveNumber
|
|
| 140 |
-currentDirection + {*:1} Integer | mayNotNull strictlyPositiveNumber
|
|
| 138 |
+maxGearDepth + {*:1} Integer | positiveNumber
|
|
| 139 |
+currentSpeed + {*:1} Float | positiveNumber
|
|
| 140 |
+currentDirection + {*:1} Integer | mayNotNull positiveNumber
|
|
| 141 | 141 |
schoolTopDepth + {*:1} Integer | positiveNumber
|
| 142 |
-schoolMeanDepth + {*:1} Integer | strictlyPositiveNumber
|
|
| 143 |
-schoolThickness + {*:1} Integer | strictlyPositiveNumber
|
|
| 142 |
+schoolMeanDepth + {*:1} Integer | positiveNumber
|
|
| 143 |
+schoolThickness + {*:1} Integer | positiveNumber
|
|
| 144 | 144 |
supportVesselName + {*:1} String
|
| 145 |
-currentMeasureDepth + {*:1} Integer | strictlyPositiveNumber
|
|
| 145 |
+currentMeasureDepth + {*:1} Integer | positiveNumber
|
|
| 146 | 146 |
schoolType + {*:1} fr.ird.observe.dto.referential.ps.common.SchoolTypeReference
|
| 147 | 147 |
targetCatchCompositionEstimatedByObserver + {*:1} boolean
|
| 148 | 148 |
targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean
|
| ... | ... | @@ -165,7 +165,7 @@ targetDiscardCatchCompositionEstimatedByObserver + {*:1} boolean |
| 165 | 165 |
targetCatch {*} data.ps.observation.TargetCatch | ordered
|
| 166 | 166 |
|
| 167 | 167 |
data.ps.observation.TargetCatch > data.Commentable | references=speciesLabel,well,catchWeight
|
| 168 |
-catchWeight + {*:1} Float | notNull strictlyPositiveNumber
|
|
| 168 |
+catchWeight + {*:1} Float | notNull positiveNumber
|
|
| 169 | 169 |
well + {*:1} String
|
| 170 | 170 |
broughtOnDeck + {*:1} Boolean
|
| 171 | 171 |
discarded + {*:1} boolean
|
| ... | ... | @@ -176,10 +176,10 @@ species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull |
| 176 | 176 |
weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
|
| 177 | 177 |
|
| 178 | 178 |
data.ps.observation.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight
|
| 179 |
-length + {*:1} Float | strictlyPositiveNumber
|
|
| 179 |
+length + {*:1} Float | positiveNumber
|
|
| 180 | 180 |
isLengthComputed + {*:1} boolean
|
| 181 | 181 |
count + {*:1} Integer | notNull positiveNumber
|
| 182 |
-weight + {*:1} Float | strictlyPositiveNumber
|
|
| 182 |
+weight + {*:1} Float | positiveNumber
|
|
| 183 | 183 |
isWeightComputed + {*:1} boolean
|
| 184 | 184 |
acquisitionMode + {*:1} int
|
| 185 | 185 |
tagNumber + {*:1} String
|
| ... | ... | @@ -5,7 +5,7 @@ measurementValue + {*:1} String |
| 5 | 5 |
gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference
|
| 6 | 6 |
|
| 7 | 7 |
data.ps.common.GearUseFeatures > data.Commentable | references=number,usedInTrip
|
| 8 |
-number + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 8 |
+number + {*:1} Integer | notNull positiveNumber
|
|
| 9 | 9 |
usedInTrip + {*:1} Boolean
|
| 10 | 10 |
gearUseFeaturesMeasurement + {*} data.ps.common.GearUseFeaturesMeasurement | ordered
|
| 11 | 11 |
gear {*:1} fr.ird.observe.dto.referential.common.GearReference | notNull
|
| ... | ... | @@ -31,16 +31,16 @@ hasSet + {*:1} Boolean |
| 31 | 31 |
|
| 32 | 32 |
data.ll.observation.BaitsComposition > data.Data | references=baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight,proportion
|
| 33 | 33 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 34 |
-individualSize + {*:1} Integer | strictlyPositiveNumber
|
|
| 35 |
-individualWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 34 |
+individualSize + {*:1} Integer | positiveNumber
|
|
| 35 |
+individualWeight + {*:1} Float | positiveNumber
|
|
| 36 | 36 |
baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
|
| 37 | 37 |
baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
|
| 38 | 38 |
|
| 39 | 39 |
data.ll.observation.Basket > data.Data >> data.ll.observation.LonglineCompositionDto | references=settingIdentifier,haulingIdentifier,sectionId
|
| 40 | 40 |
settingIdentifier + {*:1} Integer
|
| 41 | 41 |
haulingIdentifier + {*:1} Integer
|
| 42 |
-floatline1Length + {*:1} Float | strictlyPositiveNumber
|
|
| 43 |
-floatline2Length + {*:1} Float | strictlyPositiveNumber
|
|
| 42 |
+floatline1Length + {*:1} Float | positiveNumber
|
|
| 43 |
+floatline2Length + {*:1} Float | positiveNumber
|
|
| 44 | 44 |
branchline + {*} data.ll.observation.Branchline | ordered unique
|
| 45 | 45 |
section + {*:1} fr.ird.observe.dto.data.ll.observation.SectionReference
|
| 46 | 46 |
|
| ... | ... | @@ -51,13 +51,13 @@ depthRecorder + {*:1} Boolean |
| 51 | 51 |
timer + {*:1} Boolean
|
| 52 | 52 |
timeSinceContact + {*:1} Long | positiveNumber
|
| 53 | 53 |
hookOffset + {*:1} Integer | positiveNumber
|
| 54 |
-branchlineLength + {*:1} Float | strictlyPositiveNumber
|
|
| 54 |
+branchlineLength + {*:1} Float | positiveNumber
|
|
| 55 | 55 |
weightedSwivel + {*:1} Boolean
|
| 56 | 56 |
timerTimeOnBoard + {*:1} Date
|
| 57 | 57 |
weightedSnap + {*:1} Boolean
|
| 58 |
-swivelWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 59 |
-snapWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 60 |
-tracelineLength + {*:1} Float | strictlyPositiveNumber
|
|
| 58 |
+swivelWeight + {*:1} Float | positiveNumber
|
|
| 59 |
+snapWeight + {*:1} Float | positiveNumber
|
|
| 60 |
+tracelineLength + {*:1} Float | positiveNumber
|
|
| 61 | 61 |
hookLost + {*:1} Boolean
|
| 62 | 62 |
traceCutOff + {*:1} Boolean
|
| 63 | 63 |
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 |
| 70 | 70 |
basket + {*:1} fr.ird.observe.dto.data.ll.observation.BasketReference
|
| 71 | 71 |
|
| 72 | 72 |
data.ll.observation.BranchlinesComposition > data.Data | references=topTypeLabel,tracelineTypeLabel,length,proportion
|
| 73 |
-length + {*:1} Float | notNull strictlyPositiveNumber
|
|
| 73 |
+length + {*:1} Float | notNull positiveNumber
|
|
| 74 | 74 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 75 |
-tracelineLength + {*:1} Float | strictlyPositiveNumber
|
|
| 75 |
+tracelineLength + {*:1} Float | positiveNumber
|
|
| 76 | 76 |
topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 77 | 77 |
tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 78 | 78 |
|
| 79 | 79 |
data.ll.observation.Catch > data.Commentable >> data.ll.observation.LonglinePositionAwareDto | references=homeId
|
| 80 |
-count + {*:1} Integer | strictlyPositiveNumber
|
|
| 81 |
-totalWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 80 |
+count + {*:1} Integer | positiveNumber
|
|
| 81 |
+totalWeight + {*:1} Float | positiveNumber
|
|
| 82 | 82 |
hookWhenDiscarded + {*:1} Boolean
|
| 83 | 83 |
depredated + {*:1} Boolean
|
| 84 |
-beatDiameter + {*:1} Float | strictlyPositiveNumber
|
|
| 85 |
-gonadeWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 84 |
+beatDiameter + {*:1} Float | positiveNumber
|
|
| 85 |
+gonadeWeight + {*:1} Float | positiveNumber
|
|
| 86 | 86 |
photoReferences + {*:1} String
|
| 87 | 87 |
number + {*:1} Integer
|
| 88 | 88 |
acquisitionMode + {*:1} int
|
| ... | ... | @@ -104,25 +104,25 @@ sex {*:0..1} fr.ird.observe.dto.referential.common.SexReference |
| 104 | 104 |
weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
|
| 105 | 105 |
|
| 106 | 106 |
data.ll.observation.Encounter > data.Data | references=encounterTypeLabel,speciesLabel
|
| 107 |
-distance + {*:1} Float | mayNotNull strictlyPositiveNumber
|
|
| 108 |
-count + {*:1} Integer | mayNotNull strictlyPositiveNumber
|
|
| 107 |
+distance + {*:1} Float | mayNotNull positiveNumber
|
|
| 108 |
+count + {*:1} Integer | mayNotNull positiveNumber
|
|
| 109 | 109 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | mayNotNull
|
| 110 | 110 |
encounterType {*:1} fr.ird.observe.dto.referential.ll.observation.EncounterTypeReference | notNull
|
| 111 | 111 |
|
| 112 | 112 |
data.ll.observation.FloatlinesComposition > data.Data | references=lineTypeLabel,length,proportion
|
| 113 |
-length + {*:1} Float | notNull strictlyPositiveNumber
|
|
| 113 |
+length + {*:1} Float | notNull positiveNumber
|
|
| 114 | 114 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 115 | 115 |
lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 116 | 116 |
|
| 117 | 117 |
data.ll.observation.HooksComposition > data.Data | references=hookTypeLabel,hookSizeLabel,hookOffset,proportion
|
| 118 | 118 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 119 |
-hookOffset + {*:1} Integer | strictlyPositiveNumber
|
|
| 119 |
+hookOffset + {*:1} Integer | positiveNumber
|
|
| 120 | 120 |
hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
|
| 121 | 121 |
hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
|
| 122 | 122 |
|
| 123 | 123 |
data.ll.observation.Section > data.Data >> data.ll.observation.LonglineCompositionDto | references=settingIdentifier,haulingIdentifier
|
| 124 |
-settingIdentifier + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 125 |
-haulingIdentifier + {*:1} Integer | strictlyPositiveNumber
|
|
| 124 |
+settingIdentifier + {*:1} Integer | notNull positiveNumber
|
|
| 125 |
+haulingIdentifier + {*:1} Integer | positiveNumber
|
|
| 126 | 126 |
basket + {*} data.ll.observation.Basket | ordered unique
|
| 127 | 127 |
|
| 128 | 128 |
data.ll.observation.SensorUsed > data.Data | references=sensorTypeLabel
|
| ... | ... | @@ -135,21 +135,21 @@ sensorBrand {*:1} fr.ird.observe.dto.referential.ll.observation.SensorBrandRefer |
| 135 | 135 |
data {*:0..1} data.DataFile
|
| 136 | 136 |
|
| 137 | 137 |
data.ll.observation.Set > data.Commentable | references=homeId
|
| 138 |
-number + {*:1} Integer | strictlyPositiveNumber
|
|
| 138 |
+number + {*:1} Integer | positiveNumber
|
|
| 139 | 139 |
basketsPerSectionCount + {*:1} Integer | notNull strictlyPositiveNumber
|
| 140 |
-branchlinesPerBasketCount + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 141 |
-totalSectionsCount + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 142 |
-totalBasketsCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 143 |
-totalHooksCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 140 |
+branchlinesPerBasketCount + {*:1} Integer | notNull positiveNumber
|
|
| 141 |
+totalSectionsCount + {*:1} Integer | notNull positiveNumber
|
|
| 142 |
+totalBasketsCount + {*:1} Integer | positiveNumber
|
|
| 143 |
+totalHooksCount + {*:1} Integer | positiveNumber
|
|
| 144 | 144 |
weightedSnap + {*:1} Boolean
|
| 145 |
-snapWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 145 |
+snapWeight + {*:1} Float | positiveNumber
|
|
| 146 | 146 |
weightedSwivel + {*:1} Boolean
|
| 147 |
-swivelWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 147 |
+swivelWeight + {*:1} Float | positiveNumber
|
|
| 148 | 148 |
lightsticksPerBasketCount + {*:1} Integer
|
| 149 | 149 |
timeBetweenHooks + {*:1} Long | positiveNumber
|
| 150 | 150 |
shooterUsed + {*:1} Boolean
|
| 151 |
-shooterSpeed + {*:1} Float | strictlyPositiveNumber
|
|
| 152 |
-maxDepthTargeted + {*:1} Integer | strictlyPositiveNumber
|
|
| 151 |
+shooterSpeed + {*:1} Float | positiveNumber
|
|
| 152 |
+maxDepthTargeted + {*:1} Integer | positiveNumber
|
|
| 153 | 153 |
settingStartTimeStamp + {*:1} Date | notNull
|
| 154 | 154 |
settingStartLatitude + {*:1} Float | notNull
|
| 155 | 155 |
settingStartLongitude + {*:1} Float | notNull
|
| ... | ... | @@ -185,9 +185,9 @@ branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference |
| 185 | 185 |
data.ll.observation.SetDetailComposition > data.Data | mainDto=data.ll.observation.Set
|
| 186 | 186 |
settingStartTimeStamp + {*:1} Date
|
| 187 | 187 |
monitored + {*:1} Boolean
|
| 188 |
-totalSectionsCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 189 |
-basketsPerSectionCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 190 |
-branchlinesPerBasketCount + {*:1} Integer | strictlyPositiveNumber
|
|
| 188 |
+totalSectionsCount + {*:1} Integer | positiveNumber
|
|
| 189 |
+basketsPerSectionCount + {*:1} Integer | positiveNumber
|
|
| 190 |
+branchlinesPerBasketCount + {*:1} Integer | positiveNumber
|
|
| 191 | 191 |
haulingDirectionSameAsSetting + {*:1} Boolean
|
| 192 | 192 |
haulingBreaks + {*:1} Integer
|
| 193 | 193 |
section + {*} data.ll.observation.Section | ordered unique
|
| ... | ... | @@ -211,13 +211,13 @@ baskets {*:*} fr.ird.observe.dto.data.ll.observation.BasketReference |
| 211 | 211 |
branchlines {*:*} fr.ird.observe.dto.data.ll.observation.BranchlineReference
|
| 212 | 212 |
|
| 213 | 213 |
data.ll.observation.SizeMeasure > data.Data | references=sizeMeasureTypeLabel,size
|
| 214 |
-size + {*:1} Float | strictlyPositiveNumber
|
|
| 214 |
+size + {*:1} Float | positiveNumber
|
|
| 215 | 215 |
sizeMeasureType {*:1} fr.ird.observe.dto.referential.common.SizeMeasureTypeReference
|
| 216 | 216 |
lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference
|
| 217 | 217 |
|
| 218 | 218 |
data.ll.observation.Tdr > data.Data >> data.ll.observation.LonglinePositionAwareDto | references=homeId
|
| 219 |
-floatline1Length + {*:1} Float | strictlyPositiveNumber
|
|
| 220 |
-floatline2Length + {*:1} Float | strictlyPositiveNumber
|
|
| 219 |
+floatline1Length + {*:1} Float | positiveNumber
|
|
| 220 |
+floatline2Length + {*:1} Float | positiveNumber
|
|
| 221 | 221 |
serialNo + {*:1} String
|
| 222 | 222 |
hasData + {*:1} boolean
|
| 223 | 223 |
deploymentStart + {*:1} Date
|
| ... | ... | @@ -246,6 +246,6 @@ data.ll.observation.TripActivityStub > data.Data | mainDto=data.ll.observation.A |
| 246 | 246 |
timeStamp + {*:1} Date
|
| 247 | 247 |
|
| 248 | 248 |
data.ll.observation.WeightMeasure > data.Data | references=weightMeasureTypeLabel,weight
|
| 249 |
-weight + {*:1} Float | strictlyPositiveNumber
|
|
| 249 |
+weight + {*:1} Float | positiveNumber
|
|
| 250 | 250 |
weightMeasureType {*:1} fr.ird.observe.dto.referential.common.WeightMeasureTypeReference
|
| 251 | 251 |
weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.WeightMeasureMethodReference
|
| 1 | 1 |
package fr.ird.observe.dto.data.ll.logbook | form=self packagePriority=31
|
| 2 | 2 |
|
| 3 | 3 |
data.ll.logbook.SamplePart > data.Data | references=speciesLabel,length,weight
|
| 4 |
-length + {*:1} Float | strictlyPositiveNumber
|
|
| 5 |
-weight + {*:1} Float | strictlyPositiveNumber
|
|
| 6 |
-count + {*:1} Integer | notNull strictlyPositiveNumber
|
|
| 4 |
+length + {*:1} Float | positiveNumber
|
|
| 5 |
+weight + {*:1} Float | positiveNumber
|
|
| 6 |
+count + {*:1} Integer | notNull positiveNumber
|
|
| 7 | 7 |
acquisitionMode + {*:1} int
|
| 8 | 8 |
tagNumber + {*:1} String
|
| 9 | 9 |
species {*:1} fr.ird.observe.dto.referential.common.SpeciesReference | notNull
|
| ... | ... | @@ -77,9 +77,9 @@ haulingEndLatitude + {*:1} Float |
| 77 | 77 |
haulingEndLongitude + {*:1} Float
|
| 78 | 78 |
haulingBreaks + {*:1} Integer | mayNotNull
|
| 79 | 79 |
monitored + {*:1} Boolean
|
| 80 |
-totalLineLength + {*:1} Integer | strictlyPositiveNumber
|
|
| 81 |
-basketLineLength + {*:1} Integer | strictlyPositiveNumber
|
|
| 82 |
-lengthBetweenBranchlines + {*:1} Integer | strictlyPositiveNumber
|
|
| 80 |
+totalLineLength + {*:1} Integer | positiveNumber
|
|
| 81 |
+basketLineLength + {*:1} Integer | positiveNumber
|
|
| 82 |
+lengthBetweenBranchlines + {*:1} Integer | positiveNumber
|
|
| 83 | 83 |
haulingStartQuadrant + {*:1} Integer
|
| 84 | 84 |
haulingEndQuadrant + {*:1} Integer
|
| 85 | 85 |
settingStartQuadrant + {*:1} Integer | notNull
|
| ... | ... | @@ -108,35 +108,35 @@ branchlinesComposition + {*} data.ll.logbook.BranchlinesComposition |
| 108 | 108 |
|
| 109 | 109 |
data.ll.logbook.BaitsComposition > data.Data | references=baitTypeLabel,baitSettingStatusLabel,individualSize,individualWeight,proportion
|
| 110 | 110 |
proportion + {*:1} Integer | notNull positiveNumber
|
| 111 |
-individualSize + {*:1} Integer | strictlyPositiveNumber
|
|
| 112 |
-individualWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 111 |
+individualSize + {*:1} Integer | positiveNumber
|
|
| 112 |
+individualWeight + {*:1} Float | positiveNumber
|
|
| 113 | 113 |
baitSettingStatus {*:1} fr.ird.observe.dto.referential.ll.common.BaitSettingStatusReference
|
| 114 | 114 |
baitType {*:1} fr.ird.observe.dto.referential.ll.common.BaitTypeReference | notNull
|
| 115 | 115 |
|
| 116 | 116 |
data.ll.logbook.BranchlinesComposition > data.Data | references=topTypeLabel,tracelineTypeLabel,length,proportion
|
| 117 |
-length + {*:1} Float | notNull strictlyPositiveNumber
|
|
| 117 |
+length + {*:1} Float | notNull positiveNumber
|
|
| 118 | 118 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 119 |
-tracelineLength + {*:1} Float | strictlyPositiveNumber
|
|
| 119 |
+tracelineLength + {*:1} Float | positiveNumber
|
|
| 120 | 120 |
topType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 121 | 121 |
tracelineType {*:0..1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 122 | 122 |
|
| 123 | 123 |
data.ll.logbook.FloatlinesComposition > data.Data | references=lineTypeLabel,length,proportion
|
| 124 |
-length + {*:1} Float | notNull strictlyPositiveNumber
|
|
| 124 |
+length + {*:1} Float | notNull positiveNumber
|
|
| 125 | 125 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 126 | 126 |
lineType {*:1} fr.ird.observe.dto.referential.ll.common.LineTypeReference | notNull
|
| 127 | 127 |
|
| 128 | 128 |
data.ll.logbook.HooksComposition > data.Data | references=hookTypeLabel,hookSizeLabel,hookOffset,proportion
|
| 129 | 129 |
proportion + {*:1} Integer | notNull strictlyPositiveNumber
|
| 130 |
-hookOffset + {*:1} Integer | strictlyPositiveNumber
|
|
| 130 |
+hookOffset + {*:1} Integer | positiveNumber
|
|
| 131 | 131 |
hookType {*:1} fr.ird.observe.dto.referential.ll.common.HookTypeReference | notNull
|
| 132 | 132 |
hookSize {*:1} fr.ird.observe.dto.referential.ll.common.HookSizeReference
|
| 133 | 133 |
|
| 134 | 134 |
data.ll.logbook.Catch > data.Commentable | references=homeId
|
| 135 |
-count + {*:1} Integer | strictlyPositiveNumber
|
|
| 136 |
-totalWeight + {*:1} Float | strictlyPositiveNumber
|
|
| 135 |
+count + {*:1} Integer | positiveNumber
|
|
| 136 |
+totalWeight + {*:1} Float | positiveNumber
|
|
| 137 | 137 |
hookWhenDiscarded + {*:1} Boolean
|
| 138 | 138 |
depredated + {*:1} Boolean
|
| 139 |
-beatDiameter + {*:1} Float | strictlyPositiveNumber
|
|
| 139 |
+beatDiameter + {*:1} Float | positiveNumber
|
|
| 140 | 140 |
photoReferences + {*:1} String
|
| 141 | 141 |
number + {*:1} Integer
|
| 142 | 142 |
acquisitionMode + {*:1} int
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>io.ultreia.maven</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2020.35</version>
|
|
| 27 |
+ <version>2020.36</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -32,7 +32,9 @@ import org.junit.Ignore; |
| 32 | 32 |
*
|
| 33 | 33 |
* @author Tony Chemit - dev@tchemit.fr
|
| 34 | 34 |
* @since 1.9
|
| 35 |
+ * FIXME Use new report for FOB (see https://gitlab.com/ultreiaio/ird-observe/-/issues/1529)
|
|
| 35 | 36 |
*/
|
| 37 |
+@Ignore
|
|
| 36 | 38 |
public class ReportDcpUsageTest extends AbstractReportServiceLocalTest {
|
| 37 | 39 |
|
| 38 | 40 |
@Override
|
| ... | ... | @@ -119,158 +119,394 @@ report.dailySetAndCatch.request.1=0,0|row|\ |
| 119 | 119 |
Group By r.date \
|
| 120 | 120 |
Order By r.date
|
| 121 | 121 |
################################################################################
|
| 122 |
-## Utilisation des FOB
|
|
| 122 |
+## Utilisation des FOB, tableau simplifie
|
|
| 123 | 123 |
################################################################################
|
| 124 |
-report.dcpUsage.modelType=PS
|
|
| 125 |
-report.dcpUsage.name=Utilisation des FOB
|
|
| 126 |
-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
|
|
| 127 |
-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
|
|
| 128 |
-report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\
|
|
| 124 |
+report.fobUsageMinimal.modelType=PS
|
|
| 125 |
+report.fobUsageMinimal.name=Utilisation des FOB, tableau simplifi\u00e9e
|
|
| 126 |
+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
|
|
| 127 |
+report.fobUsageMinimal.columns=Type de FOB, \
|
|
| 128 |
+ Rencontr\u00e9s p\u00each\u00e9s, \
|
|
| 129 |
+ Rencontr\u00e9s non p\u00each\u00e9s, \
|
|
| 130 |
+ D\u00e9ploy\u00e9s, \
|
|
| 131 |
+ Tortues associ\u00e9es
|
|
| 132 |
+ |
|
| 133 |
+# liste des types CECOFAD en presence sur les donnees selectionnees
|
|
| 134 |
+report.fobUsageMinimal.repeatVariable.typeObjetId=java.lang.String|\
|
|
| 129 | 135 |
Select distinct (om.standardCode) \
|
| 130 | 136 |
From ObjectMaterialImpl om \
|
| 131 | 137 |
Where standardCode is not null \
|
| 132 | 138 |
And standardCode != '' \
|
| 133 | 139 |
And (Select Count(dcp) \
|
| 134 |
- From TripImpl m \
|
|
| 140 |
+ From TripSeineImpl m \
|
|
| 135 | 141 |
Join m.route r \
|
| 136 |
- Join r.activity a \
|
|
| 142 |
+ Join r.activitySeine a \
|
|
| 137 | 143 |
Join a.floatingObject dcp \
|
| 138 | 144 |
Where \
|
| 139 | 145 |
m.id In :tripId \
|
| 140 | 146 |
and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \
|
| 141 | 147 |
) > 0
|
| 142 |
-report.dcpUsage.request.1=0,0|row|\
|
|
| 148 |
+report.fobUsageMinimal.request.1=0,0|row|\
|
|
| 143 | 149 |
Select concat(str(om.standardCode) , ' - ', om.label2) \
|
| 144 | 150 |
From ObjectMaterialImpl om \
|
| 145 | 151 |
Where \
|
| 146 | 152 |
om.standardCode = :typeObjetId \
|
| 147 | 153 |
And om.status != 0
|
| 148 |
-report.dcpUsage.request.1.repeat=typeObjetId|column
|
|
| 149 |
-# visite
|
|
| 150 |
-report.dcpUsage.request.2=1,0|row|\
|
|
| 154 |
+report.fobUsageMinimal.request.1.repeat=typeObjetId|column
|
|
| 155 |
+ |
|
| 156 |
+# rencontres + peches
|
|
| 157 |
+report.fobUsageMinimal.request.2=1,0|row|\
|
|
| 151 | 158 |
Select Count(dcp) \
|
| 152 |
- From TripImpl m \
|
|
| 159 |
+ From TripSeineImpl m \
|
|
| 153 | 160 |
Join m.route r \
|
| 154 |
- Join r.activity a \
|
|
| 161 |
+ Join r.activitySeine a \
|
|
| 155 | 162 |
Join a.floatingObject dcp \
|
| 156 | 163 |
Where \
|
| 157 | 164 |
m.id In :tripId \
|
| 158 | 165 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 159 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#2' \
|
|
| 160 |
- and a.vesselActivity.id != 'fr.ird.referential.ps.observation.VesselActivity#1239832675369#0.12552908048322586'
|
|
| 161 |
-report.dcpUsage.request.2.repeat=typeObjetId|column
|
|
| 162 |
-# peche
|
|
| 163 |
-report.dcpUsage.request.3=2,0|row|\
|
|
| 166 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586' \
|
|
| 167 |
+ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
|
|
| 168 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
|
|
| 169 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
|
|
| 170 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
|
|
| 171 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
|
|
| 172 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
|
|
| 173 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
|
|
| 174 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3')
|
|
| 175 |
+report.fobUsageMinimal.request.2.repeat=typeObjetId|column
|
|
| 176 |
+ |
|
| 177 |
+# rencontres - peches
|
|
| 178 |
+report.fobUsageMinimal.request.3=2,0|row|\
|
|
| 164 | 179 |
Select Count(dcp) \
|
| 165 |
- From TripImpl m \
|
|
| 180 |
+ From TripSeineImpl m \
|
|
| 166 | 181 |
Join m.route r \
|
| 167 |
- Join r.activity a \
|
|
| 182 |
+ Join r.activitySeine a \
|
|
| 168 | 183 |
Join a.floatingObject dcp \
|
| 169 | 184 |
Where \
|
| 170 | 185 |
m.id In :tripId \
|
| 171 | 186 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 172 |
- 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')
|
|
| 173 |
-report.dcpUsage.request.3.repeat=typeObjetId|column
|
|
| 174 |
-# mis a l'eau
|
|
| 175 |
-report.dcpUsage.request.4=3,0|row|\
|
|
| 187 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 188 |
+and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
|
|
| 189 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
|
|
| 190 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
|
|
| 191 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
|
|
| 192 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
|
|
| 193 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
|
|
| 194 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
|
|
| 195 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3')
|
|
| 196 |
+report.fobUsageMinimal.request.3.repeat=typeObjetId|column
|
|
| 197 |
+ |
|
| 198 |
+# deployes
|
|
| 199 |
+report.fobUsageMinimal.request.4=3,0|row|\
|
|
| 176 | 200 |
Select Count(dcp) \
|
| 177 |
- From TripImpl m \
|
|
| 201 |
+ From TripSeineImpl m \
|
|
| 178 | 202 |
Join m.route r \
|
| 179 |
- Join r.activity a \
|
|
| 203 |
+ Join r.activitySeine a \
|
|
| 180 | 204 |
Join a.floatingObject dcp \
|
| 181 | 205 |
Where \
|
| 182 | 206 |
m.id In :tripId \
|
| 183 | 207 |
and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
|
| 184 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#1'
|
|
| 185 |
-report.dcpUsage.request.4.repeat=typeObjetId|column
|
|
| 186 |
-# modification ou renforcement
|
|
| 187 |
-#FIXME Supprime de la requete du dessous
|
|
| 188 |
-#FIXME and dcp.objectFate.id = 'fr.ird.referential.ps.ObjectFate#1396860761530#0.8869464242156488' \
|
|
| 189 |
-report.dcpUsage.request.5=4,0|row|\
|
|
| 208 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1'
|
|
| 209 |
+report.fobUsageMinimal.request.4.repeat=typeObjetId|column
|
|
| 210 |
+ |
|
| 211 |
+# Nombre de tortues
|
|
| 212 |
+report.fobUsageMinimal.request.5=4,0|row| \
|
|
| 213 |
+ Select Sum(efo.count) \
|
|
| 214 |
+ From TripSeineImpl m \
|
|
| 215 |
+ Join m.route r \
|
|
| 216 |
+ Join r.activitySeine a \
|
|
| 217 |
+ Join a.floatingObject dcp \
|
|
| 218 |
+ Join dcp.objectObservedSpecies efo \
|
|
| 219 |
+ Where \
|
|
| 220 |
+ m.id In :tripId \
|
|
| 221 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 222 |
+ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
|
|
| 223 |
+report.fobUsageMinimal.request.5.repeat=typeObjetId|column
|
|
| 224 |
+################################################################################
|
|
| 225 |
+## Utilisation des FOB, tableau detaille
|
|
| 226 |
+################################################################################
|
|
| 227 |
+report.fobUsageExtended.modelType=PS
|
|
| 228 |
+report.fobUsageExtended.name=Utilisation des FOB, tableau d\u00e9taill\u00e9
|
|
| 229 |
+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
|
|
| 230 |
+report.fobUsageExtended.columns=Type de FOB, \
|
|
| 231 |
+ Visit\u00e9s P\u00each\u00e9s, \
|
|
| 232 |
+ Visit\u00e9s non P\u00each\u00e9s, \
|
|
| 233 |
+ D\u00e9ploiement apr\u00e8s P\u00eaches, \
|
|
| 234 |
+ D\u00e9ploiement seul, \
|
|
| 235 |
+ Modifi\u00e9s P\u00each\u00e9s, \
|
|
| 236 |
+ Modifi\u00e9s non P\u00each\u00e9s, \
|
|
| 237 |
+ Retir\u00e9s P\u00each\u00e9s, \
|
|
| 238 |
+ Retir\u00e9s non P\u00each\u00e9s, \
|
|
| 239 |
+ Abandonn\u00e9s P\u00each\u00e9s, \
|
|
| 240 |
+ Abandonn\u00e9s non P\u00each\u00e9s, \
|
|
| 241 |
+ Coul\u00e9s P\u00each\u00e9s, \
|
|
| 242 |
+ Coul\u00e9s non P\u00each\u00e9s, \
|
|
| 243 |
+ Remplac\u00e9s P\u00each\u00e9s, \
|
|
| 244 |
+ Remplac\u00e9s non P\u00each\u00e9s, \
|
|
| 245 |
+ Autre P\u00each\u00e9s, \
|
|
| 246 |
+ Autre non P\u00each\u00e9s, \
|
|
| 247 |
+ Tortues associ\u00e9es
|
|
| 248 |
+ |
|
| 249 |
+report.fobUsageExtended.repeatVariable.typeObjetId=java.lang.String|\
|
|
| 250 |
+ Select distinct (om.standardCode) \
|
|
| 251 |
+ From ObjectMaterialImpl om \
|
|
| 252 |
+ Where standardCode is not null \
|
|
| 253 |
+ And standardCode != '' \
|
|
| 254 |
+ And (Select Count(dcp) \
|
|
| 255 |
+ From TripSeineImpl m \
|
|
| 256 |
+ Join m.route r \
|
|
| 257 |
+ Join r.activitySeine a \
|
|
| 258 |
+ Join a.floatingObject dcp \
|
|
| 259 |
+ Where \
|
|
| 260 |
+ m.id In :tripId \
|
|
| 261 |
+ and (dcp.computedWhenArrivingSimplifiedObjectType = om.standardCode Or dcp.computedWhenLeavingSimplifiedObjectType = om.standardCode) \
|
|
| 262 |
+ ) > 0
|
|
| 263 |
+report.fobUsageExtended.request.1=0,0|row|\
|
|
| 264 |
+ Select concat(str(om.standardCode) , ' - ', om.label2) \
|
|
| 265 |
+ From ObjectMaterialImpl om \
|
|
| 266 |
+ Where \
|
|
| 267 |
+ om.standardCode = :typeObjetId \
|
|
| 268 |
+ And om.status != 0
|
|
| 269 |
+report.fobUsageExtended.request.1.repeat=typeObjetId|column
|
|
| 270 |
+ |
|
| 271 |
+# visite + peche
|
|
| 272 |
+report.fobUsageExtended.request.2=1,0|row|\
|
|
| 190 | 273 |
Select Count(dcp) \
|
| 191 |
- From TripImpl m \
|
|
| 274 |
+ From TripSeineImpl m \
|
|
| 192 | 275 |
Join m.route r \
|
| 193 |
- Join r.activity a \
|
|
| 276 |
+ Join r.activitySeine a \
|
|
| 194 | 277 |
Join a.floatingObject dcp \
|
| 195 | 278 |
Where \
|
| 196 | 279 |
m.id In :tripId \
|
| 197 | 280 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 198 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#8'
|
|
| 199 |
-report.dcpUsage.request.5.repeat=typeObjetId|column
|
|
| 200 |
-# Retrait
|
|
| 201 |
-report.dcpUsage.request.6=5,0|row|\
|
|
| 281 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
|
|
| 282 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 283 |
+report.fobUsageExtended.request.2.repeat=typeObjetId|column
|
|
| 284 |
+ |
|
| 285 |
+# visite - peche
|
|
| 286 |
+report.fobUsageExtended.request.3=2,0|row|\
|
|
| 202 | 287 |
Select Count(dcp) \
|
| 203 |
- From TripImpl m \
|
|
| 288 |
+ From TripSeineImpl m \
|
|
| 204 | 289 |
Join m.route r \
|
| 205 |
- Join r.activity a \
|
|
| 290 |
+ Join r.activitySeine a \
|
|
| 206 | 291 |
Join a.floatingObject dcp \
|
| 207 | 292 |
Where \
|
| 208 | 293 |
m.id In :tripId \
|
| 209 | 294 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 210 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#4'
|
|
| 211 |
-report.dcpUsage.request.6.repeat=typeObjetId|column
|
|
| 212 |
-# abondonne
|
|
| 213 |
-report.dcpUsage.request.7=6,0|row|\
|
|
| 295 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#2' \
|
|
| 296 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 297 |
+report.fobUsageExtended.request.3.repeat=typeObjetId|column
|
|
| 298 |
+ |
|
| 299 |
+# Deploiement + peche
|
|
| 300 |
+report.fobUsageExtended.request.4=3,0|row|\
|
|
| 214 | 301 |
Select Count(dcp) \
|
| 215 |
- From TripImpl m \
|
|
| 302 |
+ From TripSeineImpl m \
|
|
| 216 | 303 |
Join m.route r \
|
| 217 |
- Join r.activity a \
|
|
| 304 |
+ Join r.activitySeine a \
|
|
| 305 |
+ Join a.floatingObject dcp \
|
|
| 306 |
+ Where \
|
|
| 307 |
+ m.id In :tripId \
|
|
| 308 |
+ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
|
|
| 309 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \
|
|
| 310 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 311 |
+report.fobUsageExtended.request.4.repeat=typeObjetId|column
|
|
| 312 |
+ |
|
| 313 |
+# Deploiement - peche
|
|
| 314 |
+report.fobUsageExtended.request.5=4,0|row|\
|
|
| 315 |
+ Select Count(dcp) \
|
|
| 316 |
+ From TripSeineImpl m \
|
|
| 317 |
+ Join m.route r \
|
|
| 318 |
+ Join r.activitySeine a \
|
|
| 319 |
+ Join a.floatingObject dcp \
|
|
| 320 |
+ Where \
|
|
| 321 |
+ m.id In :tripId \
|
|
| 322 |
+ and dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId \
|
|
| 323 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1' \
|
|
| 324 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 325 |
+report.fobUsageExtended.request.5.repeat=typeObjetId|column
|
|
| 326 |
+ |
|
| 327 |
+# Modifie + peche
|
|
| 328 |
+report.fobUsageExtended.request.6=5,0|row|\
|
|
| 329 |
+ Select Count(dcp) \
|
|
| 330 |
+ From TripSeineImpl m \
|
|
| 331 |
+ Join m.route r \
|
|
| 332 |
+ Join r.activitySeine a \
|
|
| 218 | 333 |
Join a.floatingObject dcp \
|
| 219 | 334 |
Where \
|
| 220 | 335 |
m.id In :tripId \
|
| 221 | 336 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 222 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#5'
|
|
| 223 |
-report.dcpUsage.request.7.repeat=typeObjetId|column
|
|
| 224 |
-# coule
|
|
| 225 |
-report.dcpUsage.request.8=7,0|row|\
|
|
| 337 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
|
|
| 338 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 339 |
+report.fobUsageExtended.request.6.repeat=typeObjetId|column
|
|
| 340 |
+ |
|
| 341 |
+# Modifie - peche
|
|
| 342 |
+report.fobUsageExtended.request.7=6,0|row|\
|
|
| 226 | 343 |
Select Count(dcp) \
|
| 227 |
- From TripImpl m \
|
|
| 344 |
+ From TripSeineImpl m \
|
|
| 228 | 345 |
Join m.route r \
|
| 229 |
- Join r.activity a \
|
|
| 346 |
+ Join r.activitySeine a \
|
|
| 230 | 347 |
Join a.floatingObject dcp \
|
| 231 | 348 |
Where \
|
| 232 | 349 |
m.id In :tripId \
|
| 233 | 350 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 234 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#7'
|
|
| 235 |
-report.dcpUsage.request.8.repeat=typeObjetId|column
|
|
| 236 |
-# remplacement
|
|
| 237 |
-report.dcpUsage.request.9=8,0|row|\
|
|
| 351 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#8' \
|
|
| 352 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 353 |
+report.fobUsageExtended.request.7.repeat=typeObjetId|column
|
|
| 354 |
+ |
|
| 355 |
+# Retire + peche
|
|
| 356 |
+report.fobUsageExtended.request.8=7,0|row|\
|
|
| 238 | 357 |
Select Count(dcp) \
|
| 239 |
- From TripImpl m \
|
|
| 358 |
+ From TripSeineImpl m \
|
|
| 240 | 359 |
Join m.route r \
|
| 241 |
- Join r.activity a \
|
|
| 360 |
+ Join r.activitySeine a \
|
|
| 242 | 361 |
Join a.floatingObject dcp \
|
| 243 | 362 |
Where \
|
| 244 | 363 |
m.id In :tripId \
|
| 245 | 364 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 246 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#09'
|
|
| 247 |
-report.dcpUsage.request.9.repeat=typeObjetId|column
|
|
| 248 |
-# autre
|
|
| 249 |
-report.dcpUsage.request.10=9,0|row|\
|
|
| 365 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
|
|
| 366 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 367 |
+report.fobUsageExtended.request.8.repeat=typeObjetId|column
|
|
| 368 |
+ |
|
| 369 |
+# Retire - peche
|
|
| 370 |
+report.fobUsageExtended.request.9=8,0|row|\
|
|
| 250 | 371 |
Select Count(dcp) \
|
| 251 |
- From TripImpl m \
|
|
| 372 |
+ From TripSeineImpl m \
|
|
| 252 | 373 |
Join m.route r \
|
| 253 |
- Join r.activity a \
|
|
| 374 |
+ Join r.activitySeine a \
|
|
| 375 |
+ Join a.floatingObject dcp \
|
|
| 376 |
+ Where \
|
|
| 377 |
+ m.id In :tripId \
|
|
| 378 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 379 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#4' \
|
|
| 380 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 381 |
+report.fobUsageExtended.request.9.repeat=typeObjetId|column
|
|
| 382 |
+ |
|
| 383 |
+# Abandonne + peche
|
|
| 384 |
+report.fobUsageExtended.request.10=9,0|row|\
|
|
| 385 |
+ Select Count(dcp) \
|
|
| 386 |
+ From TripSeineImpl m \
|
|
| 387 |
+ Join m.route r \
|
|
| 388 |
+ Join r.activitySeine a \
|
|
| 389 |
+ Join a.floatingObject dcp \
|
|
| 390 |
+ Where \
|
|
| 391 |
+ m.id In :tripId \
|
|
| 392 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 393 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
|
|
| 394 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 395 |
+report.fobUsageExtended.request.10.repeat=typeObjetId|column
|
|
| 396 |
+ |
|
| 397 |
+# Abandonne - peche
|
|
| 398 |
+report.fobUsageExtended.request.11=10,0|row|\
|
|
| 399 |
+ Select Count(dcp) \
|
|
| 400 |
+ From TripSeineImpl m \
|
|
| 401 |
+ Join m.route r \
|
|
| 402 |
+ Join r.activitySeine a \
|
|
| 403 |
+ Join a.floatingObject dcp \
|
|
| 404 |
+ Where \
|
|
| 405 |
+ m.id In :tripId \
|
|
| 406 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 407 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#5' \
|
|
| 408 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 409 |
+report.fobUsageExtended.request.11.repeat=typeObjetId|column
|
|
| 410 |
+ |
|
| 411 |
+# Coule + peche
|
|
| 412 |
+report.fobUsageExtended.request.12=11,0|row|\
|
|
| 413 |
+ Select Count(dcp) \
|
|
| 414 |
+ From TripSeineImpl m \
|
|
| 415 |
+ Join m.route r \
|
|
| 416 |
+ Join r.activitySeine a \
|
|
| 417 |
+ Join a.floatingObject dcp \
|
|
| 418 |
+ Where \
|
|
| 419 |
+ m.id In :tripId \
|
|
| 420 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 421 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
|
|
| 422 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 423 |
+report.fobUsageExtended.request.12.repeat=typeObjetId|column
|
|
| 424 |
+ |
|
| 425 |
+# Coule - peche
|
|
| 426 |
+report.fobUsageExtended.request.13=12,0|row|\
|
|
| 427 |
+ Select Count(dcp) \
|
|
| 428 |
+ From TripSeineImpl m \
|
|
| 429 |
+ Join m.route r \
|
|
| 430 |
+ Join r.activitySeine a \
|
|
| 254 | 431 |
Join a.floatingObject dcp \
|
| 255 | 432 |
Where \
|
| 256 | 433 |
m.id In :tripId \
|
| 257 | 434 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 258 |
- and dcp.objectOperation.id = 'fr.ird.referential.ps.common.ObjectOperation#0#10'
|
|
| 259 |
-report.dcpUsage.request.10.repeat=typeObjetId|column
|
|
| 260 |
-# tortues
|
|
| 261 |
-report.dcpUsage.request.11=10,0|row| \
|
|
| 435 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#7' \
|
|
| 436 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 437 |
+report.fobUsageExtended.request.13.repeat=typeObjetId|column
|
|
| 438 |
+ |
|
| 439 |
+# Remplace + peche
|
|
| 440 |
+report.fobUsageExtended.request.14=13,0|row|\
|
|
| 441 |
+ Select Count(dcp) \
|
|
| 442 |
+ From TripSeineImpl m \
|
|
| 443 |
+ Join m.route r \
|
|
| 444 |
+ Join r.activitySeine a \
|
|
| 445 |
+ Join a.floatingObject dcp \
|
|
| 446 |
+ Where \
|
|
| 447 |
+ m.id In :tripId \
|
|
| 448 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 449 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
|
|
| 450 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 451 |
+report.fobUsageExtended.request.14.repeat=typeObjetId|column
|
|
| 452 |
+ |
|
| 453 |
+# Remplace - peche
|
|
| 454 |
+report.fobUsageExtended.request.15=14,0|row|\
|
|
| 455 |
+ Select Count(dcp) \
|
|
| 456 |
+ From TripSeineImpl m \
|
|
| 457 |
+ Join m.route r \
|
|
| 458 |
+ Join r.activitySeine a \
|
|
| 459 |
+ Join a.floatingObject dcp \
|
|
| 460 |
+ Where \
|
|
| 461 |
+ m.id In :tripId \
|
|
| 462 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 463 |
+ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#9' \
|
|
| 464 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 465 |
+report.fobUsageExtended.request.15.repeat=typeObjetId|column
|
|
| 466 |
+ |
|
| 467 |
+# Autre ou ancien peche + peche
|
|
| 468 |
+report.fobUsageExtended.request.16=15,0|row|\
|
|
| 469 |
+ Select Count(dcp) \
|
|
| 470 |
+ From TripSeineImpl m \
|
|
| 471 |
+ Join m.route r \
|
|
| 472 |
+ Join r.activitySeine a \
|
|
| 473 |
+ Join a.floatingObject dcp \
|
|
| 474 |
+ Where \
|
|
| 475 |
+ m.id In :tripId \
|
|
| 476 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 477 |
+ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
|
|
| 478 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \
|
|
| 479 |
+ and a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 480 |
+report.fobUsageExtended.request.16.repeat=typeObjetId|column
|
|
| 481 |
+ |
|
| 482 |
+# Autre ou ancien peche - peche
|
|
| 483 |
+report.fobUsageExtended.request.17=16,0|row|\
|
|
| 484 |
+ Select Count(dcp) \
|
|
| 485 |
+ From TripSeineImpl m \
|
|
| 486 |
+ Join m.route r \
|
|
| 487 |
+ Join r.activitySeine a \
|
|
| 488 |
+ Join a.floatingObject dcp \
|
|
| 489 |
+ Where \
|
|
| 490 |
+ m.id In :tripId \
|
|
| 491 |
+ and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
|
| 492 |
+ and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10' \
|
|
| 493 |
+ or dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3') \
|
|
| 494 |
+ and a.vesselActivitySeine.id != 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586'
|
|
| 495 |
+report.fobUsageExtended.request.17.repeat=typeObjetId|column
|
|
| 496 |
+ |
|
| 497 |
+# Nombre de tortues
|
|
| 498 |
+report.fobUsageExtended.request.18=17,0|row| \
|
|
| 262 | 499 |
Select Sum(efo.count) \
|
| 263 |
- From TripImpl m \
|
|
| 500 |
+ From TripSeineImpl m \
|
|
| 264 | 501 |
Join m.route r \
|
| 265 |
- Join r.activity a \
|
|
| 502 |
+ Join r.activitySeine a \
|
|
| 266 | 503 |
Join a.floatingObject dcp \
|
| 267 | 504 |
Join dcp.objectObservedSpecies efo \
|
| 268 | 505 |
Where \
|
| 269 | 506 |
m.id In :tripId \
|
| 270 | 507 |
and dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId \
|
| 271 |
- and efo.species.speciesGroup.id = 'fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461'
|
|
| 272 |
-report.dcpUsage.request.11.repeat=typeObjetId|column
|
|
| 273 |
- |
|
| 508 |
+ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461'
|
|
| 509 |
+report.fobUsageExtended.request.18.repeat=typeObjetId|column
|
|
| 274 | 510 |
################################################################################
|
| 275 | 511 |
## Nombre des cal\u00e9es selon le type d'association
|
| 276 | 512 |
################################################################################
|
| ... | ... | @@ -59,7 +59,7 @@ ReasonForNullSetDto=3 |
| 59 | 59 |
FpaZoneDto=5
|
| 60 | 60 |
NonTargetCatchReleasingTimeDto=1
|
| 61 | 61 |
EncounterTypeDto=1
|
| 62 |
-VesselDto=11
|
|
| 62 |
+VesselDto=10
|
|
| 63 | 63 |
MitigationTypeDto=1
|
| 64 | 64 |
VesselSizeCategoryDto=1
|
| 65 | 65 |
SizeMeasureTypeDto=3
|