Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d7d86d37 by tchemit at 2018-11-14T14:02:00Z Mise à jour des objectmaterial - Closes #1170 (update tests) - - - - - 51843ff1 by tchemit at 2018-11-14T17:17:35Z [LL] Marée : Petits ajustements - See #1124 - - - - - 25 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java - dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java - dto/src/main/models/Observe-07-data-longline.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java - persistence/src/main/models/Observe-07-data-longline.model - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql - persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-PG.sql - test/src/main/resources/db/7.4/dataForTestLongline.sql.gz - test/src/main/resources/db/7.4/dataForTestSeine.sql.gz - test/src/main/resources/db/7.4/empty_h2.sql.gz - test/src/main/resources/db/7.4/empty_pg.sql.gz - test/src/main/resources/db/7.4/referentiel.sql.gz - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-warning-validation.xml Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -803,6 +803,7 @@ observe.common.TripLonglineDto.logbookSuspiciousData observe.common.TripLonglineDto.logbookTab observe.common.TripLonglineDto.mapTab observe.common.TripLonglineDto.noOfCrewMembers +observe.common.TripLonglineDto.noOfDays observe.common.TripLonglineDto.observationMethod observe.common.TripLonglineDto.observationsAvailability 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 </cell> </row> + <!-- noOfDays --> + <row> + <cell anchor='west'> + <JLabel id='noOfDaysLabel'/> + </cell> + <cell anchor='west' weightx="0.5"> + <JLabel id='noOfDays' styleClass="skipI18n"/> + </cell> + </row> + <!-- endDate --> <row> <cell anchor='west'> @@ -200,7 +210,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt <JLabel id='totalFishingOperationsNumberLabel'/> </cell> <cell anchor='west' weightx="0.5"> - <NumberEditor id='totalFishingOperationsNumber' constructorParams='this' styleClass="int6"/> + <JLabel id='totalFishingOperationsNumber' styleClass="skipI18n"/> </cell> </row> @@ -318,12 +328,6 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt </cell> </row> - <!-- logbookSuspiciousData --> - <row> - <cell columns='2' fill='both'> - <JCheckBox id='logbookSuspiciousData' styleClass="i18n"/> - </cell> - </row> <!-- logbookComment --> <row> <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 { selectedItem:{bean.getLandingHarbour()}; } +#totalFishingOperationsNumberLabel { + font-style:italic; +} + #totalFishingOperationsNumber { - bean:{bean}; - numberValue:{bean.getTotalFishingOperationsNumber()}; + font-weight:bold; + text:{bean.getTotalFishingOperationsNumber()+""}; } #noOfCrewMembers { @@ -114,6 +118,16 @@ BigTextEditor { _propertyName: {TripLonglineDto.PROPERTY_START_DATE}; } + +#noOfDaysLabel { + font-style:italic; +} + +#noOfDays { + font-weight:bold; + text:{bean.getNoOfDays()+""}; +} + #endDate { date:{bean.getEndDate()}; _propertyName: {TripLonglineDto.PROPERTY_END_DATE}; @@ -201,3 +215,11 @@ BigTextEditor { #logbookComment { property:{TripLonglineDto.PROPERTY_LOGBOOK_COMMENT}; } + +/* ***************************************************************************** */ +/* MAP TAB ******************************************************************** */ +/* ***************************************************************************** */ + +#mapTab { + enabled:{!model.isCreatingMode()}; +} ===================================== 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; * #L% */ +import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.open.ContentOpenableUIModel; import fr.ird.observe.dto.data.longline.TripLonglineDto; import fr.ird.observe.dto.data.longline.TripLonglineReference; @@ -59,4 +60,18 @@ public class TripLonglineUIModel extends ContentOpenableUIModel<TripLonglineDto, log.debug(getPrefix() + "date fin " + date); } } + + @Override + public void init(ContentUI ui) { + super.init(ui); + + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_START_DATE, e->{ + TripLonglineDto bean = (TripLonglineDto) e.getSource(); + bean.updateNoOfDays(); + }); + getBean().addPropertyChangeListener(TripLonglineDto.PROPERTY_END_DATE, e->{ + TripLonglineDto bean = (TripLonglineDto) e.getSource(); + bean.updateNoOfDays(); + }); + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUI.jcss ===================================== @@ -151,3 +151,11 @@ NumberEditor { #move { _observeAction:{MoveSingleTripSeineUIAction.ACTION_NAME}; } + +/* ***************************************************************************** */ +/* MAP TAB ******************************************************************** */ +/* ***************************************************************************** */ + +#mapTab { + enabled:{!model.isCreatingMode()}; +} ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java ===================================== @@ -35,4 +35,8 @@ public class TripLonglineDto extends GeneratedTripLonglineDto implements JavaBea public TripLonglineDtoJavaBeanDefinition javaBeanDefinition() { return JavaBeanDefinitionStore.definition(TripLonglineDtoJavaBeanDefinition.class); } + + public void updateNoOfDays() { + setNoOfDays(TripLonglineHelper.createNoOfDay(startDate,endDate)); + } } ===================================== dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineHelper.java ===================================== @@ -23,9 +23,11 @@ package fr.ird.observe.dto.data.longline; */ import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.concurrent.TimeUnit; public class TripLonglineHelper extends GeneratedTripLonglineHelper { @@ -37,4 +39,10 @@ public class TripLonglineHelper extends GeneratedTripLonglineHelper { return new ArrayList<>(map.values()); } + public static int createNoOfDay(Date startDate, Date endDate) { + if (startDate == null || endDate == null) { + return 0; + } + return (int) TimeUnit.MILLISECONDS.toDays(endDate.getTime() - startDate.getTime()); + } } ===================================== dto/src/main/models/Observe-07-data-longline.model ===================================== @@ -22,9 +22,9 @@ logbookComment + {*:1} String activityObsCount + {*:1} int activityLogbookCount + {*:1} int noOfCrewMembers + {*:1} Integer +noOfDays + {*:1} Integer observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -logbookSuspiciousData + {*:1} boolean tripType {*:1} fr.ird.observe.dto.referential.longline.TripTypeReference observationMethod {*:1} fr.ird.observe.dto.referential.longline.ObservationMethodReference 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 observe.common.TripLonglineDto.message.not.open=Current trip is not opened, no edit possible. observe.common.TripLonglineDto.message.updating=Updating a trip observe.common.TripLonglineDto.noOfCrewMembers=Numer of crew +observe.common.TripLonglineDto.noOfDays=Duration (days) observe.common.TripLonglineDto.observationMethod=Observations method observe.common.TripLonglineDto.observationsAvailability=Observations 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 observe.common.TripLonglineDto.message.not.open=La marea actual no está abierta, no se puede modificar. observe.common.TripLonglineDto.message.updating=La marea está en proceso de modificación. observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage +observe.common.TripLonglineDto.noOfDays=Duración (días) observe.common.TripLonglineDto.observationMethod=Observations method \#TODO observe.common.TripLonglineDto.observationsAvailability=Données d'observation 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 observe.common.TripLonglineDto.message.not.open=La marée courante n'est pas ouverte, aucune modification possible. observe.common.TripLonglineDto.message.updating=La marée est en cours de modification. observe.common.TripLonglineDto.noOfCrewMembers=Nombre d'équipage +observe.common.TripLonglineDto.noOfDays=Durée (jours) observe.common.TripLonglineDto.observationMethod=Méthode d'observations observe.common.TripLonglineDto.observationsAvailability=Données d'observation 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 entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); - entity.setTotalFishingOperationsNumber(dto.getTotalFishingOperationsNumber()); entity.setHomeId(dto.getHomeId()); entity.setErsId(dto.getErsId()); entity.setActivityObsCount(dto.getActivityObsCount()); @@ -70,7 +69,6 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip entity.setLogbookComment(dto.getLogbookComment()); entity.setSpecies(toEntitySet(dto.getSpecies())); entity.setLogbookAvailability(dto.isLogbookAvailability()); - entity.setLogbookSuspiciousData(dto.isLogbookSuspiciousData()); entity.setObservationsAvailability(dto.isObservationsAvailability()); } @@ -82,11 +80,11 @@ public class TripLonglineEntityDtoBinder extends DataEntityDtoBinderSupport<Trip dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setTotalFishingOperationsNumber(entity.getTotalFishingOperationsNumber()); + dto.setNoOfDays(entity.getNoOfDays()); dto.setNoOfCrewMembers(entity.getNoOfCrewMembers()); dto.setHomeId(entity.getHomeId()); dto.setErsId(entity.getErsId()); dto.setLogbookAvailability(entity.isLogbookAvailability()); - dto.setLogbookSuspiciousData(entity.isLogbookSuspiciousData()); dto.setObservationsAvailability(entity.isObservationsAvailability()); dto.setActivityObsCount(entity.getActivityObsCount()); 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; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ +import fr.ird.observe.dto.data.longline.TripLonglineHelper; +import fr.ird.observe.dto.referential.longline.VesselActivityLonglineHelper; + /** * Created on 8/27/14. * @@ -33,8 +36,9 @@ public class TripLonglineImpl extends TripLonglineAbstract { private static final long serialVersionUID = 1L; private Integer activityObsCount; - private Integer activityLogbookCount; + private Integer totalFishingOperationsNumber; + private Integer noOfDay; @Override public boolean isHistoricalData() { @@ -45,9 +49,29 @@ public class TripLonglineImpl extends TripLonglineAbstract { public void setHistoricalData(boolean historicalData) { } + @Override + public int getNoOfDays() { + return noOfDay == null ? noOfDay = TripLonglineHelper.createNoOfDay(startDate, endDate) : noOfDay; + } + + @Override + public void setNoOfDays(int noOfDay) { + this.noOfDay = noOfDay; + } + + @Override + public Integer getTotalFishingOperationsNumber() { + return totalFishingOperationsNumber == null ? totalFishingOperationsNumber = computeTotalFishingOperationsNumber() : totalFishingOperationsNumber; + } + + @Override + public void setTotalFishingOperationsNumber(Integer totalFishingOperationsNumber) { + this.totalFishingOperationsNumber = totalFishingOperationsNumber; + } + @Override public int getActivityObsCount() { - return activityObsCount == null ? sizeActivityLonglineObs() : activityObsCount; + return activityObsCount == null ? activityObsCount = sizeActivityLonglineObs() : activityObsCount; } @Override @@ -57,11 +81,22 @@ public class TripLonglineImpl extends TripLonglineAbstract { @Override public int getActivityLogbookCount() { - return activityLogbookCount == null ? sizeActivityLonglineLogbook() : activityLogbookCount; + return activityLogbookCount == null ? activityLogbookCount = sizeActivityLonglineLogbook() : activityLogbookCount; } @Override public void setActivityLogbookCount(int activityCount) { this.activityLogbookCount = activityCount; } + + private int computeTotalFishingOperationsNumber() { + int result = 0; + if (isActivityLonglineLogbookNotEmpty()) { + result += activityLonglineLogbook.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count(); + } + if (isActivityLonglineObsNotEmpty()) { + result += activityLonglineObs.stream().filter(f -> VesselActivityLonglineHelper.isSetOperation(f.getVesselActivityLongline().getTopiaId())).count(); + } + return result; + } } ===================================== persistence/src/main/models/Observe-07-data-longline.model ===================================== @@ -14,7 +14,6 @@ gearCaracteristic {*:1} referentiel.GearCaracteristic | notNull longline.TripLongline > ObserveDataEntity >> Trip | entity dbName=Trip startDate + {*:1} Date endDate + {*:1} Date -totalFishingOperationsNumber + {*:1} Integer noOfCrewMembers + {*:1} Integer ersId + {*:1} String homeId + {*:1} String @@ -39,7 +38,6 @@ logbookComment + {*:1} String | hibernateAttributeType=text species {*:*} referentiel.Species | manyToManyTableName=species_trip reverseDbName=trip observationsAvailability + {*:1} boolean logbookAvailability + {*:1} boolean -logbookSuspiciousData + {*:1} boolean gearUseFeaturesLongline + {*} longline.GearUseFeaturesLongline | unique orderBy=topiaCreateDate reverseDbName=trip landing + {*} longline.LandingLogbook | unique orderBy=startDate reverseDbName=trip sample + {*} longline.SampleLogbook | unique orderBy=timeStamp reverseDbName=trip @@ -47,3 +45,7 @@ getActivityObsCount() int setActivityObsCount(activityObsCount int) getActivityLogbookCount() int setActivityLogbookCount(activityObsCount int) +getNoOfDays() int +setNoOfDays(noOfDays int) +getTotalFishingOperationsNumber() Integer +setTotalFishingOperationsNumber(totalFishingOperationsNumber Integer) ===================================== persistence/src/main/resources/db/migration/7.2/09_update_longline_trip-H2.sql ===================================== @@ -19,6 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber; ALTER TABLE observe_longline.trip ALTER COLUMN tripType RENAME TO observationMethod; ALTER TABLE observe_longline.trip ALTER COLUMN comment RENAME TO observationsComment; ALTER TABLE observe_longline.trip ALTER COLUMN dataQuality RENAME TO observationsDataQuality; @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT; ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE; -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE; ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid); 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 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- +ALTER TABLE observe_longline.trip DROP COLUMN totalFishingOperationsNumber CASCADE; ALTER TABLE observe_longline.trip RENAME COLUMN tripType TO observationMethod; ALTER TABLE observe_longline.trip RENAME COLUMN comment TO observationsComment; ALTER TABLE observe_longline.trip RENAME COLUMN dataQuality TO observationsDataQuality; @@ -32,7 +33,6 @@ ALTER TABLE observe_longline.trip ADD COLUMN logbookComment TEXT; ALTER TABLE observe_longline.trip ADD COLUMN logbookDataQuality VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookDataEntryOperator VARCHAR(255); ALTER TABLE observe_longline.trip ADD COLUMN logbookAvailability BOOLEAN DEFAULT FALSE; -ALTER TABLE observe_longline.trip ADD COLUMN logbookSuspiciousData BOOLEAN DEFAULT FALSE; ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_tripType FOREIGN KEY (tripType) REFERENCES observe_longline.TripType(topiaid); ALTER TABLE observe_longline.trip ADD CONSTRAINT fk_TripLongline_observationMethod FOREIGN KEY (observationMethod) REFERENCES observe_longline.ObservationMethod(topiaid); 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 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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 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)); 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)); 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)); -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)); +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)); 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)); 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)); 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 @@ </field> <field name="observer"> <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> @@ -66,4 +67,11 @@ <message>observe.validation.trip.endDate.after.startDate</message> </field-validator> </field> + + <field name="logbookDataEntryOperator"> + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!logbookAvailability</param> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-create-warning-validation.xml ===================================== @@ -35,6 +35,7 @@ </field> <field name="observationsDataEntryOperator"> <field-validator type="notFilled" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-error-validation.xml ===================================== @@ -32,6 +32,7 @@ </field> <field name="observer"> <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> @@ -103,4 +104,10 @@ <!--</field>--> + <field name="logbookDataEntryOperator"> + <field-validator type="mandatory" short-circuit="true"> + <param name="skip">!logbookAvailability</param> + <message/> + </field-validator> + </field> </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/TripLonglineDto-update-warning-validation.xml ===================================== @@ -45,6 +45,7 @@ </field> <field name="observationsDataEntryOperator"> <field-validator type="notFilled" short-circuit="true"> + <param name="skip">!observationsAvailability</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7df49f731770fab8ad491474c4d... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7df49f731770fab8ad491474c4d... You're receiving this email because of your account on gitlab.com.