Observe-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
October 2018
- 1 participants
- 104 discussions
[Git][ultreiaio/ird-observe][develop] [LL] Composition globale de la palangre : petits ajustements - Closes #1128…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b95c598b by Tony CHEMIT at 2018-10-07T13:11:36Z
[LL] Composition globale de la palangre : petits ajustements - Closes #1128 (plus alignement de l'écran observation)
- - - - -
30 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java
- + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/NotStandaloneContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BaitsCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/BranchlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/FloatlinesCompositionObsUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jaxx
- + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/obs/HooksCompositionObsUI.jcss
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_8_3.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b95c598b05fa5dbe8f70f358d4e…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT 07 Oct '18
by Tony CHEMIT 07 Oct '18
07 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4ed9f518 by Tony CHEMIT at 2018-10-07T10:16:38Z
[LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et échantillons LL Logbooks - See #1130
- - - - -
f680c163 by Tony CHEMIT at 2018-10-07T10:52:45Z
[LL] Capture : petits ajustements - Closes #1129
- - - - -
30 changed files:
- client-configuration/src/main/config/Client.ini
- client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- 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/db/ObserveSwingDataSource.java
- 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/CatchLonglineLogbookUI.jcss
- 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/CatchLonglineLogbookUIModel.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
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- + dto/src/main/java/fr/ird/observe/dto/SpeciesListConfiguration.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/668d0921fdc8797c2be2b550a6…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL] Créer une liste d'affichage d'espèces propre aux captures, débarquements et…
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
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/668d0921fdc8797c2be2b550a65…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/668d0921fdc8797c2be2b550a65…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non…
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
7cb93827 by Tony CHEMIT at 2018-10-06T16:34:10Z
[LL][PS] Dans le widget liste déroulante d'espèces, après le code FAO et le non scientifique, ajouter le nom commun (vernaculaire) dans la langue courante - Closes #1131
- - - - -
1 changed file:
- dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
Changes:
=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java
=====================================
@@ -753,7 +753,7 @@ public class DecoratorService extends DecoratorProvider {
@Override
public void initSpeciesDto() {
registerDecorator(new SpeciesDecorator());
- registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s");
+ registerReferentialReferenceDecorator(SpeciesReference.class, "${faoCode}$s##${scientificLabel}$s##${label}$s");
}
@Override
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7cb93827c8f4dd71bee0999e7e8…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 10 commits: add test database form model 8.3
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
c75c91f7 by Tony CHEMIT at 2018-10-06T16:15:23Z
add test database form model 8.3
- - - - -
97b5b714 by Tony CHEMIT at 2018-10-06T16:15:24Z
[LL][PS] Améliorer le widget position - Closes #1133
- - - - -
332de6b9 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (correction libelle)
- - - - -
7097ff78 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (catégories de poids non obligatoires)
- - - - -
12cee0d3 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (ajout configuration pour la méthode de mesure de poids par défaut pour la création d'un nouveau débarquement)
- - - - -
3e814944 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (ajout filtre sur les navires (cargo ou inconnu))
- - - - -
2fa7ea4a by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (utilisation méthode de mensuration de poids lors de la création d'un nouveau débarquement)
- - - - -
511c3b13 by Tony CHEMIT at 2018-10-06T16:15:25Z
[LL] Débarquements : petits ajustements - See #1121 (correction des messages pour le déplacement)
- - - - -
5ecad347 by Tony CHEMIT at 2018-10-06T16:15:25Z
Ajout d'un raccourci clavier pour déplacer des éléments
- - - - -
bd5625ac by Tony CHEMIT at 2018-10-06T16:15:25Z
open api
- - - - -
30 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/db/ObserveSwingDataSource.java
- client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java
- client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveMultipleTripLonglineLandingLogbookUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/move/MoveSingleTripLonglineLandingLogbookUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.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/LandingPartLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java
- client/src/main/resources/i18n/client_en_GB.properties
- client/src/main/resources/i18n/client_es_ES.properties
- client/src/main/resources/i18n/client_fr_FR.properties
- pom.xml
- + test/src/main/resources/db/8.3/dataForTestLongline.sql.gz
- + test/src/main/resources/db/8.3/dataForTestSeine.sql.gz
- + test/src/main/resources/db/8.3/empty_h2.sql.gz
- + test/src/main/resources/db/8.3/empty_pg.sql.gz
- + test/src/main/resources/db/8.3/referentiel.sql.gz
- test/src/main/resources/fixtures/count-referential-common.properties
- test/src/main/resources/fixtures/count-referential-longline.properties
- test/src/main/resources/fixtures/validate-service-referential.properties
- validation/src/main/resources/fr/ird/observe/dto/data/longline/LandingPartLogbookDto-update-error-validation.xml
- validation/src/main/resources/i18n/validation_es_ES.properties
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4830a244ad358521527d361631…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 5 commits: end of ui handler refactor (may need a hole test of ui...)
by Tony CHEMIT 06 Oct '18
by Tony CHEMIT 06 Oct '18
06 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4e973c5c by Tony CHEMIT at 2018-10-06T14:12:43Z
end of ui handler refactor (may need a hole test of ui...)
- - - - -
fdfbb6b3 by Tony CHEMIT at 2018-10-06T14:12:45Z
[LL] Attribution de codes aux états de conservation - Closes #1123
- - - - -
d051d38a by Tony CHEMIT at 2018-10-06T14:12:45Z
[LL] Débarquements : petits ajustements - See #1121 (add harbour entry)
- - - - -
83cf3045 by Tony CHEMIT at 2018-10-06T14:12:46Z
add test database form model 8.3
- - - - -
4830a244 by Tony CHEMIT at 2018-10-06T14:13:32Z
[LL][PS] Améliorer le widget position - Closes #1133
- - - - -
30 changed files:
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.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/ActivityLonglineLogbookListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.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/FloatlinesCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.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/logbook/SamplePartLogbookUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] [LL] Correction de libellés - See #1117
by Tony CHEMIT 05 Oct '18
by Tony CHEMIT 05 Oct '18
05 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
4c51af42 by Tony CHEMIT at 2018-10-05T10:32:04Z
[LL] Correction de libellés - See #1117
- - - - -
1 changed file:
- client/src/main/resources/i18n/client_fr_FR.properties
Changes:
=====================================
client/src/main/resources/i18n/client_fr_FR.properties
=====================================
@@ -1092,8 +1092,8 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Réinitialiser l'id
observe.common.SetLonglineLogbookDto.basketLineLength=Longueur de la ligne par panier (m)
observe.common.SetLonglineLogbookDto.haulingTab=Virage
observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Distance entre avançons (m)
-observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumnes
-observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des cyalumnes
+observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumes
+observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des Cyalumes
observe.common.SetLonglineLogbookDto.message.creating=L'opération de pêche est en cours de création.
observe.common.SetLonglineLogbookDto.message.updating=L'opération de pêche est en cours de modification.
observe.common.SetLonglineLogbookDto.monitored=Instrumentée
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
9edba5b3 by Tony CHEMIT at 2018-10-04T07:25:22Z
Improve ui handlers.
- - - - -
30 changed files:
- client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/SaveOpenDataUIActionSupport.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveLonglineDetailCompositionObsUIAction.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java
- + client/src/main/java/fr/ird/observe/client/ui/content/api/EditableContentUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.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/TripLonglineUIModel.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9edba5b35eb239dd65f9db0dc3b…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9edba5b35eb239dd65f9db0dc3b…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Fix some coordinates validation - Closes #1113
by Tony CHEMIT 04 Oct '18
by Tony CHEMIT 04 Oct '18
04 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
757bd9cd by Tony CHEMIT at 2018-10-04T07:17:50Z
Fix some coordinates validation - Closes #1113
- - - - -
13 changed files:
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
- validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
- validation/src/main/resources/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties
Changes:
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml
=====================================
@@ -98,7 +98,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml
=====================================
@@ -83,7 +83,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml
=====================================
@@ -99,7 +99,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml
=====================================
@@ -84,7 +84,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml
=====================================
@@ -43,7 +43,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml
=====================================
@@ -44,7 +44,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml
=====================================
@@ -217,7 +217,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -283,7 +283,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -349,7 +349,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -415,7 +415,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml
=====================================
@@ -250,20 +250,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -271,6 +257,23 @@
</field>
+ <field name="settingStartQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
+
<field name="settingEndLatitude">
<!-- settingEndLatitude obligatoire -->
@@ -314,20 +317,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
@@ -335,6 +324,23 @@
</field>
+ <field name="settingEndQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
+
<field name="haulingStartLatitude">
<!-- haulingStartLatitude obligatoire -->
@@ -378,20 +384,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -399,6 +391,22 @@
</field>
+ <field name="haulingStartQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
<field name="haulingEndLatitude">
@@ -443,20 +451,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
@@ -464,6 +458,23 @@
</field>
+ <field name="haulingEndQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
+
<field name="settingShape">
<!-- settingShape desactive -->
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml
=====================================
@@ -217,7 +217,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -283,7 +283,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -349,7 +349,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
@@ -415,7 +415,7 @@
<field-validator type="quadrantDto" short-circuit="true">
<param name="ocean">currentTripLongline.ocean</param>
<message>
- observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()}
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
</message>
</field-validator>
=====================================
validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml
=====================================
@@ -250,20 +250,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingStart</param>
<message/>
@@ -271,6 +257,23 @@
</field>
+ <field name="settingStartQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
+
<field name="settingEndLatitude">
<!-- settingEndLatitude obligatoire -->
@@ -314,24 +317,26 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">settingEnd</param>
<message/>
</field-validator>
+ </field>
+
+ <field name="settingEndQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
</field>
@@ -378,20 +383,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingStart</param>
<message/>
@@ -399,6 +390,22 @@
</field>
+ <field name="haulingStartQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
<field name="haulingEndLatitude">
@@ -443,20 +450,6 @@
</message>
</field-validator>
- <!-- coherence quadrant par rapport a l'ocean de la maree -->
- <field-validator type="fieldexpression" short-circuit="true">
- <param name="expression"><![CDATA[
- currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null
- || (currentTripLongline.ocean.getCode() == 3)
- || (currentTripLongline.ocean.getCode() == 1)
- || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0))
- ]]>
- </param>
- <message>
- observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()}
- </message>
- </field-validator>
-
<field-validator type="coordinateLongitudeDto" short-circuit="true">
<param name="editorName">haulingEnd</param>
<message/>
@@ -464,6 +457,24 @@
</field>
+ <field name="haulingEndQuadrant">
+
+ <!-- quadrant obligatoire (http://forge.codelutin.com/issues/840) -->
+ <field-validator type="required" short-circuit="true">
+ <message>observe.validation.activity.required.quadrant</message>
+ </field-validator>
+
+ <!-- coherence quadrant par rapport a l'ocean de la maree -->
+ <field-validator type="quadrantDto" short-circuit="true">
+ <param name="ocean">currentTripLongline.ocean</param>
+ <message>
+ observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label}
+ </message>
+ </field-validator>
+
+ </field>
+
+
<field name="settingShape">
<!-- settingShape desactive -->
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -731,6 +731,7 @@ observe.validation.route.null.comment=Comment is not filled.
observe.validation.route.positive.startLogValue=Start log value must be strictly positive
observe.validation.route.required.date=Date must be filled.
observe.validation.route.unclosed.activity=There is an open activity on route (%1$s).
+observe.validation.sample.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4).
observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
observe.validation.sampleLogbook.required.date=La date est obligatoire
observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -733,6 +733,7 @@ observe.validation.route.null.comment=No hay comentario especificado.
observe.validation.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo.
observe.validation.route.required.date=Se debe especificar el día de observación.
observe.validation.route.unclosed.activity=Existe una actividad no cerrada (%1$s).
+observe.validation.sample.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4)
observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
observe.validation.sampleLogbook.required.date=La date est obligatoire
observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. \#TODO
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -731,6 +731,7 @@ observe.validation.route.null.comment=Aucun commentaire renseigné.
observe.validation.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif.
observe.validation.route.required.date=Le jour d'observation doit être renseigné.
observe.validation.route.unclosed.activity=Il existe une activité non clôturée (%1$s).
+observe.validation.sample.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4)
observe.validation.sampleLogbook.null.parts=Aucune donnée saisie
observe.validation.sampleLogbook.required.date=La date est obligatoire
observe.validation.samplePart.desactivated.weightMeasureType=Le type de mesure de poids sélectionné est désactivé.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 3 commits: [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des…
by Tony CHEMIT 03 Oct '18
by Tony CHEMIT 03 Oct '18
03 Oct '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
2ee943c1 by Tony CHEMIT at 2018-10-03T13:06:02Z
[V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des créer des activités logbook dans une marée issue d'une marée d'observation saisie en V5 - See #1108
Add some logs
- - - - -
7c802fc7 by Tony CHEMIT at 2018-10-03T13:06:20Z
optimize dependencies
- - - - -
22eeaf27 by Tony CHEMIT at 2018-10-03T15:35:05Z
Some data (in table forms) order is not deterministic - Closes #1112
- - - - -
5 changed files:
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java
- persistence/src/main/models/Observe-04-data-seine.model
- persistence/src/main/models/Observe-05-data-longline-obs.model
- persistence/src/main/models/Observe-06-data-longline-logbook.model
Changes:
=====================================
client/pom.xml
=====================================
@@ -389,6 +389,10 @@
<artifactId>java-lang</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>java-bean</artifactId>
+ </dependency>
<!-- jaxx dependencies -->
=====================================
client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java
=====================================
@@ -34,6 +34,8 @@ import fr.ird.observe.dto.data.longline.TripLonglineReference;
import fr.ird.observe.dto.result.TripChildSaveResultDto;
import fr.ird.observe.navigation.model.edit.ObserveEditNode;
import fr.ird.observe.navigation.tree.ReferenceNode;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import javax.swing.SwingUtilities;
@@ -47,6 +49,7 @@ import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigatio
public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> {
public static final String ACTION_NAME = SaveActivityLonglineLogbookUIAction.class.getName();
+ private static final Logger log = LogManager.getLogger(SaveActivityLonglineLogbookUIAction.class);
public SaveActivityLonglineLogbookUIAction(ObserveMainUI mainUI) {
super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA);
@@ -56,6 +59,9 @@ public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSup
protected boolean doSave(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode, boolean notPersisted) {
String tripId = editNode.getParent().getId();
+ log.info(ui.getModel().getPrefix() + "tripId = " + tripId);
+ log.info(ui.getModel().getPrefix() + "activityId = " + bean.getId());
+
TripChildSaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookService().save(tripId, bean);
saveResult.toDto(bean);
=====================================
persistence/src/main/models/Observe-04-data-seine.model
=====================================
@@ -40,8 +40,8 @@ isChangedZoneOperation() boolean
seine.FloatingObject > ObserveDataEntity | entity
comment + {*:1} String | hibernateAttributeType=text
-objectSchoolEstimate + {*} seine.ObjectSchoolEstimate
-objectObservedSpecies + {*} seine.ObjectObservedSpecies
+objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate
+objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate
objectOperation {*:1} referentiel.seine.ObjectOperation
supportVesselName + {*:1} String
transmittingBuoy + {*} seine.TransmittingBuoy | unique
@@ -175,7 +175,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet
nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set
targetSample + {*} seine.TargetSample | unique reverseDbName=set
targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set
-schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set
+schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate
nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set
hasTargetCatch() boolean
hasRejetThon() boolean
=====================================
persistence/src/main/models/Observe-05-data-longline-obs.model
=====================================
@@ -20,10 +20,10 @@ latitude + {*:1} Float
longitude + {*:1} Float
seaSurfaceTemperature + {*:1} Float
setLongline + {0..1} longline.SetLonglineObs | dbName=set
-encounter + {*} longline.EncounterObs | reverseDbName=activity
+encounter + {*} longline.EncounterObs | reverseDbName=activity orderBy=topiaCreateDate
vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false
dataQuality {*:0..1} referentiel.DataQuality
-sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity
+sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity orderBy=topiaCreateDate
fpaZone {*:1} referentiel.FpaZone
getDate() Date
getTime() Date
@@ -107,14 +107,14 @@ basket {*:0..1} longline.BasketObs
branchline {*:0..1} longline.BranchlineObs
catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate
discardHealthness {*:1} referentiel.longline.Healthness
-sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch
+sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch orderBy=topiaCreateDate
speciesCatch {*:1} referentiel.Species
predator {*:*} referentiel.Species | manyToManyTableName=catchObs_predator reverseDbName=catch
section {*:0..1} longline.SectionObs
maturityStatus {*:0..1} referentiel.longline.MaturityStatus
stomacFullness {*:0..1} referentiel.longline.StomacFullness
hookPosition {*:0..1} referentiel.longline.HookPosition
-weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch
+weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch orderBy=topiaCreateDate
catchHealthness {*:1} referentiel.longline.Healthness
sex {*:0..1} referentiel.Sex
weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod
@@ -187,18 +187,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric
haulingEndLongitude + {*:1} Float | sqlType=numeric
haulingBreaks + {*:1} Integer
monitored + {*:1} Boolean
-baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set
-floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set
-hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set
+baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set orderBy=topiaCreateDate
+floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate
+hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set orderBy=topiaCreateDate
section + {*} longline.SectionObs | unique orderBy=settingIdentifier reverseDbName=set
settingShape {*:1} referentiel.longline.SettingShape
-tdr + {*} longline.TdrObs | reverseDbName=set
+tdr + {*} longline.TdrObs | reverseDbName=set orderBy=topiaCreateDate
catchLongline + {*} longline.CatchLonglineObs | ordered reverseDbName=set
lineType {*:0..1} referentiel.longline.LineType
lightsticksType {*:0..1} referentiel.longline.LightsticksType
lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setObs reverseDbName=set
-branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set
+branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate
getSettingStartTime() Date
getSettingStartDate() Date
setSettingStartDate(date Date)
@@ -258,7 +258,7 @@ maxFishingDepth + {*:1} Float
meanFishingDepth + {*:1} Float
medianFishingDepth + {*:1} Float
branchline {*:0..1} longline.BranchlineObs
-tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr
+tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr orderBy=topiaCreateDate
sensorBrand {*:0..1} referentiel.longline.SensorBrand
species {*:*} referentiel.Species | reverseDbName=tdr
section {*:0..1} longline.SectionObs
=====================================
persistence/src/main/models/Observe-06-data-longline-logbook.model
=====================================
@@ -28,7 +28,7 @@ compagnies {*:1} referentiel.Compagnies
person {*:1} referentiel.Person
harbour {*:0..1} referentiel.Harbour
vessel {*:0..1} referentiel.Vessel
-landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing
+landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing orderBy=topiaCreateDate
longline.LandingPartLogbook > ObserveDataEntity | entity dbName=LandingPartLogbook
species {*:1} referentiel.Species
@@ -79,9 +79,9 @@ monitored + {*:1} Boolean
totalLineLength + {*:1} Integer
basketLineLength + {*:1} Integer
lengthBetweenBranchlines + {*:1} Integer
-baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set
-floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set
-hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set
+baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
+floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
+hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
settingShape {*:1} referentiel.longline.SettingShape
catchLongline + {*} longline.CatchLonglineLogbook | ordered reverseDbName=set
lineType {*:0..1} referentiel.longline.LineType
@@ -90,7 +90,7 @@ lightsticksCount + {*:1} Integer
lightsticksType {*:0..1} referentiel.longline.LightsticksType
lightsticksColor {*:0..1} referentiel.longline.LightsticksColor
mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setLogbook reverseDbName=set
-branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set
+branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate
getSettingStartTime() Date
getSettingStartDate() Date
setSettingStartDate(date Date)
@@ -125,11 +125,11 @@ setHooksCompositionProportionSum(sum int)
setBaitsCompositionProportionSum(sum int)
data.longline.SetLonglineLogbookGlobalComposition > data.Commentable
-baitsComposition + {*} data.longline.BaitsCompositionLogbook
-floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook
-hooksComposition + {*} data.longline.HooksCompositionLogbook
+baitsComposition + {*} data.longline.BaitsCompositionLogbook orderBy=topiaCreateDate
+floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook orderBy=topiaCreateDate
+hooksComposition + {*} data.longline.HooksCompositionLogbook orderBy=topiaCreateDate
mitigationType:set + {*:*} fr.ird.observe.dto.referential.longline.MitigationTypeReference
-branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook
+branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook orderBy=topiaCreateDate
longline.CatchLonglineLogbook > ObserveDataEntity | entity dbName=CatchLogbook
comment + {*:1} String | hibernateAttributeType=text
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9…
You're receiving this email because of your account on gitlab.com.
1
0