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

Commits:

17 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java
    ... ... @@ -358,16 +358,20 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im
    358 358 
         }
    359 359
    360 360 
         public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) {
    361 
    -        for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) {
    362 
    -            for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) {
    363 
    -                if (node.isEnabled()) {
    364 
    -                    ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId()));
    365 
    -                    if (safeIds.isEmpty()) {
    366 
    -                        node.setId(null);
    361 
    +        try {
    362 
    +            for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) {
    363 
    +                for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) {
    364 
    +                    if (node.isEnabled()) {
    365 
    +                        ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId()));
    366 
    +                        if (safeIds.isEmpty()) {
    367 
    +                            node.setId(null);
    368 
    +                        }
    367 369 
                         }
    370 
    +                    progressModel.incrementsCurrentStep();
    368 371 
                     }
    369 
    -                progressModel.incrementsCurrentStep();
    370 372 
                 }
    373 
    +        } catch (Exception e) {
    374 
    +            log.error("Could not sanitizeIds", e);
    371 375 
             }
    372 376 
         }
    373 377

  • client-core/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java
    ... ... @@ -165,7 +165,7 @@ public abstract class UsageUIHandlerSupport<D extends ReferentialDto, R extends
    165 165 
             long count = result.getCount().get(dtoType);
    166 166
    167 167 
             DtoUsageCountRequest<D> request = result.getRequest();
    168 
    -        SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, dtoType));
    168 
    +        SingletonSupplier<Collection<RR>> factory = SingletonSupplier.of(() -> usageService.find(request, referenceType));
    169 169
    170 170 
             DtoUsageUIModel<T, RR> model = new DtoUsageUIModel<>(dtoType, referenceType, count, factory);
    171 171

  • dto/src/main/i18n/getters/eugene.getter
    1 1 
     observe.data.ll.common.GearUseFeatures.type
    2 
    +observe.data.ll.common.GearUseFeaturesMeasurement.type
    2 3 
     observe.data.ll.common.Trip.type
    3 4 
     observe.data.ll.landing.Landing.type
    4 5 
     observe.data.ll.landing.LandingPart.type
    ... ... @@ -27,6 +28,7 @@ observe.data.ll.observation.SizeMeasure.type
    27 28 
     observe.data.ll.observation.Tdr.type
    28 29 
     observe.data.ll.observation.WeightMeasure.type
    29 30 
     observe.data.ps.common.GearUseFeatures.type
    31 
    +observe.data.ps.common.GearUseFeaturesMeasurement.type
    30 32 
     observe.data.ps.common.Trip.type
    31 33 
     observe.data.ps.observation.Activity.type
    32 34 
     observe.data.ps.observation.FloatingObject.type

  • dto/src/main/i18n/getters/java.getter
    ... ... @@ -40,8 +40,8 @@ observe.data.Data.traceCutOff
    40 40 
     observe.data.Data.vessel
    41 41 
     observe.data.Data.weightMeasureMethod
    42 42 
     observe.data.ll.logbook.Set.type
    43 
    -observe.data.ll.logbook.SetLonglineDetailComposition.type
    44 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.type
    43 
    +observe.data.ll.logbook.SetDetailComposition.type
    44 
    +observe.data.ll.logbook.SetGlobalComposition.type
    45 45 
     observe.data.ll.observation.Set.type
    46 46 
     observe.data.ps.observation.Set.type
    47 47 
     observe.referential.I18nReferential.label

  • dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
    ... ... @@ -27,6 +27,8 @@ import fr.ird.observe.dto.ObserveModelInitializer;
    27 27 
     import fr.ird.observe.dto.ObserveModelInitializerRunner;
    28 28 
     import fr.ird.observe.dto.data.DataDto;
    29 29 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesDto;
    30 
    +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementDto;
    31 
    +import fr.ird.observe.dto.data.ll.common.GearUseFeaturesMeasurementReference;
    30 32 
     import fr.ird.observe.dto.data.ll.common.GearUseFeaturesReference;
    31 33 
     import fr.ird.observe.dto.data.ll.common.TripReference;
    32 34 
     import fr.ird.observe.dto.data.ll.landing.LandingDto;
    ... ... @@ -327,8 +329,8 @@ public class DecoratorService extends DecoratorProvider {
    327 329 
             @Override
    328 330 
             public void initLlObservationActivityDto() {
    329 331 
                 registerDataAndDataReferenceDecorator(ActivityDto.class, ActivityReference.class,
    330 
    -                                                  "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s",
    331 
    -                                                  "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s",
    332 
    +                                                  "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s",
    333 
    +                                                  "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s",
    332 334 
                                                       " - ");
    333 335 
                 registerObserveDecorator(TripActivityDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$t", " - ");
    334 336
    ... ... @@ -337,8 +339,8 @@ public class DecoratorService extends DecoratorProvider {
    337 339 
             @Override
    338 340 
             public void initLlLogbookActivityDto() {
    339 341 
                 registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ll.logbook.ActivityDto.class, fr.ird.observe.dto.data.ll.logbook.ActivityReference.class,
    340 
    -                                                  "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivity/label}$s",
    341 
    -                                                  "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${VesselActivityLabel}$s",
    342 
    +                                                  "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivity/label}$s",
    343 
    +                                                  "${startTimeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLabel}$s",
    342 344 
                                                       " - ");
    343 345 
             }
    344 346
    ... ... @@ -470,6 +472,8 @@ public class DecoratorService extends DecoratorProvider {
    470 472
    471 473 
             @Override
    472 474 
             public void initLlCommonGearUseFeaturesMeasurementDto() {
    475 
    +            registerDataAndDataReferenceDecorator(GearUseFeaturesMeasurementDto.class, GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s",
    476 
    +                                                  "${gearCaracteristicLabel}$s##${measurementValue}$s");
    473 477 
             }
    474 478
    475 479 
             @Override
    ... ... @@ -551,8 +555,8 @@ public class DecoratorService extends DecoratorProvider {
    551 555
    552 556 
             @Override
    553 557 
             public void initLlObservationSizeMeasureDto() {
    554 
    -            registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeType/label}$s##${size}$s",
    555 
    -                                                  "${sizeTypeLabel}$s##${size}$s");
    558 
    +            registerDataAndDataReferenceDecorator(SizeMeasureDto.class, SizeMeasureReference.class, "${sizeMeasureType/label}$s##${size}$s",
    559 
    +                                                  "${sizeMeasureTypeLabel}$s##${size}$s");
    556 560 
             }
    557 561
    558 562 
             @Override
    ... ... @@ -1013,6 +1017,8 @@ public class DecoratorService extends DecoratorProvider {
    1013 1017
    1014 1018 
             @Override
    1015 1019 
             public void initPsCommonGearUseFeaturesMeasurementDto() {
    1020 
    +            registerDataAndDataReferenceDecorator(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class, fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementReference.class, "${gearCaracteristic/label}$s##${measurementValue}$s",
    1021 
    +                                                  "${gearCaracteristicLabel}$s##${measurementValue}$s");
    1016 1022 
             }
    1017 1023
    1018 1024 
             @Override
    ... ... @@ -1037,7 +1043,7 @@ public class DecoratorService extends DecoratorProvider {
    1037 1043 
             public void initPsObservationNonTargetLengthDto() {
    1038 1044
    1039 1045 
                 registerDecorator(new NonTargetLengthDecorator());
    1040 
    -            registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s");
    1046 
    +            registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$s##${sexLabel}$s");
    1041 1047 
             }
    1042 1048
    1043 1049 
             @Override

  • dto/src/main/java/fr/ird/observe/dto/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -92,8 +92,8 @@ public class ObserveI18nLabelsBuilder extends BeanPropertyI18nKeyProducerSupport
    92 92 
             n("observe.referential.Referential.uri");
    93 93 
             n("observe.referential.Referential.needComment");
    94 94 
             n("observe.referential.Referential.validityDateRange");
    95 
    -        n("observe.data.ll.logbook.SetLonglineGlobalComposition.type");
    96 
    -        n("observe.data.ll.logbook.SetLonglineDetailComposition.type");
    95 
    +        n("observe.data.ll.logbook.SetGlobalComposition.type");
    96 
    +        n("observe.data.ll.logbook.SetDetailComposition.type");
    97 97
    98 98 
             n("observe.referential.WithFormula.equation");
    99 99 
             n("observe.referential.WithFormula.coefficients");

  • dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java
    ... ... @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt
    36 36
    37 37 
         public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException {
    38 38 
             super(NonTargetLengthDto.class,
    39 
    -              "${species/scientificLabel}$s##${length}$f##${sex}$s"
    39 
    +              "${species/scientificLabel}$s##${length}$s##${sex}$s"
    40 40 
             );
    41 41 
         }
    42 42

  • dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
    ... ... @@ -158,8 +158,6 @@ import fr.ird.observe.dto.referential.ps.observation.WeightCategoryDto;
    158 158 
     public class DtoModelClasses {
    159 159
    160 160 
         public static final ImmutableSet<Class<? extends DataDto>> ENTITY_DATA_WITH_NO_BINDER_TYPES = ImmutableSet.<Class<? extends DataDto>>builder()
    161 
    -            .add(fr.ird.observe.dto.data.ps.common.GearUseFeaturesMeasurementDto.class)
    162 
    -            .add(GearUseFeaturesMeasurementDto.class)
    163 161 
                 .add(NonTargetSampleDto.class)
    164 162 
                 .add(TargetSampleDto.class)
    165 163 
                 .build();

  • dto/src/main/models/Observe-20-data-ps-observation.model
    ... ... @@ -104,7 +104,7 @@ data.ps.observation.NonTargetSample > data.Commentable | form=data.ps.observatio
    104 104 
     nonTargetLength + {*} data.ps.observation.NonTargetLength | ordered
    105 105 
     speciesFate {*:*} fr.ird.observe.dto.referential.ps.common.SpeciesFateReference
    106 106
    107 
    -data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel
    107 
    +data.ps.observation.ObjectObservedSpecies > data.Data | references=speciesLabel,speciesStatusLabel,count
    108 108 
     count + {*:1} Integer
    109 109 
     statut + {*:1} Integer
    110 110 
     speciesStatus {*:1} fr.ird.observe.dto.referential.ps.observation.SpeciesStatusReference

  • dto/src/main/models/Observe-25-data-ps.model
    1 1 
     package fr.ird.observe.dto.data.ps.common | form=self
    2 2
    3 
    -data.ps.common.GearUseFeaturesMeasurement > data.Data
    3 
    +data.ps.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel
    4 4 
     measurementValue + {*:1} String
    5 5 
     gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference
    6 6

  • dto/src/main/models/Observe-35-data-ll.model
    ... ... @@ -6,7 +6,7 @@ usedInTrip + {*:1} Boolean
    6 6 
     gearUseFeaturesMeasurement + {*} data.ll.common.GearUseFeaturesMeasurement | ordered
    7 7 
     gear {*:1} fr.ird.observe.dto.referential.common.GearReference
    8 8
    9 
    -data.ll.common.GearUseFeaturesMeasurement > data.Data
    9 
    +data.ll.common.GearUseFeaturesMeasurement > data.Data | references=measurementValue,gearCaracteristicLabel
    10 10 
     measurementValue + {*:1} String
    11 11 
     gearCaracteristic {*:1} fr.ird.observe.dto.referential.common.GearCaracteristicReference
    12 12

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Gears
    813 813 
     observe.data.ll.common.GearUseFeatures.type=Gear uses features
    814 814 
     observe.data.ll.common.GearUseFeatures.types=Gear uses features
    815 815 
     observe.data.ll.common.GearUseFeatures.usedInTrip=Used in trip
    816 
    +observe.data.ll.common.GearUseFeaturesMeasurement.type=Measurement type
    816 817 
     observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Gear uses feature measurements
    817 818 
     observe.data.ll.common.Trip.activityObs=Activity
    818 819 
     observe.data.ll.common.Trip.availableData=Available data
    ... ... @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Set
    1227 1228 
     observe.data.ll.logbook.Set.types=Sets
    1228 1229 
     observe.data.ll.logbook.Set.weightedSnap=Weighted snap
    1229 1230 
     observe.data.ll.logbook.Set.weightedSwivel=Weighted swivel
    1231 
    +observe.data.ll.logbook.SetDetailComposition.type=Detailed composition
    1230 1232 
     observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Available mitigations
    1231 1233 
     observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Baits composition
    1232 1234 
     observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Baits composition proportion sum
    ... ... @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hooks
    1244 1246 
     observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Mitigation
    1245 1247 
     observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Selected mitigations
    1246 1248 
     observe.data.ll.logbook.SetGlobalComposition.title=Global composition
    1249 
    +observe.data.ll.logbook.SetGlobalComposition.type=Global composition
    1247 1250 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set
    1248 1251 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook)
    1249 
    -observe.data.ll.logbook.SetLonglineDetailComposition.type=Detailed composition
    1250 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Available mitigations
    1251 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Baits
    1252 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Branchlines
    1253 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Floatlines
    1254 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hooks
    1255 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Mitigation
    1256 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Selected mitigations
    1257 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Global composition
    1258 1252 
     observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample
    1259 1253 
     observe.data.ll.logbook.TripSampleList.action.create=Next sample
    1260 1254 
     observe.data.ll.logbook.TripSampleList.action.create.tip=create next sample
    ... ... @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Gear uses features
    1798 1792 
     observe.data.ps.common.GearUseFeatures.types=Gear uses features
    1799 1793 
     observe.data.ps.common.GearUseFeatures.usedInTrip=Used in trip
    1800 1794 
     observe.data.ps.common.GearUseFeaturesMeasurement.title=Gear uses feature measurements
    1795 
    +observe.data.ps.common.GearUseFeaturesMeasurement.type=Measurement type
    1801 1796 
     observe.data.ps.common.Trip.action.close.tip=Close the opened maree
    1802 1797 
     observe.data.ps.common.Trip.action.closeAndCreate=Next trip
    1803 1798 
     observe.data.ps.common.Trip.action.closeAndCreate.tip=close current trip and create a new one

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Equipos
    813 813 
     observe.data.ll.common.GearUseFeatures.type=Equipamiento
    814 814 
     observe.data.ll.common.GearUseFeatures.types=Equipamientos
    815 815 
     observe.data.ll.common.GearUseFeatures.usedInTrip=Utilizado en la marea
    816 
    +observe.data.ll.common.GearUseFeaturesMeasurement.type=Tipo
    816 817 
     observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Medidas
    817 818 
     observe.data.ll.common.Trip.activityObs=Actividad
    818 819 
     observe.data.ll.common.Trip.availableData=Données disponibles
    ... ... @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Operación de pesca
    1227 1228 
     observe.data.ll.logbook.Set.types=Operaciones de pesca
    1228 1229 
     observe.data.ll.logbook.Set.weightedSnap=Snap lesté
    1229 1230 
     observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté
    1231 
    +observe.data.ll.logbook.SetDetailComposition.type=Composición detallada
    1230 1232 
     observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atenuaciónes disponibles
    1231 1233 
     observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Cebo
    1232 1234 
     observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Suma de los proporciónes de cebo (%)
    ... ... @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Anzuelos
    1244 1246 
     observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atenuaciónes
    1245 1247 
     observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas
    1246 1248 
     observe.data.ll.logbook.SetGlobalComposition.title=Composición global del palangre
    1249 
    +observe.data.ll.logbook.SetGlobalComposition.type=Composición global
    1247 1250 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Logbook - Open set \#TODO
    1248 1251 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Go to open set (Logbook) \#TODO
    1249 
    -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composición detallada
    1250 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atenuaciónes disponibles
    1251 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Cebos
    1252 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Arponcillos
    1253 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orinques
    1254 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Anzuelos
    1255 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atenuaciónes
    1256 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atenuaciónes seleccionadas
    1257 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composición global
    1258 1252 
     observe.data.ll.logbook.TripSampleList.action.close.tip=Close the opened sample
    1259 1253 
     observe.data.ll.logbook.TripSampleList.action.create=Next sample
    1260 1254 
     observe.data.ll.logbook.TripSampleList.action.create.tip=Create next sample
    ... ... @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Equipamiento
    1798 1792 
     observe.data.ps.common.GearUseFeatures.types=Equipamientos
    1799 1793 
     observe.data.ps.common.GearUseFeatures.usedInTrip=Utilizado en la marea
    1800 1794 
     observe.data.ps.common.GearUseFeaturesMeasurement.title=Medidas
    1795 
    +observe.data.ps.common.GearUseFeaturesMeasurement.type=Tipo
    1801 1796 
     observe.data.ps.common.Trip.action.close.tip=Cierre de la marea abierta
    1802 1797 
     observe.data.ps.common.Trip.action.closeAndCreate=Marea siguiente
    1803 1798 
     observe.data.ps.common.Trip.action.closeAndCreate.tip=Cierre de la marea actual y creación de una nueva

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -813,6 +813,7 @@ observe.data.ll.common.GearUseFeatures.title=Équipements
    813 813 
     observe.data.ll.common.GearUseFeatures.type=Équipement
    814 814 
     observe.data.ll.common.GearUseFeatures.types=Équipements
    815 815 
     observe.data.ll.common.GearUseFeatures.usedInTrip=Utilisé dans la marée
    816 
    +observe.data.ll.common.GearUseFeaturesMeasurement.type=Type de mesure
    816 817 
     observe.data.ll.common.GearUseFeaturesMeasurementLongline.title=Mesures
    817 818 
     observe.data.ll.common.Trip.activityObs=Activité
    818 819 
     observe.data.ll.common.Trip.availableData=Données disponibles
    ... ... @@ -1227,6 +1228,7 @@ observe.data.ll.logbook.Set.type=Opération de pêche
    1227 1228 
     observe.data.ll.logbook.Set.types=Opérations de pêche
    1228 1229 
     observe.data.ll.logbook.Set.weightedSnap=Snap lesté
    1229 1230 
     observe.data.ll.logbook.Set.weightedSwivel=Émerillon lesté
    1231 
    +observe.data.ll.logbook.SetDetailComposition.type=Composition détaillée
    1230 1232 
     observe.data.ll.logbook.SetGlobalComposition.availableMitigationType=Atténuations disponibles
    1231 1233 
     observe.data.ll.logbook.SetGlobalComposition.baitsComposition=Appâts
    1232 1234 
     observe.data.ll.logbook.SetGlobalComposition.baitsCompositionProportionSum=Somme des proportions d'appâts (%)
    ... ... @@ -1244,17 +1246,9 @@ observe.data.ll.logbook.SetGlobalComposition.hooksCompositionTab=Hameçons
    1244 1246 
     observe.data.ll.logbook.SetGlobalComposition.mitigationTypeTab=Atténuations
    1245 1247 
     observe.data.ll.logbook.SetGlobalComposition.selectedMitigationType=Atténuations sélectionnées
    1246 1248 
     observe.data.ll.logbook.SetGlobalComposition.title=Composition globale de la palangre
    1249 
    +observe.data.ll.logbook.SetGlobalComposition.type=Composition globale
    1247 1250 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.short=Livre de bord - Calée ouverte
    1248 1251 
     observe.data.ll.logbook.SetLogbook.action.goToOpen.tip=Accéder à la calée ouverte (Livre de bord)
    1249 
    -observe.data.ll.logbook.SetLonglineDetailComposition.type=Composition détaillée
    1250 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.availableMitigationType=Atténuations disponibles
    1251 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.baitsCompositionTab=Appâts
    1252 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.branchlinesCompositionTab=Avançons
    1253 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.floatlinesCompositionTab=Orins
    1254 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.hooksCompositionTab=Hameçons
    1255 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.mitigationTypeTab=Atténuations
    1256 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.selectedMitigationType=Atténuations sélectionnées
    1257 
    -observe.data.ll.logbook.SetLonglineGlobalComposition.type=Composition globale
    1258 1252 
     observe.data.ll.logbook.TripSampleList.action.close.tip=Clôturer l'échantillon ouverte
    1259 1253 
     observe.data.ll.logbook.TripSampleList.action.create=Échantillon suivant
    1260 1254 
     observe.data.ll.logbook.TripSampleList.action.create.tip=Créer l’échantillon suivant
    ... ... @@ -1798,6 +1792,7 @@ observe.data.ps.common.GearUseFeatures.type=Équipement
    1798 1792 
     observe.data.ps.common.GearUseFeatures.types=Équipements
    1799 1793 
     observe.data.ps.common.GearUseFeatures.usedInTrip=Utilisé dans la marée
    1800 1794 
     observe.data.ps.common.GearUseFeaturesMeasurement.title=Mesures
    1795 
    +observe.data.ps.common.GearUseFeaturesMeasurement.type=Type de mesure
    1801 1796 
     observe.data.ps.common.Trip.action.close.tip=Clôturer la marée ouverte
    1802 1797 
     observe.data.ps.common.Trip.action.closeAndCreate=Marée suivante
    1803 1798 
     observe.data.ps.common.Trip.action.closeAndCreate.tip=Clôturer la marée courante et en créer une nouvelle

  • services-client/src/main/java/fr/ird/observe/services/client/usage/UsageServiceClient.java
    1 
    +package fr.ird.observe.services.client.usage;
    2 
    +
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Services client implementation
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import com.google.common.collect.ImmutableSet;
    26 
    +import fr.ird.observe.dto.IdDto;
    27 
    +import fr.ird.observe.dto.reference.DtoReference;
    28 
    +import fr.ird.observe.dto.referential.ReferentialDto;
    29 
    +import fr.ird.observe.services.service.usage.DtoUsageCountRequest;
    30 
    +import org.apache.http.HttpStatus;
    31 
    +
    32 
    +import java.util.concurrent.TimeUnit;
    33 
    +
    34 
    +public class UsageServiceClient extends GeneratedUsageServiceClient {
    35 
    +
    36 
    +    @Override
    37 
    +    public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) {
    38 
    +        return executeRequest(create("find")
    39 
    +                                      .addParameter("request", gson().toJson(request))
    40 
    +                                      .addParameter("targetType", targetType)
    41 
    +                                      .addAuthToken()
    42 
    +                                      .useMultiPartForm()
    43 
    +                                      .setTimeout(TimeUnit.MINUTES, 1)
    44 
    +                                      .post(), HttpStatus.SC_OK).toImmutableSet(targetType);
    45 
    +    }
    46 
    +
    47 
    +}

  • services-local/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java
    ... ... @@ -43,7 +43,7 @@ import fr.ird.observe.services.service.usage.UsageService;
    43 43 
     import fr.ird.observe.spi.DbModelHelper;
    44 44 
     import fr.ird.observe.spi.DtoModelHelper;
    45 45 
     import fr.ird.observe.spi.context.DataEntityContext;
    46 
    -import fr.ird.observe.spi.context.DtoEntityContext;
    46 
    +import fr.ird.observe.spi.context.ReferenceEntityContext;
    47 47 
     import fr.ird.observe.spi.context.ReferentialEntityContext;
    48 48 
     import fr.ird.observe.spi.map.ImmutableTypedMap;
    49 49 
     import org.nuiton.topia.persistence.TopiaEntity;
    ... ... @@ -75,12 +75,12 @@ public class UsageServiceLocal extends ObserveServiceLocal implements UsageServi
    75 75 
         }
    76 76
    77 77 
         @Override
    78 
    -    public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<T> targetType) {
    78 
    +    public <D extends ReferentialDto, T extends IdDto, R extends DtoReference<T, R>> ImmutableSet<R> find(DtoUsageCountRequest<D> request, Class<R> targetType) {
    79 79 
             ObserveReferentialEntity entity = loadEntity(request.getDtoType(), request.getId());
    80 80
    81 81 
             TopiaUsageSupport topiaUsageSupport = serviceContext.getTopiaPersistenceContext().getTopiaUsageSupport();
    82 82
    83 
    -        DtoEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromDto(targetType);
    83 
    +        ReferenceEntityContext<T, R, ObserveEntity> entityContext = DbModelHelper.fromReference(targetType);
    84 84 
             Class<ObserveEntity> entityType = entityContext.toEntityType();
    85 85
    86 86 
             List<ObserveEntity> compositions = topiaUsageSupport.findReverseComposition(entity, entityType);

  • test/src/main/resources/fixtures/global.properties
    ... ... @@ -31,7 +31,7 @@ SET_SEINE_ID=fr.ird.data.ps.observation.Set#1359573677233#0.016313003525718517
    31 31 
     GEAR_USE_FEATURES_SEINE_ID=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216
    32 32 
     GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.data.ps.common.GearUseFeatures#1440486230661#0.42614931015885216
    33 33 
     SPECIES_GROUP_ID=fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075
    34 
    -REFERENCE_DATA_COUNT=44
    34 
    +REFERENCE_DATA_COUNT=46
    35 35 
     DATA_FORM_COUNT=59
    36 36 
     VALIDATORS_COUNT=87
    37 37 
     VALIDATOR_CREATE_DATA_COUNT=7

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