- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation - Closes #1358
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3fe2e040 by tchemit at 2019-07-26T13:06:35Z Création de nouvelles icônes de navigation - Closes #1358 - - - - - 30 changed files: - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/CatchLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/CatchLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/EncounterObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/EncounterObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/SensorUsedObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/SensorUsedObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/SetLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/SetLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/TdrObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/TdrObs_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ps/common/GearUseFeatures_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ps/common/GearUseFeatures_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ps/common/Trip_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ps/common/Trip_24x24.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3fe2e040e16a23b877c3efec362… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3fe2e040e16a23b877c3efec362… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Refactor Seine model (remove Seine from any entity nor dto)
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c390804 by tchemit at 2019-07-26T12:12:55Z Refactor Seine model (remove Seine from any entity nor dto) - - - - - 0f9adfde by tchemit at 2019-07-26T12:12:56Z Refactor I18n - quite a bit change.... - - - - - 4 changed files: - client-configuration/pom.xml - client-configuration/src/main/i18n/getters/config.getter - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/00d1cdab78cc72d50ea5831ec0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/00d1cdab78cc72d50ea5831ec0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Refactor Seine model (remove Seine from any entity nor dto)
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f2db9a76 by tchemit at 2019-07-26T12:08:15Z Refactor Seine model (remove Seine from any entity nor dto) - - - - - 00d1cdab by tchemit at 2019-07-26T12:08:17Z Refactor I18n - quite a bit change.... - - - - - 4 changed files: - client-configuration/pom.xml - client-configuration/src/main/i18n/getters/config.getter - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cca327af5349c4ee320de77e12… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cca327af5349c4ee320de77e12… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Refactor Seine model (remove Seine from any entity nor dto)
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cac2b17c by tchemit at 2019-07-26T11:54:16Z Refactor Seine model (remove Seine from any entity nor dto) - - - - - cca327af by tchemit at 2019-07-26T11:54:18Z Refactor I18n - quite a bit change.... - - - - - 4 changed files: - client-configuration/pom.xml - client-configuration/src/main/i18n/getters/config.getter - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aada3899a42e72a70ebc64a510… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aada3899a42e72a70ebc64a510… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Refactor Seine model (remove Seine from any entity nor dto)
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: aada3899 by tchemit at 2019-07-24T23:50:24Z Refactor Seine model (remove Seine from any entity nor dto) - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivityFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineSetUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteActivitySeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteFloatingObjectSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteRouteSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteRouteUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSetSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteTripSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteTripUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleActivitySeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleRouteUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleTripSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleTripUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleActivitySeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleRouteUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleTripSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleTripUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveActivitySeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveRouteSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveRouteUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSetSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveTripSeineUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveTripUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowEmptyNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aada3899a42e72a70ebc64a510b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aada3899a42e72a70ebc64a510b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [PS] Une espèce sans catégorie apparaît à tord dans le formulaire thons capturés - Closes #1367
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: aaae338b by tchemit at 2019-07-24T16:38:15Z [PS] Une espèce sans catégorie apparaît à tord dans le formulaire thons capturés - Closes #1367 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetCatchUIHandler.java ===================================== @@ -41,19 +41,22 @@ import fr.ird.observe.dto.referential.SpeciesReference; import fr.ird.observe.dto.referential.seine.WeightCategoryHelper; import fr.ird.observe.dto.referential.seine.WeightCategoryReference; import fr.ird.observe.dto.result.SaveResultDto; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.widgets.select.BeanFilterableComboBox; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; import java.awt.Container; import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; @@ -72,9 +75,11 @@ public class TargetCatchUIHandler extends ContentTableUIHandler<SetSeineTargetCa addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); + Set<String> usedSpeciesId = getDataSource().getReferentialReferenceSet(WeightCategoryReference.class).toSet().stream().map(WeightCategoryReference::getSpeciesId).collect(Collectors.toSet()); String tripSeineId = getDataContext().getSelectedTripSeineId(); - List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList(); - return DtoReferenceCollection.filterEnabled(result); + List<SpeciesReference> allSpecies = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList(); + List<SpeciesReference> speciesWithCategory = allSpecies.stream().filter(s -> usedSpeciesId.contains(s.getId())).collect(Collectors.toList()); + return DtoReferenceCollection.filterEnabled(speciesWithCategory); }); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/TargetDiscardCatchUIHandler.java ===================================== @@ -58,6 +58,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; @@ -78,9 +79,11 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineT addReferentialFilter(TargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto, SpeciesReference>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineTargetCatchId(); + Set<String> usedSpeciesId = getDataSource().getReferentialReferenceSet(WeightCategoryReference.class).toSet().stream().map(WeightCategoryReference::getSpeciesId).collect(Collectors.toSet()); String tripSeineId = getDataContext().getSelectedTripSeineId(); - List<SpeciesReference> result = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList(); - return DtoReferenceCollection.filterEnabled(result); + List<SpeciesReference> allSpecies = getTripSeineService().getSpeciesByListAndTrip(tripSeineId, speciesListId).toList(); + List<SpeciesReference> speciesWithCategory = allSpecies.stream().filter(s -> usedSpeciesId.contains(s.getId())).collect(Collectors.toList()); + return DtoReferenceCollection.filterEnabled(speciesWithCategory); }); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aaae338b321966ca63197700767… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/aaae338b321966ca63197700767… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Impossible de modifier le champs Species.wormsId - Closes #1357
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 4357232a by tchemit at 2019-07-17T15:33:36Z Impossible de modifier le champs Species.wormsId - Closes #1357 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jaxx ===================================== @@ -97,7 +97,7 @@ <JPanel layout='{new GridLayout()}'> <JTextField id='homeId'/> <JTextField id='faoCode'/> - <JTextField id='wormsId' onKeyReleased='getBean().setWormsId(Long.valueOf(wormsId.getText()))'/> + <NumberEditor id='wormsId' constructorParams='this' styleClass="long10"/> </JPanel> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/ref/common/SpeciesUI.jcss ===================================== @@ -43,7 +43,8 @@ } #wormsId { - text:{getStringValue(bean.getWormsId())}; + property:{SpeciesDto.PROPERTY_WORMS_ID}; + numberValue:{bean.getWormsId()}; } #scientificLabel { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4357232ab8f901bcebc27009748… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4357232ab8f901bcebc27009748… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 17 commits: Fix Tdr screen loading
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: e27a2789 by tchemit at 2019-07-24T15:42:13Z Fix Tdr screen loading - - - - - 45743b68 by tchemit at 2019-07-24T15:51:13Z fix NonTargetLengthDto decorator - - - - - fbb4e5df by tchemit at 2019-07-24T15:51:27Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 761fbc11 by tchemit at 2019-07-24T15:54:04Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 08165585 by tchemit at 2019-07-24T15:54:04Z Move to new version 9.0-alpha-1 - - - - - 6b76b42c by tchemit at 2019-07-24T15:54:04Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 2b80777c by tchemit at 2019-07-24T15:54:05Z Module 2 (first flush) - - - - - 1d17d493 by tchemit at 2019-07-24T15:54:05Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - ce9795e6 by tchemit at 2019-07-24T15:54:06Z Module 2 - second flush - - - - - cb13336b by tchemit at 2019-07-24T15:54:06Z Report from v8 for ps logbook model - - - - - da107b81 by tchemit at 2019-07-24T15:54:06Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 31a514e3 by tchemit at 2019-07-24T15:54:06Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 8e80132a by tchemit at 2019-07-24T15:54:06Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 4af9a9f5 by tchemit at 2019-07-24T15:54:07Z Insertion des lots de débarquements - See #1259 - - - - - 04374e3c by tchemit at 2019-07-24T15:54:07Z Insertion du plan de cuves - See #1260 - - - - - f8defe03 by tchemit at 2019-07-24T15:54:08Z Insertion de l’échantillonnage au port - See #1261 - - - - - 1464aaf4 by tchemit at 2019-07-24T15:54:08Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b950c3b53de65fe120eafc57c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b950c3b53de65fe120eafc57c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix Tdr screen loading
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e27a2789 by tchemit at 2019-07-24T15:42:13Z Fix Tdr screen loading - - - - - 45743b68 by tchemit at 2019-07-24T15:51:13Z fix NonTargetLengthDto decorator - - - - - 4 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java - dto/src/main/models/Observe-20-data-ps-observation.model Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -75,6 +75,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; _skipBindingToBean:true; + _skipBindingFromBean:true; } #timestampPanel { ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -1062,7 +1062,7 @@ public class DecoratorService extends DecoratorProvider { public void initPsObservationNonTargetLengthDto() { registerDecorator(new NonTargetLengthDecorator()); - registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${gender}$s"); + registerDataReferenceDecorator(NonTargetLengthReference.class, "${speciesLabel}$s##${length}$f##${sexLabel}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/NonTargetLengthDecorator.java ===================================== @@ -36,7 +36,7 @@ public class NonTargetLengthDecorator extends ObserveDecorator<NonTargetLengthDt public NonTargetLengthDecorator() throws IllegalArgumentException, NullPointerException { super(NonTargetLengthDto.class, - "${species/scientificLabel}$s##${length}$f##${gender}$s" + "${species/scientificLabel}$s##${length}$f##${sex}$s" ); } ===================================== dto/src/main/models/Observe-20-data-ps-observation.model ===================================== @@ -84,7 +84,7 @@ conformity {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchRel releasingTime {*:1} fr.ird.observe.dto.referential.ps.observation.NonTargetCatchReleasingTimeReference lengthMeasureMethod {*:0..1} fr.ird.observe.dto.referential.common.LengthMeasureMethodReference -data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length +data.ps.observation.NonTargetLength > data.Data | references=speciesLabel,length,sexLabel length + {*:1} Float isLengthComputed + {*:1} boolean picturesReferences + {*:1} String View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5e98fbc50afeb8da47daf47927… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5e98fbc50afeb8da47daf47927… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 25 commits: Assouplir un contrôle de saisie - Closes #1360
by Tony CHEMIT 24 Jul '19

24 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: cea7ccc1 by tchemit at 2019-07-19T13:00:30Z Assouplir un contrôle de saisie - Closes #1360 - - - - - 0281d0dc by tchemit at 2019-07-21T14:19:57Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 7d78f295 by tchemit at 2019-07-23T11:34:29Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 6ac3a215 by tchemit at 2019-07-23T12:04:47Z Impossible de supprimer une activité LL - Closes #1361 - - - - - a464dde5 by tchemit at 2019-07-23T12:29:14Z [LL] Activité logbook : petits ajustements - Closes #1362 - - - - - 5c906f6b by tchemit at 2019-07-23T14:15:49Z [LL][LOGBOOKS] Echantillons, ajouter l'unité ° - Closes #1366 - - - - - 55df1b79 by tchemit at 2019-07-23T14:15:50Z [LL][LOGBOOKS] Plage de taille d'un échantillon - Closes #1365 - - - - - c351b54d by tchemit at 2019-07-23T14:15:50Z [LL][LOGBOOKS] Source d'information d'un débarquement - Closes #1364 - - - - - 285711c2 by tchemit at 2019-07-23T14:16:10Z [LL] Fenêtre d'appariement d'activités - Closes #1363 - - - - - 5e98fbc5 by tchemit at 2019-07-23T14:32:59Z update changelog [skip ci] - - - - - 25bd173d by tchemit at 2019-07-24T10:12:47Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - feb86add by tchemit at 2019-07-24T10:19:04Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - bf9f90a8 by tchemit at 2019-07-24T10:19:04Z Move to new version 9.0-alpha-1 - - - - - 43a1b704 by tchemit at 2019-07-24T10:19:04Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - eaa8f739 by tchemit at 2019-07-24T10:37:44Z Module 2 (first flush) - - - - - e8bc1fe8 by tchemit at 2019-07-24T10:37:45Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 67796da2 by tchemit at 2019-07-24T10:38:12Z Module 2 - second flush - - - - - 65c5e3b9 by tchemit at 2019-07-24T10:38:12Z Report from v8 for ps logbook model - - - - - 46a04ce2 by tchemit at 2019-07-24T10:38:12Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 1c1afe38 by tchemit at 2019-07-24T10:38:12Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 2b60b8a0 by tchemit at 2019-07-24T10:38:13Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 077e43be by tchemit at 2019-07-24T10:39:06Z Insertion des lots de débarquements - See #1259 - - - - - 472c05de by tchemit at 2019-07-24T10:39:35Z Insertion du plan de cuves - See #1260 - - - - - f1f0f796 by tchemit at 2019-07-24T10:40:17Z Insertion de l’échantillonnage au port - See #1261 - - - - - b950c3b5 by tchemit at 2019-07-24T15:33:45Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 10 changed files: - .mvn/gitlab-cache/milestones/268612-issues.json - .mvn/gitlab-cache/milestones/268617-issues.json - .mvn/gitlab-cache/milestones/268621-issues.json - .mvn/gitlab-cache/milestones/268622-issues.json - .mvn/gitlab-cache/milestones/268623-issues.json - .mvn/gitlab-cache/milestones/268624-issues.json - .mvn/gitlab-cache/milestones/268625-issues.json - .mvn/gitlab-cache/milestones/268626-issues.json - .mvn/gitlab-cache/milestones/268627-issues.json - .mvn/gitlab-cache/milestones/268628-issues.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a33bc21b158de0cf273377b384… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/a33bc21b158de0cf273377b384… You're receiving this email because of your account on gitlab.com.

1 0