Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 602e639c by Tony Chemit at 2020-07-02T12:20:58+02:00 [PS] Pratiques de remise à l'eau, cétacés non trouvés - Closes #1564 (report v8) - - - - - 5fed9110 by Tony Chemit at 2020-07-03T19:24:41+02:00 le reset reste actif sur les éditeurs de nombres même si ceci ne sont pas actif - Closes #1568 le reset des combo box ne fonctionne pas bien (alors que l'action associée Ctrl+D est ok) - Closes #1569 - - - - - 10 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchReleaseUIHandler.java - 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 - pom.xml - server-core/src/main/filtered-resources/mapping - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== client-configuration/src/main/config/Client.ini ===================================== @@ -402,12 +402,6 @@ key = sizeMeasureType.seine.observation.targetSample type = String[] defaultValue = [\"fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607\", \"fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336\"] -[option speciesGroupSeineObservationNonTargetCatchReleaseId] -description = observe.config.speciesGroup.seine.observation.nonTargetCatchRelease -key = speciesGroup.seine.observation.nonTargetCatchRelease -type = String[] -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\"] - [option speciesListSeineObservationSchoolEstimateId] description = observe.config.speciesList.seine.observation.schoolEstimate key = speciesList.seine.observation.schoolEstimate ===================================== client-configuration/src/main/i18n/getters/config.getter ===================================== @@ -77,7 +77,6 @@ observe.config.showMigrationSql observe.config.showSql observe.config.simplifiedObjectTypeSpecializedRules.description observe.config.sizeMeasureType.seine.observation.targetSample -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease observe.config.speciesList.longline.common.trip observe.config.speciesList.longline.depredator 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 private ReferentialReferencesFilter<SpeciesDto, SpeciesReference> newSpeciesList() { return incomingReferences -> { - ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getPsObservationNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId(), getClientConfig().getSpeciesGroupSeineObservationNonTargetCatchReleaseId()); + String[] speciesGroupIds = speciesGroupDtoMap.keySet().toArray(new String[0]); + ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getPsObservationNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId(), speciesGroupIds); return new LinkedList<>(sampleSpecies.toSet()); }; } @@ -124,7 +125,7 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetNon public void afterInit(NonTargetCatchReleaseUI ui) { super.afterInit(ui); speciesGroupDtoMap = new TreeMap<>(); - getReferentialService().getReferentialDtoSet(SpeciesGroupDto.class, null, getClientConfig().getSpeciesGroupSeineObservationNonTargetCatchReleaseId()).forEach(id -> speciesGroupDtoMap.put(id.getId(), id)); + getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id)); } @Override ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -529,7 +529,6 @@ observe.config.showMigrationSql=Show migration sql queries observe.config.showSql=Show sql observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules observe.config.sizeMeasureType.seine.observation.targetSample=Size measure types used to filter target sample species -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Species groups used to filter non target catch release species observe.config.speciesList.longline.common.trip=Species for trip longline observe.config.speciesList.longline.depredator=Species for observation depredator 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 observe.config.showSql=Mostrar en todas las consultas sql ejecutadas observe.config.simplifiedObjectTypeSpecializedRules.description=simplified object type specialized rules \#TODO observe.config.sizeMeasureType.seine.observation.targetSample=Size measure types used to filter target sample species \#TODO -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Species groups used to filter non target catch release species \#TODO observe.config.speciesList.longline.common.trip=Espèces ciébles pour les marées Palangre observe.config.speciesList.longline.depredator=Espèces pour les déprédations 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 observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées observe.config.simplifiedObjectTypeSpecializedRules.description=Liste des règles supplémantaires pour la détermination du type simplifié d'un DCP observe.config.sizeMeasureType.seine.observation.targetSample=Types de mesures de taille utilisées dans les captures d'espèces ciblées -observe.config.speciesGroup.seine.observation.nonTargetCatchRelease=Groupes d'espèces utilisés dans les mode de libération observe.config.speciesList.longline.common.trip=Espèces ciébles pour les marées Palangre observe.config.speciesList.longline.depredator=Espèces pour les déprédations observe.config.speciesList.longline.landing=Espèces pour les débarquements Logbook ===================================== pom.xml ===================================== @@ -170,7 +170,7 @@ <!-- <lib.version.java4all.topia>1.17</lib.version.java4all.topia>--> <!-- <lib.version.java4all.eugene>3.0-alpha-34-SNAPSHOT</lib.version.java4all.eugene>--> -<!-- <lib.version.java4all.jaxx>3.0-alpha-72-SNAPSHOT</lib.version.java4all.jaxx>--> + <lib.version.java4all.jaxx>3.0-alpha-74</lib.version.java4all.jaxx> <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>--> <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> ===================================== server-core/src/main/filtered-resources/mapping ===================================== @@ -271,6 +271,7 @@ GET /api/v1/referential/ReferentialService/loadDto POST /api/v1/referential/ReferentialService/loadDtoList v1.referential.ReferentialServiceRestApi.loadDtoList GET /api/v1/referential/ReferentialService/loadForm v1.referential.ReferentialServiceRestApi.loadForm GET /api/v1/referential/ReferentialService/loadReference v1.referential.ReferentialServiceRestApi.loadReference +GET /api/v1/referential/ReferentialService/loadSensibleSpeciesGroup v1.referential.ReferentialServiceRestApi.loadSensibleSpeciesGroup GET /api/v1/referential/ReferentialService/preCreate v1.referential.ReferentialServiceRestApi.preCreate POST /api/v1/referential/ReferentialService/replaceReference v1.referential.ReferentialServiceRestApi.replaceReference POST /api/v1/referential/ReferentialService/save v1.referential.ReferentialServiceRestApi.save ===================================== 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; import fr.ird.observe.dto.referential.ReferenceStatus; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ReferentialLocale; +import fr.ird.observe.dto.referential.common.SpeciesGroupDto; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.entities.ObserveEntityEnum; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; @@ -135,6 +136,12 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe return spi.toDto(getReferentialLocale(), type, entities); } + @Override + public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { + ImmutableSet<SpeciesGroupDto> speciesGroups = loadDtoList(SpeciesGroupDto.class); + return ImmutableSet.copyOf(speciesGroups.stream().filter(t -> !t.isSpeciesGroupReleaseModeEmpty()).collect(Collectors.toSet())); + } + @Override public <D extends ReferentialDto> D loadDto(Class<D> type, String id) { 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; import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; +import fr.ird.observe.dto.referential.common.SpeciesGroupDto; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadDataPermission; @@ -67,6 +68,10 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission <D extends ReferentialDto> ImmutableSet<D> getReferentialDtoSet(Class<D> type, @Nullable Date lastUpdateDate, String... ids); + @ReadReferentialPermission + @Get + ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(); + @ReadReferentialPermission @Get <D extends ReferentialDto> D loadDto(Class<D> type, String id); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cb293850605b3ecb0a92206e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cb293850605b3ecb0a92206e... You're receiving this email because of your account on gitlab.com.