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

Commits:

8 changed files:

Changes:

  • client-configuration/src/main/config/Client.ini
    ... ... @@ -402,12 +402,6 @@ key = sizeMeasureType.seine.observation.targetSample
    402 402 
     type = String[]
    403 403 
     defaultValue = [\"fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607\", \"fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336\"]
    404 404
    405 
    -[option speciesGroupSeineObservationNonTargetCatchReleaseId]
    406 
    -description = observe.config.speciesGroup.seine.observation.nonTargetCatchRelease
    407 
    -key = speciesGroup.seine.observation.nonTargetCatchRelease
    408 
    -type = String[]
    409 
    -defaultValue = [\"fr.ird.referential.common.SpeciesGroup#1445863056144#0.9820877553253712\", \"fr.ird.referential.common.SpeciesGroup#1239832683690#0.24333033683679461\", \"fr.ird.referential.common.SpeciesGroup#1446014286433#0.6480183366605247\", \"fr.ird.referential.common.SpeciesGroup#1239832683689#0.7120116158620075\"]
    410 
    -
    411 405 
     [option speciesListSeineObservationSchoolEstimateId]
    412 406 
     description = observe.config.speciesList.seine.observation.schoolEstimate
    413 407 
     key = speciesList.seine.observation.schoolEstimate

  • client-configuration/src/main/i18n/getters/config.getter
    ... ... @@ -77,7 +77,6 @@ observe.config.showMigrationSql
    77 77 
     observe.config.showSql
    78 78 
     observe.config.simplifiedObjectTypeSpecializedRules.description
    79 79 
     observe.config.sizeMeasureType.seine.observation.targetSample
    80 
    -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease
    81 80 
     observe.config.speciesList.longline.common.trip
    82 81 
     observe.config.speciesList.longline.depredator
    83 82 
     observe.config.speciesList.longline.landing

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java
    ... ... @@ -115,7 +115,8 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon
    115 115
    116 116 
         private ReferentialReferencesFilter<SpeciesDto, SpeciesReference> newSpeciesList() {
    117 117 
             return incomingReferences -> {
    118 
    -            ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getPsObservationNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId(), getClientConfig().getSpeciesGroupSeineObservationNonTargetCatchReleaseId());
    118 
    +            String[] speciesGroupIds = speciesGroupDtoMap.keySet().toArray(new String[0]);
    119 
    +            ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getPsObservationNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId(), speciesGroupIds);
    119 120 
                 return new LinkedList<>(sampleSpecies.toSet());
    120 121 
             };
    121 122 
         }
    ... ... @@ -124,7 +125,7 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon
    124 125 
         public void afterInit(NonTargetCatchReleaseUI ui) {
    125 126 
             super.afterInit(ui);
    126 127 
             speciesGroupDtoMap = new TreeMap<>();
    127 
    -        getReferentialService().getReferentialDtoSet(SpeciesGroupDto.class, null, getClientConfig().getSpeciesGroupSeineObservationNonTargetCatchReleaseId()).forEach(id -> speciesGroupDtoMap.put(id.getId(), id));
    128 
    +        getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id));
    128 129 
         }
    129 130
    130 131 
         @Override

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -529,7 +529,6 @@ observe.config.showMigrationSql=Show migration sql queries
    529 529 
     observe.config.showSql=Show sql
    530 530 
     observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules
    531 531 
     observe.config.sizeMeasureType.seine.observation.targetSample=Size measure types used to filter target sample species
    532 
    -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Species groups used to filter non target catch release species
    533 532 
     observe.config.speciesList.longline.common.trip=Species for trip longline
    534 533 
     observe.config.speciesList.longline.depredator=Species for observation depredator
    535 534 
     observe.config.speciesList.longline.landing=Species for logbook landings

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -529,7 +529,6 @@ observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas dur
    529 529 
     observe.config.showSql=Mostrar en todas las consultas sql ejecutadas
    530 530 
     observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules \#TODO
    531 531 
     observe.config.sizeMeasureType.seine.observation.targetSample=Size measure types used to filter target sample species \#TODO
    532 
    -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Species groups used to filter non target catch release species \#TODO
    533 532 
     observe.config.speciesList.longline.common.trip=Espèces ciébles pour les marées Palangre
    534 533 
     observe.config.speciesList.longline.depredator=Espèces pour les déprédations
    535 534 
     observe.config.speciesList.longline.landing=Espèces pour les débarquements Logbook

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -529,7 +529,6 @@ observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lor
    529 529 
     observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées
    530 530 
     observe.config.simplifiedObjectTypeSpecializedRules.description=Liste des règles supplémantaires pour la détermination du type simplifié d'un DCP
    531 531 
     observe.config.sizeMeasureType.seine.observation.targetSample=Types de mesures de taille utilisées dans les captures d'espèces ciblées
    532 
    -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Groupes d'espèces utilisés dans les mode de libération
    533 532 
     observe.config.speciesList.longline.common.trip=Espèces ciébles pour les marées Palangre
    534 533 
     observe.config.speciesList.longline.depredator=Espèces pour les déprédations
    535 534 
     observe.config.speciesList.longline.landing=Espèces pour les débarquements Logbook

  • services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
    ... ... @@ -33,6 +33,7 @@ import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    33 33 
     import fr.ird.observe.dto.referential.ReferenceStatus;
    34 34 
     import fr.ird.observe.dto.referential.ReferentialDto;
    35 35 
     import fr.ird.observe.dto.referential.ReferentialLocale;
    36 
    +import fr.ird.observe.dto.referential.common.SpeciesGroupDto;
    36 37 
     import fr.ird.observe.dto.result.SaveResultDto;
    37 38 
     import fr.ird.observe.entities.ObserveEntityEnum;
    38 39 
     import fr.ird.observe.entities.ObserveTopiaPersistenceContext;
    ... ... @@ -135,6 +136,12 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe
    135 136 
             return spi.toDto(getReferentialLocale(), type, entities);
    136 137 
         }
    137 138
    139 
    +    @Override
    140 
    +    public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() {
    141 
    +        ImmutableSet<SpeciesGroupDto> speciesGroups = loadDtoList(SpeciesGroupDto.class);
    142 
    +        return ImmutableSet.copyOf(speciesGroups.stream().filter(t -> !t.isSpeciesGroupReleaseModeEmpty()).collect(Collectors.toSet()));
    143 
    +    }
    144 
    +
    138 145 
         @Override
    139 146 
         public <D extends ReferentialDto> D loadDto(Class<D> type, String id) {
    140 147 
             ReferentialEntity<D, ?> entity = loadEntity(type, id);

  • services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java
    ... ... @@ -28,6 +28,7 @@ import fr.ird.observe.dto.form.Form;
    28 28 
     import fr.ird.observe.dto.reference.ReferentialDtoReference;
    29 29 
     import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
    30 30 
     import fr.ird.observe.dto.referential.ReferentialDto;
    31 
    +import fr.ird.observe.dto.referential.common.SpeciesGroupDto;
    31 32 
     import fr.ird.observe.dto.result.SaveResultDto;
    32 33 
     import fr.ird.observe.services.service.ObserveService;
    33 34 
     import fr.ird.observe.services.spi.ReadDataPermission;
    ... ... @@ -67,6 +68,10 @@ public interface ReferentialService extends ObserveService {
    67 68 
         @ReadReferentialPermission
    68 69 
         <D extends ReferentialDto> ImmutableSet<D> getReferentialDtoSet(Class<D> type, @Nullable Date lastUpdateDate, String... ids);
    69 70
    71 
    +    @ReadReferentialPermission
    72 
    +    @Get
    73 
    +    ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup();
    74 
    +
    70 75 
         @ReadReferentialPermission
    71 76 
         @Get
    72 77 
         <D extends ReferentialDto> D loadDto(Class<D> type, String id);

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