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

Commits:

25 changed files:

Changes:

  • client-core/src/main/i18n/getters/jaxx.getter
    ... ... @@ -803,6 +803,7 @@ observe.common.TripLonglineDto.logbookSuspiciousData
    803 803
     observe.common.TripLonglineDto.logbookTab
    
    804 804
     observe.common.TripLonglineDto.mapTab
    
    805 805
     observe.common.TripLonglineDto.noOfCrewMembers
    
    806
    +observe.common.TripLonglineDto.noOfDays
    
    806 807
     observe.common.TripLonglineDto.observationMethod
    
    807 808
     observe.common.TripLonglineDto.observationsAvailability
    
    808 809
     observe.common.TripLonglineDto.observationsComment
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx
    ... ... @@ -154,6 +154,16 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt
    154 154
                 </cell>
    
    155 155
               </row>
    
    156 156
     
    
    157
    +          <!-- noOfDays -->
    
    158
    +          <row>
    
    159
    +            <cell anchor='west'>
    
    160
    +              <JLabel id='noOfDaysLabel'/>
    
    161
    +            </cell>
    
    162
    +            <cell anchor='west' weightx="0.5">
    
    163
    +              <JLabel id='noOfDays' styleClass="skipI18n"/>
    
    164
    +            </cell>
    
    165
    +          </row>
    
    166
    +
    
    157 167
               <!-- endDate -->
    
    158 168
               <row>
    
    159 169
                 <cell anchor='west'>
    
    ... ... @@ -200,7 +210,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt
    200 210
                   <JLabel id='totalFishingOperationsNumberLabel'/>
    
    201 211
                 </cell>
    
    202 212
                 <cell anchor='west' weightx="0.5">
    
    203
    -              <NumberEditor id='totalFishingOperationsNumber' constructorParams='this' styleClass="int6"/>
    
    213
    +              <JLabel id='totalFishingOperationsNumber' styleClass="skipI18n"/>
    
    204 214
                 </cell>
    
    205 215
               </row>
    
    206 216
     
    
    ... ... @@ -318,12 +328,6 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt
    318 328
                 </cell>
    
    319 329
               </row>
    
    320 330
     
    
    321
    -          <!-- logbookSuspiciousData -->
    
    322
    -          <row>
    
    323
    -            <cell columns='2' fill='both'>
    
    324
    -              <JCheckBox id='logbookSuspiciousData' styleClass="i18n"/>
    
    325
    -            </cell>
    
    326
    -          </row>
    
    327 331
               <!-- logbookComment -->
    
    328 332
               <row>
    
    329 333
                 <cell columns='2' fill='both' weighty="1">
    

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss
    ... ... @@ -79,9 +79,13 @@ BigTextEditor {
    79 79
       selectedItem:{bean.getLandingHarbour()};
    
    80 80
     }
    
    81 81
     
    
    82
    +#totalFishingOperationsNumberLabel {
    
    83
    +  font-style:italic;
    
    84
    +}
    
    85
    +
    
    82 86
     #totalFishingOperationsNumber {
    
    83
    -  bean:{bean};
    
    84
    -  numberValue:{bean.getTotalFishingOperationsNumber()};
    
    87
    +  font-weight:bold;
    
    88
    +  text:{bean.getTotalFishingOperationsNumber()+""};
    
    85 89
     }
    
    86 90
     
    
    87 91
     #noOfCrewMembers {
    
    ... ... @@ -114,6 +118,16 @@ BigTextEditor {
    114 118
       _propertyName: {TripLonglineDto.PROPERTY_START_DATE};
    
    115 119
     }
    
    116 120
     
    
    121
    +
    
    122
    +#noOfDaysLabel {
    
    123
    +  font-style:italic;
    
    124
    +}
    
    125
    +
    
    126
    +#noOfDays {
    
    127
    +  font-weight:bold;
    
    128
    +  text:{bean.getNoOfDays()+""};
    
    129
    +}
    
    130
    +
    
    117 131
     #endDate {
    
    118 132
       date:{bean.getEndDate()};
    
    119 133
       _propertyName: {TripLonglineDto.PROPERTY_END_DATE};
    
    ... ... @@ -201,3 +215,11 @@ BigTextEditor {
    201 215
     #logbookComment {
    
    202 216
       property:{TripLonglineDto.PROPERTY_LOGBOOK_COMMENT};
    
    203 217
     }
    
    218
    +
    
    219
    +/* ***************************************************************************** */
    
    220
    +/*  MAP TAB ******************************************************************** */
    
    221
    +/* ***************************************************************************** */
    
    222
    +
    
    223
    +#mapTab {
    
    224
    +  enabled:{!model.isCreatingMode()};
    
    225
    +}

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java
    ... ... @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.data.longline;
    22 22
      * #L%
    
    23 23
      */
    
    24 24
     
    
    25
    +import fr.ird.observe.client.ui.content.api.ContentUI;
    
    25 26
     import fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUIModel;
    
    26 27
     import fr.ird.observe.dto.data.longline.TripLonglineDto;
    
    27 28
     import fr.ird.observe.dto.data.longline.TripLonglineReference;
    
    ... ... @@ -59,4 +60,18 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto,
    59 60
                 log.debug(getPrefix() + "date fin " + date);
    
    60 61
             }
    
    61 62
         }
    
    63
    +
    
    64
    +    @Override
    
    65
    +    public void init(ContentUI ui) {
    
    66
    +        super.init(ui);
    
    67
    +
    
    68
    +        getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_START_DATE, e->{
    
    69
    +            TripLonglineDto bean = (TripLonglineDto) e.getSource();
    
    70
    +            bean.updateNoOfDays();
    
    71
    +        });
    
    72
    +        getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_END_DATE, e->{
    
    73
    +            TripLonglineDto bean = (TripLonglineDto) e.getSource();
    
    74
    +            bean.updateNoOfDays();
    
    75
    +        });
    
    76
    +    }
    
    62 77
     }

  • client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss
    ... ... @@ -151,3 +151,11 @@ NumberEditor {
    151 151
     #move {
    
    152 152
       _observeAction:{MoveSingleTripSeineUIAction.ACTION_NAME};
    
    153 153
     }
    
    154
    +
    
    155
    +/* ***************************************************************************** */
    
    156
    +/*  MAP TAB ******************************************************************** */
    
    157
    +/* ***************************************************************************** */
    
    158
    +
    
    159
    +#mapTab {
    
    160
    +  enabled:{!model.isCreatingMode()};
    
    161
    +}

  • dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java
    ... ... @@ -35,4 +35,8 @@ public class TripLonglineDto extends GeneratedTripLonglineDto implements JavaBea
    35 35
         public TripLonglineDtoJavaBeanDefinition javaBeanDefinition() {
    
    36 36
             return JavaBeanDefinitionStore.definition(TripLonglineDtoJavaBeanDefinition.class);
    
    37 37
         }
    
    38
    +
    
    39
    +    public void updateNoOfDays() {
    
    40
    +        setNoOfDays(TripLonglineHelper.createNoOfDay(startDate,endDate));
    
    41
    +    }
    
    38 42
     }

  • dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java
    ... ... @@ -23,9 +23,11 @@ package fr.ird.observe.dto.data.longline;
    23 23
      */
    
    24 24
     
    
    25 25
     import java.util.ArrayList;
    
    26
    +import java.util.Date;
    
    26 27
     import java.util.List;
    
    27 28
     import java.util.Map;
    
    28 29
     import java.util.TreeMap;
    
    30
    +import java.util.concurrent.TimeUnit;
    
    29 31
     
    
    30 32
     public class TripLonglineHelper extends GeneratedTripLonglineHelper {
    
    31 33
     
    
    ... ... @@ -37,4 +39,10 @@ public class TripLonglineHelper extends GeneratedTripLonglineHelper {
    37 39
             return new ArrayList<>(map.values());
    
    38 40
         }
    
    39 41
     
    
    42
    +    public static int createNoOfDay(Date startDate, Date endDate) {
    
    43
    +        if (startDate == null || endDate == null) {
    
    44
    +            return 0;
    
    45
    +        }
    
    46
    +        return (int) TimeUnit.MILLISECONDS.toDays(endDate.getTime() - startDate.getTime());
    
    47
    +    }
    
    40 48
     }

  • dto/src/main/models/Observe-07-data-longline.model
    ... ... @@ -22,9 +22,9 @@ logbookComment + {*:1} String
    22 22
     activityObsCount + {*:1} int
    
    23 23
     activityLogbookCount + {*:1} int
    
    24 24
     noOfCrewMembers + {*:1} Integer
    
    25
    +noOfDays + {*:1} Integer
    
    25 26
     observationsAvailability + {*:1} boolean
    
    26 27
     logbookAvailability + {*:1} boolean
    
    27
    -logbookSuspiciousData + {*:1} boolean
    
    28 28
     tripType {*:1} fr.ird.observe.dto.referential.longline.TripTypeReference
    
    29 29
     observationMethod {*:1} fr.ird.observe.dto.referential.longline.ObservationMethodReference
    
    30 30
     observer {*:1} fr.ird.observe.dto.referential.PersonReference
    

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=No opened trip found, you
    2353 2353
     observe.common.TripLonglineDto.message.not.open=Current trip is not opened, no edit possible.
    
    2354 2354
     observe.common.TripLonglineDto.message.updating=Updating a trip
    
    2355 2355
     observe.common.TripLonglineDto.noOfCrewMembers=Numer of crew
    
    2356
    +observe.common.TripLonglineDto.noOfDays=Duration (days)
    
    2356 2357
     observe.common.TripLonglineDto.observationMethod=Observations method
    
    2357 2358
     observe.common.TripLonglineDto.observationsAvailability=Observations
    
    2358 2359
     observe.common.TripLonglineDto.observationsComment=Comment
    

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=Ninguna marea está abier
    2353 2353
     observe.common.TripLonglineDto.message.not.open=La marea actual no está abierta, no se puede modificar.
    
    2354 2354
     observe.common.TripLonglineDto.message.updating=La marea está en proceso de modificación.
    
    2355 2355
     observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage
    
    2356
    +observe.common.TripLonglineDto.noOfDays=Duración (días)
    
    2356 2357
     observe.common.TripLonglineDto.observationMethod=Observations method \#TODO
    
    2357 2358
     observe.common.TripLonglineDto.observationsAvailability=Données d'observation
    
    2358 2359
     observe.common.TripLonglineDto.observationsComment=Comentarios
    

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -2353,6 +2353,7 @@ observe.common.TripLonglineDto.message.no.active.found=Aucune marée ouverte, vo
    2353 2353
     observe.common.TripLonglineDto.message.not.open=La marée courante n'est pas ouverte, aucune modification possible.
    
    2354 2354
     observe.common.TripLonglineDto.message.updating=La marée est en cours de modification.
    
    2355 2355
     observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage
    
    2356
    +observe.common.TripLonglineDto.noOfDays=Durée (jours)
    
    2356 2357
     observe.common.TripLonglineDto.observationMethod=Méthode d'observations
    
    2357 2358
     observe.common.TripLonglineDto.observationsAvailability=Données d'observation
    
    2358 2359
     observe.common.TripLonglineDto.observationsComment=Commentaire
    

  • persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java
    ... ... @@ -45,7 +45,6 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip
    45 45
     
    
    46 46
             entity.setStartDate(dto.getStartDate());
    
    47 47
             entity.setEndDate(dto.getEndDate());
    
    48
    -        entity.setTotalFishingOperationsNumber(dto.getTotalFishingOperationsNumber());
    
    49 48
             entity.setHomeId(dto.getHomeId());
    
    50 49
             entity.setErsId(dto.getErsId());
    
    51 50
             entity.setActivityObsCount(dto.getActivityObsCount());
    
    ... ... @@ -70,7 +69,6 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip
    70 69
             entity.setLogbookComment(dto.getLogbookComment());
    
    71 70
             entity.setSpecies(toEntitySet(dto.getSpecies()));
    
    72 71
             entity.setLogbookAvailability(dto.isLogbookAvailability());
    
    73
    -        entity.setLogbookSuspiciousData(dto.isLogbookSuspiciousData());
    
    74 72
             entity.setObservationsAvailability(dto.isObservationsAvailability());
    
    75 73
         }
    
    76 74
     
    
    ... ... @@ -82,11 +80,11 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip
    82 80
             dto.setStartDate(entity.getStartDate());
    
    83 81
             dto.setEndDate(entity.getEndDate());
    
    84 82
             dto.setTotalFishingOperationsNumber(entity.getTotalFishingOperationsNumber());
    
    83
    +        dto.setNoOfDays(entity.getNoOfDays());
    
    85 84
             dto.setNoOfCrewMembers(entity.getNoOfCrewMembers());
    
    86 85
             dto.setHomeId(entity.getHomeId());
    
    87 86
             dto.setErsId(entity.getErsId());
    
    88 87
             dto.setLogbookAvailability(entity.isLogbookAvailability());
    
    89
    -        dto.setLogbookSuspiciousData(entity.isLogbookSuspiciousData());
    
    90 88
             dto.setObservationsAvailability(entity.isObservationsAvailability());
    
    91 89
             dto.setActivityObsCount(entity.getActivityObsCount());
    
    92 90
             dto.setActivityLogbookCount(entity.getActivityLogbookCount());
    

  • persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java
    ... ... @@ -10,18 +10,21 @@ package fr.ird.observe.entities.longline;
    10 10
      * it under the terms of the GNU General Public License as
    
    11 11
      * published by the Free Software Foundation, either version 3 of the
    
    12 12
      * License, or (at your option) any later version.
    
    13
    - * 
    
    13
    + *
    
    14 14
      * This program is distributed in the hope that it will be useful,
    
    15 15
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    
    16 16
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    
    17 17
      * GNU General Public License for more details.
    
    18
    - * 
    
    18
    + *
    
    19 19
      * You should have received a copy of the GNU General Public
    
    20 20
      * License along with this program.  If not, see
    
    21 21
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    22 22
      * #L%
    
    23 23
      */
    
    24 24
     
    
    25
    +import fr.ird.observe.dto.data.longline.TripLonglineHelper;
    
    26
    +import fr.ird.observe.dto.referential.longline.VesselActivityLonglineHelper;
    
    27
    +
    
    25 28
     /**
    
    26 29
      * Created on 8/27/14.
    
    27 30
      *
    
    ... ... @@ -33,8 +36,9 @@ public class TripLonglineImpl extends TripLonglineAbstract {
    33 36
         private static final long serialVersionUID = 1L;
    
    34 37
     
    
    35 38
         private Integer activityObsCount;
    
    36
    -
    
    37 39
         private Integer activityLogbookCount;
    
    40
    +    private Integer totalFishingOperationsNumber;
    
    41
    +    private Integer noOfDay;
    
    38 42
     
    
    39 43
         @Override
    
    40 44
         public boolean isHistoricalData() {
    
    ... ... @@ -45,9 +49,29 @@ public class TripLonglineImpl extends TripLonglineAbstract {
    45 49
         public void setHistoricalData(boolean historicalData) {
    
    46 50
         }
    
    47 51
     
    
    52
    +    @Override
    
    53
    +    public int getNoOfDays() {
    
    54
    +        return noOfDay == null ? noOfDay = TripLonglineHelper.createNoOfDay(startDate, endDate) : noOfDay;
    
    55
    +    }
    
    56
    +
    
    57
    +    @Override
    
    58
    +    public void setNoOfDays(int noOfDay) {
    
    59
    +        this.noOfDay = noOfDay;
    
    60
    +    }
    
    61
    +
    
    62
    +    @Override
    
    63
    +    public Integer getTotalFishingOperationsNumber() {
    
    64
    +        return totalFishingOperationsNumber == null ? totalFishingOperationsNumber = computeTotalFishingOperationsNumber() : totalFishingOperationsNumber;
    
    65
    +    }
    
    66
    +
    
    67
    +    @Override
    
    68
    +    public void setTotalFishingOperationsNumber(Integer totalFishingOperationsNumber) {
    
    69
    +        this.totalFishingOperationsNumber = totalFishingOperationsNumber;
    
    70
    +    }
    
    71
    +
    
    48 72
         @Override
    
    49 73
         public int getActivityObsCount() {
    
    50
    -        return activityObsCount == null ? sizeActivityLonglineObs() : activityObsCount;
    
    74
    +        return activityObsCount == null ? activityObsCount = sizeActivityLonglineObs() : activityObsCount;
    
    51 75
         }
    
    52 76
     
    
    53 77
         @Override
    
    ... ... @@ -57,11 +81,22 @@ public class TripLonglineImpl extends TripLonglineAbstract {
    57 81
     
    
    58 82
         @Override
    
    59 83
         public int getActivityLogbookCount() {
    
    60
    -        return activityLogbookCount == null ? sizeActivityLonglineLogbook() : activityLogbookCount;
    
    84
    +        return activityLogbookCount == null ? activityLogbookCount = sizeActivityLonglineLogbook() : activityLogbookCount;
    
    61 85
         }
    
    62 86
     
    
    63 87
         @Override
    
    64 88
         public void setActivityLogbookCount(int activityCount) {
    
    65 89
             this.activityLogbookCount = activityCount;
    
    66 90
         }
    
    91
    +
    
    92
    +    private int computeTotalFishingOperationsNumber() {
    
    93
    +        int result = 0;
    
    94
    +        if (isActivityLonglineLogbookNotEmpty()) {
    
    95
    +            result += activityLonglineLogbook.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count();
    
    96
    +        }
    
    97
    +        if (isActivityLonglineObsNotEmpty()) {
    
    98
    +            result += activityLonglineObs.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count();
    
    99
    +        }
    
    100
    +        return result;
    
    101
    +    }
    
    67 102
     }

  • persistence/src/main/models/Observe-07-data-longline.model
    ... ... @@ -14,7 +14,6 @@ gearCaracteristic {*:1} referentiel.GearCaracteristic | notNull
    14 14
     longline.TripLongline > ObserveDataEntity >> Trip | entity dbName=Trip
    
    15 15
     startDate + {*:1} Date
    
    16 16
     endDate + {*:1} Date
    
    17
    -totalFishingOperationsNumber + {*:1} Integer
    
    18 17
     noOfCrewMembers + {*:1} Integer
    
    19 18
     ersId + {*:1} String
    
    20 19
     homeId + {*:1} String
    
    ... ... @@ -39,7 +38,6 @@ logbookComment + {*:1} String | hibernateAttributeType=text
    39 38
     species {*:*} referentiel.Species | manyToManyTableName=species_trip reverseDbName=trip
    
    40 39
     observationsAvailability + {*:1} boolean
    
    41 40
     logbookAvailability + {*:1} boolean
    
    42
    -logbookSuspiciousData + {*:1} boolean
    
    43 41
     gearUseFeaturesLongline + {*} longline.GearUseFeaturesLongline | unique orderBy=topiaCreateDate reverseDbName=trip
    
    44 42
     landing + {*} longline.LandingLogbook | unique orderBy=startDate reverseDbName=trip
    
    45 43
     sample + {*} longline.SampleLogbook | unique orderBy=timeStamp reverseDbName=trip
    
    ... ... @@ -47,3 +45,7 @@ getActivityObsCount() int
    47 45
     setActivityObsCount(activityObsCount int)
    
    48 46
     getActivityLogbookCount() int
    
    49 47
     setActivityLogbookCount(activityObsCount int)
    
    48
    +getNoOfDays() int
    
    49
    +setNoOfDays(noOfDays int)
    
    50
    +getTotalFishingOperationsNumber() Integer
    
    51
    +setTotalFishingOperationsNumber(totalFishingOperationsNumber Integer)

  • persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql
    ... ... @@ -19,6 +19,7 @@
    19 19
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20 20
     -- #L%
    
    21 21
     ---
    
    22
    +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber;
    
    22 23
     ALTER TABLE observe_longline.trip ALTER COLUMN tripType RENAME TO observationMethod;
    
    23 24
     ALTER TABLE observe_longline.trip ALTER COLUMN comment RENAME TO observationsComment;
    
    24 25
     ALTER TABLE observe_longline.trip ALTER COLUMN dataQuality RENAME TO observationsDataQuality;
    
    ... ... @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT;
    32 33
     ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255);
    
    33 34
     ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255);
    
    34 35
     ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE;
    
    35
    -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE;
    
    36 36
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid);
    
    37 37
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid);
    
    38 38
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationsDataQuality FOREIGN KEY (observationsDataQuality) REFERENCES observe_common.DataQuality(topiaid);
    

  • persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql
    ... ... @@ -19,6 +19,7 @@
    19 19
     -- <http://www.gnu.org/licenses/gpl-3.0.html>.
    
    20 20
     -- #L%
    
    21 21
     ---
    
    22
    +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber CASCADE;
    
    22 23
     ALTER TABLE observe_longline.trip RENAME COLUMN tripType TO observationMethod;
    
    23 24
     ALTER TABLE observe_longline.trip RENAME COLUMN comment TO observationsComment;
    
    24 25
     ALTER TABLE observe_longline.trip RENAME COLUMN dataQuality TO observationsDataQuality;
    
    ... ... @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT;
    32 33
     ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255);
    
    33 34
     ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255);
    
    34 35
     ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE;
    
    35
    -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE;
    
    36 36
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid);
    
    37 37
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid);
    
    38 38
     ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationsDataQuality FOREIGN KEY (observationsDataQuality) REFERENCES observe_common.DataQuality(topiaid);
    

  • test/src/main/resources/db/7.4/dataForTestLongline.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.4/dataForTestSeine.sql.gz The diff for this file was not included because it is too large.
  • test/src/main/resources/db/7.4/empty_h2.sql.gz
    ... ... @@ -93,7 +93,7 @@ create table OBSERVE_LONGLINE.species_trip (trip varchar(255), species varchar(2
    93 93
     create table OBSERVE_LONGLINE.stomacFullness (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_LONGLINE.tdrObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, homeId varchar(255), floatline1Length numeric, floatline2Length numeric, serialNo varchar(255), data blob, dataFilename varchar(255), dataLocation varchar(255), deployementStart timestamp, deployementEnd timestamp, fishingStart timestamp, fishingEnd timestamp, fishingStartDepth float, fishingEndDepth float, meanDeployementDepth float, medianDeployementDepth float, minFishingDepth float, maxFishingDepth float, meanFishingDepth float, medianFishingDepth float, branchline varchar(255), sensorBrand varchar(255), section varchar(255), basket varchar(255), itemHorizontalPosition varchar(255), itemVerticalPosition varchar(255), set varchar(255), primary key (topiaId));
    
    95 95
     create table OBSERVE_LONGLINE.tdrRecordObs (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, timeStamp timestamp, temperature numeric, depth numeric, basket varchar(255), tdr varchar(255), primary key (topiaId));
    
    96
    -create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, totalFishingOperationsNumber integer, noOfCrewMembers integer, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment varchar(2147483647), observationsComment varchar(2147483647), logbookComment varchar(2147483647), observationsAvailability boolean, logbookAvailability boolean, logbookSuspiciousData boolean, primary key (topiaId));
    
    96
    +create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, noOfCrewMembers integer, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment varchar(2147483647), observationsComment varchar(2147483647), logbookComment varchar(2147483647), observationsAvailability boolean, logbookAvailability boolean, primary key (topiaId));
    
    97 97
     create table OBSERVE_LONGLINE.tripType (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));
    
    98 98
     create table OBSERVE_LONGLINE.VesselActivity (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));
    
    99 99
     create table OBSERVE_LONGLINE.WeightCategory (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));
    

  • test/src/main/resources/db/7.4/empty_pg.sql.gz
    ... ... @@ -93,7 +93,7 @@ create table OBSERVE_LONGLINE.species_trip (trip varchar(255), species varchar(2
    93 93
     create table OBSERVE_LONGLINE.stomacFullness (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_LONGLINE.tdrObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, homeId varchar(255), floatline1Length numeric, floatline2Length numeric, serialNo varchar(255), data oid, dataFilename varchar(255), dataLocation varchar(255), deployementStart timestamp, deployementEnd timestamp, fishingStart timestamp, fishingEnd timestamp, fishingStartDepth float4, fishingEndDepth float4, meanDeployementDepth float4, medianDeployementDepth float4, minFishingDepth float4, maxFishingDepth float4, meanFishingDepth float4, medianFishingDepth float4, branchline varchar(255), sensorBrand varchar(255), section varchar(255), basket varchar(255), itemHorizontalPosition varchar(255), itemVerticalPosition varchar(255), set varchar(255), primary key (topiaId));
    
    95 95
     create table OBSERVE_LONGLINE.tdrRecordObs (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, timeStamp timestamp, temperature numeric, depth numeric, basket varchar(255), tdr varchar(255), primary key (topiaId));
    
    96
    -create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, totalFishingOperationsNumber int4, noOfCrewMembers int4, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment text, observationsComment text, logbookComment text, observationsAvailability boolean, logbookAvailability boolean, logbookSuspiciousData boolean, primary key (topiaId));
    
    96
    +create table OBSERVE_LONGLINE.Trip (topiaId varchar(255) not null, topiaVersion int8 not null, topiaCreateDate timestamp, lastUpdateDate timestamp not null, startDate timestamp, endDate timestamp, noOfCrewMembers int4, ersId varchar(255), homeId varchar(255), tripType varchar(255), observationMethod varchar(255), observer varchar(255), vessel varchar(255), captain varchar(255), observationsDataEntryOperator varchar(255), logbookDataEntryOperator varchar(255), program varchar(255), ocean varchar(255), departureHarbour varchar(255), landingHarbour varchar(255), observationsDataQuality varchar(255), logbookDataQuality varchar(255), generalComment text, observationsComment text, logbookComment text, observationsAvailability boolean, logbookAvailability boolean, primary key (topiaId));
    
    97 97
     create table OBSERVE_LONGLINE.tripType (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));
    
    98 98
     create table OBSERVE_LONGLINE.VesselActivity (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));
    
    99 99
     create table OBSERVE_LONGLINE.WeightCategory (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));
    

  • test/src/main/resources/db/7.4/referentiel.sql.gz The diff for this file was not included because it is too large.
  • validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-error-validation.xml
    ... ... @@ -30,6 +30,7 @@
    30 30
       </field>
    
    31 31
       <field name="observer">
    
    32 32
         <field-validator type="mandatory" short-circuit="true">
    
    33
    +      <param name="skip">!observationsAvailability</param>
    
    33 34
           <message/>
    
    34 35
         </field-validator>
    
    35 36
       </field>
    
    ... ... @@ -66,4 +67,11 @@
    66 67
           <message>observe.validation.trip.endDate.after.startDate</message>
    
    67 68
         </field-validator>
    
    68 69
       </field>
    
    70
    +
    
    71
    +  <field name="logbookDataEntryOperator">
    
    72
    +    <field-validator type="mandatory" short-circuit="true">
    
    73
    +      <param name="skip">!logbookAvailability</param>
    
    74
    +      <message/>
    
    75
    +    </field-validator>
    
    76
    +  </field>
    
    69 77
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-warning-validation.xml
    ... ... @@ -35,6 +35,7 @@
    35 35
       </field>
    
    36 36
       <field name="observationsDataEntryOperator">
    
    37 37
         <field-validator type="notFilled" short-circuit="true">
    
    38
    +      <param name="skip">!observationsAvailability</param>
    
    38 39
           <message/>
    
    39 40
         </field-validator>
    
    40 41
       </field>
    

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-error-validation.xml
    ... ... @@ -32,6 +32,7 @@
    32 32
       </field>
    
    33 33
       <field name="observer">
    
    34 34
         <field-validator type="mandatory" short-circuit="true">
    
    35
    +      <param name="skip">!observationsAvailability</param>
    
    35 36
           <message/>
    
    36 37
         </field-validator>
    
    37 38
       </field>
    
    ... ... @@ -103,4 +104,10 @@
    103 104
     
    
    104 105
       <!--</field>-->
    
    105 106
     
    
    107
    +  <field name="logbookDataEntryOperator">
    
    108
    +    <field-validator type="mandatory" short-circuit="true">
    
    109
    +      <param name="skip">!logbookAvailability</param>
    
    110
    +      <message/>
    
    111
    +    </field-validator>
    
    112
    +  </field>
    
    106 113
     </validators>

  • validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-warning-validation.xml
    ... ... @@ -45,6 +45,7 @@
    45 45
       </field>
    
    46 46
       <field name="observationsDataEntryOperator">
    
    47 47
         <field-validator type="notFilled" short-circuit="true">
    
    48
    +      <param name="skip">!observationsAvailability</param>
    
    48 49
           <message/>
    
    49 50
         </field-validator>
    
    50 51
       </field>