Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ee943c1 by Tony CHEMIT at 2018-10-03T13:06:02Z [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des créer des activités logbook dans une marée issue d'une marée d'observation saisie en V5 - See #1108 Add some logs - - - - - 7c802fc7 by Tony CHEMIT at 2018-10-03T13:06:20Z optimize dependencies - - - - - 22eeaf27 by Tony CHEMIT at 2018-10-03T15:35:05Z Some data (in table forms) order is not deterministic - Closes #1112 - - - - - 5 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java - persistence/src/main/models/Observe-04-data-seine.model - persistence/src/main/models/Observe-05-data-longline-obs.model - persistence/src/main/models/Observe-06-data-longline-logbook.model Changes: ===================================== client/pom.xml ===================================== @@ -389,6 +389,10 @@ <artifactId>java-lang</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency> <!-- jaxx dependencies --> ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java ===================================== @@ -34,6 +34,8 @@ import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.result.TripChildSaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.tree.ReferenceNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.swing.SwingUtilities; @@ -47,6 +49,7 @@ import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigatio public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> { public static final String ACTION_NAME = SaveActivityLonglineLogbookUIAction.class.getName(); + private static final Logger log = LogManager.getLogger(SaveActivityLonglineLogbookUIAction.class); public SaveActivityLonglineLogbookUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); @@ -56,6 +59,9 @@ public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSup protected boolean doSave(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode, boolean notPersisted) { String tripId = editNode.getParent().getId(); + log.info(ui.getModel().getPrefix() + "tripId = " + tripId); + log.info(ui.getModel().getPrefix() + "activityId = " + bean.getId()); + TripChildSaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookService().save(tripId, bean); saveResult.toDto(bean); ===================================== persistence/src/main/models/Observe-04-data-seine.model ===================================== @@ -40,8 +40,8 @@ isChangedZoneOperation() boolean seine.FloatingObject > ObserveDataEntity | entity comment + {*:1} String | hibernateAttributeType=text -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate -objectObservedSpecies + {*} seine.ObjectObservedSpecies +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate objectOperation {*:1} referentiel.seine.ObjectOperation supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique @@ -175,7 +175,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set targetSample + {*} seine.TargetSample | unique reverseDbName=set targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set hasTargetCatch() boolean hasRejetThon() boolean ===================================== persistence/src/main/models/Observe-05-data-longline-obs.model ===================================== @@ -20,10 +20,10 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float setLongline + {0..1} longline.SetLonglineObs | dbName=set -encounter + {*} longline.EncounterObs | reverseDbName=activity +encounter + {*} longline.EncounterObs | reverseDbName=activity orderBy=topiaCreateDate vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false dataQuality {*:0..1} referentiel.DataQuality -sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity +sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity orderBy=topiaCreateDate fpaZone {*:1} referentiel.FpaZone getDate() Date getTime() Date @@ -107,14 +107,14 @@ basket {*:0..1} longline.BasketObs branchline {*:0..1} longline.BranchlineObs catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate discardHealthness {*:1} referentiel.longline.Healthness -sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch +sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch orderBy=topiaCreateDate speciesCatch {*:1} referentiel.Species predator {*:*} referentiel.Species | manyToManyTableName=catchObs_predator reverseDbName=catch section {*:0..1} longline.SectionObs maturityStatus {*:0..1} referentiel.longline.MaturityStatus stomacFullness {*:0..1} referentiel.longline.StomacFullness hookPosition {*:0..1} referentiel.longline.HookPosition -weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch +weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch orderBy=topiaCreateDate catchHealthness {*:1} referentiel.longline.Healthness sex {*:0..1} referentiel.Sex weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod @@ -187,18 +187,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set -hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set +baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set orderBy=topiaCreateDate section + {*} longline.SectionObs | unique orderBy=settingIdentifier reverseDbName=set settingShape {*:1} referentiel.longline.SettingShape -tdr + {*} longline.TdrObs | reverseDbName=set +tdr + {*} longline.TdrObs | reverseDbName=set orderBy=topiaCreateDate catchLongline + {*} longline.CatchLonglineObs | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setObs reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -258,7 +258,7 @@ maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} longline.BranchlineObs -tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr +tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr orderBy=topiaCreateDate sensorBrand {*:0..1} referentiel.longline.SensorBrand species {*:*} referentiel.Species | reverseDbName=tdr section {*:0..1} longline.SectionObs ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -28,7 +28,7 @@ compagnies {*:1} referentiel.Compagnies person {*:1} referentiel.Person harbour {*:0..1} referentiel.Harbour vessel {*:0..1} referentiel.Vessel -landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing +landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing orderBy=topiaCreateDate longline.LandingPartLogbook > ObserveDataEntity | entity dbName=LandingPartLogbook species {*:1} referentiel.Species @@ -79,9 +79,9 @@ monitored + {*:1} Boolean totalLineLength + {*:1} Integer basketLineLength + {*:1} Integer lengthBetweenBranchlines + {*:1} Integer -baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set -hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set +baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate settingShape {*:1} referentiel.longline.SettingShape catchLongline + {*} longline.CatchLonglineLogbook | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType @@ -90,7 +90,7 @@ lightsticksCount + {*:1} Integer lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setLogbook reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -125,11 +125,11 @@ setHooksCompositionProportionSum(sum int) setBaitsCompositionProportionSum(sum int) data.longline.SetLonglineLogbookGlobalComposition > data.Commentable -baitsComposition + {*} data.longline.BaitsCompositionLogbook -floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook -hooksComposition + {*} data.longline.HooksCompositionLogbook +baitsComposition + {*} data.longline.BaitsCompositionLogbook orderBy=topiaCreateDate +floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook orderBy=topiaCreateDate +hooksComposition + {*} data.longline.HooksCompositionLogbook orderBy=topiaCreateDate mitigationType:set + {*:*} fr.ird.observe.dto.referential.longline.MitigationTypeReference -branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook +branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook orderBy=topiaCreateDate longline.CatchLonglineLogbook > ObserveDataEntity | entity dbName=CatchLogbook comment + {*:1} String | hibernateAttributeType=text View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9e... You're receiving this email because of your account on gitlab.com.