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

Commits:

5 changed files:

Changes:

  • client/pom.xml
    ... ... @@ -389,6 +389,10 @@
    389 389 
           <artifactId>java-lang</artifactId>
    390 390 
           <scope>compile</scope>
    391 391 
         </dependency>
    392 
    +    <dependency>
    393 
    +      <groupId>io.ultreia.java4all</groupId>
    394 
    +      <artifactId>java-bean</artifactId>
    395 
    +    </dependency>
    392 396
    393 397 
         <!-- jaxx dependencies -->
    394 398

  • 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;
    34 34 
     import fr.ird.observe.dto.result.TripChildSaveResultDto;
    35 35 
     import fr.ird.observe.navigation.model.edit.ObserveEditNode;
    36 36 
     import fr.ird.observe.navigation.tree.ReferenceNode;
    37 
    +import org.apache.logging.log4j.LogManager;
    38 
    +import org.apache.logging.log4j.Logger;
    37 39
    38 40 
     import javax.swing.SwingUtilities;
    39 41
    ... ... @@ -47,6 +49,7 @@ import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigatio
    47 49 
     public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> {
    48 50
    49 51 
         public static final String ACTION_NAME = SaveActivityLonglineLogbookUIAction.class.getName();
    52 
    +    private static final Logger log = LogManager.getLogger(SaveActivityLonglineLogbookUIAction.class);
    50 53
    51 54 
         public SaveActivityLonglineLogbookUIAction(ObserveMainUI mainUI) {
    52 55 
             super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA);
    ... ... @@ -56,6 +59,9 @@ public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSup
    56 59 
         protected boolean doSave(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode, boolean notPersisted) {
    57 60 
             String tripId = editNode.getParent().getId();
    58 61
    62 
    +        log.info(ui.getModel().getPrefix() + "tripId     = " + tripId);
    63 
    +        log.info(ui.getModel().getPrefix() + "activityId = " + bean.getId());
    64 
    +
    59 65 
             TripChildSaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookService().save(tripId, bean);
    60 66 
             saveResult.toDto(bean);
    61 67

  • persistence/src/main/models/Observe-04-data-seine.model
    ... ... @@ -40,8 +40,8 @@ isChangedZoneOperation() boolean
    40 40
    41 41 
     seine.FloatingObject > ObserveDataEntity | entity
    42 42 
     comment + {*:1} String | hibernateAttributeType=text
    43 
    -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate
    44 
    -objectObservedSpecies + {*} seine.ObjectObservedSpecies
    43 
    +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate
    44 
    +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate
    45 45 
     objectOperation {*:1} referentiel.seine.ObjectOperation
    46 46 
     supportVesselName + {*:1} String
    47 47 
     transmittingBuoy + {*} seine.TransmittingBuoy | unique
    ... ... @@ -175,7 +175,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet
    175 175 
     nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set
    176 176 
     targetSample + {*} seine.TargetSample | unique reverseDbName=set
    177 177 
     targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set
    178 
    -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set
    178 
    +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate
    179 179 
     nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set
    180 180 
     hasTargetCatch() boolean
    181 181 
     hasRejetThon() boolean

  • persistence/src/main/models/Observe-05-data-longline-obs.model
    ... ... @@ -20,10 +20,10 @@ latitude + {*:1} Float
    20 20 
     longitude + {*:1} Float
    21 21 
     seaSurfaceTemperature + {*:1} Float
    22 22 
     setLongline + {0..1} longline.SetLonglineObs | dbName=set
    23 
    -encounter + {*} longline.EncounterObs | reverseDbName=activity
    23 
    +encounter + {*} longline.EncounterObs | reverseDbName=activity orderBy=topiaCreateDate
    24 24 
     vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false
    25 25 
     dataQuality {*:0..1} referentiel.DataQuality
    26 
    -sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity
    26 
    +sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity orderBy=topiaCreateDate
    27 27 
     fpaZone {*:1} referentiel.FpaZone
    28 28 
     getDate() Date
    29 29 
     getTime() Date
    ... ... @@ -107,14 +107,14 @@ basket {*:0..1} longline.BasketObs
    107 107 
     branchline {*:0..1} longline.BranchlineObs
    108 108 
     catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate
    109 109 
     discardHealthness {*:1} referentiel.longline.Healthness
    110 
    -sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch
    110 
    +sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch orderBy=topiaCreateDate
    111 111 
     speciesCatch {*:1} referentiel.Species
    112 112 
     predator {*:*} referentiel.Species | manyToManyTableName=catchObs_predator reverseDbName=catch
    113 113 
     section {*:0..1} longline.SectionObs
    114 114 
     maturityStatus {*:0..1} referentiel.longline.MaturityStatus
    115 115 
     stomacFullness {*:0..1} referentiel.longline.StomacFullness
    116 116 
     hookPosition {*:0..1} referentiel.longline.HookPosition
    117 
    -weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch
    117 
    +weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch orderBy=topiaCreateDate
    118 118 
     catchHealthness {*:1} referentiel.longline.Healthness
    119 119 
     sex {*:0..1} referentiel.Sex
    120 120 
     weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod
    ... ... @@ -187,18 +187,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric
    187 187 
     haulingEndLongitude + {*:1} Float | sqlType=numeric
    188 188 
     haulingBreaks + {*:1} Integer
    189 189 
     monitored + {*:1} Boolean
    190 
    -baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set
    191 
    -floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set
    192 
    -hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set
    190 
    +baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set orderBy=topiaCreateDate
    191 
    +floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate
    192 
    +hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set orderBy=topiaCreateDate
    193 193 
     section + {*} longline.SectionObs | unique orderBy=settingIdentifier reverseDbName=set
    194 194 
     settingShape {*:1} referentiel.longline.SettingShape
    195 
    -tdr + {*} longline.TdrObs | reverseDbName=set
    195 
    +tdr + {*} longline.TdrObs | reverseDbName=set orderBy=topiaCreateDate
    196 196 
     catchLongline + {*} longline.CatchLonglineObs | ordered reverseDbName=set
    197 197 
     lineType {*:0..1} referentiel.longline.LineType
    198 198 
     lightsticksType {*:0..1} referentiel.longline.LightsticksType
    199 199 
     lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
    200 200 
     mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setObs reverseDbName=set
    201 
    -branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set
    201 
    +branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate
    202 202 
     getSettingStartTime() Date
    203 203 
     getSettingStartDate() Date
    204 204 
     setSettingStartDate(date Date)
    ... ... @@ -258,7 +258,7 @@ maxFishingDepth + {*:1} Float
    258 258 
     meanFishingDepth + {*:1} Float
    259 259 
     medianFishingDepth + {*:1} Float
    260 260 
     branchline {*:0..1} longline.BranchlineObs
    261 
    -tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr
    261 
    +tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr orderBy=topiaCreateDate
    262 262 
     sensorBrand {*:0..1} referentiel.longline.SensorBrand
    263 263 
     species {*:*} referentiel.Species | reverseDbName=tdr
    264 264 
     section {*:0..1} longline.SectionObs

  • persistence/src/main/models/Observe-06-data-longline-logbook.model
    ... ... @@ -28,7 +28,7 @@ compagnies {*:1} referentiel.Compagnies
    28 28 
     person {*:1} referentiel.Person
    29 29 
     harbour {*:0..1} referentiel.Harbour
    30 30 
     vessel {*:0..1} referentiel.Vessel
    31 
    -landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing
    31 
    +landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing orderBy=topiaCreateDate
    32 32
    33 33 
     longline.LandingPartLogbook > ObserveDataEntity | entity dbName=LandingPartLogbook
    34 34 
     species {*:1} referentiel.Species
    ... ... @@ -79,9 +79,9 @@ monitored + {*:1} Boolean
    79 79 
     totalLineLength + {*:1} Integer
    80 80 
     basketLineLength + {*:1} Integer
    81 81 
     lengthBetweenBranchlines + {*:1} Integer
    82 
    -baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set
    83 
    -floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set
    84 
    -hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set
    82 
    +baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
    83 
    +floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
    84 
    +hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
    85 85 
     settingShape {*:1} referentiel.longline.SettingShape
    86 86 
     catchLongline + {*} longline.CatchLonglineLogbook | ordered reverseDbName=set
    87 87 
     lineType {*:0..1} referentiel.longline.LineType
    ... ... @@ -90,7 +90,7 @@ lightsticksCount + {*:1} Integer
    90 90 
     lightsticksType {*:0..1} referentiel.longline.LightsticksType
    91 91 
     lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
    92 92 
     mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setLogbook reverseDbName=set
    93 
    -branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set
    93 
    +branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
    94 94 
     getSettingStartTime() Date
    95 95 
     getSettingStartDate() Date
    96 96 
     setSettingStartDate(date Date)
    ... ... @@ -125,11 +125,11 @@ setHooksCompositionProportionSum(sum int)
    125 125 
     setBaitsCompositionProportionSum(sum int)
    126 126
    127 127 
     data.longline.SetLonglineLogbookGlobalComposition > data.Commentable
    128 
    -baitsComposition + {*} data.longline.BaitsCompositionLogbook
    129 
    -floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook
    130 
    -hooksComposition + {*} data.longline.HooksCompositionLogbook
    128 
    +baitsComposition + {*} data.longline.BaitsCompositionLogbook orderBy=topiaCreateDate
    129 
    +floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook orderBy=topiaCreateDate
    130 
    +hooksComposition + {*} data.longline.HooksCompositionLogbook orderBy=topiaCreateDate
    131 131 
     mitigationType:set + {*:*} fr.ird.observe.dto.referential.longline.MitigationTypeReference
    132 
    -branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook
    132 
    +branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook orderBy=topiaCreateDate
    133 133
    134 134 
     longline.CatchLonglineLogbook > ObserveDataEntity | entity dbName=CatchLogbook
    135 135 
     comment + {*:1} String | hibernateAttributeType=text

    • —
    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.