Commit 49216b2b authored by COTONNEC's avatar COTONNEC
Browse files

[fix] fix database errors for ACOST program

parent 5d04a55b
......@@ -36,7 +36,7 @@
<!-- Test if database is empty -->
<sqlCheck expectedResult="0">${sqlCheck.empty.sql}</sqlCheck>
<!-- OR if expected production database -->
<sqlCheck expectedResult="${sqlCheck.adap.expectedResult}">${sqlCheck.adap.sql}</sqlCheck>
<sqlCheck expectedResult="${sqlCheck.acost.expectedResult}">${sqlCheck.acost.sql}</sqlCheck>
</or>
</preConditions>
......
......@@ -52,6 +52,7 @@
<PROGRAM_PROPERTY ID="91" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.autoFill" NAME="true"/>
<PROGRAM_PROPERTY ID="92" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.metiers.enable" NAME="false"/>
<PROGRAM_PROPERTY ID="93" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.linked" NAME="true"/>
<PROGRAM_PROPERTY ID="93" STATUS_FK="1" PROGRAM_FK="50" CREATION_DATE="2019-02-11" LABEL="sumaris.trip.operation.batch.taxonName.enable" NAME="false"/>
<PROGRAM2LOCATION_CLASSIF PROGRAM_FK="50" LOCATION_CLASSIFICATION_FK="2"/>
......@@ -68,8 +69,9 @@
<PMFM_STRATEGY ID="600" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="1" PMFM_FK="21" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="1" MIN_VALUE="1" MAX_VALUE="50"/>
<!-- PmfmStrategy / Physical gear -->
<PMFM_STRATEGY ID="610" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="2" PMFM_FK="3" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="611" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="2" PMFM_FK="380" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="610" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="2" PMFM_FK="120" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="611" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="2" PMFM_FK="3" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="612" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="2" PMFM_FK="380" RANK_ORDER="3" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<!-- PmfmStrategy / Operation -->
<PMFM_STRATEGY ID="620" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="3" PMFM_FK="29" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
......@@ -82,17 +84,19 @@
<PMFM_STRATEGY ID="640" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="4" PMFM_FK="95" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
<!-- PmfmStrategy / Sorting batch -->
<PMFM_STRATEGY ID="650" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="5" PMFM_FK="90" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
<PMFM_STRATEGY ID="651" STRATEGY_FK="10" ACQUISITION_LEVEL_FK="5" PMFM_FK="91" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
<PMFM_STRATEGY ID="650" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="5" PMFM_FK="90" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
<PMFM_STRATEGY ID="651" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="5" PMFM_FK="91" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="0"/>
<!-- PmfmStrategy / Sorting batch / individual -->
<PMFM_STRATEGY ID="652" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="6" PMFM_FK="90" RANK_ORDER="1" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="653" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="6" PMFM_FK="80" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<PMFM_STRATEGY ID="653" STRATEGY_FK="40" ACQUISITION_LEVEL_FK="6" PMFM_FK="81" RANK_ORDER="2" ACQUISITION_NUMBER="1" IS_MANDATORY="1"/>
<!-- **** Nets **** -->
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="610" GEAR_FK="11"/>
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="610" GEAR_FK="20"/>
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="611" GEAR_FK="11"/>
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="611" GEAR_FK="20"/>
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="612" GEAR_FK="11"/>
<PMFM_STRATEGY2GEAR PMFM_STRATEGY_FK="612" GEAR_FK="20"/>
</dataset>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment