Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

19 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -356,9 +356,11 @@ observe.common.NonTargetSampleDto.action.create.tip
    356 356 
     observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip
    357 357 
     observe.common.NonTargetSampleDto.message.cantAdd
    358 358 
     observe.common.NonTargetSampleDto.title
    359 
    +observe.common.ObjectMaterialDto.biodegradable
    359 360 
     observe.common.ObjectMaterialDto.childSelectionMandatory
    360 361 
     observe.common.ObjectMaterialDto.childrenMultiSelectable
    361 362 
     observe.common.ObjectMaterialDto.legacyCodeStandardCode
    363 
    +observe.common.ObjectMaterialDto.nonEntangling
    362 364 
     observe.common.ObjectMaterialDto.objectMaterialType
    363 365 
     observe.common.ObjectMaterialDto.parentCode
    364 366 
     observe.common.ObjectMaterialDto.validation

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jaxx
    ... ... @@ -30,7 +30,8 @@
    30 30 
         fr.ird.observe.dto.referential.seine.ObjectMaterialDto
    31 31 
         fr.ird.observe.dto.referential.seine.ObjectMaterialReference
    32 32 
         fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference
    33 
    -
    33 
    +    fr.ird.observe.client.ui.util.BooleanEditor
    34 
    +
    34 35 
         org.nuiton.jaxx.widgets.select.BeanFilterableComboBox
    35 36
    36 37 
         static fr.ird.observe.client.ui.util.UIHelper.getStringValue
    ... ... @@ -114,8 +115,26 @@
    114 115 
           </cell>
    115 116 
         </row>
    116 117
    118 
    +    <!--biodegradable-->
    119 
    +    <row>
    120 
    +      <cell anchor="west">
    121 
    +        <JLabel id='biodegradableLabel'/>
    122 
    +      </cell>
    123 
    +      <cell anchor='east' weightx="1" fill="both">
    124 
    +        <BooleanEditor id='biodegradable'/>
    125 
    +      </cell>
    126 
    +    </row>
    127 
    +    <!--nonEntangling-->
    128 
    +    <row>
    129 
    +      <cell anchor="west">
    130 
    +        <JLabel id='nonEntanglingLabel'/>
    131 
    +      </cell>
    132 
    +      <cell anchor='east' weightx="1" fill="both">
    133 
    +        <BooleanEditor id='nonEntangling'/>
    134 
    +      </cell>
    135 
    +    </row>
    136 
    +
    117 137 
         <!-- validation -->
    118 
    -    <!-- coefficients -->
    119 138 
         <row>
    120 139 
           <cell anchor='west' columns="2">
    121 140 
             <JLabel id='validationInformation'/>

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/seine/ObjectMaterialUI.jcss
    ... ... @@ -57,3 +57,11 @@
    57 57 
     #childSelectionMandatory {
    58 58 
       selected:{bean.isChildSelectionMandatory()};
    59 59 
     }
    60 
    +
    61 
    +#nonEntangling {
    62 
    +  booleanValue:{bean.getNonEntangling()};
    63 
    +}
    64 
    +
    65 
    +#biodegradable {
    66 
    +  booleanValue:{bean.getBiodegradable()};
    67 
    +}

  • dto/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialDtoReferenceBinder.java
    ... ... @@ -48,8 +48,8 @@ public class ObjectMaterialDtoReferenceBinder extends ReferentialDtoReferenceBin
    48 48 
                                                Optional.ofNullable(dto.getParent()).map(GeneratedObjectMaterialReference::getParentId).orElse(null),
    49 49 
                                                Optional.ofNullable(dto.getObjectMaterialType()).map(ReferentialDtoReference::getId).orElse(null),
    50 50 
                                                dto.getValidation(),
    51 
    -                                           dto.isBiodegradable(),
    52 
    -                                           dto.isNonEntangling());
    51 
    +                                           dto.getBiodegradable(),
    52 
    +                                           dto.getNonEntangling());
    53 53
    54 54 
         }
    55 55 
     }

  • dto/src/main/models/Observe.model
    ... ... @@ -553,8 +553,8 @@ referential.seine.NonTargetCatchReleasingTime > referential.I18nReferential
    553 553 
     referential.seine.ObjectMaterial > referential.I18nReferential | references=code,label,uri,parentId,objectMaterialTypeId,validation,biodegradable,nonEntangling
    554 554 
     legacyCode + {*:1} String
    555 555 
     standardCode + {*:1} String
    556 
    -biodegradable + {*:1} boolean
    557 
    -nonEntangling + {*:1} boolean
    556 
    +biodegradable + {*:1} Boolean
    557 
    +nonEntangling + {*:1} Boolean
    558 558 
     childrenMultiSelectable + {*:1} boolean
    559 559 
     childSelectionMandatory + {*:1} boolean
    560 560 
     parent {*:0..1} fr.ird.observe.dto.referential.seine.ObjectMaterialReference

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insert this non target sampl
    949 949 
     observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reset
    950 950 
     observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Can not add non target samples</strong>(no rejected non target catch)</body></html>
    951 951 
     observe.common.NonTargetSampleDto.title=Non target sample
    952 
    +observe.common.ObjectMaterialDto.biodegradable=Biodegradable
    952 953 
     observe.common.ObjectMaterialDto.childSelectionMandatory=child selection mandatory
    953 954 
     observe.common.ObjectMaterialDto.childrenMultiSelectable=children multi selectable
    954 955 
     observe.common.ObjectMaterialDto.legacyCode=Legacy code
    955 956 
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Legacy code / Standard code
    957 
    +observe.common.ObjectMaterialDto.nonEntangling=Non entangling
    956 958 
     observe.common.ObjectMaterialDto.objectMaterialType=Type
    957 959 
     observe.common.ObjectMaterialDto.parent=Parent
    958 960 
     observe.common.ObjectMaterialDto.parentCode=Parent

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insertar el muestreo de faun
    949 949 
     observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Reiniciar
    950 950 
     observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Imposible añadir los muestreos de fauna accesoria</strong>(no hay descartes de fauna)</body></html>
    951 951 
     observe.common.NonTargetSampleDto.title=Muestreo fauna accesoria
    952 
    +observe.common.ObjectMaterialDto.biodegradable=Biodegradable
    952 953 
     observe.common.ObjectMaterialDto.childSelectionMandatory=Obligatorio seleccionar un campo
    953 954 
     observe.common.ObjectMaterialDto.childrenMultiSelectable=Selección múltiple da campos
    954 955 
     observe.common.ObjectMaterialDto.legacyCode=Código antiguo
    955 956 
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Código antiguo / Código estándar
    957 
    +observe.common.ObjectMaterialDto.nonEntangling=No enmallante
    956 958 
     observe.common.ObjectMaterialDto.objectMaterialType=Tipo
    957 959 
     observe.common.ObjectMaterialDto.parent=Componente asociado
    958 960 
     observe.common.ObjectMaterialDto.parentCode=Código de componente asociado

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -949,10 +949,12 @@ observe.common.NonTargetSampleDto.action.create.tip=Insérer cet échantillon d'
    949 949 
     observe.common.NonTargetSampleDto.action.resetPicturesReferences.tip=Réinitialiser
    950 950 
     observe.common.NonTargetSampleDto.message.cantAdd=<html><body><strong>Impossible d'ajouter des échantillons</strong>(pas de rejet faune)</body></html>
    951 951 
     observe.common.NonTargetSampleDto.title=Échantillons espèces accessoires
    952 
    +observe.common.ObjectMaterialDto.biodegradable=Biodégradable
    952 953 
     observe.common.ObjectMaterialDto.childSelectionMandatory=Sélection d'un fils obligatoire
    953 954 
     observe.common.ObjectMaterialDto.childrenMultiSelectable=Sélection multiple des fils
    954 955 
     observe.common.ObjectMaterialDto.legacyCode=Ancien code
    955 956 
     observe.common.ObjectMaterialDto.legacyCodeStandardCode=Ancien code / Code standard
    957 
    +observe.common.ObjectMaterialDto.nonEntangling=Non maillant
    956 958 
     observe.common.ObjectMaterialDto.objectMaterialType=Type
    957 959 
     observe.common.ObjectMaterialDto.parent=Parent
    958 960 
     observe.common.ObjectMaterialDto.parentCode=Parent

  • persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityDtoBinder.java
    ... ... @@ -50,6 +50,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup
    50 50 
             entity.setValidation(dto.getValidation());
    51 51 
             entity.setChildrenMultiSelectable(dto.isChildrenMultiSelectable());
    52 52 
             entity.setChildSelectionMandatory(dto.isChildSelectionMandatory());
    53 
    +        entity.setBiodegradable(dto.getBiodegradable());
    54 
    +        entity.setNonEntangling(dto.getNonEntangling());
    53 55 
         }
    54 56
    55 57 
         @Override
    ... ... @@ -65,6 +67,8 @@ public class ObjectMaterialEntityDtoBinder extends ReferentialEntityDtoBinderSup
    65 67 
             dto.setValidation(entity.getValidation());
    66 68 
             dto.setChildrenMultiSelectable(entity.isChildrenMultiSelectable());
    67 69 
             dto.setChildSelectionMandatory(entity.isChildSelectionMandatory());
    70 
    +        dto.setBiodegradable(entity.getBiodegradable());
    71 
    +        dto.setNonEntangling(entity.getNonEntangling());
    68 72
    69 73 
         }
    70 74

  • persistence/src/main/java/fr/ird/observe/binder/referential/seine/ObjectMaterialEntityReferenceBinder.java
    ... ... @@ -48,8 +48,8 @@ public class ObjectMaterialEntityReferenceBinder extends ReferentialEntityRefere
    48 48 
                                                Optional.ofNullable(dto.getParent()).map(TopiaEntity::getTopiaId).orElse(null),
    49 49 
                                                Optional.ofNullable(dto.getObjectMaterialType()).map(TopiaEntity::getTopiaId).orElse(null),
    50 50 
                                                dto.getValidation(),
    51 
    -                                           dto.isBiodegradable(),
    52 
    -                                           dto.isNonEntangling());
    51 
    +                                           dto.getBiodegradable(),
    52 
    +                                           dto.getNonEntangling());
    53 53
    54 54 
         }
    55 55 
     }

  • persistence/src/main/models/Observe.model
    ... ... @@ -594,8 +594,8 @@ referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntit
    594 594 
     referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity
    595 595 
     legacyCode + {*:1} String | hibernateAttributeType=text
    596 596 
     standardCode + {*:1} String
    597 
    -biodegradable + {*:1} boolean | notNull
    598 
    -nonEntangling + {*:1} boolean | notNull
    597 
    +biodegradable + {*:1} Boolean
    598 
    +nonEntangling + {*:1} Boolean
    599 599 
     childrenMultiSelectable + {*:1} boolean | notNull
    600 600 
     childSelectionMandatory + {*:1} boolean | notNull
    601 601 
     parent {*:0..1} referentiel.seine.ObjectMaterial

  • persistence/src/main/resources/db/migration/6.1/02_add_object_material-common.sql
    ... ... @@ -30,7 +30,7 @@ INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreated
    30 30 
     INSERT INTO observe_seine.objectMaterialType(topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, code, label1, label2) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#3', 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, '4', 'Text', 'Texte');
    31 31 
     UPDATE observe_seine.objectMaterialType set label3 = label2 || ' TODO';
    32 32
    33 
    -CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN DEFAULT false, nonEntangling BOOLEAN DEFAULT false, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255));
    33 
    +CREATE TABLE observe_seine.objectMaterial( topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255) NOT NULL, legacyCode VARCHAR(1024), standardCode VARCHAR(255), parent VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), objectMaterialType VARCHAR(255), biodegradable BOOLEAN, nonEntangling BOOLEAN, label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255), selectable boolean ,childrenMultiSelectable boolean,childSelectionMandatory boolean, validation VARCHAR(255));
    34 34 
     ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT PK_OBJECT_MATERIAL PRIMARY KEY(topiaid);
    35 35 
     ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_PARENT FOREIGN KEY (parent) REFERENCES observe_seine.objectMaterial(topiaid);
    36 36 
     ALTER TABLE observe_seine.objectMaterial ADD CONSTRAINT FK_OBJECT_MATERIAL_OBJECT_MATERIAL_TYPE FOREIGN KEY (objectMaterialType) REFERENCES observe_seine.objectMaterialType(topiaid);

  • persistence/src/main/resources/db/migration/6.1/09_fill_object_material-common.sql The diff for this file was not included because it is too large.
  • services/src/main/java/fr/ird/observe/services/service/actions/consolidate/dcp/FloatingObjectConsolidateEngine.java
    ... ... @@ -124,12 +124,16 @@ public class FloatingObjectConsolidateEngine {
    124 124 
         private DcpComputedValue computeDcpBiodegradable0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) {
    125 125 
             DcpComputedValue result = DcpComputedValue.UNKNOWN;
    126 126 
             if (!FloatingObjectPartDtos.isEmpty()) {
    127 
    -            result = DcpComputedValue.TRUE;
    128 127 
                 for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) {
    129 
    -                if (!FloatingObjectPartDto.getObjectMaterial().isBiodegradable()) {
    128 
    +                Boolean biodegradable = FloatingObjectPartDto.getObjectMaterial().getBiodegradable();
    129 
    +                if (biodegradable==null) {
    130 
    +                    continue;
    131 
    +                }
    132 
    +                if (!biodegradable) {
    130 133 
                         result = DcpComputedValue.FALSE;
    131 134 
                         break;
    132 135 
                     }
    136 
    +                result = DcpComputedValue.TRUE;
    133 137 
                 }
    134 138 
             }
    135 139 
             return result;
    ... ... @@ -146,12 +150,16 @@ public class FloatingObjectConsolidateEngine {
    146 150 
         private DcpComputedValue computeDcpNonEntangling0(Set<FloatingObjectPartDto> FloatingObjectPartDtos) {
    147 151 
             DcpComputedValue result = DcpComputedValue.UNKNOWN;
    148 152 
             if (!FloatingObjectPartDtos.isEmpty()) {
    149 
    -            result = DcpComputedValue.TRUE;
    150 153 
                 for (FloatingObjectPartDto FloatingObjectPartDto : FloatingObjectPartDtos) {
    151 
    -                if (!FloatingObjectPartDto.getObjectMaterial().isNonEntangling()) {
    154 
    +                Boolean nonEntangling = FloatingObjectPartDto.getObjectMaterial().getNonEntangling();
    155 
    +                if (nonEntangling==null) {
    156 
    +                    continue;
    157 
    +                }
    158 
    +                if (!nonEntangling) {
    152 159 
                         result = DcpComputedValue.FALSE;
    153 160 
                         break;
    154 161 
                     }
    162 
    +                result = DcpComputedValue.TRUE;
    155 163 
                 }
    156 164 
             }
    157 165 
             return result;

  • test/src/main/resources/db/7.0/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.0/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.0/empty_h2.sql.gz
    ... ... @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    89 89 
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    90 90 
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count integer, acquisitionMode integer, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx integer, primary key (topiaId));
    91 91 
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment varchar(2147483647), set varchar(255), primary key (topiaId));
    92 
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    92 
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode varchar(2147483647), standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    93 93 
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    94 94 
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count integer, statut integer, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    95 95 
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status integer, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));

  • test/src/main/resources/db/7.0/empty_pg.sql.gz
    ... ... @@ -89,7 +89,7 @@ create table OBSERVE_SEINE.nonTargetCatchReleaseStatus (topiaId varchar(255) not
    89 89 
     create table OBSERVE_SEINE.nonTargetCatchReleasingTime (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    90 90 
     create table OBSERVE_SEINE.nonTargetLength (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, length numeric, isLengthComputed boolean, picturesReferences varchar(255), weight numeric, isWeightComputed boolean, count int4, acquisitionMode int4, tagNumber varchar(255), species varchar(255), sex varchar(255), speciesFate varchar(255), sizeMeasureType varchar(255), nonTargetSample varchar(255), nonTargetSample_idx int4, primary key (topiaId));
    91 91 
     create table OBSERVE_SEINE.nonTargetSample (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, comment text, set varchar(255), primary key (topiaId));
    92 
    -create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean not null, nonEntangling boolean not null, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    92 
    +create table OBSERVE_SEINE.objectMaterial (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), legacyCode text, standardCode varchar(255), biodegradable boolean, nonEntangling boolean, childrenMultiSelectable boolean not null, childSelectionMandatory boolean not null, parent varchar(255), objectMaterialType varchar(255), validation varchar(255), primary key (topiaId));
    93 93 
     create table OBSERVE_SEINE.objectMaterialType (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId));
    94 94 
     create table OBSERVE_SEINE.objectObservedSpecies (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, count int4, statut int4, species varchar(255), speciesStatus varchar(255), floatingObject varchar(255), primary key (topiaId));
    95 95 
     create table OBSERVE_SEINE.objectOperation (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, code varchar(255), uri varchar(255), needComment boolean not null, status int4, label1 varchar(255), label2 varchar(255), label3 varchar(255), label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), whenArriving boolean not null, whenLeaving boolean not null, primary key (topiaId));

  • test/src/main/resources/db/7.0/referentiel.sql.gz The diff for this file was not included because it is too large.

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.