[Git][ultreiaio/ird-observe][develop] [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…

6 Oct 2018


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


Commits:
668d0921 by Tony CHEMIT at 2018-10-06T17:15:24Z
[LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130

- - - - -


22 changed files:

- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
- client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
- client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
- client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java


Changes:

=====================================
client-configuration/src/main/config/Client.ini
=====================================
@@ -369,24 +369,43 @@ key = speciesList.seine.objectObservedSpecies
 type = string
 defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.2"
 
-[option speciesListLonglineCatchId]
-description = observe.config.speciesList.longline.catch
-key = speciesList.longline.catch
+[option speciesListLonglineObsCatchId]
+description = observe.config.speciesList.longline.obs.catch
+key = speciesList.longline.obs.catch
 type = string
 defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
 
-[option speciesListLonglineEncounterId]
-description = observe.config.speciesList.longline.encounter
-key = speciesList.longline.encounter
+[option speciesListLonglineObsEncounterId]
+description = observe.config.speciesList.longline.obs.encounter
+key = speciesList.longline.obs.encounter
 type = string
 defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.4"
 
-[option speciesListLonglineDepredatorId]
-description = observe.config.speciesList.longline.encounter
-key = speciesList.longline.depredator
+[option speciesListLonglineObsDepredatorId]
+description = observe.config.speciesList.longline.obs.depredator
+key = speciesList.longline.obs.tdr
 type = string
 defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.5"
 
+[option speciesListLonglineLogbookCatchId]
+description = observe.config.speciesList.longline.logbook.catch
+key = speciesList.longline.logbook.catch
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+[option speciesListLonglineLogbookLandingId]
+description = observe.config.speciesList.longline.logbook.landing
+key = speciesList.longline.logbook.landing
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+[option speciesListLonglineLogbookSampleId]
+description = observe.config.speciesList.longline.logbook.sample
+key = speciesList.longline.logbook.sample
+type = string
+defaultValue = "fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.3"
+
+
 [option speciesListLonglineTripId]
 description = observe.config.speciesList.longline.trip
 key = speciesList.longline.trip


=====================================
client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Server data source con
 observe.config.showMigrationProgression=Show migration progression
 observe.config.showMigrationSql=Show migration sql queries
 observe.config.showSql=Show sql
-observe.config.speciesList.longline.catch=Species for catches
-observe.config.speciesList.longline.encounter=Species for encounters
+observe.config.speciesList.longline.logbook.catch=Species for logbook catches
+observe.config.speciesList.longline.logbook.landing=Species for logbook landings
+observe.config.speciesList.longline.logbook.sample=Species for logbook samples
+observe.config.speciesList.longline.obs.catch=Species for observation catches
+observe.config.speciesList.longline.obs.depredator=Species for observation depredator
+observe.config.speciesList.longline.obs.encounter=Species for encounters
 observe.config.speciesList.longline.trip=Species for trip longline
 observe.config.speciesList.seine.nonTargetCatch=Species for non target catches
 observe.config.speciesList.seine.objectObservedSpecies=Species for object observed species


=====================================
client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=Configurations de serv
 observe.config.showMigrationProgression=Mostar los logs de actualización de una base de datos
 observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos
 observe.config.showSql=Mostrar en los los todas las consultas sql ejecutadas
-observe.config.speciesList.longline.catch=Especies para las capturas - TDR
-observe.config.speciesList.longline.encounter=Especies para los encuentros
+observe.config.speciesList.longline.logbook.catch=Especies para las capturas logbook \#TODO
+observe.config.speciesList.longline.logbook.landing=Especies para las landing logbook \#TODO
+observe.config.speciesList.longline.logbook.sample=Especies para las sample logbook \#TODO
+observe.config.speciesList.longline.obs.catch=Especies para las capturas observations \#TODO
+observe.config.speciesList.longline.obs.depredator=Species for observation depredator \#TODO
+observe.config.speciesList.longline.obs.encounter=Especies para los encuentros
 observe.config.speciesList.longline.trip=Especies para las marea - Longline
 observe.config.speciesList.seine.nonTargetCatch=Especies para las capturas que no forman parte del objetivo
 observe.config.speciesList.seine.objectObservedSpecies=Especies para los especies que no forman parte del objetivo y que fueron observadas


=====================================
client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties
=====================================
@@ -69,8 +69,12 @@ observe.config.serverDataSourceConfigurations.description=connexions à des serv
 observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base
 observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base
 observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées
-observe.config.speciesList.longline.catch=Espèces pour les captures - TDR
-observe.config.speciesList.longline.encounter=Espèces pour les rencontre
+observe.config.speciesList.longline.logbook.catch=Espèces pour les captures Logbook
+observe.config.speciesList.longline.logbook.landing=Espèces pour les débarquements Logbook
+observe.config.speciesList.longline.logbook.sample=Espèces pour les échantillons Logbook
+observe.config.speciesList.longline.obs.catch=Espèces pour les captures observation
+observe.config.speciesList.longline.obs.depredator=Espèces pour les déprédations
+observe.config.speciesList.longline.obs.encounter=Espèces pour les rencontre
 observe.config.speciesList.longline.trip=Espèces ciébles pour les marées Palangre
 observe.config.speciesList.seine.nonTargetCatch=Espèces pour les captures non cible
 observe.config.speciesList.seine.objectObservedSpecies=Espèces pour les espèces non cible observées


=====================================
client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java
=====================================
@@ -36,8 +36,8 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.dto.reference.ReferentialDtoReference;
 import fr.ird.observe.dto.referential.SpeciesListReference;
 import io.ultreia.java4all.config.ConfigOptionDef;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jdesktop.swingx.renderer.DefaultTableRenderer;
 import org.nuiton.decorator.Decorator;
 import org.nuiton.jaxx.widgets.config.ConfigCategoryUI;
@@ -234,8 +234,13 @@ public class ShowConfigAction extends MenuActionSupport {
                                n("observe.config.category.speciesList.longline.description"),
                                ObserveUICallback.ui.name());
 
-            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID);
-            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_TRIP_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_CATCH_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_DEPREDATOR_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_OBS_ENCOUNTER_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_CATCH_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_LANDING_ID);
+            helper.addSpeciesListOption(ClientConfigOption.SPECIES_LIST_LONGLINE_LOGBOOK_SAMPLE_ID);
 
 
         }


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java
=====================================
@@ -70,7 +70,7 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr
     }
 
     @Override
-    public void afterInit(TripLonglineUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TripLonglineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> {
             List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences);
             return DtoReferenceCollection.filterEnabled(result);
@@ -98,6 +98,10 @@ class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLonglineDto, Tr
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
+    }
+
+    @Override
+    public void afterInit(TripLonglineUI ui) {
         super.afterInit(ui);
         TripMapUI tripMap = ui.getTripMap();
         ClientConfig config = ObserveSwingApplicationContext.get().getConfig();


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
=====================================
@@ -126,22 +126,19 @@ public class CatchLonglineLogbookUIHandler extends ContentTableUIHandler<SetLong
     }
 
     @Override
-    public void afterInit(CatchLonglineLogbookUI ui) {
-        super.afterInit(ui);
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookCatchId();
             String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
-
         addReferentialFilter(CatchLonglineLogbookDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
             String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
-
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java
=====================================
@@ -22,11 +22,13 @@ package fr.ird.observe.client.ui.content.data.longline.logbook;
  * #L%
  */
 
+import fr.ird.observe.client.ObserveSwingApplicationContext;
 import fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler;
 import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy;
 import fr.ird.observe.client.ui.util.UIHelper;
 import fr.ird.observe.dto.data.longline.LandingLogbookDto;
 import fr.ird.observe.dto.data.longline.LandingPartLogbookDto;
+import fr.ird.observe.dto.reference.DtoReferenceCollection;
 import fr.ird.observe.dto.referential.SpeciesReference;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -36,6 +38,7 @@ import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.Component;
 import java.awt.Container;
+import java.util.List;
 
 import static org.nuiton.i18n.I18n.n;
 
@@ -69,6 +72,16 @@ public class LandingPartLogbookUIHandler extends ContentTableUIHandler<LandingLo
         };
     }
 
+    @Override
+    protected void onAfterInitAddReferentialFilters() {
+        addReferentialFilter(LandingPartLogbookDto.PROPERTY_SPECIES, incomingReferences -> {
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookLandingId();
+            String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
+            List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
+            return DtoReferenceCollection.filterEnabled(result);
+        });
+    }
+
     @Override
     protected void initTableUI(DefaultTableCellRenderer renderer) {
         JTable table = ui.getTable();


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java
=====================================
@@ -31,7 +31,7 @@ import fr.ird.observe.client.ui.content.api.ui.ObserveLayoutFocusTraversalPolicy
 import fr.ird.observe.client.ui.util.UIHelper;
 import fr.ird.observe.dto.data.longline.SampleLogbookDto;
 import fr.ird.observe.dto.data.longline.SamplePartLogbookDto;
-import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
+import fr.ird.observe.dto.reference.DtoReferenceCollection;
 import fr.ird.observe.dto.referential.SexReference;
 import fr.ird.observe.dto.referential.SizeMeasureTypeReference;
 import fr.ird.observe.dto.referential.SpeciesReference;
@@ -46,7 +46,6 @@ import javax.swing.table.DefaultTableCellRenderer;
 import java.awt.Component;
 import java.awt.Container;
 import java.beans.PropertyChangeListener;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
@@ -97,21 +96,24 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb
     }
 
     @Override
-    public void afterInit(SamplePartLogbookUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(SamplePartLogbookDto.PROPERTY_SPECIES, incomingReferences -> {
-            if (fromActivity) {
-//                FIXME We do not have the set selected here (since this is a brother of it)
-                String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId();
-                if (setId == null) {
-                    return incomingReferences;
-                }
-                ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId);
-                return new LinkedList<>(sampleSpecies.toSet());
-            } else {
-                return incomingReferences;
-            }
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineLogbookSampleId();
+            String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
+            List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
+            return DtoReferenceCollection.filterEnabled(result);
+//            if (fromActivity) {
+////                FIXME We do not have the set selected here (since this is a brother of it)
+//                String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId();
+//                if (setId == null) {
+//                    return incomingReferences;
+//                }
+//                ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId);
+//                return new LinkedList<>(sampleSpecies.toSet());
+//            } else {
+//                return incomingReferences;
+//            }
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/CatchLonglineObsUIHandler.java
=====================================
@@ -161,24 +161,25 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline
     }
 
     @Override
-    public void afterInit(CatchLonglineObsUI ui) {
-
-        super.afterInit(ui);
-
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(CatchLonglineObsDto.PROPERTY_SPECIES_CATCH, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId();
             String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
 
         addReferentialFilter(CatchLonglineObsDto.PROPERTY_PREDATOR, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineDepredatorId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsDepredatorId();
             String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
+    }
 
+    @Override
+    public void afterInit(CatchLonglineObsUI ui) {
+        super.afterInit(ui);
         CatchLonglineObsUIModel model = ui.getModel();
         model.addPropertyChangeListener(CatchLonglineObsUIModel.PROPERTY_SHOW_INDIVIDUAL_TABS, evt -> {
             Boolean newValue = (Boolean) evt.getNewValue();


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/EncounterObsUIHandler.java
=====================================
@@ -60,9 +60,9 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin
     private static final Logger log = LogManager.getLogger(EncounterObsUIHandler.class);
 
     @Override
-    public void afterInit(EncounterObsUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(EncounterObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineEncounterId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsEncounterId();
             Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
             SpeciesListDto speciesListDto = speciesListDtoForm.getObject();
 
@@ -71,7 +71,6 @@ public class EncounterObsUIHandler extends ContentTableUIHandler<ActivityLonglin
             List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/TdrObsUIHandler.java
=====================================
@@ -181,15 +181,18 @@ public class TdrObsUIHandler extends ContentTableUIHandler<SetLonglineObsTdrDto,
     }
 
     @Override
-    public void afterInit(TdrObsUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TdrObsDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
-            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineCatchId();
+            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListLonglineObsCatchId();
             String tripLonglineId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getTrip().getId();
             List<SpeciesReference> result = getTripLonglineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
+    }
 
+    @Override
+    public void afterInit(TdrObsUI ui) {
+        super.afterInit(ui);
         positionHelper = new LonglinePositionHelper<>(ui.getSection(), ui.getBasket(), ui.getBranchline(), ui.getTableEditBean());
     }
 


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java
=====================================
@@ -113,11 +113,15 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei
     }
 
     @Override
-    public void afterInit(NonTargetCatchReleaseUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(NonTargetCatchReleaseDto.PROPERTY_SPECIES, incomingReferences -> {
             ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getModel().getSelectedId());
             return new LinkedList<>(sampleSpecies.toSet());
         });
+    }
+
+    @Override
+    public void afterInit(NonTargetCatchReleaseUI ui) {
         super.afterInit(ui);
         speciesGroupDtoMap = new TreeMap<>();
         getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id));


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchUIHandler.java
=====================================
@@ -180,11 +180,8 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
         UIHelper.setTableColumnRenderer(table, 7, UIHelper.newEmptyNumberTableCellRenderer(renderer));
         UIHelper.setTableColumnRenderer(table, 8, UIHelper.newStringTableCellRenderer(renderer, 10, true));
     }
-
     @Override
-    protected void loadEditBean(String beanId) {
-        Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId);
-        getModel().openForm(form);
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();
             String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId();
@@ -193,6 +190,19 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
         });
     }
 
+    @Override
+    protected void loadEditBean(String beanId) {
+        Form<SetSeineNonTargetCatchDto> form = getNonTargetCatchService().loadForm(beanId);
+        getModel().openForm(form);
+        //FIXME voir pk on faisait ça à ce moment
+//        addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
+//            String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();
+//            String tripId = ObserveSwingApplicationContext.get().getNavigationSelect().getSeine().getTrip().getId();
+//            List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
+//            return DtoReferenceCollection.filterEnabled(result);
+//        });
+    }
+
     @Override
     protected void onSelectedRowChanged(int editingRow, NonTargetCatchDto bean, boolean create) {
         ContentTableModel<SetSeineNonTargetCatchDto, NonTargetCatchDto> model = getTableModel();


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
=====================================
@@ -91,7 +91,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
     }
 
     @Override
-    public void afterInit(NonTargetSampleUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, incomingReferences -> {
             ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getModel().getSelectedId());
             return new LinkedList<>(sampleSpecies.toSet());
@@ -102,7 +102,6 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
             return new LinkedList<>(speciesFate);
 //            return ReferentialDtoReferences.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectObservedSpeciesUIHandler.java
=====================================
@@ -58,7 +58,7 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati
     private static final Logger log = LogManager.getLogger(ObjectObservedSpeciesUIHandler.class);
 
     @Override
-    public void afterInit(ObjectObservedSpeciesUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectObservedSpeciesId();
             Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
@@ -69,7 +69,6 @@ public class ObjectObservedSpeciesUIHandler extends ContentTableUIHandler<Floati
             List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ObjectSchoolEstimateUIHandler.java
=====================================
@@ -56,7 +56,7 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin
     private static final Logger log = LogManager.getLogger(ObjectSchoolEstimateUIHandler.class);
 
     @Override
-    public void afterInit(ObjectSchoolEstimateUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(ObjectSchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineObjectSchoolEstimateId();
             Form<SpeciesListDto> speciesListDtoForm = getReferentialService().loadForm(SpeciesListDto.class, speciesListId);
@@ -67,7 +67,6 @@ public class ObjectSchoolEstimateUIHandler extends ContentTableUIHandler<Floatin
             List<SpeciesReference> result = DtoReferenceCollection.filterContains(incomingReferences, speciesIds);
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/SchoolEstimateUIHandler.java
=====================================
@@ -56,7 +56,7 @@ import static org.nuiton.i18n.I18n.n;
 public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoolEstimateDto, SchoolEstimateDto, SchoolEstimateUI> implements UIHandler<SchoolEstimateUI> {
 
     @Override
-    public void afterInit(SchoolEstimateUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(SchoolEstimateDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineSchoolEstimateId();
 
@@ -64,7 +64,6 @@ public class SchoolEstimateUIHandler extends ContentTableUIHandler<SetSeineSchoo
             List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java
=====================================
@@ -67,7 +67,7 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa
     private static final Logger log = LogManager.getLogger(TargetCatchUIHandler.class);
 
     @Override
-    public void afterInit(TargetCatchUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
 
@@ -75,6 +75,10 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa
             List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
+    }
+
+    @Override
+    public void afterInit(TargetCatchUI ui) {
         super.afterInit(ui);
 
         // lors de la modification d'une species (sur une entree non sauvee)


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java
=====================================
@@ -71,7 +71,7 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
     private static final Logger log = LogManager.getLogger(TargetDiscardCatchUIHandler.class);
 
     @Override
-    public void afterInit(TargetDiscardCatchUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId();
 
@@ -79,6 +79,10 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT
             List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId).toList();
             return DtoReferenceCollection.filterEnabled(result);
         });
+    }
+
+    @Override
+    public void afterInit(TargetDiscardCatchUI ui) {
         super.afterInit(ui);
 
         // lors de la modification d'une species (sur une entree non sauvee)


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetSampleUIHandler.java
=====================================
@@ -136,7 +136,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar
     }
 
     @Override
-    public void afterInit(U ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TargetLengthDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> {
             List<SpeciesReference> result = TargetSampleUIHandler.this.getTargetSampleService().getSampleSpecies(getModel().getSelectedId(), discarded).toList();
             return DtoReferenceCollection.filterEnabled(result);
@@ -146,7 +146,6 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar
             checkSizeMeasureTypes(result);
             return DtoReferenceCollection.filterEnabled(result);
         });
-        super.afterInit(ui);
     }
 
     @Override


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/TripSeineUIHandler.java
=====================================
@@ -65,7 +65,7 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein
     }
 
     @Override
-    public void afterInit(TripSeineUI ui) {
+    protected void onAfterInitAddReferentialFilters() {
         addReferentialFilter(TripSeineDto.PROPERTY_CAPTAIN, (ReferentialReferencesFilter<PersonDto, PersonReference>) incomingReferences -> {
             List<PersonReference> result = PersonHelper.filterCaptainReferences(incomingReferences);
             return DtoReferenceCollection.filterEnabled(result);
@@ -83,6 +83,10 @@ class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto, TripSein
             List<VesselReference> result = VesselHelper.filterVesselReferencesByVesselTypeIds(incomingReferences, config.getLonglineVesselTypeIds());
             return DtoReferenceCollection.filterEnabled(result);
         });
+    }
+
+    @Override
+    public void afterInit(TripSeineUI ui) {
         super.afterInit(ui);
 
         TripMapUI tripMap = ui.getTripMap();



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a657...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a657...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)