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

[Git][ultreiaio/ird-observe][develop] Big big refactor around actions in handler, introduce new handler for any case.
by Tony CHEMIT 30 Sep '18

30 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7a87dfd3 by Tony CHEMIT at 2018-09-30T21:06:12Z Big big refactor around actions in handler, introduce new handler for any case. Now UI are no more responsible of any actions except of loading - start and stop editing :) Yes now we have more classes, but no more fear about whre does goes our code... - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteDataUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteReferenceUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/SaveEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AbstractContentUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/AbstractContentUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetEditUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ResetEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ShowTechnicalInformationsAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ShowTechnicalInformationsAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/DeleteEditDataUIActionSupport.java - + 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/list/CloseOpenDataFromListUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CreateOpenDataFromListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleDataUIActionSupport.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/move/MoveMultipleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/MoveMultipleTripUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/DeleteOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleDataUIActionSupport.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/move/MoveSingleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleTripUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.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/simple/SaveSimpleDataUIActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7a87dfd3a8678c9e1b822dda71d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7a87dfd3a8678c9e1b822dda71d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Big big refactor around actions in handler, introduce new handler for any case.
by Tony CHEMIT 29 Sep '18

29 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1cd245e9 by Tony CHEMIT at 2018-09-29T00:38:22Z Big big refactor around actions in handler, introduce new handler for any case. Now UI are no more responsible of any actions except of loading - start and stop editing :) Yes now we have more classes, but no more fear about whre does goes our code... - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteDataUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/SaveEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/CloseOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/CreateOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteEditDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveMultipleTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveSingleTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/NewTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/NewTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/OpenOpenDataUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/ResetTableEntryUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveEditDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteReferenceUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveSimpleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveTableDataUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/SaveTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionDeleteAllSectionsAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/LonglineDetailCompositionDeleteAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionGenerateAllSectionsAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/LonglineDetailCompositionGenerateAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineLogbookSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineObsSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineObsSetUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteSetLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteSetLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/delete/DeleteTripLonglineLandingLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1cd245e9eb45849f60049292d61… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1cd245e9eb45849f60049292d61… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: generate dto to main dto type class mapping
by Tony CHEMIT 29 Sep '18

29 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3629c6ba by Tony CHEMIT at 2018-09-26T18:54:40Z generate dto to main dto type class mapping - - - - - ee5cfdfb by Tony CHEMIT at 2018-09-26T18:55:18Z Add model name on navigation models and nodes - - - - - 8f217acc by Tony CHEMIT at 2018-09-27T23:45:23Z clean navigation popup code - - - - - 94a309d8 by Tony CHEMIT at 2018-09-27T23:45:39Z Improve Open/Close API - See #1096 - - - - - 6e3810a5 by Tony CHEMIT at 2018-09-28T14:10:55Z Fix log configuration - - - - - b17de67f by Tony CHEMIT at 2018-09-28T14:15:34Z Amélioration de l'api sur les activités de fin de veille (on crée un service pour ne plus être lié à l'ui pour découvrir cette propriété). - - - - - 6a7e83c3 by Tony CHEMIT at 2018-09-29T00:03:28Z Improve Open/Close API - See #1096 (now we have the full algo to open - close from nowhere to anywhere :)) - - - - - 94a5ad76 by Tony CHEMIT at 2018-09-29T00:04:03Z fix a strange bug, while asking a delete, main ui stays in busy mode. king od bug form a long time alog... - - - - - 3ccf184d by Tony CHEMIT at 2018-09-29T00:06:04Z Big big refactor around actions in handler, introduce new handler for any case. Now UI are no more responsible of any actions except of loading - start and stop editing :) Yes now we have more classes, but no more fear about whre does goes our code... - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - + client/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - − client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteDataUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/SaveEditUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/CloseOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/CreateOpenDataUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteEditDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/DeleteTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveMultipleTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleDataUIActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveSingleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/MoveSingleTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/NewTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/NewTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ReOpenUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/OpenOpenDataUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/ResetTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/ResetTableEntryUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveEditDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/DeleteReferenceUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveSimpleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveTableDataUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/SaveTableEntryUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/SaveTableEntryUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionDeleteAllSectionsAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/LonglineDetailCompositionDeleteAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/LonglineDetailCompositionGenerateAllSectionsAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/LonglineDetailCompositionGenerateAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineLogbookSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineLogbookSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineObsSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/add/AddActivityLonglineObsSetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/18110ae5d7f4c20b1fe691ca0a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/18110ae5d7f4c20b1fe691ca0a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Let's generate Reference binders
by Tony CHEMIT 25 Sep '18

25 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 18110ae5 by Tony CHEMIT at 2018-09-25T23:36:36Z Let's generate Reference binders - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/ActivityLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BaitsCompositionLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BaitsCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BasketObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlinesCompositionLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/BranchlinesCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/CatchLonglineLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/CatchLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/EncounterObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/FloatlinesCompositionLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/FloatlinesCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/GearUseFeaturesLonglineDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/HooksCompositionLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/HooksCompositionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/LandingLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/LandingPartLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SampleLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SamplePartLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SectionObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SensorUsedObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineLogbookDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SetLonglineObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/SizeMeasureObsDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/binder/data/longline/WeightMeasureObsDtoReferenceBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/18110ae5d7f4c20b1fe691ca0a7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/18110ae5d7f4c20b1fe691ca0a7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 131 commits: Réusinage de la donnée observe_longline.Trip - Closes #904
by Tony CHEMIT 25 Sep '18

25 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 633ebc91 by Tony CHEMIT at 2018-09-25T19:08:32Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - d0165ae1 by Tony CHEMIT at 2018-09-25T19:08:42Z use topia extension - - - - - 3e820e89 by Tony CHEMIT at 2018-09-25T19:08:42Z Tableaux de synthèse - Closes #916 - - - - - 2fd26dca by Tony CHEMIT at 2018-09-25T19:08:42Z Correction des variables dans les rapports - - - - - 53091797 by Tony CHEMIT at 2018-09-25T19:08:43Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - cb3e5e0d by Tony CHEMIT at 2018-09-25T19:08:45Z Update toolkit and topia-extension - - - - - 895f8e18 by Tony CHEMIT at 2018-09-25T19:08:45Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - a9efa1ef by Tony CHEMIT at 2018-09-25T19:08:45Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3-SNAPSHOT development[skip ci] - - - - - 33151801 by Tony CHEMIT at 2018-09-25T19:08:45Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 4493836b by Tony CHEMIT at 2018-09-25T19:08:45Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 5334ed2c by Tony CHEMIT at 2018-09-25T19:08:45Z suppression des enumerations pour generer les constantes - - - - - 89593f33 by Tony CHEMIT at 2018-09-25T19:08:46Z Use exploded models (really easier to maintain) - - - - - bb16f3da by Tony CHEMIT at 2018-09-25T19:08:49Z Improve test API (adding more fixtures) + update pom - - - - - 8a5ea36d by Tony CHEMIT at 2018-09-25T19:08:50Z Ajout de la donnée observe_longline.ActivityLogbook - See #907 \ Ajout de la donnée observe_longline.SetLogbook - See #909 \ Ajout de la donnée observe_longline.CatchLogbook - See #911 \ - - - - - 2ae38168 by Tony CHEMIT at 2018-09-25T19:08:52Z Ajout de la donnée observe_longline.LandingLogbook - See #912 - - - - - 41c93237 by Tony CHEMIT at 2018-09-25T19:08:54Z Ajout de la donnée observe_longline.SampleLogbook - See #913 - - - - - 2ed7b7c2 by Tony CHEMIT at 2018-09-25T19:08:55Z Ajout de la donnée observe_longline.SampleLogbook - See #913 Ajout de la donnée observe_longline.LandingLogbook - See #912 Amélioration nom des écrans de type List - - - - - 60de5564 by Tony CHEMIT at 2018-09-25T19:08:55Z stash - - - - - a9402087 by Tony CHEMIT at 2018-09-25T19:08:56Z Utilisation de la nouvelle API de navigation - - - - - fd8d7642 by Tony CHEMIT at 2018-09-25T19:08:56Z update gitlab cache and changelog of release 7.0-RC-14 (on develop) - - - - - aeef3d63 by Tony CHEMIT at 2018-09-25T19:08:56Z update gitlab cache and changelog of release 7.0-RC-15 (on develop) - - - - - 0cdc4db9 by Tony CHEMIT at 2018-09-25T19:08:56Z Update CHANGELOG.md - - - - - adbadf42 by Tony CHEMIT at 2018-09-25T19:08:57Z use last topia exntension - - - - - ace0850e by Tony CHEMIT at 2018-09-25T19:08:57Z Fix some bugs... - - - - - 29dbe8b0 by Tony CHEMIT at 2018-09-25T19:08:57Z update changelog - - - - - d1c66c1f by Tony CHEMIT at 2018-09-25T19:08:57Z start report from v7 - - - - - 1ed46fb2 by Tony CHEMIT at 2018-09-25T19:08:57Z update changelog - - - - - db352d4e by Tony CHEMIT at 2018-09-25T19:08:57Z Requêtes pour insertion préalable des systèmes observés 20, 21 et 22 - Closes #989 - - - - - 73a73eb3 by Tony CHEMIT at 2018-09-25T19:08:57Z Migration de sql.gz V5 HS - Closes #990 - - - - - bed6fa4a by Tony CHEMIT at 2018-09-25T19:08:59Z report v7 - - - - - b852f5cd by Tony CHEMIT at 2018-09-25T19:09:00Z Be able to use server configuration to perform database management - Closes #1034) - - - - - 9448204b by Tony CHEMIT at 2018-09-25T19:09:00Z Exception sur formulaire équipement - Closes #1032 - - - - - df5c70d0 by Tony CHEMIT at 2018-09-25T19:09:02Z [SPECIES RELEASE] Add a status in the reference list "Etat à la libération" during migration - Closes #1037 - - - - - 25ea8ccc by Tony CHEMIT at 2018-09-25T19:09:04Z Report from 7.x (migrates to Log4j2) - - - - - f43a531d by Tony CHEMIT at 2018-09-25T19:09:04Z update changelog - - - - - 65060528 by Tony CHEMIT at 2018-09-25T19:09:04Z Be able to use server configuration to perform database management - Closes #1034) - - - - - 1ebf2f9c by Tony CHEMIT at 2018-09-25T19:09:05Z Use a new improved combo box - Closes #1035 - - - - - ff1f275a by Tony CHEMIT at 2018-09-25T19:09:05Z [LL][SERVER] Sur section Capture, le racourcis Nouveau (F4) ne fonctionne pas - Closes #1029 - Closes #1025 - - - - - 6e24629d by Tony CHEMIT at 2018-09-25T19:09:05Z [PS] Un classement de liste déroulante est inversé - Closes #1039 - - - - - d38b7a37 by Tony CHEMIT at 2018-09-25T19:09:05Z Affichage du nom de base dans les écrans de synchro avancée - Closes #1041 - - - - - 94f981dd by Tony CHEMIT at 2018-09-25T19:09:05Z Synchro avancée de marées : sélection de marées impossible à droite ? - Closes #1043 - - - - - 6c0e03ab by Tony CHEMIT at 2018-09-25T19:09:05Z [PS] Un libellé à corriger - Closes #1040 - - - - - 42ac2ff6 by Tony CHEMIT at 2018-09-25T19:09:06Z Types de mesures par défaut manquants pour 94 espèces dans le référentiel - Closes #1013 - - - - - 1075e175 by Tony CHEMIT at 2018-09-25T19:09:06Z correction suite à la suppression d'un objet openable - - - - - 8ab8e5b9 by Tony CHEMIT at 2018-09-25T19:09:06Z La synchro référentiel simple ne fonctionne pas, l'ordre des requetes à executer n'est pas bon - Closes #1047 - - - - - 7b0d6bc4 by Tony CHEMIT at 2018-09-25T19:09:06Z La synchronisation des référentiels pourrait ne pas fonctionner sur la suppression de certains référentiels - Closes #1048 - - - - - fbb309cd by Tony CHEMIT at 2018-09-25T19:09:06Z [PS][LL][DIRECT][SERVEUR] La suppression de marées ne fonctionne pas bien - Closes #1046 - - - - - 44137f46 by Tony CHEMIT at 2018-09-25T19:09:06Z [PS][LL][DIRECT][SERVEUR] La suppression de marées ne fonctionne pas bien - Closes #1046 - - - - - 83ab9c55 by Tony CHEMIT at 2018-09-25T19:09:06Z La synchro de marée LL et PS entre bases centrales en mode serveur ne fonctionne pas - Closes #1042 - - - - - c9d1d2e0 by Tony CHEMIT at 2018-09-25T19:09:06Z use last pom - - - - - 6e7c805e by Tony CHEMIT at 2018-09-25T19:09:06Z do not close and generate changelog while release, this should be done before. - - - - - 296db019 by Tony CHEMIT at 2018-09-25T19:09:06Z migrate to log4j2 - - - - - ae8ba57a by Tony CHEMIT at 2018-09-25T19:09:07Z do not close and generate changelog while release, this should be done before. - - - - - b78233a9 by Tony CHEMIT at 2018-09-25T19:09:07Z Report v7 (revue des raccourcis claviers) - - - - - 87a24e58 by Tony CHEMIT at 2018-09-25T19:09:07Z Ajout de la donnée observe_longline.SetLogbook - See #909 - - - - - a266039e by Tony CHEMIT at 2018-09-25T19:09:07Z Ajout de la donnée observe_longline.CatchLogbook - See #911 - - - - - 2007b87e by Tony CHEMIT at 2018-09-25T19:09:07Z il faut supprimer ler nœud sélectionné avant d'en crée un nouveau - - - - - 13a76565 by Tony CHEMIT at 2018-09-25T19:09:07Z correction de la création de la calée suite à la création de l'activité - - - - - 28d870a7 by Tony CHEMIT at 2018-09-25T19:09:07Z correction de la mise à jour des nœuds de sélection - - - - - c2e01614 by Tony CHEMIT at 2018-09-25T19:09:07Z correction de la sélection d'un nœud (on doit pouvoir le faire sans faire de check sur l'état du formulaire lorsqu'on programme des changements de nœud dans les actions). - - - - - 25eb5235 by Tony CHEMIT at 2018-09-25T19:09:08Z Ajout de la donnée observe_longline.SampleLogbook (See #913) - - - - - c925397a by Tony CHEMIT at 2018-09-25T19:09:10Z use last stable of topia extension - - - - - 9d401ccd by Tony CHEMIT at 2018-09-25T19:09:11Z Ajout de la donnée observe_longline.Landing (See #912) - - - - - 1a604549 by Tony CHEMIT at 2018-09-25T19:09:14Z correction d'appel dans les handler openable - - - - - 876c9655 by Tony CHEMIT at 2018-09-25T19:09:14Z correction de l'api de navigation - - - - - 91c7c2b7 by Tony CHEMIT at 2018-09-25T19:09:14Z update changelog - - - - - 2ae689e0 by Tony CHEMIT at 2018-09-25T19:09:14Z optimize dependencies - - - - - f5a3660b by Tony CHEMIT at 2018-09-25T19:09:14Z fix api call only for seine model - - - - - 81ecade1 by Tony CHEMIT at 2018-09-25T19:09:15Z [PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038 - - - - - bfb5363e by Tony CHEMIT at 2018-09-25T19:09:15Z Amélioration du calcul des droits d'un écran (reste encore à en dégager les messages, ce n'est pas le bon endroit pour faire cela...) - - - - - 18ab736a by Tony CHEMIT at 2018-09-25T19:09:15Z Improve log levels (to see migration progress) - - - - - 4562aa77 by Tony CHEMIT at 2018-09-25T19:09:15Z update changelog - - - - - f08a81bb by Tony CHEMIT at 2018-09-25T19:09:15Z add apache doc - - - - - 4f3f93b9 by Tony CHEMIT at 2018-09-25T19:09:15Z Visualisation des données du livre de bord sur la carte - Closes #902 - - - - - 2c929f61 by Tony CHEMIT at 2018-09-25T19:09:16Z update changelog - - - - - b01ffb62 by Tony CHEMIT at 2018-09-25T19:09:16Z La synchro avancée du référentiel listes d'espèces provoque une exception - Closes #1054 - - - - - 3fcc833d by Tony CHEMIT at 2018-09-25T19:09:16Z Problème de timeout en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - See #1053 - - - - - 20d8a43e by Tony CHEMIT at 2018-09-25T19:09:16Z Suppression de lignes de référentiel : liste de ceux qui plantent avec erreurs spécifiques - Closes #1052 - - - - - f052548b by Tony CHEMIT at 2018-09-25T19:09:16Z update pom - - - - - 82741ad6 by Tony CHEMIT at 2018-09-25T19:09:16Z add more log when can not get Call.ParameterTree - - - - - 69c17a07 by Tony CHEMIT at 2018-09-25T19:09:16Z [PS][LL] La synchro avancée de marées plante - Closes #1050 - - - - - 521ecee4 by Tony CHEMIT at 2018-09-25T19:09:16Z Problème de socket en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - Closes #1053 - - - - - c7305621 by Tony CHEMIT at 2018-09-25T19:09:16Z use last toolkit to fix topia generation - - - - - 8a2c3406 by Tony CHEMIT at 2018-09-25T19:09:17Z fix entity binder - - - - - 04c87d05 by Tony CHEMIT at 2018-09-25T19:09:17Z [LL] La suppression d'une marée en mode serveur provoque une exception - Closes #1049 - - - - - 64cfb424 by Tony CHEMIT at 2018-09-25T19:09:17Z use snapshot of topia extension to fix some data copies - - - - - 0b6e2511 by Tony CHEMIT at 2018-09-25T19:09:17Z use last pom and snapshot of toolkit - - - - - 23414b81 by Tony CHEMIT at 2018-09-25T19:09:17Z Add missing validation messages - - - - - 44db9814 by Tony CHEMIT at 2018-09-25T19:09:17Z stash pom.... - - - - - 1197edf3 by Tony CHEMIT at 2018-09-25T19:09:17Z En mode serveur, la boîte d'information sur la connexion n'indique pas la BD (alias) à laquelle on est connecté - Closes #1057 - - - - - 76554b92 by Tony CHEMIT at 2018-09-25T19:09:17Z use last pom - - - - - 9a8a5c1f by Tony CHEMIT at 2018-09-25T19:09:18Z clean stream api - - - - - 8d9f90b9 by Tony CHEMIT at 2018-09-25T19:09:18Z La suppression d'une espèce avec remplacement de code échoue - Closes #1060 La suppression d'océan avec remplacement de code pose problème - Closes #1061 La suppression d'un sexe avec remplacement de code échoue - Closes #1062 - - - - - 3b65f85d by Tony CHEMIT at 2018-09-25T19:09:18Z L'UI de synchro de référentiels ne présente plus les éléments à synchroniser qu'un par un - See #1058 - - - - - 65313d50 by Tony CHEMIT at 2018-09-25T19:09:18Z L'UI de synchro de référentiels ne présente plus les éléments à synchroniser qu'un par un - Closes #1058 - - - - - ea73c3eb by Tony CHEMIT at 2018-09-25T19:09:18Z Only remove program node if it is enabled (otherwise it is not in navigation tree) - - - - - 8c7371fc by Tony CHEMIT at 2018-09-25T19:09:18Z [SYNCHRO] Problème avec la synchro avancée d'un programme - Closes #1063 - - - - - 1df5c6fe by Tony CHEMIT at 2018-09-25T19:09:18Z [SYNCHRO] La synchro avancée d'une marée nécessitant une référence absente dans la base cible provoque une exception - Closes #1064 - - - - - f35bd21a by Tony CHEMIT at 2018-09-25T19:09:19Z L'UI de remplacement de code de référentiel dépasse parfois les limites de l'écran - Closes #1059 - - - - - abcbcd95 by Tony CHEMIT at 2018-09-25T19:09:19Z remove EntityMap class - - - - - 74530e6b by Tony CHEMIT at 2018-09-25T19:09:19Z Use topia-extension usage support to compute usages (see #1066) - - - - - e2ee503a by Tony CHEMIT at 2018-09-25T19:09:19Z use new topia metadata model feature to generate clean sql statements (See #1065) - - - - - de5f4950 by Tony CHEMIT at 2018-09-25T19:09:19Z improve logs (validators are now warns a lot too much :() - - - - - faca35f3 by Tony CHEMIT at 2018-09-25T19:09:19Z [LL] Après migration l'UI v7 n'affiche plus qu'une seule des captures de chaque opération de pêche - Closes #1068 - - - - - d10a77bd by Tony CHEMIT at 2018-09-25T19:09:20Z Add more accelerator on referential nb synchro config ui - - - - - 8bf452b5 by Tony CHEMIT at 2018-09-25T19:09:20Z fix parameter order to generate update sql statement - - - - - cc1ee0a4 by Tony CHEMIT at 2018-09-25T19:09:20Z fix a missing decorator - - - - - 92fa515f by Tony CHEMIT at 2018-09-25T19:09:20Z Suppression de la configuration d'ajout de référentiels dans les deux actions de synchronisation de données + réusinage du code commun aux deux actions - - - - - b1fe7bcf by Tony CHEMIT at 2018-09-25T19:09:20Z update changelog - - - - - 070879c0 by Tony CHEMIT at 2018-09-25T19:09:21Z update test databases - - - - - 4b75bbbf by Tony CHEMIT at 2018-09-25T19:09:23Z Review focus management - Closes #1036 - - - - - 7b800ea0 by Tony CHEMIT at 2018-09-25T19:09:24Z start to improve navigation popup - - - - - 176b9b78 by Tony CHEMIT at 2018-09-25T19:09:24Z Fix some validation messages - - - - - f40f5308 by Tony CHEMIT at 2018-09-25T19:09:24Z L'action de sauvegarde de la base locale est lancée automatiquement si on sélectionne une source connue - Closes #1072 - - - - - 74647580 by Tony CHEMIT at 2018-09-25T19:09:24Z Introduce actions for admin tabs - - - - - 0189cd06 by Tony CHEMIT at 2018-09-25T19:09:24Z L'assistant calcul de donnés demande abusivement (ou pas) de configurer une connexion - Closes #961 - - - - - 0a21e009 by Tony CHEMIT at 2018-09-25T19:09:24Z La mise à jour des référentiels ne fonctionne pas si il y a des référentiels obsolètes! - Closes #1073 - - - - - fad698a3 by Tony CHEMIT at 2018-09-25T19:09:24Z Après avoir réussit à effectuer les remplacements de référentiels obsolètes, la base source est toujours sauvegardé! - Closes #1074 - - - - - 0ead8fb7 by Tony CHEMIT at 2018-09-25T19:09:24Z [PS] Utilisation d'un objet flottant de référence - Closes #1074 - - - - - 1fa4a80f by Tony CHEMIT at 2018-09-25T19:09:25Z [PS] La création automatique d'une calée ne fonctionne plus (Closes #1075) - Add a NavigationTree.selectSafeNode method to skip any check on selected screen - Review the flow of OpenableUI to do afterSave extra code at the right place - - - - - 5f0a1b55 by Tony CHEMIT at 2018-09-25T19:09:25Z Widget température °C/°F : message de validation perfectible - Closes #960 - - - - - e9bab645 by Tony CHEMIT at 2018-09-25T19:09:25Z update changelog - - - - - ce62c273 by Tony CHEMIT at 2018-09-25T19:09:25Z update changelog - - - - - 88255c05 by Tony CHEMIT at 2018-09-25T19:09:25Z fix desactivate referential generated sql - - - - - 157c96f4 by Tony CHEMIT at 2018-09-25T19:09:25Z Fix validation result serializatoin on server mode - - - - - 35a3d0b4 by Tony CHEMIT at 2018-09-25T19:09:26Z Les rapports ne fonctionnent pas très bien - Closes #1081 - - - - - 2dac7c64 by Tony CHEMIT at 2018-09-25T19:09:26Z remove some default shortcuts on some uis (but it still does not work for some of them)... - - - - - 3a15875b by Tony CHEMIT at 2018-09-25T19:09:26Z optimize dependencies - - - - - e9db379f by Tony CHEMIT at 2018-09-25T19:09:26Z add a new method to get long label (but will be fix with usage of DecoratorService...) - - - - - dac7b398 by Tony CHEMIT at 2018-09-25T19:09:26Z Improve Move API - Closes #1084 - - - - - 067461f8 by Tony CHEMIT at 2018-09-25T19:09:26Z Optimize open API (let's use new navigation API instead of poor old API) - - - - - 21 changed files: - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/522759-artifacts.json - .mvn/gitlab-cache/milestones/522759-issues.json - .mvn/gitlab-cache/milestones/522759.json - + .mvn/gitlab-cache/milestones/529485-artifacts.json - .mvn/gitlab-cache/milestones/529485-issues.json - .mvn/gitlab-cache/milestones/529485.json - + .mvn/gitlab-cache/milestones/532584-artifacts.json - + .mvn/gitlab-cache/milestones/532584-issues.json - + .mvn/gitlab-cache/milestones/532584.json - + .mvn/gitlab-cache/milestones/532657-artifacts.json - + .mvn/gitlab-cache/milestones/532657-issues.json - + .mvn/gitlab-cache/milestones/532657.json - + .mvn/gitlab-cache/milestones/532658-issues.json - + .mvn/gitlab-cache/milestones/532658.json - + .mvn/gitlab-cache/milestones/570739-artifacts.json - + .mvn/gitlab-cache/milestones/570739-issues.json - + .mvn/gitlab-cache/milestones/570739.json - + .mvn/gitlab-cache/milestones/585302-artifacts.json - + .mvn/gitlab-cache/milestones/585302-issues.json - + .mvn/gitlab-cache/milestones/585302.json The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/57ad99a43e5f8108cbbbc4db21… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/57ad99a43e5f8108cbbbc4db21… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve Move API - Closes #1084
by Tony CHEMIT 25 Sep '18

25 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 57ad99a4 by Tony CHEMIT at 2018-09-25T14:27:39Z Improve Move API - Closes #1084 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddFloatingObjectPresetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbookUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbooksUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObsUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeineUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRouteUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineLandingLogbooksUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineSampleLogbooksUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveMultipleActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveMultipleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveMultipleTripLonglineLandingLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveMultipleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveMultipleTripLonglineUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/longline/MoveSingleActivityLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57ad99a43e5f8108cbbbc4db214… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57ad99a43e5f8108cbbbc4db214… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: add a new method to get long label (but will be fix with usage of DecoratorService...)
by Tony CHEMIT 25 Sep '18

25 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0796eac8 by Tony CHEMIT at 2018-09-25T10:11:35Z add a new method to get long label (but will be fix with usage of DecoratorService...) - - - - - 167d3469 by Tony CHEMIT at 2018-09-25T12:28:10Z Improve Move API - See #1084 (ui part) - - - - - 30 changed files: - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbookUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObsUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeineUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveMultipleDataUIActionSupport.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRouteUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveSingleDataUIActionSupport.java - − client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbooksUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleActivitySeineUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleRouteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineLandingLogbooksUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripLonglineLandingLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineSampleLogbooksUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripSeineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripsUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveMultipleTripUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleActivityLonglineObsUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleActivitySeineUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleDataUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleRouteUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglineUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeineUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripSeineUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/move/MoveSingleTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6863e0fbf245e77f04d3f7eca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6863e0fbf245e77f04d3f7eca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: fix desactivate referential generated sql
by Tony CHEMIT 23 Sep '18

23 Sep '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 642401fc by Tony CHEMIT at 2018-09-23T21:14:58Z fix desactivate referential generated sql - - - - - f3379ac9 by Tony CHEMIT at 2018-09-23T21:15:11Z Fix validation result serializatoin on server mode - - - - - 649d3f81 by Tony CHEMIT at 2018-09-23T21:35:02Z Les rapports ne fonctionnent pas très bien - Closes #1081 - - - - - f3bbfcf7 by Tony CHEMIT at 2018-09-23T21:35:23Z remove some default shortcuts on some uis (but it still does not work for some of them)... - - - - - e6863e0f by Tony CHEMIT at 2018-09-23T21:39:27Z optimize dependencies - - - - - 25 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/dcprefs/FloatingObjectPresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/report/ReportServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DisableSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportNonTargetDistributionLengthsTest.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java - services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java - + services/src/main/java/fr/ird/observe/services/gson/ValidationResultDtoAdapter.java - services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java - + services/src/main/java/fr/ird/observe/services/service/actions/validate/DataValidationResult.java - + services/src/main/java/fr/ird/observe/services/service/actions/validate/ReferentialValidationResult.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResult.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultDto.java - services/src/main/resources/observe-reports.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.admin.config; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -30,14 +30,14 @@ import fr.ird.observe.client.ui.admin.AdminUIModel; import fr.ird.observe.client.ui.admin.report.ReportModel; import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.dto.IdDto; +import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.ObserveModelType; import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; -import fr.ird.observe.spi.DtoModelClasses; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; @@ -102,10 +102,8 @@ public class SelectDataModel extends AdminActionModel { // on doit aussi calculer les ids des marées distantes ObserveSwingDataSource safeCentralSource = uiModel.getConfigModel().getSafeCentralSource(true); - List<DataDtoReference<?, ?>> existingTrip = new ArrayList<>(); - DataDtoReferenceSet<TripSeineReference> tripSeineSet = safeCentralSource.getTripSeineService().getAllTripSeine(); - existingTrip.addAll(tripSeineSet.toSet()); + List<DataDtoReference<?, ?>> existingTrip = new ArrayList<>(tripSeineSet.toSet()); DataDtoReferenceSet<TripLonglineReference> tripLonglineSet = safeCentralSource.getTripLonglineService().getAllTripLongline(); existingTrip.addAll(tripLonglineSet.toSet()); @@ -131,7 +129,7 @@ public class SelectDataModel extends AdminActionModel { return null; } DataDtoReference dto = data.iterator().next(); - if (DtoModelClasses.isTrip(dto)) { + if (IdHelper.isTrip(dto)) { return dto; } @@ -143,7 +141,7 @@ public class SelectDataModel extends AdminActionModel { ImmutableSet.Builder<DataDtoReference> result = ImmutableSet.builder(); Set<DataDtoReference<?, ?>> data = getSelectionDataModel().getSelectedData(); for (DataDtoReference<?, ?> datum : data) { - if (DtoModelClasses.isTrip(datum)) { + if (IdHelper.isTrip(datum)) { result.add(datum); } } @@ -208,6 +206,7 @@ public class SelectDataModel extends AdminActionModel { public boolean validate(AdminUIModel uiModel) { boolean validate = true; + boolean empty = selectionDataModel.isSelectionEmpty(); if (uiModel.containsOperation(AdminStep.VALIDATE)) { @@ -216,7 +215,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -227,7 +225,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -238,7 +235,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -248,9 +244,8 @@ public class SelectDataModel extends AdminActionModel { validate &= uiModel.validate(AdminStep.CONFIG); if (validate) { - // il faut exactement une Trip de selectionnee - int selectedCount = selectionDataModel.getSelectedCount(); - validate = selectedCount > 0; + // il faut au moins une donnee de selectionnee + validate = !empty; } } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java ===================================== @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -30,8 +30,6 @@ import fr.ird.observe.client.ui.admin.config.ConfigUI; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.ObserveModelType; import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.dto.decoration.ObserveI18nLabelsBuilder; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.DataMatrix; @@ -39,8 +37,8 @@ import fr.ird.observe.services.service.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.spi.DtoModelHelper; -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.decorator.JXPathDecorator; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -331,27 +329,16 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa combo.setShowReset(true); variablesPanel.add(combo); - log.info("init variable: " + variable); - Class variableType = variable.getType(); Decorator decorator; - Class referenceType; - if (ReferentialDto.class.isAssignableFrom(variableType) && !universe.isEmpty()) { - referenceType = DtoModelHelper.fromReferentialDto(variableType).toReferenceType(); - decorator = getDecoratorService().getReferentialReferenceDecorator(referenceType); - } else if (DataDto.class.isAssignableFrom(variableType) && !universe.isEmpty()) { - referenceType = DtoModelHelper.fromDataDto(variableType).toReferenceType(); - decorator = getDecoratorService().getDataReferenceDecorator(referenceType); + if (ReferentialDto.class.isAssignableFrom(variable.getType()) && !universe.isEmpty()) { + Class type = DtoModelHelper.fromReferentialDto(variable.getType()).toReferenceType(); + decorator = getDecoratorService().getReferentialReferenceDecorator(type); + } else if (DataDto.class.isAssignableFrom(variable.getType()) && !universe.isEmpty()) { + Class type = DtoModelHelper.fromDataDto(variable.getType()).toReferenceType(); + decorator = getDecoratorService().getDataReferenceDecorator(type); } else { - referenceType = variableType; - decorator = getDecoratorService().getDecoratorByType(variableType); + decorator = getDecoratorService().getDecoratorByType(variable.getType()); } - log.info("decorator: " + decorator); - combo.setI18nPrefix("observe.common."); - combo.setBeanType(referenceType); - combo.setI18nLabelBuilder(ObserveI18nLabelsBuilder.createFromReferenceType(referenceType)); - String entityLabel = t(ObserveI18nDecoratorHelper.getTypeI18nKey(variableType)); - combo.setPopupTitleText(t("observe.common.ReferentialDto.type", entityLabel)); - combo.init((JXPathDecorator<Object>) decorator, universe); JComboBox jComboBox = combo.getCombobox(); jComboBox.putClientProperty(VARIABLE_NAME, variableName); ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jcss ===================================== @@ -68,19 +68,19 @@ #ERROR { _value:{NuitonValidatorScope.ERROR}; - text:{NuitonValidatorScope.ERROR.getLabel()}; + text:{t(NuitonValidatorScope.ERROR.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), ERROR)}; } #WARNING { _value:{NuitonValidatorScope.WARNING}; - text:{NuitonValidatorScope.WARNING.getLabel()}; + text:{t(NuitonValidatorScope.WARNING.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), WARNING)}; } #INFO { _value:{NuitonValidatorScope.INFO}; - text:{NuitonValidatorScope.INFO.getLabel()}; + text:{t(NuitonValidatorScope.INFO.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), INFO)}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -43,6 +43,7 @@ import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; +import fr.ird.observe.services.service.actions.validate.DataValidationResult; import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationResult; @@ -50,8 +51,8 @@ import fr.ird.observe.services.service.actions.validate.ValidationResultDto; import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; import fr.ird.observe.services.validation.ValidatorDto; import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -410,7 +411,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements mainRequest.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); mainRequest.setSeineBycatchObservedSystemConfig(config.getSeineBycatchObservedSystem()); - ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(ReferentialLocale.valueOf(config.getDbLocale()), mainRequest); + ValidationResult.Builder<DataValidationRequest, DataValidationResult> resultBuilder = DataValidationResult.builder(ReferentialLocale.valueOf(config.getDbLocale()), mainRequest); for (DataDtoReference<?, ?> dataReference : dataModel.getSelectedData()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/dcprefs/FloatingObjectPresetsUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.dcprefs; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -33,8 +33,12 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import javax.swing.AbstractButton; import javax.swing.DefaultListModel; +import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.BorderLayout; +import java.awt.event.KeyEvent; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -69,6 +73,8 @@ public class FloatingObjectPresetsUIHandler implements UIHandler<FloatingObjectP if (o instanceof AbstractButton) { init(actionMap, (AbstractButton) o); + } else if (o instanceof JSplitPane) { + init((JSplitPane) o); } } @@ -119,6 +125,12 @@ public class FloatingObjectPresetsUIHandler implements UIHandler<FloatingObjectP UIHelper.askFocus(ui.getQuitAction()); } + + protected void init(JSplitPane editor) { + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); + } + protected void init(ObserveActionMap actionMap, AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== @@ -29,8 +29,8 @@ import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; -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.runtime.swing.renderer.DecoratorListCellRenderer; @@ -40,8 +40,11 @@ import javax.swing.ActionMap; import javax.swing.DefaultListModel; import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.BorderLayout; +import java.awt.event.KeyEvent; import java.util.List; import java.util.Objects; @@ -79,6 +82,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { if (o instanceof AbstractButton) { init(inputMap, actionMap, (AbstractButton) o); + } else if (o instanceof JSplitPane) { + init((JSplitPane) o); } } @@ -190,6 +195,11 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } + protected void init(JSplitPane editor) { + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); + } + protected void init(InputMap inputMap, ActionMap actionMap, AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java ===================================== @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/report/ReportServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.actions.report; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -43,6 +43,10 @@ import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.context.DataDtoEntityContext; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.awt.Dimension; import java.awt.Point; import java.io.Serializable; @@ -54,9 +58,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang3.mutable.MutableInt; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -651,6 +652,7 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer AbstractObserveTopiaDao dao = (AbstractObserveTopiaDao) getTopiaPersistenceContext().getDao(TripSeine.class); + log.info(String.format("Request: %s, params: %s", request, paramsFixes)); return dao.findAllFromHql(request, paramsFixes); } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DisableSqlStatementGenerator.java ===================================== @@ -43,7 +43,7 @@ public class DisableSqlStatementGenerator { } public String generateSql(String sourceId) { - return TopiaSqlStatements.generateUpdateStatement(metadataEntity, sourceId, "enabled = false, topiaVersion = topiaVersion + 1"); + return TopiaSqlStatements.generateUpdateStatement(metadataEntity, sourceId, "status = 0, topiaVersion = topiaVersion + 1"); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.actions.validate; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -40,16 +40,17 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.persistence.Entities; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; +import fr.ird.observe.services.service.actions.validate.DataValidationResult; import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest; +import fr.ird.observe.services.service.actions.validate.ReferentialValidationResult; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationRequest; -import fr.ird.observe.services.service.actions.validate.ValidationResult; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.validation.ServiceValidationContext; import fr.ird.observe.services.validation.ValidatorsMap; import fr.ird.observe.spi.DbModelHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.xwork2.XWork2ValidatorUtil; import java.util.List; @@ -69,12 +70,12 @@ public class ValidateServiceLocal extends ObserveServiceLocal implements Validat private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5); @Override - public ValidationResult<ReferentialValidationRequest> validateReferential(ReferentialValidationRequest request) { + public ReferentialValidationResult validateReferential(ReferentialValidationRequest request) { - Future<ValidationResult<ReferentialValidationRequest>> future = EXECUTOR_SERVICE.submit(() -> { + Future<ReferentialValidationResult> future = EXECUTOR_SERVICE.submit(() -> { ReferentialLocale referentialLocale = getReferentialLocale(); - ValidationResult.Builder<ReferentialValidationRequest> resultBuilder = ValidationResult.builder(referentialLocale, request); + ReferentialValidationResult.Builder<ReferentialValidationRequest, ReferentialValidationResult> resultBuilder = ReferentialValidationResult.builder(referentialLocale, request); ServiceValidationContext validationContext = createServiceValidationContext(request); @@ -99,12 +100,12 @@ public class ValidateServiceLocal extends ObserveServiceLocal implements Validat } @Override - public ValidationResult<DataValidationRequest> validateData(DataValidationRequest request) { + public DataValidationResult validateData(DataValidationRequest request) { - Future<ValidationResult<DataValidationRequest>> future = EXECUTOR_SERVICE.submit(() -> { + Future<DataValidationResult> future = EXECUTOR_SERVICE.submit(() -> { ReferentialLocale referentialLocale = getReferentialLocale(); - ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(referentialLocale, request); + DataValidationResult.Builder<DataValidationRequest, DataValidationResult> resultBuilder = DataValidationResult.builder(referentialLocale, request); ServiceValidationContext validationContext = createServiceValidationContext(request); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java ===================================== @@ -41,6 +41,7 @@ import fr.ird.observe.dto.navigation.select.ObserveSelectModel; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveEntity; +import fr.ird.observe.services.service.actions.validate.ReferentialValidationResult; import fr.ird.observe.services.service.actions.validate.ValidationResult; import fr.ird.observe.services.validation.ServiceValidationContext; import fr.ird.observe.services.validation.ValidatorsMap; @@ -162,7 +163,7 @@ class ValidationMessageDetector implements SimpleBeanValidatorListener { static ValidationMessageDetector forReferential(ValidatorsMap validators, ServiceValidationContext validationDataContext, ReferentialLocale referentialLocale, - ValidationResult.Builder resultBuilder) { + ReferentialValidationResult.Builder resultBuilder) { ImmutableMap.Builder<Class, EntityInterceptor> interceptorsBuilder = ImmutableMap.builder(); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -34,8 +34,8 @@ import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -58,15 +58,45 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup /** Logger */ private static final Logger log = LogManager.getLogger(AbstractReportServiceLocalTest.class); - - protected ReportService service; - /** La liste de tous les reports connus. */ protected static List<Report> reports; - + protected ReportService service; /** Le report à tester. */ private Report report; + protected static Report getReport(Logger log, String reportId) throws IOException { + if (reports == null) { + + URL reportLocation = + AbstractReportServiceLocalTest.class.getResource("/observe-reports.properties"); + + if (log.isInfoEnabled()) { + log.info("Loading reports from " + reportLocation); + } + + ReportBuilder builder = new ReportBuilder(); + + reports = builder.load(reportLocation); + + builder.clear(); + + Assert.assertNotNull(reports); + Assert.assertFalse(reports.isEmpty()); + } + + Report result = null; + // recuperation du report à tester + for (Report report : reports) { + if (reportId.equals(report.getId())) { + result = report; + break; + } + } + + Assert.assertNotNull("Could not find report with id " + reportId, reports); + return result; + } + protected abstract String getReportId(); @Before @@ -83,7 +113,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup } - /** * L'unique test à lancer. * @@ -92,7 +121,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup * <li>la syntaxe du report via {@link #testReportSyntax(Report)}</li> * <li>le résultat du report via {@link #testReportResult(DataMatrix)}</li> * </ul> - * */ @Test public final void testReport() { @@ -149,39 +177,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected abstract void testReportResult(DataMatrix result); - protected static Report getReport(Logger log, String reportId) throws IOException { - if (reports == null) { - - URL reportLocation = - AbstractReportServiceLocalTest.class.getResource("/observe-reports.properties"); - - if (log.isInfoEnabled()) { - log.info("Loading reports from " + reportLocation); - } - - ReportBuilder builder = new ReportBuilder(); - - reports = builder.load(reportLocation); - - builder.clear(); - - Assert.assertNotNull(reports); - Assert.assertFalse(reports.isEmpty()); - } - - Report result = null; - // recuperation du report à tester - for (Report report : reports) { - if (reportId.equals(report.getId())) { - result = report; - break; - } - } - - Assert.assertNotNull("Could not find report with id " + reportId, reports); - return result; - } - protected void assertReportName(Report report, String name, String description) { @@ -234,12 +229,12 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected void assertResultRow(DataMatrix result, int rowId, Object... row) { Object[] actualRow = result.getData()[rowId]; - int index=0; + int index = 0; for (Object o : actualRow) { - if (o==null) { + if (o == null) { Assert.assertEquals(row[index++], o); - }else { - Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"),o.toString().split("\\s*\\n\\s*")); + } else { + Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"), o.toString().split("\\s*\\n\\s*")); } } //Assert.assertArrayEquals(row, actualRow); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportNonTargetDistributionLengthsTest.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% ===================================== services/pom.xml ===================================== @@ -97,10 +97,6 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> - <dependency> - <groupId>io.ultreia.java4all</groupId> - <artifactId>java-lang</artifactId> - </dependency>  <dependency> ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.services.gson; import com.google.gson.GsonBuilder; import fr.ird.observe.services.service.actions.consolidate.dcp.FloatingObjectModification; import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.services.service.actions.validate.ValidationResultDto; import io.ultreia.java4all.http.HResponseError; import io.ultreia.java4all.http.HResponseErrorAdapter; @@ -51,7 +52,7 @@ public class ObserveDtoGsonSupplier extends ObserveDtoGsonSupplierSupport { gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter()); gsonBuilder.registerTypeAdapter(HResponseError.class, new HResponseErrorAdapter()); gsonBuilder.registerTypeAdapter(FloatingObjectModification.class, new FloatingObjectModificationAdapter()); - + gsonBuilder.registerTypeAdapter(ValidationResultDto.class, new ValidationResultDtoAdapter()); } return gsonBuilder; ===================================== services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java ===================================== @@ -29,10 +29,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.spi.DtoModelHelper; import java.lang.reflect.Type; import java.util.Set; @@ -55,10 +54,10 @@ public class ReportVariableAdapter implements JsonDeserializer<ReportVariable> { Class valueType = type; if (DataDto.class.isAssignableFrom(type)) { - valueType = DataDtoReference.class; + valueType = DtoModelHelper.fromDataDto((Class) type).toReferenceType(); } if (ReferentialDto.class.isAssignableFrom(type)) { - valueType = ReferentialDtoReference.class; + valueType = DtoModelHelper.fromReferentialDto((Class) type).toReferenceType(); } JsonElement valuesJson = reportVariableJson.get(ReportVariable.PROPERTY_VALUES); ===================================== services/src/main/java/fr/ird/observe/services/gson/ValidationResultDtoAdapter.java ===================================== @@ -0,0 +1,66 @@ +package fr.ird.observe.services.gson; + +/* + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import com.google.common.reflect.TypeToken; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.gson.ImmutableSetAdapter; +import fr.ird.observe.services.service.actions.validate.ValidationResultDto; +import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; + +import java.lang.reflect.Type; +import java.util.Set; + +/** + * Created by tchemit on 23/09/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ValidationResultDtoAdapter implements JsonDeserializer<ValidationResultDto>, JsonSerializer<ValidationResultDto> { + + @Override + public ValidationResultDto deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + JsonObject reportVariableJson = json.getAsJsonObject(); + Class<?> type = context.deserialize(reportVariableJson.get("type"), Class.class); + DtoReference dtoReference = context.deserialize(reportVariableJson.get("dtoReference"), type); + Set<ValidationResultDtoMessage> messages = context.deserialize(reportVariableJson.get("messages"), ImmutableSetAdapter.setOf(TypeToken.of(ValidationResultDtoMessage.class)).getType()); + return new ValidationResultDto(dtoReference, ImmutableSet.copyOf(messages)); + } + + @Override + public JsonElement serialize(ValidationResultDto src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject result = new JsonObject(); + result.add("type", context.serialize(src.getReference().getReferenceType())); + result.add("dtoReference", context.serialize(src.getReference())); + result.add("messages", context.serialize(src.getMessages().asList())); + return result; + } +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -51,27 +51,24 @@ import java.util.regex.Pattern; */ public class ReportBuilder { - private static final Pattern REPORT_DEFINITION_PATTERN = Pattern.compile("report.(\\w+).name"); + public static final Pattern REPORT_DEFINITION_PATTERN = Pattern.compile("report.(\\w+).name"); - private static final String REQUEST_PREFIX = "request."; + public static final String REQUEST_PREFIX = "request."; - private static final String OPERATION_PREFIX = "operations."; + public static final String OPERATION_PREFIX = "operations."; - private static final String VARIABLE_PREFIX = "variable."; + public static final String VARIABLE_PREFIX = "variable."; - private static final String REPEAT_VARIABLE_PREFIX = "repeatVariable."; + public static final String REPEAT_VARIABLE_PREFIX = "repeatVariable."; /** Logger */ private static final Logger log = LogManager.getLogger(ReportBuilder.class); - - /** les propriétés chargées par le builder pour construire les reports */ - private Properties properties; - - /** la liste des lastName sde reports connus par le système */ - private List<String> reportNames; - /** les operations connues par le système */ protected static Map<String, Class<?>> operations; + /** les propriétés chargées par le builder pour construire les reports */ + protected Properties properties; + /** la liste des lastName sde reports connus par le système */ + protected List<String> reportNames; public List<String> getReportNames() { return reportNames; @@ -97,7 +94,7 @@ public class ReportBuilder { } - private List<String> detectReportNames() { + protected List<String> detectReportNames() { List<String> reportNames = new ArrayList<>(); Enumeration<Object> keys = properties.keys(); while (keys.hasMoreElements()) { @@ -163,7 +160,7 @@ public class ReportBuilder { ); } - private Map<String, String> detectReportProperties(String reportName) { + protected Map<String, String> detectReportProperties(String reportName) { Map<String, String> dico = new TreeMap<>(); @@ -238,8 +235,8 @@ public class ReportBuilder { return result.toArray(new ReportRequest[0]); } - private ReportRequest getRequest(String requestDef, - String requestRepeatDef) { + protected ReportRequest getRequest(String requestDef, + String requestRepeatDef) { String[] parts = requestDef.split("\\|"); if (parts.length != 3) { @@ -311,7 +308,7 @@ public class ReportBuilder { return result.toArray(new ReportOperation[0]); } - private ReportVariable[] getVariables(String reportName, Map<String, String> dico) { + protected ReportVariable[] getVariables(String reportName, Map<String, String> dico) { List<ReportVariable> result = new ArrayList<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); List<String> ids = new ArrayList<>(); @@ -351,7 +348,7 @@ public class ReportBuilder { return result.toArray(new ReportVariable[0]); } - private ReportVariable[] getRepeatVariables(String reportName, Map<String, String> dico) { + protected ReportVariable[] getRepeatVariables(String reportName, Map<String, String> dico) { List<ReportVariable> result = new ArrayList<>(); Iterator<Map.Entry<String, String>> itr = dico.entrySet().iterator(); List<String> ids = new ArrayList<>(); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -25,8 +25,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import fr.ird.observe.dto.ObserveDto; import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.awt.Point; import java.io.Serializable; @@ -42,61 +42,16 @@ import java.util.Map; */ public class ReportRequest implements Serializable, ObserveDto { + public static final String TRIP_ID_VARIABLE = "tripId"; private static final long serialVersionUID = 1L; - /** Logger. */ private static final Logger log = LogManager.getLogger(ReportRequest.class); - - public static final String TRIP_ID_VARIABLE = "tripId"; - - /** le layout de la requete. */ - public enum RequestLayout { - /** lorsque les résultats de la requète sont les lignes du résultat. */ - row, - /** lorsque les résultats de la requète sont les colonnes du résultat. */ - column - } - - /** Un repeater optionnel sur la requête. */ - public static class RequestRepeat implements Serializable, ObserveDto { - - protected final String variableName; - - protected final RequestLayout layout; - - private static final long serialVersionUID = 1L; - - public RequestRepeat(String variableName, RequestLayout layout) { - this.variableName = variableName; - this.layout = layout; - } - - public String getVariableName() { - return variableName; - } - - public RequestLayout getLayout() { - return layout; - } - - @Override - public String toString() { - ToStringBuilder builder = new ToStringBuilder(this); - builder.append("variableName", getVariableName()); - builder.append("layout", getLayout()); - return builder.toString(); - } - } - /** layout de la requète. */ protected final RequestLayout layout; - /** la requète à exécuter. */ protected final String request; - /** la position de la requète. */ protected final Point location; - /** le repeater optionel. */ protected final RequestRepeat repeat; @@ -111,30 +66,6 @@ public class ReportRequest implements Serializable, ObserveDto { location = new Point(x, y); } - public RequestLayout getLayout() { - return layout; - } - - public int getX() { - return (int) location.getX(); - } - - public int getY() { - return (int) location.getY(); - } - - public Point getLocation() { - return location; - } - - public String getRequest() { - return request; - } - - public RequestRepeat getRepeat() { - return repeat; - } - public static Map<String, Object> extractParams(Report report, ImmutableSet<String> tripId) { Map<String, Object> params = Maps.newHashMap(); @@ -176,6 +107,30 @@ public class ReportRequest implements Serializable, ObserveDto { return datas; } + public RequestLayout getLayout() { + return layout; + } + + public int getX() { + return (int) location.getX(); + } + + public int getY() { + return (int) location.getY(); + } + + public Point getLocation() { + return location; + } + + public String getRequest() { + return request; + } + + public RequestRepeat getRepeat() { + return repeat; + } + @Override public String toString() { ToStringBuilder builder = new ToStringBuilder(this); @@ -185,4 +140,41 @@ public class ReportRequest implements Serializable, ObserveDto { builder.append("repeatVariable", getRepeat()); return builder.toString(); } + + /** le layout de la requete. */ + public enum RequestLayout { + /** lorsque les résultats de la requète sont les lignes du résultat. */ + row, + /** lorsque les résultats de la requète sont les colonnes du résultat. */ + column + } + + /** Un repeater optionnel sur la requête. */ + public static class RequestRepeat implements Serializable, ObserveDto { + + private static final long serialVersionUID = 1L; + protected final String variableName; + protected final RequestLayout layout; + + public RequestRepeat(String variableName, RequestLayout layout) { + this.variableName = variableName; + this.layout = layout; + } + + public String getVariableName() { + return variableName; + } + + public RequestLayout getLayout() { + return layout; + } + + @Override + public String toString() { + ToStringBuilder builder = new ToStringBuilder(this); + builder.append("variableName", getVariableName()); + builder.append("layout", getLayout()); + return builder.toString(); + } + } } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/DataValidationResult.java ===================================== @@ -0,0 +1,57 @@ +package fr.ird.observe.services.service.actions.validate; + +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.referential.ReferentialLocale; + +/** + * Created by tchemit on 06/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class DataValidationResult extends ValidationResult<DataValidationRequest> { + + private final DataValidationRequest request; + + private DataValidationResult(DataValidationRequest request, ImmutableSet<ValidationResultDto> data) { + super(data); + this.request = request; + } + + @Override + public DataValidationRequest getRequest() { + return request; + } + + public static Builder<DataValidationRequest, DataValidationResult> builder(ReferentialLocale referenceLocale, DataValidationRequest request) { + return new Builder<DataValidationRequest, DataValidationResult>(referenceLocale, request) { + + @Override + protected DataValidationResult newResult(DataValidationRequest request, ImmutableSet<ValidationResultDto> result) { + return new DataValidationResult(request, result); + } + }; + } + +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ReferentialValidationResult.java ===================================== @@ -0,0 +1,57 @@ +package fr.ird.observe.services.service.actions.validate; + +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.referential.ReferentialLocale; + +/** + * Created by tchemit on 06/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferentialValidationResult extends ValidationResult<ReferentialValidationRequest> { + + private final ReferentialValidationRequest request; + + private ReferentialValidationResult(ReferentialValidationRequest request, ImmutableSet<ValidationResultDto> data) { + super(data); + this.request = request; + } + + @Override + public ReferentialValidationRequest getRequest() { + return request; + } + + public static Builder<ReferentialValidationRequest, ReferentialValidationResult> builder(ReferentialLocale referenceLocale, ReferentialValidationRequest request) { + return new Builder<ReferentialValidationRequest, ReferentialValidationResult>(referenceLocale, request) { + + @Override + protected ReferentialValidationResult newResult(ReferentialValidationRequest request, ImmutableSet<ValidationResultDto> result) { + return new ReferentialValidationResult(request, result); + } + }; + } + +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java ===================================== @@ -37,11 +37,11 @@ public interface ValidateService extends ObserveService { @ReadReferentialPermission @Post - ValidationResult<ReferentialValidationRequest> validateReferential(ReferentialValidationRequest request); + ReferentialValidationResult validateReferential(ReferentialValidationRequest request); @ReadDataPermission @ReadReferentialPermission @Post - ValidationResult<DataValidationRequest> validateData(DataValidationRequest request); + DataValidationResult validateData(DataValidationRequest request); } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResult.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.actions.validate; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -28,8 +28,8 @@ import com.google.common.collect.Multimap; import fr.ird.observe.dto.ObserveDto; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import java.util.ArrayList; @@ -47,23 +47,15 @@ import static org.nuiton.i18n.I18n.l; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class ValidationResult<R extends ValidationRequest> implements ObserveDto { +public abstract class ValidationResult<R extends ValidationRequest> implements ObserveDto { - private final R request; private final ImmutableSet<ValidationResultDto> data; - public static <R extends ValidationRequest> Builder<R> builder(ReferentialLocale referenceLocale, R request) { - return new Builder<>(referenceLocale, request); - } - - private ValidationResult(R request, ImmutableSet<ValidationResultDto> data) { - this.request = request; + ValidationResult(ImmutableSet<ValidationResultDto> data) { this.data = data; } - public R getRequest() { - return request; - } + public abstract R getRequest(); public ImmutableSet<ValidationResultDto> getData() { return data; @@ -91,7 +83,7 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto * * @author Tony Chemit - dev(a)tchemit.fr */ - public static class Builder<R extends ValidationRequest> { + public static abstract class Builder<R extends ValidationRequest, S extends ValidationResult<R>> { /** Logger. */ private static final Logger log = LogManager.getLogger(Builder.class); @@ -100,7 +92,7 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto private final R request; private final ReferentialLocale referenceLocale; - private Builder(ReferentialLocale referenceLocale, R request) { + Builder(ReferentialLocale referenceLocale, R request) { this.referenceLocale = referenceLocale; this.request = request; data = HashMultimap.create(); @@ -119,12 +111,14 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto return this; } - public ValidationResult<R> build() { + protected abstract S newResult(R request, ImmutableSet<ValidationResultDto> result); + + public S build() { ImmutableSet.Builder<ValidationResultDto> result = ImmutableSet.builder(); for (Map.Entry<DtoReference, Collection<ValidationResultDtoMessage>> entry : data.asMap().entrySet()) { result.add(new ValidationResultDto(entry.getKey(), ImmutableSet.copyOf(entry.getValue()))); } - return new ValidationResult<>(request, result.build()); + return newResult(request, result.build()); } private String translateMessage(String message) { ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultDto.java ===================================== @@ -35,7 +35,7 @@ public class ValidationResultDto { private final DtoReference reference; private final ImmutableSet<ValidationResultDtoMessage> messages; - ValidationResultDto(DtoReference reference, ImmutableSet<ValidationResultDtoMessage> messages) { + public ValidationResultDto(DtoReference reference, ImmutableSet<ValidationResultDtoMessage> messages) { this.reference = reference; this.messages = messages; } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -19,7 +19,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### - ################################################################################ ## Liste des \u00e9quipements (Seine) ################################################################################ @@ -36,7 +35,6 @@ report.tripSeineGearUseFeatures.repeatVariable.gearUseFeaturesId=java.lang.Strin m.id In :tripId \ and g in elements (m.gearUseFeaturesSeine) \ Order By g.gear.label2 - report.tripSeineGearUseFeatures.request.1=0,0|row|\ Select \ concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ @@ -44,9 +42,7 @@ report.tripSeineGearUseFeatures.request.1=0,0|row|\ ( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Ind\u00e9termin\u00e9' End End )\ From GearUseFeaturesSeineImpl g \ Where g.id = :gearUseFeaturesId - report.tripSeineGearUseFeatures.request.1.repeat=gearUseFeaturesId|column - ################################################################################ ## Liste des \u00e9quipements (Longline) ################################################################################ @@ -63,7 +59,6 @@ report.tripLonglineGearUseFeatures.repeatVariable.gearUseFeaturesId=java.lang.St m.id In :tripId \ and g in elements (m.gearUseFeaturesLongline) \ Order By g.gear.label2 - report.tripLonglineGearUseFeatures.request.1=0,0|row|\ Select \ concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ @@ -71,9 +66,7 @@ report.tripLonglineGearUseFeatures.request.1=0,0|row|\ ( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Ind\u00e9termin\u00e9' End End )\ From GearUseFeaturesLonglineImpl g \ Where g.id = :gearUseFeaturesId - report.tripLonglineGearUseFeatures.request.1.repeat=gearUseFeaturesId|column - ################################################################################ ## Liste des activit\u00e9s avec des comments ################################################################################ @@ -91,7 +84,6 @@ report.activityWithComment.request.1=0,0|row|\ m.id In :tripId \ and a.comment is not null \ Order By r.date, a.time - ################################################################################ ## Liste de toutes les activit\u00e9s et leurs positions ################################################################################ @@ -108,7 +100,6 @@ report.allActivitys.request.1=0,0|row|\ Where \ m.id In :tripId \ Order By r.date, a.time - ################################################################################ ## Nombre de cal\u00e9es et captures journali\u00e8res d'une mar\u00e9e ################################################################################ @@ -127,7 +118,6 @@ report.dailySetAndCatch.request.1=0,0|row|\ m.id In :tripId \ Group By r.date \ Order By r.date - ################################################################################ ## Utilisation des DCP ################################################################################ @@ -145,14 +135,12 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Where \ m.id In :tripId \ Order by to.code - report.dcpUsage.request.1=0,0|row|\ Select concat(str(to.code) , ' - ', to.label2) \ From ObjectTypeImpl to \ Where \ to.id = :typeObjetId report.dcpUsage.request.1.repeat=typeObjetId|column - report.dcpUsage.request.2=1,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -164,7 +152,6 @@ report.dcpUsage.request.2=1,0|row|\ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' report.dcpUsage.request.2.repeat=typeObjetId|column - report.dcpUsage.request.3=2,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -176,7 +163,6 @@ report.dcpUsage.request.3=2,0|row|\ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' report.dcpUsage.request.3.repeat=typeObjetId|column - report.dcpUsage.request.4=3,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -188,7 +174,6 @@ report.dcpUsage.request.4=3,0|row|\ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' report.dcpUsage.request.4.repeat=typeObjetId|column - report.dcpUsage.request.5=4,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -201,7 +186,6 @@ report.dcpUsage.request.5=4,0|row|\ and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ and dcp.objectOperation.id != 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' report.dcpUsage.request.5.repeat=typeObjetId|column - report.dcpUsage.request.6=5,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -213,7 +197,6 @@ report.dcpUsage.request.6=5,0|row|\ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' report.dcpUsage.request.6.repeat=typeObjetId|column - report.dcpUsage.request.7=6,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m \ @@ -226,7 +209,6 @@ report.dcpUsage.request.7=6,0|row| \ and dcp.objectType.id = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.7.repeat=typeObjetId|column - ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ @@ -249,7 +231,6 @@ report.setByAssociation.request.1=0,0|column|\ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.2=0,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -262,7 +243,6 @@ report.setByAssociation.request.2=0,1|column|\ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.3=1,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -275,7 +255,6 @@ report.setByAssociation.request.3=1,0|column|\ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - report.setByAssociation.request.4=1,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -288,7 +267,6 @@ report.setByAssociation.request.4=1,1|column|\ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - report.setByAssociation.request.5=2,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -301,7 +279,6 @@ report.setByAssociation.request.5=2,0|column|\ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - report.setByAssociation.request.6=2,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -314,7 +291,6 @@ report.setByAssociation.request.6=2,1|column|\ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - report.setByAssociation.request.7=3,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -327,7 +303,6 @@ report.setByAssociation.request.7=3,0|column|\ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.8=3,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -340,7 +315,6 @@ report.setByAssociation.request.8=3,1|column|\ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Captures thon par type d'association ################################################################################ @@ -351,7 +325,6 @@ report.targetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total report.targetCatchByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total report.targetCatchByAssociation.operations.1=SumRow report.targetCatchByAssociation.operations.2=SumColumn - # ligne 1 report.targetCatchByAssociation.request.1=0,0|row|\ Select \ @@ -383,7 +356,6 @@ report.targetCatchByAssociation.request.1=0,0|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - # ligne 2 report.targetCatchByAssociation.request.7=0,1|row|\ Select \ @@ -415,7 +387,6 @@ report.targetCatchByAssociation.request.7=0,1|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - # ligne 3 report.targetCatchByAssociation.request.13=0,2|row|\ Select \ @@ -447,7 +418,6 @@ report.targetCatchByAssociation.request.13=0,2|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - # ligne 4 report.targetCatchByAssociation.request.19=0,3|row|\ Select \ @@ -479,7 +449,6 @@ report.targetCatchByAssociation.request.19=0,3|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Rejets thons selon le type d'association ################################################################################ @@ -490,7 +459,6 @@ report.targetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Tot report.targetDiscardedByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total report.targetDiscardedByAssociation.operations.1=SumRow report.targetDiscardedByAssociation.operations.2=SumColumn - # ligne 1 report.targetDiscardedByAssociation.request.1=0,0|row|\ Select \ @@ -522,7 +490,6 @@ report.targetDiscardedByAssociation.request.1=0,0|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - # ligne 2 report.targetDiscardedByAssociation.request.7=0,1|row|\ Select \ @@ -554,7 +521,6 @@ report.targetDiscardedByAssociation.request.7=0,1|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - # ligne 3 report.targetDiscardedByAssociation.request.13=0,2|row|\ Select \ @@ -586,7 +552,6 @@ report.targetDiscardedByAssociation.request.13=0,2|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - # ligne 4 report.targetDiscardedByAssociation.request.19=0,3|row|\ Select \ @@ -618,7 +583,6 @@ report.targetDiscardedByAssociation.request.19=0,3|row|\ m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Captures accessoires observ\u00e9es ################################################################################ @@ -631,7 +595,6 @@ report.accessoryCatch.repeatVariable.speciesId=java.lang.String|\ Select e.id From SpeciesImpl e \ Where e.speciesGroup.id = :speciesGroup \ Order By e.homeId - report.accessoryCatch.request.1=0,0|row|\ Select \ concat('[FAO]', (case when e.faoCode is not null then e.faoCode else '-' end), \ @@ -640,7 +603,6 @@ report.accessoryCatch.request.1=0,0|row|\ From SpeciesImpl e \ Where e.id = :speciesId report.accessoryCatch.request.1.repeat=speciesId|column - report.accessoryCatch.request.2=1,0|row|\ Select \ case when Count(ca) > 0 then \ @@ -657,7 +619,6 @@ report.accessoryCatch.request.2=1,0|row|\ with ca.species.id = :speciesId \ Where m.id In :tripId report.accessoryCatch.request.2.repeat=speciesId|column - report.accessoryCatch.request.3=2,0|row|\ Select \ case when Count(ca) > 0 then \ @@ -674,7 +635,6 @@ report.accessoryCatch.request.3=2,0|row|\ with ca.species.id = :speciesId \ Where m.id In :tripId report.accessoryCatch.request.3.repeat=speciesId|column - ################################################################################ ## Captures accessoires par speciesGroup d'esp\u00e8ces ################################################################################ @@ -683,7 +643,6 @@ report.accessoryCatchByGroup.name=D\u00e9nombrement des captures accessoires et report.accessoryCatchByGroup.description=Afficher les nombres de captures accessoires par groupe d'esp\u00e8ce selon le type de banc et le devenir report.accessoryCatchByGroup.columns=Esp\u00e8ce, Total BL, Total BO, Sorti vivant/\u00e9chapp\u00e9, Sorti mort, Rejet\u00e9 vivant, Rejet\u00e9 mort, Partiellement conserv\u00e9, Cuve, Cuisine, Autre report.accessoryCatchByGroup.variable.speciesGroup=fr.ird.observe.dto.referential.SpeciesGroupDto|From SpeciesGroupImpl ge Order By ge.code - report.accessoryCatchByGroup.request.1=0,0|row|\ Select \ concat(\ @@ -726,7 +685,6 @@ report.accessoryCatchByGroup.request.1=0,0|row|\ Where m.id In :tripId \ Group by e \ Order By e.homeId - ########################################################### ## Distribution des tailles par espèces non ciblées ########################################################### @@ -754,7 +712,6 @@ Where t.id In :tripId \ And ntl.species.id = :speciesId \ Group By ntl.length \ Order By ntl.length - #################################################################### ## Distribution des tailles des conservés par espèces ciblées (LD1) #################################################################### @@ -786,7 +743,6 @@ Where t.id In :tripId \ And ts.discarded = false \ Group By tl.length \ Order By tl.length - ################################################################ ## Distribution des tailles des rejets par espèces ciblées (LD1) ################################################################ @@ -818,7 +774,6 @@ Where t.id In :tripId \ And ts.discarded = true \ Group By tl.length \ Order By tl.length - ############################################################### ## Distribution des tailles des conservés par espèces ciblées (LF) ############################################################### @@ -850,7 +805,6 @@ Where t.id In :tripId \ And ts.discarded = false \ Group By tl.length \ Order By tl.length - ############################################################### ## Distribution des tailles des rejets par espèces ciblées (LF) ############################################################### @@ -882,7 +836,6 @@ Where t.id In :tripId \ And ts.discarded = true \ Group By tl.length \ Order By tl.length - ############################################ ## Répartition des calées par cuves ############################################ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fb5deba00986e3133e252edc75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fb5deba00986e3133e252edc75… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 23 Sep '18

23 Sep '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 102d4797 by 166231 at 2018-09-23T21:32:09Z Site checkin for project ObServe :: Pom - - - - - 4 changed files: - changelog.html - changes-report.html - dev-activity.html - file-activity.html Changes: ===================================== changelog.html ===================================== @@ -93,56 +93,16 @@ Total number of changed sets: 1 <div class="section"> <h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3> -Total commits: 90 Total number of files changed: 179 +Total commits: 80 Total number of files changed: 173 <table border="0" class="table table-striped"> <tr class="a"> <th>Timestamp</th> <th>Author</th> <th>Details</th></tr> <tr class="b"> -<td>2018-09-23 14:17:00</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=fec04535395b3…">v fec04535395b3afa9a4827c541b5c33eb941617b</a> optimize dependencies</td></tr> -<tr class="a"> -<td>2018-09-23 14:03:19</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1e8222468a8841a…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_en_GB.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_es_ES.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_fr_FR.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1e8222468a8841ad73…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">dto/src/main/resources/i18n/dto_en_GB.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">dto/src/main/resources/i18n/dto_es_ES.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">dto/src/main/resources/i18n/dto_fr_FR.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java">validation/.mvn/i18n-parse-java</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java?re…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1e8222468a8…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_en_GB.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_es_ES.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_fr_FR.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v 1e8222468a8841ad735784aa921bae6d0c855c3b</a> optimize i18n + detect again all we can</td></tr> -<tr class="b"> -<td>2018-09-23 13:28:54</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/i18n-parse-validation</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/i18n-parse-validation-messages</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=eed4e25e4f8…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_en_GB.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_es_ES.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_fr_FR.properties</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">v eed4e25e4f8241e6b14ab1bfbb949213ad476b67</a> optimize i18n</td></tr> -<tr class="a"> -<td>2018-09-23 13:12:55</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/Observe.model</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model?…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineActivityEntityDtoBinder.java</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureCompareFieldValidator.java</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">v dedbdd76768398422707fa00f1a93381febc45d5</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/validators.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">v dedbdd76768398422707fa00f1a93381febc45d5</a> Un contrôle insoupçonné vérifie les températures entre activités - Closes #1080</td></tr> -<tr class="b"> -<td>2018-09-23 13:00:05</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=3…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=330cd26380f2571…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=330cd26380f2571adc…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=330cd26380f257…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=330cd26380…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=330cd26380f2571adcb41f…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=3…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=330cd26380f2571…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=330cd2…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=330cd26…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=330cd26380f25…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=330cd26380f2571ad…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=330cd26380f…">v 330cd26380f2571adcb41fe55e6ff558a8402324</a> Revert "[jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-23">RC-23</a>-SNAPSHOT development[skip ci]" This reverts commit 6a01a724cd1b921bd952795c25d83e0dbe5e0c02.</td></tr> -<tr class="a"> -<td>2018-09-23 12:40:43</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=d…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=d5576682e34670c…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=d5576682e34670c616…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=d5576682e34670…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=d5576682e3…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=d5576682e34670c6162ed9…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=d…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=d5576682e34670c…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=d55766…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=d557668…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=d5576682e3467…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=d5576682e34670c61…">v d5576682e34670c6162ed912577748a5d5981017</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=d5576682e34…">v d5576682e34670c6162ed912577748a5d5981017</a> [jgitflow-maven-plugin]updating poms for branch'release/7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a>' with non-snapshot versions[skip ci]</td></tr> -<tr class="b"> -<td>2018-09-23 12:18:09</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=e4977e4973a214c4cd…">v e4977e4973a214c4cdec7fae427da950b21953f0</a> [jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a> branch with snapshot versions[skip ci]</td></tr> -<tr class="a"> -<td>2018-09-23 09:51:33</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1703fb1fc75e38d…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1703fb1fc75e38d99c…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=1703fb1fc75e38…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=1703fb1fc7…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=1703fb1fc75e38d99cde60…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=1703fb1fc75e38d…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=1703fb…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=1703fb1…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=1703fb1fc75e3…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=1703fb1fc75e38d99…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1703fb1fc75…">v 1703fb1fc75e38d99cde60635d82a4f5fb6c1637</a> [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]</td></tr> -<tr class="b"> -<td>2018-09-23 09:51:32</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=f21c25bb91e3ea9…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=f21c25bb91e3ea9882…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=f21c25bb91e3ea…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=f21c25bb91…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=f21c25bb91e3ea9882b24f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=f…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=f21c25bb91e3ea9…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=f21c25…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=f21c25b…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=f21c25bb91e3e…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=f21c25bb91e3ea988…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=f21c25bb91e…">v f21c25bb91e3ea9882b24f39113222da5981f2b1</a> [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]</td></tr> -<tr class="a"> <td>2018-09-23 09:43:38</td> <td>Tony CHEMIT <dev(a)tchemit.fr></td> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=1…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=1b666e84e4349f0…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=1b666e84e4349f0d3e…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=1b666e84e4349f…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=1b666e84e4…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=1b666e84e4349f0d3ecb76…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=1…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=1b666e84e4349f0…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=1b666e…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=1b666e8…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=1b666e84e4349…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=1b666e84e4349f0d3…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=1b666e84e43…">v 1b666e84e4349f0d3ecb76885d30d7ecfd41dade</a> [jgitflow-maven-plugin]updating poms for branch'release/7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-22">RC-22</a>' with non-snapshot versions[skip ci]</td></tr> -<tr class="b"> -<td>2018-09-23 09:43:15</td> -<td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml?rev=6…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml?rev=6a01a724cd1b921…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml?rev=6a01a724cd1b921bd9…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml?rev=6a01a724cd1b92…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml?rev=6a01a724cd…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml?rev=6a01a724cd1b921bd95279…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml?rev=6…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml?rev=6a01a724cd1b921…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml?rev=6a01a7…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml?rev=6a01a72…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml?rev=6a01a724cd1b9…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml?rev=6a01a724cd1b921bd…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml?rev=6a01a724cd1…">v 6a01a724cd1b921bd952795c25d83e0dbe5e0c02</a> [jgitflow-maven-plugin]updating poms for 7.0-<a class="externalLink" href="http://jira.codehaus.org/browse/RC-23">RC-23</a>-SNAPSHOT development[skip ci]</td></tr> <tr class="a"> <td>2018-09-22 20:50:56</td> <td>Tony CHEMIT <dev(a)tchemit.fr></td> ===================================== changes-report.html ===================================== The diff for this file was not included because it is too large. ===================================== dev-activity.html ===================================== @@ -92,7 +92,7 @@ <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3> -Total commits: 90 Total number of files changed: 179 +Total commits: 80 Total number of files changed: 173 <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -100,8 +100,8 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>90</td> -<td>179</td></tr></table></div></div> +<td>80</td> +<td>173</td></tr></table></div></div> </div> </div> </div> ===================================== file-activity.html ===================================== @@ -92,50 +92,50 @@ <h2><a name="File_Activity_Report"></a>File Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2018-08-24_and_2018-09-24"></a>Changes between 2018-08-24 and 2018-09-24</h3> -Total commits: 90 Total number of files changed: 179 +Total commits: 80 Total number of files changed: 173 <table border="0" class="table table-striped"> <tr class="a"> <th>Filename</th> <th>Number of Times Changed</th></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/pom.xml">pom.xml</a> </td> -<td>37</td></tr> +<td>32</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/pom.xml">services/pom.xml</a> </td> -<td>27</td></tr> +<td>21</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> </td> -<td>26</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> </td> +<td>20</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/pom.xml">client/pom.xml</a> </td> -<td>25</td></tr> +<td>19</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> </td> -<td>25</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> </td> +<td>19</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/pom.xml">persistence/pom.xml</a> </td> -<td>25</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> </td> +<td>19</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> </td> -<td>24</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> </td> +<td>19</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/pom.xml">server/pom.xml</a> </td> -<td>24</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/pom.xml">validation/pom.xml</a> </td> +<td>19</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/pom.xml">services-client/pom.xml</a> </td> -<td>24</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/pom.xml">client-configuration/pom.xml</a> </td> +<td>18</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/pom.xml">services-local/pom.xml</a> </td> -<td>24</td></tr> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/pom.xml">dto/pom.xml</a> </td> +<td>18</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/pom.xml">server-configuration/pom.xml</a> </td> -<td>23</td></tr> +<td>18</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/test/pom.xml">test/pom.xml</a> </td> -<td>23</td></tr> +<td>18</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/observe/pom.xml">observe/pom.xml</a> </td> -<td>22</td></tr> +<td>17</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java</a> </td> <td>6</td></tr> @@ -143,28 +143,10 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java</a> </td> <td>4</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_en_GB.properties</a> </td> -<td>4</td></tr> -<tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_es_ES.properties</a> </td> -<td>4</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_fr_FR.properties</a> </td> -<td>4</td></tr> -<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java</a> </td> <td>4</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java</a> </td> -<td>4</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_en_GB.properties</a> </td> -<td>4</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_es_ES.properties</a> </td> -<td>4</td></tr> -<tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_fr_FR.properties</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java</a> </td> <td>4</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/CHANGELOG.md">CHANGELOG.md</a> </td> @@ -173,7 +155,13 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java</a> </td> <td>3</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_en_GB.properties</a> </td> +<td>3</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_es_ES.properties</a> </td> +<td>3</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/resources/i18n/cli…">client/src/main/resources/i18n/client_fr_FR.properties</a> </td> <td>3</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java</a> </td> @@ -194,100 +182,94 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java</a> </td> -<td>2</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/src/main/java/fr/i…">services-client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java</a> </td> -<td>2</td></tr> -<tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/filtered-resources…">server/src/main/filtered-resources/mapping</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_en_GB.properties</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_es_ES.properties</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/i18n…">validation/src/main/resources/i18n/validation_fr_FR.properties</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-client/src/main/java/fr/i…">services-client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/Observe.model</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/filtered-resources…">server/src/main/filtered-resources/mapping</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineActivityEntityDtoBinder.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureCompareFieldValidator.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/validators.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroModel.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroModel.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jcss</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jcss</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIHandler.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineUIHandler.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/data/seine/ActivitySeineUIHandler.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/actions/content/ShowTechnicalInformationsAction.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/actions/content/ShowTechnicalInformationsAction.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/TripLonglineServiceLocal.java</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/TripLonglineServiceLocal.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/TripSeineServiceLocal.java</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/TripSeineServiceLocal.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/log4j2.xml</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/log4j2.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/observe-log4j2.xml</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client-configuration/src/main/reso…">client-configuration/src/main/resources/observe-log4j2.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/log4j2.xml</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/log4j2.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/observeweb-log4j2.xml</a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server-configuration/src/main/reso…">server-configuration/src/main/resources/observeweb-log4j2.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml</a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-create-error-validation.xml</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/seine/ActivitySeineDto-update-error-validation.xml</a> </td> <td>2</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java</a> </td> @@ -314,18 +296,6 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java</a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_en…">dto/src/main/resources/i18n/dto_en_GB.properties</a> </td> -<td>1</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_es…">dto/src/main/resources/i18n/dto_es_ES.properties</a> </td> -<td>1</td></tr> -<tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/resources/i18n/dto_fr…">dto/src/main/resources/i18n/dto_fr_FR.properties</a> </td> -<td>1</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-java">validation/.mvn/i18n-parse-java</a> </td> -<td>1</td></tr> -<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java</a> </td> <td>1</td></tr> <tr class="a"> @@ -371,15 +341,33 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/client/src/main/java/fr/ird/observ…">client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java</a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/seine/ActivitySeineStubEntityDtoBinder.java</a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/java/fr/ird/observe/d…">dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java</a> </td> <td>1</td></tr> <tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/dto/src/main/models/Observe.model">dto/src/main/models/Observe.model</a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/longline/TripLonglineActivityEntityDtoBinder.java</a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/binder/data/seine/ActivitySeineStubEntityDtoBinder.java</a> </td> +<td>1</td></tr> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureBoundFieldValidator.java</a> </td> <td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services/src/main/java/fr/ird/obse…">services/src/main/java/fr/ird/observe/services/validation/validators/TemperatureCompareFieldValidator.java</a> </td> +<td>1</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-create-error-validation.xml</a> </td> <td>1</td></tr> <tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/fr/i…">validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineDto-update-error-validation.xml</a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/src/main/resources/vali…">validation/src/main/resources/validators.xml</a> </td> +<td>1</td></tr> +<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/server/src/main/java/fr/ird/observ…">server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java</a> </td> <td>1</td></tr> <tr class="a"> @@ -614,12 +602,6 @@ <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/persistence/src/main/java/fr/ird/o…">persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java</a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/i18n-parse-validation</a> </td> -<td>1</td></tr> -<tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/validation/.mvn/i18n-parse-validat…">validation/.mvn/i18n-parse-validation-messages</a> </td> -<td>1</td></tr> -<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/services-local/src/main/java/fr/ir…">services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java</a> </td> <td>1</td></tr> <tr class="a"> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/102d479721428cf45bba607751a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/102d479721428cf45bba607751a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 9 commits: optimize i18n + detect again all we can
by Tony CHEMIT 23 Sep '18

23 Sep '18

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 3ba166c4 by Tony CHEMIT at 2018-09-23T20:08:24Z optimize i18n + detect again all we can - - - - - bd699648 by Tony CHEMIT at 2018-09-23T20:08:29Z optimize dependencies - - - - - e72eae33 by Tony CHEMIT at 2018-09-23T20:08:29Z fix desactivate referential generated sql - - - - - e8cf278f by Tony CHEMIT at 2018-09-23T20:08:30Z Fix validation result serializatoin on server mode - - - - - 5bd56caf by Tony CHEMIT at 2018-09-23T20:33:04Z Les rapports ne fonctionnent pas très bien - Closes #1081 - - - - - 6a9d6644 by Tony CHEMIT at 2018-09-23T20:33:05Z remove some default shortcuts on some uis (but it still does not work for some of them)... - - - - - 96c75a89 by Tony CHEMIT at 2018-09-23T20:41:19Z [jgitflow-maven-plugin]updating poms for 7.0-RC-22 branch with snapshot versions[skip ci] - - - - - 99b971a7 by Tony CHEMIT at 2018-09-23T20:46:59Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-22' with non-snapshot versions[skip ci] - - - - - 6521b438 by Tony CHEMIT at 2018-09-23T20:58:12Z [jgitflow-maven-plugin]merging 'release/7.0-RC-22' into 'master-7.x' - - - - - 27 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/dcprefs/FloatingObjectPresetsUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java - services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/report/ReportServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DisableSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java - + services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportNonTargetDistributionLengthsTest.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java - services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java - + services/src/main/java/fr/ird/observe/services/gson/ValidationResultDtoAdapter.java - services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java - services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java - services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java - + services/src/main/java/fr/ird/observe/services/service/actions/validate/DataValidationResult.java - + services/src/main/java/fr/ird/observe/services/service/actions/validate/ReferentialValidationResult.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResult.java - services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultDto.java - services/src/main/resources/observe-reports.properties Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java ===================================== @@ -10,36 +10,39 @@ package fr.ird.observe.client.ui.admin.config; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.admin.AdminActionModel; import fr.ird.observe.client.ui.admin.AdminStep; import fr.ird.observe.client.ui.admin.AdminUIModel; import fr.ird.observe.client.ui.admin.report.ReportModel; import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel; +import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.IdHelper; import fr.ird.observe.dto.ObserveModelType; import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.data.seine.TripSeineReference; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DataDtoReferenceSet; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.ArrayList; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; /** * Created on 28/11/16. @@ -99,10 +102,8 @@ public class SelectDataModel extends AdminActionModel { // on doit aussi calculer les ids des marées distantes ObserveSwingDataSource safeCentralSource = uiModel.getConfigModel().getSafeCentralSource(true); - List<DataDtoReference<?, ?>> existingTrip = new ArrayList<>(); - DataDtoReferenceSet<TripSeineReference> tripSeineSet = safeCentralSource.getTripSeineService().getAllTripSeine(); - existingTrip.addAll(tripSeineSet.toSet()); + List<DataDtoReference<?, ?>> existingTrip = new ArrayList<>(tripSeineSet.toSet()); DataDtoReferenceSet<TripLonglineReference> tripLonglineSet = safeCentralSource.getTripLonglineService().getAllTripLongline(); existingTrip.addAll(tripLonglineSet.toSet()); @@ -136,6 +137,17 @@ public class SelectDataModel extends AdminActionModel { return null; } + public ImmutableSet<DataDtoReference> getSelectedTrips() { + ImmutableSet.Builder<DataDtoReference> result = ImmutableSet.builder(); + Set<DataDtoReference<?, ?>> data = getSelectionDataModel().getSelectedData(); + for (DataDtoReference<?, ?> datum : data) { + if (IdHelper.isTrip(datum)) { + result.add(datum); + } + } + return result.build(); + } + public void start(AdminUIModel uiModel) { if (!uiModel.needSelect()) { @@ -194,6 +206,7 @@ public class SelectDataModel extends AdminActionModel { public boolean validate(AdminUIModel uiModel) { boolean validate = true; + boolean empty = selectionDataModel.isSelectionEmpty(); if (uiModel.containsOperation(AdminStep.VALIDATE)) { @@ -202,7 +215,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -213,7 +225,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -224,7 +235,6 @@ public class SelectDataModel extends AdminActionModel { if (validate) { // il faut au moins une donnee de selectionnee - boolean empty = selectionDataModel.isSelectionEmpty(); validate = !empty; } } @@ -234,12 +244,15 @@ public class SelectDataModel extends AdminActionModel { validate &= uiModel.validate(AdminStep.CONFIG); if (validate) { - // il faut exactement une Trip de selectionnee - int selectedCount = selectionDataModel.getSelectedCount(); - validate = selectedCount == 1; + // il faut au moins une donnee de selectionnee + validate = !empty; } } return validate; } + + public ImmutableSet<String> getSelectedTripIds() { + return ImmutableSet.copyOf(getSelectedTrips().stream().map(IdDto::getId).collect(Collectors.toSet())); + } } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jcss ===================================== @@ -71,7 +71,7 @@ JToolBar { } #reportDescription { - text:{getHandler().updateSelectedReportDescrption(stepModel.getSelectedReport())}; + text:{getHandler().updateSelectedReportDescription(stepModel.getSelectedReport())}; editable:false; focusable:false; } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java ===================================== @@ -6,22 +6,22 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ird.observe.client.ui.admin.report; -import com.google.common.collect.Lists; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.admin.AdminStep; @@ -36,8 +36,9 @@ import fr.ird.observe.services.service.actions.report.DataMatrix; import fr.ird.observe.services.service.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.service.actions.report.ReportVariable; -import org.apache.logging.log4j.Logger; +import fr.ird.observe.spi.DtoModelHelper; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.decorator.Decorator; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; @@ -57,6 +58,7 @@ import java.awt.Component; import java.awt.Font; import java.awt.event.ItemEvent; import java.io.File; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -71,7 +73,7 @@ import static org.nuiton.i18n.I18n.t; */ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHandler<ReportUI> { - public static final String VARIABLE_NAME = "variableName"; + private static final String VARIABLE_NAME = "variableName"; /** Logger */ private static final Logger log = LogManager.getLogger(ReportUIHandler.class); @@ -142,14 +144,14 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa Font headerFont; - public Font getDefaultFont(JTable table) { + Font getDefaultFont(JTable table) { if (defaultFont == null) { defaultFont = table.getFont(); } return defaultFont; } - public Font getHeaderFont(JTable table) { + Font getHeaderFont(JTable table) { if (headerFont == null) { headerFont = getDefaultFont(table).deriveFont(Font.BOLD); } @@ -187,13 +189,13 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa configUI.getExtraConfig().add(extraConfig); } - public void setModelTypeFromEvent(ItemEvent event) { + void setModelTypeFromEvent(ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { getStepModel().setModelType((ObserveModelType) event.getItem()); } } - public void updateSelectedReportFromEvent(ItemEvent event) { + void updateSelectedReportFromEvent(ItemEvent event) { if (event.getStateChange() == ItemEvent.SELECTED) { if (log.isInfoEnabled()) { @@ -204,7 +206,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } } - public void updateSelectedReport(Report report) { + void updateSelectedReport(Report report) { ui.getModel().setBusy(true); try { if (log.isInfoEnabled()) { @@ -217,14 +219,14 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } } - public String updateSelectedReportDescrption(Report report) { + String updateSelectedReportDescription(Report report) { if (report == null) { return t("observe.message.no.report.selected"); } return t(report.getDescription()); } - public void updateVariable(JComboBox combo, Object value) { + private void updateVariable(JComboBox combo, Object value) { String variableName = (String) combo.getClientProperty(VARIABLE_NAME); if (variableName == null) { throw new IllegalStateException( @@ -236,7 +238,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa getStepModel().addVariable(variableName, value); } - public void chooseReportFile() { + void chooseReportFile() { ReportModel model = ui.getModel().getReportModel(); File f = UIHelper.chooseFile( ui, @@ -248,10 +250,10 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa model.setReportFile(f); } - public void copyReportToClipBoard(Report report, - ResultTableModel model, - boolean copyRowHeaders, - boolean copyColumnHeaders) { + void copyReportToClipBoard(Report report, + ResultTableModel model, + boolean copyRowHeaders, + boolean copyColumnHeaders) { if (report == null) { // pas de report sélectionné, rien à faire @@ -267,7 +269,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa UIHelper.copyToClipBoard(content); } - protected void onReportsChanged(ReportUI tabUI, List<?> newValue) { + private void onReportsChanged(ReportUI tabUI, List<?> newValue) { if (log.isDebugEnabled()) { log.debug("New reports : " + newValue); @@ -281,7 +283,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } @SuppressWarnings({"unchecked"}) - protected void onSelectedReportChanged(ReportUI tabUI, ReportModel model, Report report) { + private void onSelectedReportChanged(ReportUI tabUI, ReportModel model, Report report) { if (log.isInfoEnabled()) { log.info("New selected report [" + report + "]"); @@ -309,7 +311,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa ReportService reportService = dataSource.getReportService(); - report = reportService.populateVariables(report, ui.getModel().getSelectDataModel().getSelectedTrip().getId()); + report = reportService.populateVariables(report, ui.getModel().getSelectDataModel().getSelectedTripIds()); } catch (Exception e) { throw new ObserveSwingTechnicalException("unable to populate report : " + report.getName(), e); @@ -322,16 +324,18 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa String variableName = variable.getName(); // String value = variables.get(variableName); Set values = variable.getValues(); - List<Object> universe = Lists.newArrayList(values); + List<Object> universe = new ArrayList<>(values); BeanComboBox<Object> combo = new BeanComboBox<>(); combo.setShowReset(true); variablesPanel.add(combo); Decorator decorator; if (ReferentialDto.class.isAssignableFrom(variable.getType()) && !universe.isEmpty()) { - decorator = getDecoratorService().getReferentialReferenceDecorator(variable.getType()); + Class type = DtoModelHelper.fromReferentialDto(variable.getType()).toReferenceType(); + decorator = getDecoratorService().getReferentialReferenceDecorator(type); } else if (DataDto.class.isAssignableFrom(variable.getType()) && !universe.isEmpty()) { - decorator = getDecoratorService().getDataReferenceDecorator(variable.getType()); + Class type = DtoModelHelper.fromDataDto(variable.getType()).toReferenceType(); + decorator = getDecoratorService().getDataReferenceDecorator(type); } else { decorator = getDecoratorService().getDecoratorByType(variable.getType()); } @@ -372,7 +376,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } } - protected void onVariablesChanges(ReportModel model, Map<String, Object> variables) { + private void onVariablesChanges(ReportModel model, Map<String, Object> variables) { Report report = model.getSelectedReport(); if (report != null) { @@ -381,7 +385,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa } } - protected void onValidChanged(ReportModel model, boolean valid) { + private void onValidChanged(ReportModel model, boolean valid) { if (log.isInfoEnabled()) { log.info("valid state changed to " + valid); @@ -399,11 +403,10 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa Report report = model.getSelectedReport(); + ImmutableSet<String> tripIds = ui.getModel().getSelectDataModel().getSelectedTripIds(); DataDtoReference trip = ui.getModel().getSelectDataModel().getSelectedTrip(); - if (log.isDebugEnabled()) { - log.debug("Build result for report [" + report.getName() + "] on " + trip); - } + log.info(String.format("Build result for report [%s] on %s", report.getName(), trip)); Map<String, Object> variables = model.getVariables(); @@ -421,13 +424,11 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa ReportService reportService = dataSource.getReportService(); - DataMatrix data = reportService.executeReport(report, trip.getId()); + DataMatrix data = reportService.executeReport(report, tripIds); timeLog.log(startTime, "execute", report.getName()); - if (log.isInfoEnabled()) { - log.info("Result to dispaly:\n" + data.getClipboardContent(true, true, false, '\t')); - } + log.info("Result to display:\n" + data.getClipboardContent(true, true, false, '\t')); // calcul des données et contruction du tableau model.getResultModel().populate(report, data); @@ -439,17 +440,11 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa model.isCopyRowHeaders(), model.isCopyColumnHeaders()); } - } catch (Exception e) { - UIHelper.handlingError("Could not obtain report data", e); - model.getResultModel().clear(); - } finally { - ui.getModel().setBusy(false); - } } @@ -457,15 +452,13 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa return ui.getModel().getReportModel(); } - protected void updateValidState(Report report, Map<String, Object> variables) { - + private void updateValidState(Report report, Map<String, Object> variables) { boolean canExecute = report != null && report.canExecute(variables); getStepModel().setValid(canExecute); } public void destroy() { ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getSafeLocalSource(false); - if (dataSource.isOpen()) { dataSource.close(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateConfigUI.jcss ===================================== @@ -68,19 +68,19 @@ #ERROR { _value:{NuitonValidatorScope.ERROR}; - text:{NuitonValidatorScope.ERROR.getLabel()}; + text:{t(NuitonValidatorScope.ERROR.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), ERROR)}; } #WARNING { _value:{NuitonValidatorScope.WARNING}; - text:{NuitonValidatorScope.WARNING.getLabel()}; + text:{t(NuitonValidatorScope.WARNING.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), WARNING)}; } #INFO { _value:{NuitonValidatorScope.INFO}; - text:{NuitonValidatorScope.INFO.getLabel()}; + text:{t(NuitonValidatorScope.INFO.getLabel())}; selected:{getHandler().isScopeSelected(validateModel.getScopes(), INFO)}; } ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -43,6 +43,7 @@ import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; +import fr.ird.observe.services.service.actions.validate.DataValidationResult; import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationResult; @@ -50,8 +51,8 @@ import fr.ird.observe.services.service.actions.validate.ValidationResultDto; import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; import fr.ird.observe.services.validation.ValidatorDto; import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.context.JAXXInitialContext; import org.nuiton.jaxx.runtime.spi.UIHandler; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; @@ -410,7 +411,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements mainRequest.setValidationLengthWeightEnable(config.getValidationLengthWeightEnable()); mainRequest.setSeineBycatchObservedSystemConfig(config.getSeineBycatchObservedSystem()); - ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(ReferentialLocale.valueOf(config.getDbLocale()), mainRequest); + ValidationResult.Builder<DataValidationRequest, DataValidationResult> resultBuilder = DataValidationResult.builder(ReferentialLocale.valueOf(config.getDbLocale()), mainRequest); for (DataDtoReference<?, ?> dataReference : dataModel.getSelectedData()) { ===================================== client/src/main/java/fr/ird/observe/client/ui/dcprefs/FloatingObjectPresetsUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.dcprefs; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -33,8 +33,12 @@ import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer; import javax.swing.AbstractButton; import javax.swing.DefaultListModel; +import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.BorderLayout; +import java.awt.event.KeyEvent; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -69,6 +73,8 @@ public class FloatingObjectPresetsUIHandler implements UIHandler<FloatingObjectP if (o instanceof AbstractButton) { init(actionMap, (AbstractButton) o); + } else if (o instanceof JSplitPane) { + init((JSplitPane) o); } } @@ -119,6 +125,12 @@ public class FloatingObjectPresetsUIHandler implements UIHandler<FloatingObjectP UIHelper.askFocus(ui.getQuitAction()); } + + protected void init(JSplitPane editor) { + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); + } + protected void init(ObserveActionMap actionMap, AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/presets/RemotePresetsUIHandler.java ===================================== @@ -29,8 +29,8 @@ import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.decoration.DecoratorService; import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; -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.runtime.swing.renderer.DecoratorListCellRenderer; @@ -40,8 +40,11 @@ import javax.swing.ActionMap; import javax.swing.DefaultListModel; import javax.swing.InputMap; import javax.swing.JComponent; +import javax.swing.JSplitPane; +import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import java.awt.BorderLayout; +import java.awt.event.KeyEvent; import java.util.List; import java.util.Objects; @@ -79,6 +82,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { if (o instanceof AbstractButton) { init(inputMap, actionMap, (AbstractButton) o); + } else if (o instanceof JSplitPane) { + init((JSplitPane) o); } } @@ -190,6 +195,11 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } + protected void init(JSplitPane editor) { + editor.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT) + .put(KeyStroke.getKeyStroke(KeyEvent.VK_F6, 0), "none"); + } + protected void init(InputMap inputMap, ActionMap actionMap, AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/report/AbstractReportServiceClientTest.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -22,6 +22,7 @@ package fr.ird.observe.services.client.service.actions.report; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.services.client.service.ServiceClientTestSupport; import fr.ird.observe.services.service.actions.report.DataMatrix; @@ -43,7 +44,7 @@ import java.util.List; /** * Classe abstraite de test d'un report. - * + * * On définit ici le mécanisme pour tester unitairement un report et son * résultat. * @@ -54,15 +55,45 @@ public abstract class AbstractReportServiceClientTest extends ServiceClientTestS /** Logger */ private static final Logger log = LogManager.getLogger(AbstractReportServiceClientTest.class); - - protected ReportService service; - /** La liste de tous les reports connus. */ protected static List<Report> reports; - + protected ReportService service; /** Le report à tester. */ private Report report; + protected static Report getReport(Logger log, String reportId) throws IOException { + if (reports == null) { + + URL reportLocation = + AbstractReportServiceClientTest.class.getResource("/observe-reports.properties"); + + if (log.isInfoEnabled()) { + log.info("Loading reports from " + reportLocation); + } + + ReportBuilder builder = new ReportBuilder(); + + reports = builder.load(reportLocation); + + builder.clear(); + + Assert.assertNotNull(reports); + Assert.assertFalse(reports.isEmpty()); + } + + Report result = null; + // recuperation du report à tester + for (Report report : reports) { + if (reportId.equals(report.getId())) { + result = report; + break; + } + } + + Assert.assertNotNull("Could not find report with id " + reportId, reports); + return result; + } + protected abstract String getReportId(); @Before @@ -81,16 +112,14 @@ public abstract class AbstractReportServiceClientTest extends ServiceClientTestS } - /** * L'unique test à lancer. - * + * * On vérifie : * <ul> * <li>la syntaxe du report via {@link #testReportSyntax(Report)}</li> * <li>le résultat du report via {@link #testReportResult(DataMatrix)}</li> * </ul> - * */ @Test public final void testReport() { @@ -99,23 +128,25 @@ public abstract class AbstractReportServiceClientTest extends ServiceClientTestS testReportSyntax(report); // creation de l'executeur de report - report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1); + ImmutableSet<String> tripIds = getTripIds(); + report = service.populateVariables(report, tripIds); // preparation des variables prepareVariables(); // on execute le report - DataMatrix result = service.executeReport(report,ObserveFixtures. TRIP_SEINE_ID_1); - - if (log.isInfoEnabled()) { - log.info("Result :\n" + result.getClipboardContent(true, true, false, '\t')); - } + DataMatrix result = service.executeReport(report, tripIds); + log.info("Result :\n" + result.getClipboardContent(true, true, false, '\t')); // on verifie le resultat testReportResult(result); } + protected ImmutableSet<String> getTripIds() { + return ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1); + } + protected void prepareVariables() { } @@ -127,9 +158,9 @@ public abstract class AbstractReportServiceClientTest extends ServiceClientTestS if (variableName.equals(variable.getName())) { Object value = variable.getValues().stream() - .filter(DtoReference.newIdPredicate(id)) - .findFirst() - .orElse(null); + .filter(DtoReference.newIdPredicate(id)) + .findFirst() + .orElse(null); variable.setSelectedValue(value); @@ -143,39 +174,6 @@ public abstract class AbstractReportServiceClientTest extends ServiceClientTestS protected abstract void testReportResult(DataMatrix result); - protected static Report getReport(Logger log, String reportId) throws IOException { - if (reports == null) { - - URL reportLocation = - AbstractReportServiceClientTest.class.getResource("/observe-reports.properties"); - - if (log.isInfoEnabled()) { - log.info("Loading reports from " + reportLocation); - } - - ReportBuilder builder = new ReportBuilder(); - - reports = builder.load(reportLocation); - - builder.clear(); - - Assert.assertNotNull(reports); - Assert.assertFalse(reports.isEmpty()); - } - - Report result = null; - // recuperation du report à tester - for (Report report : reports) { - if (reportId.equals(report.getId())) { - result = report; - break; - } - } - - Assert.assertNotNull("Could not find report with id " + reportId, reports); - return result; - } - protected void assertReportName(Report report, String name, String description) { ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/report/ReportServiceLocal.java ===================================== @@ -10,18 +10,19 @@ package fr.ird.observe.services.local.service.actions.report; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.reference.DataDtoReferenceSet; @@ -42,6 +43,10 @@ import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.spi.DbModelHelper; import fr.ird.observe.spi.context.DataDtoEntityContext; import fr.ird.observe.spi.context.ReferentialDtoEntityContext; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.awt.Dimension; import java.awt.Point; import java.io.Serializable; @@ -53,9 +58,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.lang3.mutable.MutableInt; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -66,11 +68,11 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer private static final Logger log = LogManager.getLogger(ReportServiceLocal.class); @Override - public Report populateVariables(Report report, String tripId) { + public Report populateVariables(Report report, ImmutableSet<String> tripIds) { Map<String, Object> vars = new TreeMap<>(); - vars.put(ReportRequest.TRIP_ID_VARIABLE, tripId); + vars.put(ReportRequest.TRIP_ID_VARIABLE, tripIds); for (ReportVariable variable : report.getVariables()) { @@ -116,7 +118,7 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer } @Override - public DataMatrix executeReport(Report report, String tripId) { + public DataMatrix executeReport(Report report, ImmutableSet<String> tripId) { if (report == null) { @@ -171,7 +173,7 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer return result; } - private DataMatrix executeReportOperation(ReportOperation executeRequests, Report report, String tripId, DataMatrix incoming) { + private DataMatrix executeReportOperation(ReportOperation executeRequests, Report report, ImmutableSet<String> tripId, DataMatrix incoming) { DataMatrix result = incoming; @@ -413,7 +415,7 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer return result; } - private DataMatrix executeReportRequest(ReportRequest request, Report report, String tripId, ReportVariable repeatValues) { + private DataMatrix executeReportRequest(ReportRequest request, Report report, ImmutableSet<String> tripId, ReportVariable repeatValues) { DataMatrix result = new DataMatrix(); @@ -457,7 +459,7 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer return result; } - private DataMatrix executeReportRequest(ReportRequest request, Report report, String tripId) { + private DataMatrix executeReportRequest(ReportRequest request, Report report, ImmutableSet<String> tripId) { Map<String, Object> params = ReportRequest.extractParams(report, tripId); return executeReportRequest(request, params); @@ -650,10 +652,11 @@ public class ReportServiceLocal extends ObserveServiceLocal implements ReportSer AbstractObserveTopiaDao dao = (AbstractObserveTopiaDao) getTopiaPersistenceContext().getDao(TripSeine.class); + log.info(String.format("Request: %s, params: %s", request, paramsFixes)); return dao.findAllFromHql(request, paramsFixes); } - private void doPopulateRepeatVariables(Report report, String tripId) { + private void doPopulateRepeatVariables(Report report, ImmutableSet<String> tripId) { Map<String, Object> vars = ReportRequest.extractParams(report, tripId); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DisableSqlStatementGenerator.java ===================================== @@ -43,7 +43,7 @@ public class DisableSqlStatementGenerator { } public String generateSql(String sourceId) { - return TopiaSqlStatements.generateUpdateStatement(metadataEntity, sourceId, "enabled = false, topiaVersion = topiaVersion + 1"); + return TopiaSqlStatements.generateUpdateStatement(metadataEntity, sourceId, "status = 0, topiaVersion = topiaVersion + 1"); } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.actions.validate; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -33,25 +33,24 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.SpeciesDto; -import fr.ird.observe.dto.referential.seine.ObservedSystemReference; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import fr.ird.observe.persistence.Entities; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; +import fr.ird.observe.services.service.actions.validate.DataValidationResult; import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest; +import fr.ird.observe.services.service.actions.validate.ReferentialValidationResult; import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.actions.validate.ValidationRequest; -import fr.ird.observe.services.service.actions.validate.ValidationResult; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.validation.ServiceValidationContext; import fr.ird.observe.services.validation.ValidationDataContext; import fr.ird.observe.services.validation.ValidatorsMap; import fr.ird.observe.spi.DbModelHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.xwork2.XWork2ValidatorUtil; import java.util.List; @@ -71,12 +70,12 @@ public class ValidateServiceLocal extends ObserveServiceLocal implements Validat private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5); @Override - public ValidationResult<ReferentialValidationRequest> validateReferential(ReferentialValidationRequest request) { + public ReferentialValidationResult validateReferential(ReferentialValidationRequest request) { - Future<ValidationResult<ReferentialValidationRequest>> future = EXECUTOR_SERVICE.submit(() -> { + Future<ReferentialValidationResult> future = EXECUTOR_SERVICE.submit(() -> { ReferentialLocale referentialLocale = getReferentialLocale(); - ValidationResult.Builder<ReferentialValidationRequest> resultBuilder = ValidationResult.builder(referentialLocale, request); + ReferentialValidationResult.Builder<ReferentialValidationRequest, ReferentialValidationResult> resultBuilder = ReferentialValidationResult.builder(referentialLocale, request); ServiceValidationContext validationContext = createServiceValidationContext(request); @@ -101,12 +100,12 @@ public class ValidateServiceLocal extends ObserveServiceLocal implements Validat } @Override - public ValidationResult<DataValidationRequest> validateData(DataValidationRequest request) { + public DataValidationResult validateData(DataValidationRequest request) { - Future<ValidationResult<DataValidationRequest>> future = EXECUTOR_SERVICE.submit(() -> { + Future<DataValidationResult> future = EXECUTOR_SERVICE.submit(() -> { ReferentialLocale referentialLocale = getReferentialLocale(); - ValidationResult.Builder<DataValidationRequest> resultBuilder = ValidationResult.builder(referentialLocale, request); + DataValidationResult.Builder<DataValidationRequest, DataValidationResult> resultBuilder = DataValidationResult.builder(referentialLocale, request); ServiceValidationContext validationContext = createServiceValidationContext(request); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidationMessageDetector.java ===================================== @@ -35,6 +35,7 @@ import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.data.seine.SetSeineDto; import fr.ird.observe.dto.data.seine.TripSeineDto; import fr.ird.observe.entities.ObserveEntity; +import fr.ird.observe.services.service.actions.validate.ReferentialValidationResult; import fr.ird.observe.services.service.actions.validate.ValidationResult; import fr.ird.observe.services.validation.ServiceValidationContext; import fr.ird.observe.services.validation.ValidatorsMap; @@ -135,7 +136,7 @@ class ValidationMessageDetector implements SimpleBeanValidatorListener { static ValidationMessageDetector forReferential(ValidatorsMap validators, ServiceValidationContext validationDataContext, ReferentialLocale referentialLocale, - ValidationResult.Builder resultBuilder) { + ReferentialValidationResult.Builder resultBuilder) { ImmutableMap.Builder<Class, EntityInterceptor> interceptorsBuilder = ImmutableMap.builder(); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -22,6 +22,7 @@ package fr.ird.observe.services.local.service.actions.report; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.service.actions.report.DataMatrix; @@ -33,15 +34,16 @@ import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; import fr.ird.observe.test.spi.DatabaseNameConfiguration; -import java.io.IOException; -import java.net.URL; -import java.util.List; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.io.IOException; +import java.net.URL; +import java.util.List; + /** * Classe abstraite de test d'un report. * @@ -56,15 +58,45 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup /** Logger */ private static final Logger log = LogManager.getLogger(AbstractReportServiceLocalTest.class); - - protected ReportService service; - /** La liste de tous les reports connus. */ protected static List<Report> reports; - + protected ReportService service; /** Le report à tester. */ private Report report; + protected static Report getReport(Logger log, String reportId) throws IOException { + if (reports == null) { + + URL reportLocation = + AbstractReportServiceLocalTest.class.getResource("/observe-reports.properties"); + + if (log.isInfoEnabled()) { + log.info("Loading reports from " + reportLocation); + } + + ReportBuilder builder = new ReportBuilder(); + + reports = builder.load(reportLocation); + + builder.clear(); + + Assert.assertNotNull(reports); + Assert.assertFalse(reports.isEmpty()); + } + + Report result = null; + // recuperation du report à tester + for (Report report : reports) { + if (reportId.equals(report.getId())) { + result = report; + break; + } + } + + Assert.assertNotNull("Could not find report with id " + reportId, reports); + return result; + } + protected abstract String getReportId(); @Before @@ -81,7 +113,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup } - /** * L'unique test à lancer. * @@ -90,7 +121,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup * <li>la syntaxe du report via {@link #testReportSyntax(Report)}</li> * <li>le résultat du report via {@link #testReportResult(DataMatrix)}</li> * </ul> - * */ @Test public final void testReport() { @@ -98,24 +128,28 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup // test de la syntaxe du report testReportSyntax(report); + ImmutableSet<String> tripIds = getTripIds(); + // creation de l'executeur de report - report = service.populateVariables(report, ObserveFixtures.TRIP_SEINE_ID_1); + report = service.populateVariables(report, tripIds); // preparation des variables prepareVariables(); // on execute le report - DataMatrix result = service.executeReport(report, ObserveFixtures.TRIP_SEINE_ID_1); + DataMatrix result = service.executeReport(report, tripIds); - if (log.isInfoEnabled()) { - log.info("Result :\n" + result.getClipboardContent(true, true, true, ',')); - } + log.info(String.format("Result :\n%s", result.getClipboardContent(true, true, true, ','))); // on verifie le resultat testReportResult(result); } + protected ImmutableSet<String> getTripIds() { + return ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1); + } + protected void prepareVariables() { } @@ -143,39 +177,6 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected abstract void testReportResult(DataMatrix result); - protected static Report getReport(Logger log, String reportId) throws IOException { - if (reports == null) { - - URL reportLocation = - AbstractReportServiceLocalTest.class.getResource("/observe-reports.properties"); - - if (log.isInfoEnabled()) { - log.info("Loading reports from " + reportLocation); - } - - ReportBuilder builder = new ReportBuilder(); - - reports = builder.load(reportLocation); - - builder.clear(); - - Assert.assertNotNull(reports); - Assert.assertFalse(reports.isEmpty()); - } - - Report result = null; - // recuperation du report à tester - for (Report report : reports) { - if (reportId.equals(report.getId())) { - result = report; - break; - } - } - - Assert.assertNotNull("Could not find report with id " + reportId, reports); - return result; - } - protected void assertReportName(Report report, String name, String description) { @@ -228,12 +229,12 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected void assertResultRow(DataMatrix result, int rowId, Object... row) { Object[] actualRow = result.getData()[rowId]; - int index=0; + int index = 0; for (Object o : actualRow) { - if (o==null) { + if (o == null) { Assert.assertEquals(row[index++], o); - }else { - Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"),o.toString().split("\\s*\\n\\s*")); + } else { + Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"), o.toString().split("\\s*\\n\\s*")); } } //Assert.assertArrayEquals(row, actualRow); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/ReportNonTargetDistributionLengthsTest.java ===================================== @@ -0,0 +1,89 @@ +/* + * #%L + * ObServe :: Services local implementation + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.local.service.actions.report; + + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; +import fr.ird.observe.test.ObserveFixtures; +import org.junit.Assert; + +/** + * Test du report {@code accessoryCatch}. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 1.9 + */ +public class ReportNonTargetDistributionLengthsTest extends AbstractReportServiceLocalTest { + + @Override + protected void testReportSyntax(Report report) { + Assert.assertNotNull(report); + assertReportName( + report, + "Distribution des tailles par espèces non ciblées", + "Afficher la nombre d'individus mesurés par classe de taille pour les espèces non ciblées" + ); + + assertReportDimension( + report, + -1, + 2, + new String[]{"Classe de taille", "Effectif"} + ); + + assertReportNbRequests(report, 1); + + ReportRequest[] requests = report.getRequests(); + + assertReportRequestDimension( + requests[0], + ReportRequest.RequestLayout.row, + 0, + 0 + ); + + } + + @Override + protected String getReportId() { + return "nonTargetDistributionLengths"; + } + + @Override + protected ImmutableSet<String> getTripIds() { + return ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2); + } + + @Override + protected void prepareVariables() { + setVariableValue("speciesId", "fr.ird.observe.entities.referentiel.Species#1239832684439#0.9130769003657221"); + } + + @Override + protected void testReportResult(DataMatrix result) { + assertResultDimension(result, 2, 1, 0, 1); + assertResultRow(result, 0, "14.0", "1"); + } +} ===================================== services/pom.xml ===================================== @@ -93,6 +93,10 @@ <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-lang</artifactId> + </dependency>  <dependency> ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.services.gson; import com.google.gson.GsonBuilder; import fr.ird.observe.services.service.actions.consolidate.dcp.FloatingObjectModification; import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.services.service.actions.validate.ValidationResultDto; import io.ultreia.java4all.http.HResponseError; import io.ultreia.java4all.http.HResponseErrorAdapter; @@ -51,7 +52,7 @@ public class ObserveDtoGsonSupplier extends ObserveDtoGsonSupplierSupport { gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter()); gsonBuilder.registerTypeAdapter(HResponseError.class, new HResponseErrorAdapter()); gsonBuilder.registerTypeAdapter(FloatingObjectModification.class, new FloatingObjectModificationAdapter()); - + gsonBuilder.registerTypeAdapter(ValidationResultDto.class, new ValidationResultDtoAdapter()); } return gsonBuilder; ===================================== services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java ===================================== @@ -29,10 +29,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.spi.DtoModelHelper; import java.lang.reflect.Type; import java.util.Set; @@ -55,10 +54,10 @@ public class ReportVariableAdapter implements JsonDeserializer<ReportVariable> { Class valueType = type; if (DataDto.class.isAssignableFrom(type)) { - valueType = DataDtoReference.class; + valueType = DtoModelHelper.fromDataDto((Class) type).toReferenceType(); } if (ReferentialDto.class.isAssignableFrom(type)) { - valueType = ReferentialDtoReference.class; + valueType = DtoModelHelper.fromReferentialDto((Class) type).toReferenceType(); } JsonElement valuesJson = reportVariableJson.get(ReportVariable.PROPERTY_VALUES); ===================================== services/src/main/java/fr/ird/observe/services/gson/ValidationResultDtoAdapter.java ===================================== @@ -0,0 +1,65 @@ +package fr.ird.observe.services.gson; + +/* + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import com.google.common.reflect.TypeToken; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import fr.ird.observe.dto.reference.DtoReference; +import fr.ird.observe.services.service.actions.validate.ValidationResultDto; +import fr.ird.observe.services.service.actions.validate.ValidationResultDtoMessage; + +import java.lang.reflect.Type; +import java.util.Set; + +/** + * Created by tchemit on 23/09/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ValidationResultDtoAdapter implements JsonDeserializer<ValidationResultDto>, JsonSerializer<ValidationResultDto> { + + @Override + public ValidationResultDto deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + JsonObject reportVariableJson = json.getAsJsonObject(); + Class<?> type = context.deserialize(reportVariableJson.get("type"), Class.class); + DtoReference dtoReference = context.deserialize(reportVariableJson.get("dtoReference"), type); + Set<ValidationResultDtoMessage> messages = context.deserialize(reportVariableJson.get("messages"), ImmutableSetAdapter.setOf(TypeToken.of(ValidationResultDtoMessage.class)).getType()); + return new ValidationResultDto(dtoReference, ImmutableSet.copyOf(messages)); + } + + @Override + public JsonElement serialize(ValidationResultDto src, Type typeOfSrc, JsonSerializationContext context) { + JsonObject result = new JsonObject(); + result.add("type", context.serialize(src.getReference().getReferenceType())); + result.add("dtoReference", context.serialize(src.getReference())); + result.add("messages", context.serialize(src.getMessages().asList())); + return result; + } +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java ===================================== @@ -6,15 +6,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.actions.report; import fr.ird.observe.dto.ObserveModelType; +import io.ultreia.java4all.lang.Objects2; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.nuiton.util.SortedProperties; @@ -62,16 +63,13 @@ public class ReportBuilder { /** Logger */ private static final Logger log = LogManager.getLogger(ReportBuilder.class); - + /** les operations connues par le système */ + protected static Map<String, Class<?>> operations; /** les propriétés chargées par le builder pour construire les reports */ protected Properties properties; - /** la liste des lastName sde reports connus par le système */ protected List<String> reportNames; - /** les operations connues par le système */ - protected static Map<String, Class<?>> operations; - public List<String> getReportNames() { return reportNames; } @@ -331,7 +329,7 @@ public class ReportBuilder { // on interdit l'utilisation de la variable tripId if (ReportRequest.TRIP_ID_VARIABLE.equals(id)) { - throw new IllegalArgumentException("La variable tripId n'est pas utilisable (c'est uen variable réservée) pour le report " + reportName); + throw new IllegalArgumentException("La variable tripId n'est pas utilisable (c'est une variable réservée) pour le report " + reportName); } ids.add(id); String[] parts = operations.split("\\|"); @@ -341,13 +339,8 @@ public class ReportBuilder { } String typeStr = parts[0].trim(); String request = parts[1].trim(); - Class<?> type; - try { - type = Class.forName(typeStr); - } catch (ClassNotFoundException eee) { - throw new IllegalArgumentException("Le type " + typeStr + " n'est pas connu", eee); - } - ReportVariable variable = new ReportVariable(id, type, request); + Class<?> type = Objects2.forName(typeStr); + ReportVariable<?> variable = new ReportVariable<>(id, type, request); log.debug(String.format("Detects a variable : [%s:%s] = %s (type = %s)", reportName, variable.getName(), variable.getRequest(), variable.getType().getName())); result.add(variable); itr.remove(); @@ -386,12 +379,7 @@ public class ReportBuilder { } String typeStr = parts[0].trim(); String request = parts[1].trim(); - Class<?> type = null; - try { - type = Class.forName(typeStr); - } catch (ClassNotFoundException eee) { - throw new IllegalArgumentException("Le type " + typeStr + " n'est pas connu", eee); - } + Class<?> type = Objects2.forName(typeStr); ReportVariable<?> variable = new ReportVariable<>(id, type, request); log.debug(String.format("Detects a variable : [%s:%s] = %s (type = %s)", reportName, variable.getName(), variable.getRequest(), variable.getType().getName())); result.add(variable); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java ===================================== @@ -6,26 +6,27 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ird.observe.services.service.actions.report; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import fr.ird.observe.dto.ObserveDto; import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.awt.Point; import java.io.Serializable; @@ -41,61 +42,16 @@ import java.util.Map; */ public class ReportRequest implements Serializable, ObserveDto { + public static final String TRIP_ID_VARIABLE = "tripId"; private static final long serialVersionUID = 1L; - /** Logger. */ private static final Logger log = LogManager.getLogger(ReportRequest.class); - - public static final String TRIP_ID_VARIABLE = "tripId"; - - /** le layout de la requete. */ - public enum RequestLayout { - /** lorsque les résultats de la requète sont les lignes du résultat. */ - row, - /** lorsque les résultats de la requète sont les colonnes du résultat. */ - column - } - - /** Un repeater optionnel sur la requête. */ - public static class RequestRepeat implements Serializable, ObserveDto { - - protected final String variableName; - - protected final RequestLayout layout; - - private static final long serialVersionUID = 1L; - - public RequestRepeat(String variableName, RequestLayout layout) { - this.variableName = variableName; - this.layout = layout; - } - - public String getVariableName() { - return variableName; - } - - public RequestLayout getLayout() { - return layout; - } - - @Override - public String toString() { - ToStringBuilder builder = new ToStringBuilder(this); - builder.append("variableName", getVariableName()); - builder.append("layout", getLayout()); - return builder.toString(); - } - } - /** layout de la requète. */ protected final RequestLayout layout; - /** la requète à exécuter. */ protected final String request; - /** la position de la requète. */ protected final Point location; - /** le repeater optionel. */ protected final RequestRepeat repeat; @@ -110,31 +66,7 @@ public class ReportRequest implements Serializable, ObserveDto { location = new Point(x, y); } - public RequestLayout getLayout() { - return layout; - } - - public int getX() { - return (int) location.getX(); - } - - public int getY() { - return (int) location.getY(); - } - - public Point getLocation() { - return location; - } - - public String getRequest() { - return request; - } - - public RequestRepeat getRepeat() { - return repeat; - } - - public static Map<String, Object> extractParams(Report report, String tripId) { + public static Map<String, Object> extractParams(Report report, ImmutableSet<String> tripId) { Map<String, Object> params = Maps.newHashMap(); @@ -175,6 +107,30 @@ public class ReportRequest implements Serializable, ObserveDto { return datas; } + public RequestLayout getLayout() { + return layout; + } + + public int getX() { + return (int) location.getX(); + } + + public int getY() { + return (int) location.getY(); + } + + public Point getLocation() { + return location; + } + + public String getRequest() { + return request; + } + + public RequestRepeat getRepeat() { + return repeat; + } + @Override public String toString() { ToStringBuilder builder = new ToStringBuilder(this); @@ -184,4 +140,41 @@ public class ReportRequest implements Serializable, ObserveDto { builder.append("repeatVariable", getRepeat()); return builder.toString(); } + + /** le layout de la requete. */ + public enum RequestLayout { + /** lorsque les résultats de la requète sont les lignes du résultat. */ + row, + /** lorsque les résultats de la requète sont les colonnes du résultat. */ + column + } + + /** Un repeater optionnel sur la requête. */ + public static class RequestRepeat implements Serializable, ObserveDto { + + private static final long serialVersionUID = 1L; + protected final String variableName; + protected final RequestLayout layout; + + public RequestRepeat(String variableName, RequestLayout layout) { + this.variableName = variableName; + this.layout = layout; + } + + public String getVariableName() { + return variableName; + } + + public RequestLayout getLayout() { + return layout; + } + + @Override + public String toString() { + ToStringBuilder builder = new ToStringBuilder(this); + builder.append("variableName", getVariableName()); + builder.append("layout", getLayout()); + return builder.toString(); + } + } } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.actions.report; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; @@ -35,10 +36,10 @@ public interface ReportService extends ObserveService { @ReadDataPermission @ReadReferentialPermission @Post - Report populateVariables(Report report, String tripId); + Report populateVariables(Report report, ImmutableSet<String> tripId); @ReadDataPermission @ReadReferentialPermission @Post - DataMatrix executeReport(Report report, String tripId); + DataMatrix executeReport(Report report, ImmutableSet<String> tripId); } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/DataValidationResult.java ===================================== @@ -0,0 +1,57 @@ +package fr.ird.observe.services.service.actions.validate; + +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.referential.ReferentialLocale; + +/** + * Created by tchemit on 06/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class DataValidationResult extends ValidationResult<DataValidationRequest> { + + private final DataValidationRequest request; + + private DataValidationResult(DataValidationRequest request, ImmutableSet<ValidationResultDto> data) { + super(data); + this.request = request; + } + + @Override + public DataValidationRequest getRequest() { + return request; + } + + public static Builder<DataValidationRequest, DataValidationResult> builder(ReferentialLocale referenceLocale, DataValidationRequest request) { + return new Builder<DataValidationRequest, DataValidationResult>(referenceLocale, request) { + + @Override + protected DataValidationResult newResult(DataValidationRequest request, ImmutableSet<ValidationResultDto> result) { + return new DataValidationResult(request, result); + } + }; + } + +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ReferentialValidationResult.java ===================================== @@ -0,0 +1,57 @@ +package fr.ird.observe.services.service.actions.validate; + +/*- + * #%L + * ObServe :: Services API + * %% + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.dto.referential.ReferentialLocale; + +/** + * Created by tchemit on 06/08/17. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ReferentialValidationResult extends ValidationResult<ReferentialValidationRequest> { + + private final ReferentialValidationRequest request; + + private ReferentialValidationResult(ReferentialValidationRequest request, ImmutableSet<ValidationResultDto> data) { + super(data); + this.request = request; + } + + @Override + public ReferentialValidationRequest getRequest() { + return request; + } + + public static Builder<ReferentialValidationRequest, ReferentialValidationResult> builder(ReferentialLocale referenceLocale, ReferentialValidationRequest request) { + return new Builder<ReferentialValidationRequest, ReferentialValidationResult>(referenceLocale, request) { + + @Override + protected ReferentialValidationResult newResult(ReferentialValidationRequest request, ImmutableSet<ValidationResultDto> result) { + return new ReferentialValidationResult(request, result); + } + }; + } + +} ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java ===================================== @@ -37,11 +37,11 @@ public interface ValidateService extends ObserveService { @ReadReferentialPermission @Post - ValidationResult<ReferentialValidationRequest> validateReferential(ReferentialValidationRequest request); + ReferentialValidationResult validateReferential(ReferentialValidationRequest request); @ReadDataPermission @ReadReferentialPermission @Post - ValidationResult<DataValidationRequest> validateData(DataValidationRequest request); + DataValidationResult validateData(DataValidationRequest request); } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResult.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.services.service.actions.validate; * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -28,8 +28,8 @@ import com.google.common.collect.Multimap; import fr.ird.observe.dto.ObserveDto; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent; import java.util.ArrayList; @@ -47,23 +47,15 @@ import static org.nuiton.i18n.I18n.l; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class ValidationResult<R extends ValidationRequest> implements ObserveDto { +public abstract class ValidationResult<R extends ValidationRequest> implements ObserveDto { - private final R request; private final ImmutableSet<ValidationResultDto> data; - public static <R extends ValidationRequest> Builder<R> builder(ReferentialLocale referenceLocale, R request) { - return new Builder<>(referenceLocale, request); - } - - private ValidationResult(R request, ImmutableSet<ValidationResultDto> data) { - this.request = request; + ValidationResult(ImmutableSet<ValidationResultDto> data) { this.data = data; } - public R getRequest() { - return request; - } + public abstract R getRequest(); public ImmutableSet<ValidationResultDto> getData() { return data; @@ -91,7 +83,7 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto * * @author Tony Chemit - dev(a)tchemit.fr */ - public static class Builder<R extends ValidationRequest> { + public static abstract class Builder<R extends ValidationRequest, S extends ValidationResult<R>> { /** Logger. */ private static final Logger log = LogManager.getLogger(Builder.class); @@ -100,7 +92,7 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto private final R request; private final ReferentialLocale referenceLocale; - private Builder(ReferentialLocale referenceLocale, R request) { + Builder(ReferentialLocale referenceLocale, R request) { this.referenceLocale = referenceLocale; this.request = request; data = HashMultimap.create(); @@ -119,12 +111,14 @@ public class ValidationResult<R extends ValidationRequest> implements ObserveDto return this; } - public ValidationResult<R> build() { + protected abstract S newResult(R request, ImmutableSet<ValidationResultDto> result); + + public S build() { ImmutableSet.Builder<ValidationResultDto> result = ImmutableSet.builder(); for (Map.Entry<DtoReference, Collection<ValidationResultDtoMessage>> entry : data.asMap().entrySet()) { result.add(new ValidationResultDto(entry.getKey(), ImmutableSet.copyOf(entry.getValue()))); } - return new ValidationResult<>(request, result.build()); + return newResult(request, result.build()); } private String translateMessage(String message) { ===================================== services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultDto.java ===================================== @@ -35,7 +35,7 @@ public class ValidationResultDto { private final DtoReference reference; private final ImmutableSet<ValidationResultDtoMessage> messages; - ValidationResultDto(DtoReference reference, ImmutableSet<ValidationResultDtoMessage> messages) { + public ValidationResultDto(DtoReference reference, ImmutableSet<ValidationResultDtoMessage> messages) { this.reference = reference; this.messages = messages; } ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -19,7 +19,6 @@ # <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### - ################################################################################ ## Liste des \u00e9quipements (Seine) ################################################################################ @@ -33,10 +32,9 @@ report.tripSeineGearUseFeatures.repeatVariable.gearUseFeaturesId=java.lang.Strin From TripSeineImpl m \ Join m.gearUseFeaturesSeine g \ Where \ - m.id = :tripId \ + m.id In :tripId \ and g in elements (m.gearUseFeaturesSeine) \ Order By g.gear.label2 - report.tripSeineGearUseFeatures.request.1=0,0|row|\ Select \ concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ @@ -44,9 +42,7 @@ report.tripSeineGearUseFeatures.request.1=0,0|row|\ ( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Ind\u00e9termin\u00e9' End End )\ From GearUseFeaturesSeineImpl g \ Where g.id = :gearUseFeaturesId - report.tripSeineGearUseFeatures.request.1.repeat=gearUseFeaturesId|column - ################################################################################ ## Liste des \u00e9quipements (Longline) ################################################################################ @@ -60,10 +56,9 @@ report.tripLonglineGearUseFeatures.repeatVariable.gearUseFeaturesId=java.lang.St From TripLonglineImpl m \ Join m.gearUseFeaturesLongline g \ Where \ - m.id = :tripId \ + m.id In :tripId \ and g in elements (m.gearUseFeaturesLongline) \ Order By g.gear.label2 - report.tripLonglineGearUseFeatures.request.1=0,0|row|\ Select \ concat(CASE When g.gear.code IS NULL Then 'Aucun code' Else g.gear.code End, ' - ', g.gear.label2), \ @@ -71,9 +66,7 @@ report.tripLonglineGearUseFeatures.request.1=0,0|row|\ ( CASE g.usedInTrip When true Then 'Oui' Else Case g.usedInTrip When false Then 'Non' Else 'Ind\u00e9termin\u00e9' End End )\ From GearUseFeaturesLonglineImpl g \ Where g.id = :gearUseFeaturesId - report.tripLonglineGearUseFeatures.request.1.repeat=gearUseFeaturesId|column - ################################################################################ ## Liste des activit\u00e9s avec des comments ################################################################################ @@ -88,10 +81,9 @@ report.activityWithComment.request.1=0,0|row|\ Join r.activitySeine a \ Join a.vesselActivitySeine ab \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.comment is not null \ Order By r.date, a.time - ################################################################################ ## Liste de toutes les activit\u00e9s et leurs positions ################################################################################ @@ -106,9 +98,8 @@ report.allActivitys.request.1=0,0|row|\ Join r.activitySeine a \ Join a.vesselActivitySeine ab \ Where \ - m.id = :tripId \ + m.id In :tripId \ Order By r.date, a.time - ################################################################################ ## Nombre de cal\u00e9es et captures journali\u00e8res d'une mar\u00e9e ################################################################################ @@ -124,10 +115,9 @@ report.dailySetAndCatch.request.1=0,0|row|\ Join a.setSeine s \ left join s.targetCatch as ct \ Where \ - m.id = :tripId \ + m.id In :tripId \ Group By r.date \ Order By r.date - ################################################################################ ## Utilisation des DCP ################################################################################ @@ -143,16 +133,14 @@ report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ Join a.floatingObject dcp \ Join dcp.objectType to \ Where \ - m.id = :tripId \ + m.id In :tripId \ Order by to.code - report.dcpUsage.request.1=0,0|row|\ Select concat(str(to.code) , ' - ', to.label2) \ From ObjectTypeImpl to \ Where \ to.id = :typeObjetId report.dcpUsage.request.1.repeat=typeObjetId|column - report.dcpUsage.request.2=1,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -160,11 +148,10 @@ report.dcpUsage.request.2=1,0|row|\ Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8268884472438458' report.dcpUsage.request.2.repeat=typeObjetId|column - report.dcpUsage.request.3=2,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -172,11 +159,10 @@ report.dcpUsage.request.3=2,0|row|\ Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.8431519556575698' report.dcpUsage.request.3.repeat=typeObjetId|column - report.dcpUsage.request.4=3,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -184,11 +170,10 @@ report.dcpUsage.request.4=3,0|row|\ Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' report.dcpUsage.request.4.repeat=typeObjetId|column - report.dcpUsage.request.5=4,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -196,12 +181,11 @@ report.dcpUsage.request.5=4,0|row|\ Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and dcp.objectFate.id = 'fr.ird.observe.entities.referentiel.seine.ObjectFate#1396860761530#0.8869464242156488' \ and dcp.objectOperation.id != 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686248#0.8669327599318251' report.dcpUsage.request.5.repeat=typeObjetId|column - report.dcpUsage.request.6=5,0|row|\ Select Count(dcp) \ From TripSeineImpl m \ @@ -209,11 +193,10 @@ report.dcpUsage.request.6=5,0|row|\ Join r.activitySeine a \ Join a.floatingObject dcp \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#1239832686249#0.7838704130950722' report.dcpUsage.request.6.repeat=typeObjetId|column - report.dcpUsage.request.7=6,0|row| \ Select Sum(efo.count) \ From TripSeineImpl m \ @@ -222,11 +205,10 @@ report.dcpUsage.request.7=6,0|row| \ Join a.floatingObject dcp \ Join dcp.objectObservedSpecies efo \ Where \ - m.id = :tripId \ + m.id In :tripId \ and dcp.objectType.id = :typeObjetId \ and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.7.repeat=typeObjetId|column - ################################################################################ ## Nombre des cal\u00e9es selon le type d'association ################################################################################ @@ -244,12 +226,11 @@ report.setByAssociation.request.1=0,0|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.2=0,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -257,12 +238,11 @@ report.setByAssociation.request.2=0,1|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.3=1,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -270,12 +250,11 @@ report.setByAssociation.request.3=1,0|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - report.setByAssociation.request.4=1,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -283,12 +262,11 @@ report.setByAssociation.request.4=1,1|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - report.setByAssociation.request.5=2,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -296,12 +274,11 @@ report.setByAssociation.request.5=2,0|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 1 \ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - report.setByAssociation.request.6=2,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -309,12 +286,11 @@ report.setByAssociation.request.6=2,1|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 1 \ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - report.setByAssociation.request.7=3,0|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -322,12 +298,11 @@ report.setByAssociation.request.7=3,0|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 1 \ and a.setSeine.reasonForNullSet is null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - report.setByAssociation.request.8=3,1|column|\ Select Count(a) \ From TripSeineImpl m \ @@ -335,12 +310,11 @@ report.setByAssociation.request.8=3,1|column|\ Join r.activitySeine a, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and a.setSeine.schoolType = 1 \ and a.setSeine.reasonForNullSet is not null \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Captures thon par type d'association ################################################################################ @@ -351,7 +325,6 @@ report.targetCatchByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Total report.targetCatchByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total report.targetCatchByAssociation.operations.1=SumRow report.targetCatchByAssociation.operations.2=SumColumn - # ligne 1 report.targetCatchByAssociation.request.1=0,0|row|\ Select \ @@ -380,10 +353,9 @@ report.targetCatchByAssociation.request.1=0,0|row|\ with ct.discarded = false, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - # ligne 2 report.targetCatchByAssociation.request.7=0,1|row|\ Select \ @@ -412,10 +384,9 @@ report.targetCatchByAssociation.request.7=0,1|row|\ with ct.discarded = false, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - # ligne 3 report.targetCatchByAssociation.request.13=0,2|row|\ Select \ @@ -444,10 +415,9 @@ report.targetCatchByAssociation.request.13=0,2|row|\ with ct.discarded = false, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - # ligne 4 report.targetCatchByAssociation.request.19=0,3|row|\ Select \ @@ -476,10 +446,9 @@ report.targetCatchByAssociation.request.19=0,3|row|\ with ct.discarded = false, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Rejets thons selon le type d'association ################################################################################ @@ -490,7 +459,6 @@ report.targetDiscardedByAssociation.columns=YFT, SKJ, BET, LTA, FRI, Autres, Tot report.targetDiscardedByAssociation.rows=BL sans baleine, BL avec baleine, BO avec requin-baleine, BO sans requin-baleine, Total report.targetDiscardedByAssociation.operations.1=SumRow report.targetDiscardedByAssociation.operations.2=SumColumn - # ligne 1 report.targetDiscardedByAssociation.request.1=0,0|row|\ Select \ @@ -519,10 +487,9 @@ report.targetDiscardedByAssociation.request.1=0,0|row|\ with ct.discarded = true, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os not in elements(a.observedSystem) - # ligne 2 report.targetDiscardedByAssociation.request.7=0,1|row|\ Select \ @@ -551,10 +518,9 @@ report.targetDiscardedByAssociation.request.7=0,1|row|\ with ct.discarded = true, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ and os in elements(a.observedSystem) - # ligne 3 report.targetDiscardedByAssociation.request.13=0,2|row|\ Select \ @@ -583,10 +549,9 @@ report.targetDiscardedByAssociation.request.13=0,2|row|\ with ct.discarded = true, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os in elements(a.observedSystem) - # ligne 4 report.targetDiscardedByAssociation.request.19=0,3|row|\ Select \ @@ -615,10 +580,9 @@ report.targetDiscardedByAssociation.request.19=0,3|row|\ with ct.discarded = true, \ ObservedSystemImpl os \ Where \ - m.id = :tripId \ + m.id In :tripId \ and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ and os not in elements(a.observedSystem) - ################################################################################ ## Captures accessoires observ\u00e9es ################################################################################ @@ -631,7 +595,6 @@ report.accessoryCatch.repeatVariable.speciesId=java.lang.String|\ Select e.id From SpeciesImpl e \ Where e.speciesGroup.id = :speciesGroup \ Order By e.homeId - report.accessoryCatch.request.1=0,0|row|\ Select \ concat('[FAO]', (case when e.faoCode is not null then e.faoCode else '-' end), \ @@ -640,7 +603,6 @@ report.accessoryCatch.request.1=0,0|row|\ From SpeciesImpl e \ Where e.id = :speciesId report.accessoryCatch.request.1.repeat=speciesId|column - report.accessoryCatch.request.2=1,0|row|\ Select \ case when Count(ca) > 0 then \ @@ -655,9 +617,8 @@ report.accessoryCatch.request.2=1,0|row|\ with c.schoolType = 2 \ Join c.nonTargetCatch ca \ with ca.species.id = :speciesId \ - Where m.id = :tripId + Where m.id In :tripId report.accessoryCatch.request.2.repeat=speciesId|column - report.accessoryCatch.request.3=2,0|row|\ Select \ case when Count(ca) > 0 then \ @@ -672,9 +633,8 @@ report.accessoryCatch.request.3=2,0|row|\ with c.schoolType = 1 \ Join c.nonTargetCatch ca \ with ca.species.id = :speciesId \ - Where m.id = :tripId + Where m.id In :tripId report.accessoryCatch.request.3.repeat=speciesId|column - ################################################################################ ## Captures accessoires par speciesGroup d'esp\u00e8ces ################################################################################ @@ -683,7 +643,6 @@ report.accessoryCatchByGroup.name=D\u00e9nombrement des captures accessoires et report.accessoryCatchByGroup.description=Afficher les nombres de captures accessoires par groupe d'esp\u00e8ce selon le type de banc et le devenir report.accessoryCatchByGroup.columns=Esp\u00e8ce, Total BL, Total BO, Sorti vivant/\u00e9chapp\u00e9, Sorti mort, Rejet\u00e9 vivant, Rejet\u00e9 mort, Partiellement conserv\u00e9, Cuve, Cuisine, Autre report.accessoryCatchByGroup.variable.speciesGroup=fr.ird.observe.dto.referential.SpeciesGroupDto|From SpeciesGroupImpl ge Order By ge.code - report.accessoryCatchByGroup.request.1=0,0|row|\ Select \ concat(\ @@ -723,10 +682,9 @@ report.accessoryCatchByGroup.request.1=0,0|row|\ Join c.nonTargetCatch ca \ Join ca.species e \ with e.speciesGroup.id = :speciesGroup \ - Where m.id = :tripId \ + Where m.id In :tripId \ Group by e \ Order By e.homeId - ########################################################### ## Distribution des tailles par espèces non ciblées ########################################################### @@ -742,7 +700,7 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.nonTargetSample nts \ Join nts.nonTargetLength ntl \ -Where t.id = :tripId +Where t.id In :tripId report.nonTargetDistributionLengths.request.1=0,0|row| \ Select ntl.length, sum(ntl.count) \ From TripSeineImpl t \ @@ -750,11 +708,10 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.nonTargetSample nts \ Join nts.nonTargetLength ntl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And ntl.species.id = :speciesId \ Group By ntl.length \ Order By ntl.length - #################################################################### ## Distribution des tailles des conservés par espèces ciblées (LD1) #################################################################### @@ -770,7 +727,7 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.sizeMeasureType = 1 \ And ts.discarded = false report.targetStoredDistributionLengthsLD1.request.1=0,0|row| \ @@ -780,13 +737,12 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.species.id = :speciesId \ And tl.sizeMeasureType = 1 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length - ################################################################ ## Distribution des tailles des rejets par espèces ciblées (LD1) ################################################################ @@ -802,7 +758,7 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.sizeMeasureType = 1 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLD1.request.1=0,0|row| \ @@ -812,13 +768,12 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.species.id = :speciesId \ And tl.sizeMeasureType = 1\ And ts.discarded = true \ Group By tl.length \ Order By tl.length - ############################################################### ## Distribution des tailles des conservés par espèces ciblées (LF) ############################################################### @@ -834,7 +789,7 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.sizeMeasureType = 2 \ And ts.discarded = false report.targetStoredDistributionLengthsLF.request.1=0,0|row| \ @@ -844,13 +799,12 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.species.id = :speciesId \ And tl.sizeMeasureType = 2 \ And ts.discarded = false \ Group By tl.length \ Order By tl.length - ############################################################### ## Distribution des tailles des rejets par espèces ciblées (LF) ############################################################### @@ -866,7 +820,7 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.sizeMeasureType = 2 \ And ts.discarded = true report.targetDiscardedDistributionLengthsLF.request.1=0,0|row| \ @@ -876,13 +830,12 @@ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetSample ts \ Join ts.targetLength tl \ -Where t.id = :tripId \ +Where t.id In :tripId \ And tl.species.id = :speciesId \ And tl.sizeMeasureType = 2 \ And ts.discarded = true \ Group By tl.length \ Order By tl.length - ############################################ ## Répartition des calées par cuves ############################################ @@ -902,6 +855,6 @@ From TripSeineImpl t \ Join t.route r \ Join r.activitySeine a \ Join a.setSeine.targetCatch tc \ -Where t.id = :tripId \ +Where t.id In :tripId \ Group By r.date, a.time, a.latitude, a.longitude, tc.weightCategory.species, tc.weightCategory.species.faoCode, tc.well, a.setSeine.schoolType \ Order By r.date, a.time, tc.weightCategory.species, tc.well View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5051afba523ad7aabee29ab8c9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/5051afba523ad7aabee29ab8c9… You're receiving this email because of your account on gitlab.com.

1 0