Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
2b1bbcf6
by Tony Chemit at 2020-07-02T09:21:42+02:00
-
ce958170
by Tony Chemit at 2020-07-02T10:00:36+02:00
14 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/i18n/getters/config.getter
- client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client-core/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss
- client-core/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java
- client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
- client-core/src/main/java/fr/ird/observe/client/ui/util/UIHelper.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
- services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/NonTargetCatchReleaseServiceLocal.java
- services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
- services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java
- services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java
Changes:
| ... | ... | @@ -395,6 +395,14 @@ key = speciesList.longline.depredator |
| 395 | 395 |
type = string
|
| 396 | 396 |
defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5"
|
| 397 | 397 |
|
| 398 |
+[option nonTargetCatchReleaseSpeciesGroups]
|
|
| 399 |
+description = observe.config.nonTargetCatchRelease.speciesGroups
|
|
| 400 |
+key = ui.nonTargetCatchRelease.speciesGroups
|
|
| 401 |
+type = String[]
|
|
| 402 |
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712,fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461,fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247,fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075,fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.9204972827240977"
|
|
| 403 |
+transient = true
|
|
| 404 |
+final = true
|
|
| 405 |
+ |
|
| 398 | 406 |
[option mapBackgroundColor]
|
| 399 | 407 |
description = observe.config.map.background.description
|
| 400 | 408 |
key = map.background.color
|
| ... | ... | @@ -53,6 +53,7 @@ observe.config.map.layer7.description |
| 53 | 53 |
observe.config.map.layer8.description
|
| 54 | 54 |
observe.config.map.layer9.description
|
| 55 | 55 |
observe.config.map.style.description
|
| 56 |
+observe.config.nonTargetCatchRelease.speciesGroups
|
|
| 56 | 57 |
observe.config.observation.activitysDetaillees
|
| 57 | 58 |
observe.config.observation.fauneAssociee
|
| 58 | 59 |
observe.config.observation.floatingObject
|
| ... | ... | @@ -527,6 +527,11 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre |
| 527 | 527 |
}
|
| 528 | 528 |
}
|
| 529 | 529 |
|
| 530 |
+ public ImmutableSet<String> getNonTargetCatchReleaseSpeciesGroupsIds() {
|
|
| 531 |
+ List<String> ids = get().getOptionAsList(ClientConfigOption.NON_TARGET_CATCH_RELEASE_SPECIES_GROUPS.getKey()).getOption();
|
|
| 532 |
+ return ImmutableSet.copyOf(ids);
|
|
| 533 |
+ }
|
|
| 534 |
+ |
|
| 530 | 535 |
//////////////////////////////////////////////////
|
| 531 | 536 |
// Toutes les étapes d'actions
|
| 532 | 537 |
//////////////////////////////////////////////////
|
| ... | ... | @@ -81,7 +81,7 @@ JaxxComboBox { |
| 81 | 81 |
}
|
| 82 | 82 |
|
| 83 | 83 |
BlockingLayerUI {
|
| 84 |
- acceptedComponentTypes: {javax.swing.JScrollBar.class};
|
|
| 84 |
+ acceptedComponentTypes: {fr.ird.observe.client.ui.util.UIHelper.ACCEPTABLE_COMPONENTS_TYPE};
|
|
| 85 | 85 |
}
|
| 86 | 86 |
|
| 87 | 87 |
.i18n {
|
| ... | ... | @@ -355,7 +355,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> |
| 355 | 355 |
}
|
| 356 | 356 |
|
| 357 | 357 |
protected void initBlockLayerUI(String... doNotBlockComponentIds) {
|
| 358 |
- ui.getBlockLayerUI().setAcceptedComponentTypes(ObserveMapPane.class, JScrollBar.class);
|
|
| 358 |
+// ui.getBlockLayerUI().setAcceptedComponentTypes(UIHelper.ACCEPTABLE_COMPONENTS_TYPE);
|
|
| 359 | 359 |
ui.getBlockLayerUI().setAcceptedComponentNames(doNotBlockComponentIds);
|
| 360 | 360 |
|
| 361 | 361 |
}
|
| ... | ... | @@ -21,6 +21,7 @@ |
| 21 | 21 |
*/
|
| 22 | 22 |
package fr.ird.observe.client.ui.content.data.seine;
|
| 23 | 23 |
|
| 24 |
+import com.google.common.collect.ImmutableSet;
|
|
| 24 | 25 |
import fr.ird.observe.client.constants.AcquisitionMode;
|
| 25 | 26 |
import fr.ird.observe.client.db.constants.DataContextType;
|
| 26 | 27 |
import fr.ird.observe.client.ui.content.ContentMode;
|
| ... | ... | @@ -42,8 +43,8 @@ import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityRefer |
| 42 | 43 |
import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusReference;
|
| 43 | 44 |
import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeReference;
|
| 44 | 45 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 45 |
-import org.apache.logging.log4j.Logger;
|
|
| 46 | 46 |
import org.apache.logging.log4j.LogManager;
|
| 47 |
+import org.apache.logging.log4j.Logger;
|
|
| 47 | 48 |
import org.nuiton.jaxx.runtime.spi.UIHandler;
|
| 48 | 49 |
import org.nuiton.validator.NuitonValidatorScope;
|
| 49 | 50 |
|
| ... | ... | @@ -85,8 +86,11 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei |
| 85 | 86 |
updateSpecies(species);
|
| 86 | 87 |
}
|
| 87 | 88 |
};
|
| 89 |
+ |
|
| 88 | 90 |
addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> {
|
| 89 |
- ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId());
|
|
| 91 |
+ ImmutableSet<String> speciesGroupIds = ui.getConfig().getNonTargetCatchReleaseSpeciesGroupsIds();
|
|
| 92 |
+// ImmutableSet<String> speciesGroupIds = ObserveSwingApplicationContext.get().getConfig().getNonTargetCatchReleaseSpeciesGroupsIds();
|
|
| 93 |
+ ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId(), speciesGroupIds);
|
|
| 90 | 94 |
return new LinkedList<>(sampleSpecies.toSet());
|
| 91 | 95 |
});
|
| 92 | 96 |
}
|
| ... | ... | @@ -177,8 +181,8 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei |
| 177 | 181 |
super.afterInit(ui);
|
| 178 | 182 |
|
| 179 | 183 |
speciesGroupDtoMap = new TreeMap<>();
|
| 180 |
- |
|
| 181 |
- getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id));
|
|
| 184 |
+ ImmutableSet<String> speciesGroupIds = ui.getConfig().getNonTargetCatchReleaseSpeciesGroupsIds();
|
|
| 185 |
+ getReferentialService().loadSensibleSpeciesGroup(speciesGroupIds).forEach(id -> speciesGroupDtoMap.put(id.getId(), id));
|
|
| 182 | 186 |
|
| 183 | 187 |
}
|
| 184 | 188 |
|
| ... | ... | @@ -28,6 +28,7 @@ import fr.ird.observe.client.ui.actions.main.menu.storage.ChangeStorageAction; |
| 28 | 28 |
import fr.ird.observe.client.ui.actions.main.menu.storage.CloseStorageAction;
|
| 29 | 29 |
import fr.ird.observe.client.ui.actions.main.menu.storage.ReloadStorageAction;
|
| 30 | 30 |
import fr.ird.observe.client.ui.util.table.ObserveBooleanTableCellRenderer;
|
| 31 |
+import fr.ird.observe.client.ui.util.tripMap.ObserveMapPane;
|
|
| 31 | 32 |
import fr.ird.observe.dto.IdDto;
|
| 32 | 33 |
import fr.ird.observe.dto.data.DataFileDto;
|
| 33 | 34 |
import fr.ird.observe.dto.decoration.DecoratorService;
|
| ... | ... | @@ -51,7 +52,9 @@ import org.nuiton.jaxx.widgets.file.JaxxFileChooser; |
| 51 | 52 |
import javax.swing.JComponent;
|
| 52 | 53 |
import javax.swing.JDialog;
|
| 53 | 54 |
import javax.swing.JOptionPane;
|
| 55 |
+import javax.swing.JScrollBar;
|
|
| 54 | 56 |
import javax.swing.JScrollPane;
|
| 57 |
+import javax.swing.JTabbedPane;
|
|
| 55 | 58 |
import javax.swing.JTable;
|
| 56 | 59 |
import javax.swing.JTree;
|
| 57 | 60 |
import javax.swing.KeyStroke;
|
| ... | ... | @@ -106,6 +109,11 @@ public class UIHelper extends SwingUtil { |
| 106 | 109 |
// copy progression of any admin tab to clipboard
|
| 107 | 110 |
"progressionTopCopyCliptBoard"
|
| 108 | 111 |
};
|
| 112 |
+ |
|
| 113 |
+ public static final Class<?>[] ACCEPTABLE_COMPONENTS_TYPE = {
|
|
| 114 |
+ ObserveMapPane.class, JScrollBar.class, JTabbedPane.class
|
|
| 115 |
+ };
|
|
| 116 |
+ |
|
| 109 | 117 |
/** Logger */
|
| 110 | 118 |
static private final Logger log = LogManager.getLogger(UIHelper.class);
|
| 111 | 119 |
|
| ... | ... | @@ -1756,6 +1756,7 @@ observe.config.map.layer7.description=File (shapefile) for layer 7 of map |
| 1756 | 1756 |
observe.config.map.layer8.description=File (shapefile) for layer 8 of map
|
| 1757 | 1757 |
observe.config.map.layer9.description=File (shapefile) for layer 9 of map
|
| 1758 | 1758 |
observe.config.map.style.description=File of styles used in map
|
| 1759 |
+observe.config.nonTargetCatchRelease.speciesGroups=Species groups authorized in NonTargetCatchRelease form
|
|
| 1759 | 1760 |
observe.config.observation.activitysDetaillees=Observation of detailled activities
|
| 1760 | 1761 |
observe.config.observation.fauneAssociee=Observation of non target
|
| 1761 | 1762 |
observe.config.observation.floatingObject=Observation of floating objects
|
| ... | ... | @@ -1756,6 +1756,7 @@ observe.config.map.layer7.description=Archivo (shapeFiles) del séptimo calco de |
| 1756 | 1756 |
observe.config.map.layer8.description=Archivo (shapeFiles) del octavo calco del mapa
|
| 1757 | 1757 |
observe.config.map.layer9.description=Archivo (shapeFiles) del noveno calco del mapa
|
| 1758 | 1758 |
observe.config.map.style.description=Archivo de los estilos a aplicar sobre los calcos del mapa
|
| 1759 |
+observe.config.nonTargetCatchRelease.speciesGroups=Species groups authorized in NonTargetCatchRelease form \#TODO
|
|
| 1759 | 1760 |
observe.config.observation.activitysDetaillees=Observación de actividades detalladas
|
| 1760 | 1761 |
observe.config.observation.fauneAssociee=Observación de Fauna asociada
|
| 1761 | 1762 |
observe.config.observation.floatingObject=Observación de objetos flotantes
|
| ... | ... | @@ -1756,6 +1756,7 @@ observe.config.map.layer7.description=Fichier (Shape Files) du septième calque |
| 1756 | 1756 |
observe.config.map.layer8.description=Fichier (Shape Files) du huitième calque de la carte
|
| 1757 | 1757 |
observe.config.map.layer9.description=Fichier (Shape Files) du neuvième calque de la carte
|
| 1758 | 1758 |
observe.config.map.style.description=Fichier des style à appliquer sur les calques de la carte
|
| 1759 |
+observe.config.nonTargetCatchRelease.speciesGroups=Groupes d'espèces autorisés dans le formulaire des espèces accessoires sensibles libérées
|
|
| 1759 | 1760 |
observe.config.observation.activitysDetaillees=Observation des activités détaillées
|
| 1760 | 1761 |
observe.config.observation.fauneAssociee=Observation des Faunes associées
|
| 1761 | 1762 |
observe.config.observation.floatingObject=Observation des objets flottants
|
| ... | ... | @@ -22,6 +22,7 @@ package fr.ird.observe.services.local.service.data.seine; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import com.google.common.collect.ImmutableSet;
|
|
| 25 | 26 |
import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto;
|
| 26 | 27 |
import fr.ird.observe.dto.form.Form;
|
| 27 | 28 |
import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
|
| ... | ... | @@ -45,7 +46,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple |
| 45 | 46 |
private static final Logger log = LogManager.getLogger(NonTargetCatchReleaseServiceLocal.class);
|
| 46 | 47 |
|
| 47 | 48 |
@Override
|
| 48 |
- public ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId) {
|
|
| 49 |
+ public ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId, ImmutableSet<String> speciesGroupIds) {
|
|
| 49 | 50 |
if (log.isTraceEnabled()) {
|
| 50 | 51 |
log.trace("getSampleSpecies(" + setSeineId + ")");
|
| 51 | 52 |
}
|
| ... | ... | @@ -55,7 +56,7 @@ public class NonTargetCatchReleaseServiceLocal extends ObserveServiceLocal imple |
| 55 | 56 |
return SPECIES_SPI.toReferentialReferenceSet(setSeine.getNonTargetCatch().stream()
|
| 56 | 57 |
.map(NonTargetCatch::getSpecies)
|
| 57 | 58 |
.distinct()
|
| 58 |
- .filter(s -> SpeciesGroupHelper.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId()))
|
|
| 59 |
+ .filter(s -> speciesGroupIds.contains(s.getSpeciesGroup().getTopiaId()))
|
|
| 59 | 60 |
.collect(Collectors.toList()), getReferentialLocale(), null);
|
| 60 | 61 |
}
|
| 61 | 62 |
|
| ... | ... | @@ -43,7 +43,6 @@ import fr.ird.observe.dto.referential.ReferentialDto; |
| 43 | 43 |
import fr.ird.observe.dto.referential.ReferentialLocale;
|
| 44 | 44 |
import fr.ird.observe.dto.referential.SpeciesDto;
|
| 45 | 45 |
import fr.ird.observe.dto.referential.SpeciesGroupDto;
|
| 46 |
-import fr.ird.observe.dto.referential.SpeciesGroupHelper;
|
|
| 47 | 46 |
import fr.ird.observe.dto.referential.seine.ObservedSystemReference;
|
| 48 | 47 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 49 | 48 |
import fr.ird.observe.entities.ObserveDataEntity;
|
| ... | ... | @@ -168,10 +167,10 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe |
| 168 | 167 |
}
|
| 169 | 168 |
|
| 170 | 169 |
@Override
|
| 171 |
- public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() {
|
|
| 170 |
+ public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(ImmutableSet<String> ids) {
|
|
| 172 | 171 |
ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder();
|
| 173 |
- for (String speciesGroupId : SpeciesGroupHelper.SPECIES_GROUP_IDS) {
|
|
| 174 |
- result.add(loadSpeciesGroup(speciesGroupId));
|
|
| 172 |
+ for (String id : ids) {
|
|
| 173 |
+ result.add(loadSpeciesGroup(id));
|
|
| 175 | 174 |
}
|
| 176 | 175 |
return result.build();
|
| 177 | 176 |
}
|
| ... | ... | @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.data.seine; |
| 22 | 22 |
* #L%
|
| 23 | 23 |
*/
|
| 24 | 24 |
|
| 25 |
+import com.google.common.collect.ImmutableSet;
|
|
| 25 | 26 |
import fr.ird.observe.dto.data.seine.SetSeineNonTargetCatchReleaseDto;
|
| 26 | 27 |
import fr.ird.observe.dto.form.Form;
|
| 27 | 28 |
import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
|
| ... | ... | @@ -41,7 +42,7 @@ public interface NonTargetCatchReleaseService extends ObserveService { |
| 41 | 42 |
|
| 42 | 43 |
@Get
|
| 43 | 44 |
@ReadDataPermission
|
| 44 |
- ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId);
|
|
| 45 |
+ ReferentialDtoReferenceSet<SpeciesReference> getSampleSpecies(String setSeineId, ImmutableSet<String> speciesGroupIds);
|
|
| 45 | 46 |
|
| 46 | 47 |
@Get
|
| 47 | 48 |
@ReadDataPermission
|
| ... | ... | @@ -85,7 +85,7 @@ public interface ReferentialService extends ObserveService { |
| 85 | 85 |
|
| 86 | 86 |
@ReadReferentialPermission
|
| 87 | 87 |
@Get
|
| 88 |
- ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup();
|
|
| 88 |
+ ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(ImmutableSet<String> ids);
|
|
| 89 | 89 |
//FIXME charger cela dans le cache côté applicatif
|
| 90 | 90 |
|
| 91 | 91 |
@ReadReferentialPermission
|