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

[Git][ultreiaio/ird-observe][develop] 5 commits: end of ui handler refactor (may need a hole test of ui...)
by Tony CHEMIT Oct. 6, 2018

Oct. 6, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4e973c5c by Tony CHEMIT at 2018-10-06T14:12:43Z end of ui handler refactor (may need a hole test of ui...) - - - - - fdfbb6b3 by Tony CHEMIT at 2018-10-06T14:12:45Z [LL] Attribution de codes aux états de conservation - Closes #1123 - - - - - d051d38a by Tony CHEMIT at 2018-10-06T14:12:45Z [LL] Débarquements : petits ajustements - See #1121 (add harbour entry) - - - - - 83cf3045 by Tony CHEMIT at 2018-10-06T14:12:46Z add test database form model 8.3 - - - - - 4830a244 by Tony CHEMIT at 2018-10-06T14:13:32Z [LL][PS] Améliorer le widget position - Closes #1133 - - - - - 30 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BranchlinesCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/FloatlinesCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/HooksCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c51af42c264c2e1bfa060a84b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [LL] Correction de libellés - See #1117
by Tony CHEMIT Oct. 5, 2018

Oct. 5, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4c51af42 by Tony CHEMIT at 2018-10-05T10:32:04Z [LL] Correction de libellés - See #1117 - - - - - 1 changed file: - client/src/main/resources/i18n/client_fr_FR.properties Changes: ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -1092,8 +1092,8 @@ observe.common.SetLonglineLogbookDto.action.reset.homeId.tip=Réinitialiser l'id observe.common.SetLonglineLogbookDto.basketLineLength=Longueur de la ligne par panier (m) observe.common.SetLonglineLogbookDto.haulingTab=Virage observe.common.SetLonglineLogbookDto.lengthBetweenBranchlines=Distance entre avançons (m) -observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumnes -observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des cyalumnes +observe.common.SetLonglineLogbookDto.lightsticksTab=Cyalumes +observe.common.SetLonglineLogbookDto.lightsticksUsed=Utilisation des Cyalumes observe.common.SetLonglineLogbookDto.message.creating=L'opération de pêche est en cours de création. observe.common.SetLonglineLogbookDto.message.updating=L'opération de pêche est en cours de modification. observe.common.SetLonglineLogbookDto.monitored=Instrumentée View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4c51af42c264c2e1bfa060a84bc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve ui handlers.
by Tony CHEMIT Oct. 4, 2018

Oct. 4, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9edba5b3 by Tony CHEMIT at 2018-10-04T07:25:22Z Improve ui handlers. - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/edit/SaveEditDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/SaveOpenDataUIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveLonglineDetailCompositionObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java - + client/src/main/java/fr/ird/observe/client/ui/content/api/EditableContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9edba5b35eb239dd65f9db0dc3b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9edba5b35eb239dd65f9db0dc3b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Fix some coordinates validation - Closes #1113
by Tony CHEMIT Oct. 4, 2018

Oct. 4, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 757bd9cd by Tony CHEMIT at 2018-10-04T07:17:50Z Fix some coordinates validation - Closes #1113 - - - - - 13 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -98,7 +98,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -83,7 +83,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -99,7 +99,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -84,7 +84,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -43,7 +43,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -44,7 +44,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -217,7 +217,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -283,7 +283,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -349,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -415,7 +415,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -250,20 +250,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -271,6 +257,23 @@ </field> + <field name="settingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> + <field name="settingEndLatitude">  @@ -314,20 +317,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> @@ -335,6 +324,23 @@ </field> + <field name="settingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> + <field name="haulingStartLatitude">  @@ -378,20 +384,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -399,6 +391,22 @@ </field> + <field name="haulingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> <field name="haulingEndLatitude"> @@ -443,20 +451,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -464,6 +458,23 @@ </field> + <field name="haulingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> + <field name="settingShape">  ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml ===================================== @@ -217,7 +217,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -283,7 +283,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -349,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -415,7 +415,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml ===================================== @@ -250,20 +250,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartLongitude == null || settingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingStart</param> <message/> @@ -271,6 +257,23 @@ </field> + <field name="settingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> + <field name="settingEndLatitude">  @@ -314,24 +317,26 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndLongitude == null || settingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( settingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">settingEnd</param> <message/> </field-validator> + </field> + + <field name="settingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> </field> @@ -378,20 +383,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartLongitude == null || haulingStartLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingStartLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingStart</param> <message/> @@ -399,6 +390,22 @@ </field> + <field name="haulingStartQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> <field name="haulingEndLatitude"> @@ -443,20 +450,6 @@ </message> </field-validator> -  - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndLongitude == null || haulingEndLatitude == null - || (currentTripLongline.ocean.getCode() == 3) - || (currentTripLongline.ocean.getCode() == 1) - || (currentTripLongline.ocean.getCode() == 2 && ( haulingEndLongitude >= 0)) - ]]> - </param> - <message> - observe.validation.activity.invalid.quadrant##${currentTripSeine.ocean.getLabel()} - </message> - </field-validator> - <field-validator type="coordinateLongitudeDto" short-circuit="true"> <param name="editorName">haulingEnd</param> <message/> @@ -464,6 +457,24 @@ </field> + <field name="haulingEndQuadrant"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.activity.required.quadrant</message> + </field-validator> + +  + <field-validator type="quadrantDto" short-circuit="true"> + <param name="ocean">currentTripLongline.ocean</param> + <message> + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} + </message> + </field-validator> + + </field> + + <field name="settingShape">  ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Comment is not filled. observe.validation.route.positive.startLogValue=Start log value must be strictly positive observe.validation.route.required.date=Date must be filled. observe.validation.route.unclosed.activity=There is an open activity on route (%1$s). +observe.validation.sample.invalid.quadrant=Quadrant is not coherent with ocean (%1$s) of trip (indian\: 1,2, atlantic 1,2,3,4). observe.validation.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== @@ -733,6 +733,7 @@ observe.validation.route.null.comment=No hay comentario especificado. observe.validation.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo. observe.validation.route.required.date=Se debe especificar el día de observación. observe.validation.route.unclosed.activity=Existe una actividad no cerrada (%1$s). +observe.validation.sample.invalid.quadrant=El cuadrante no es coherente con el informe del oceano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4) observe.validation.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Selected weight mesure type is disabled. \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== @@ -731,6 +731,7 @@ observe.validation.route.null.comment=Aucun commentaire renseigné. observe.validation.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif. observe.validation.route.required.date=Le jour d'observation doit être renseigné. observe.validation.route.unclosed.activity=Il existe une activité non clôturée (%1$s). +observe.validation.sample.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) observe.validation.sampleLogbook.null.parts=Aucune donnée saisie observe.validation.sampleLogbook.required.date=La date est obligatoire observe.validation.samplePart.desactivated.weightMeasureType=Le type de mesure de poids sélectionné est désactivé. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/757bd9cd10d19a4bbd88c5fcf96… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des…
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ee943c1 by Tony CHEMIT at 2018-10-03T13:06:02Z [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des créer des activités logbook dans une marée issue d'une marée d'observation saisie en V5 - See #1108 Add some logs - - - - - 7c802fc7 by Tony CHEMIT at 2018-10-03T13:06:20Z optimize dependencies - - - - - 22eeaf27 by Tony CHEMIT at 2018-10-03T15:35:05Z Some data (in table forms) order is not deterministic - Closes #1112 - - - - - 5 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java - persistence/src/main/models/Observe-04-data-seine.model - persistence/src/main/models/Observe-05-data-longline-obs.model - persistence/src/main/models/Observe-06-data-longline-logbook.model Changes: ===================================== client/pom.xml ===================================== @@ -389,6 +389,10 @@ <artifactId>java-lang</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency>  ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java ===================================== @@ -34,6 +34,8 @@ import fr.ird.observe.dto.data.longline.TripLonglineReference; import fr.ird.observe.dto.result.TripChildSaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.tree.ReferenceNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import javax.swing.SwingUtilities; @@ -47,6 +49,7 @@ import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigatio public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> { public static final String ACTION_NAME = SaveActivityLonglineLogbookUIAction.class.getName(); + private static final Logger log = LogManager.getLogger(SaveActivityLonglineLogbookUIAction.class); public SaveActivityLonglineLogbookUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, ObserveKeyStrokes.KEY_STROKE_SAVE_DATA); @@ -56,6 +59,9 @@ public class SaveActivityLonglineLogbookUIAction extends SaveOpenDataUIActionSup protected boolean doSave(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode, boolean notPersisted) { String tripId = editNode.getParent().getId(); + log.info(ui.getModel().getPrefix() + "tripId = " + tripId); + log.info(ui.getModel().getPrefix() + "activityId = " + bean.getId()); + TripChildSaveResultDto saveResult = getServicesProvider().getActivityLonglineLogbookService().save(tripId, bean); saveResult.toDto(bean); ===================================== persistence/src/main/models/Observe-04-data-seine.model ===================================== @@ -40,8 +40,8 @@ isChangedZoneOperation() boolean seine.FloatingObject > ObserveDataEntity | entity comment + {*:1} String | hibernateAttributeType=text -objectSchoolEstimate + {*} seine.ObjectSchoolEstimate -objectObservedSpecies + {*} seine.ObjectObservedSpecies +objectSchoolEstimate + {*} seine.ObjectSchoolEstimate | orderBy=topiaCreateDate +objectObservedSpecies + {*} seine.ObjectObservedSpecies | orderBy=topiaCreateDate objectOperation {*:1} referentiel.seine.ObjectOperation supportVesselName + {*:1} String transmittingBuoy + {*} seine.TransmittingBuoy | unique @@ -175,7 +175,7 @@ reasonForNullSet {*:0..1} referentiel.seine.ReasonForNullSet nonTargetSample + {*} seine.NonTargetSample | unique reverseDbName=set targetSample + {*} seine.TargetSample | unique reverseDbName=set targetCatch + {*} seine.TargetCatch | ordered reverseDbName=set -schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set +schoolEstimate + {*} seine.SchoolEstimate | reverseDbName=set orderBy=topiaCreateDate nonTargetCatchRelease + {*} seine.NonTargetCatchRelease | ordered reverseDbName=set hasTargetCatch() boolean hasRejetThon() boolean ===================================== persistence/src/main/models/Observe-05-data-longline-obs.model ===================================== @@ -20,10 +20,10 @@ latitude + {*:1} Float longitude + {*:1} Float seaSurfaceTemperature + {*:1} Float setLongline + {0..1} longline.SetLonglineObs | dbName=set -encounter + {*} longline.EncounterObs | reverseDbName=activity +encounter + {*} longline.EncounterObs | reverseDbName=activity orderBy=topiaCreateDate vesselActivityLongline {*:1} referentiel.longline.VesselActivityLongline | dbName=vesselActivity lazy=false dataQuality {*:0..1} referentiel.DataQuality -sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity +sensorUsed + {*} longline.SensorUsedObs | reverseDbName=activity orderBy=topiaCreateDate fpaZone {*:1} referentiel.FpaZone getDate() Date getTime() Date @@ -107,14 +107,14 @@ basket {*:0..1} longline.BasketObs branchline {*:0..1} longline.BranchlineObs catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFate discardHealthness {*:1} referentiel.longline.Healthness -sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch +sizeMeasure + {*} longline.SizeMeasureObs | reverseDbName=catch orderBy=topiaCreateDate speciesCatch {*:1} referentiel.Species predator {*:*} referentiel.Species | manyToManyTableName=catchObs_predator reverseDbName=catch section {*:0..1} longline.SectionObs maturityStatus {*:0..1} referentiel.longline.MaturityStatus stomacFullness {*:0..1} referentiel.longline.StomacFullness hookPosition {*:0..1} referentiel.longline.HookPosition -weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch +weightMeasure + {*} longline.WeightMeasureObs | reverseDbName=catch orderBy=topiaCreateDate catchHealthness {*:1} referentiel.longline.Healthness sex {*:0..1} referentiel.Sex weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod @@ -187,18 +187,18 @@ haulingEndLatitude + {*:1} Float | sqlType=numeric haulingEndLongitude + {*:1} Float | sqlType=numeric haulingBreaks + {*:1} Integer monitored + {*:1} Boolean -baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set -hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set +baitsComposition + {*} longline.BaitsCompositionObs | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksCompositionObs | reverseDbName=set orderBy=topiaCreateDate section + {*} longline.SectionObs | unique orderBy=settingIdentifier reverseDbName=set settingShape {*:1} referentiel.longline.SettingShape -tdr + {*} longline.TdrObs | reverseDbName=set +tdr + {*} longline.TdrObs | reverseDbName=set orderBy=topiaCreateDate catchLongline + {*} longline.CatchLonglineObs | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setObs reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesCompositionObs | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -258,7 +258,7 @@ maxFishingDepth + {*:1} Float meanFishingDepth + {*:1} Float medianFishingDepth + {*:1} Float branchline {*:0..1} longline.BranchlineObs -tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr +tdrRecord + {*} longline.TdrRecordObs | reverseDbName=tdr orderBy=topiaCreateDate sensorBrand {*:0..1} referentiel.longline.SensorBrand species {*:*} referentiel.Species | reverseDbName=tdr section {*:0..1} longline.SectionObs ===================================== persistence/src/main/models/Observe-06-data-longline-logbook.model ===================================== @@ -28,7 +28,7 @@ compagnies {*:1} referentiel.Compagnies person {*:1} referentiel.Person harbour {*:0..1} referentiel.Harbour vessel {*:0..1} referentiel.Vessel -landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing +landingPart + {*} longline.LandingPartLogbook | reverseDbName=landing orderBy=topiaCreateDate longline.LandingPartLogbook > ObserveDataEntity | entity dbName=LandingPartLogbook species {*:1} referentiel.Species @@ -79,9 +79,9 @@ monitored + {*:1} Boolean totalLineLength + {*:1} Integer basketLineLength + {*:1} Integer lengthBetweenBranchlines + {*:1} Integer -baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set -floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set -hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set +baitsComposition + {*} longline.BaitsCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate +floatlinesComposition + {*} longline.FloatlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate +hooksComposition + {*} longline.HooksCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate settingShape {*:1} referentiel.longline.SettingShape catchLongline + {*} longline.CatchLonglineLogbook | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType @@ -90,7 +90,7 @@ lightsticksCount + {*:1} Integer lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_setLogbook reverseDbName=set -branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set +branchlinesComposition + {*} longline.BranchlinesCompositionLogbook | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date setSettingStartDate(date Date) @@ -125,11 +125,11 @@ setHooksCompositionProportionSum(sum int) setBaitsCompositionProportionSum(sum int) data.longline.SetLonglineLogbookGlobalComposition > data.Commentable -baitsComposition + {*} data.longline.BaitsCompositionLogbook -floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook -hooksComposition + {*} data.longline.HooksCompositionLogbook +baitsComposition + {*} data.longline.BaitsCompositionLogbook orderBy=topiaCreateDate +floatlinesComposition + {*} data.longline.FloatlinesCompositionLogbook orderBy=topiaCreateDate +hooksComposition + {*} data.longline.HooksCompositionLogbook orderBy=topiaCreateDate mitigationType:set + {*:*} fr.ird.observe.dto.referential.longline.MitigationTypeReference -branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook +branchlinesComposition + {*} data.longline.BranchlinesCompositionLogbook orderBy=topiaCreateDate longline.CatchLonglineLogbook > ObserveDataEntity | entity dbName=CatchLogbook comment + {*:1} String | hibernateAttributeType=text View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4457e86b4391c810b7e3266c9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update project version
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4457e86 by Tony CHEMIT at 2018-10-03T03:49:44Z update project version - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4457e86b4391c810b7e3266c9e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4457e86b4391c810b7e3266c9e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Deleted 38 commits: Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 0d38cd09 by Tony CHEMIT at 2018-05-19T10:26:58Z Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889 - - - - - d9ad9a27 by Tony CHEMIT at 2018-05-19T19:21:34Z Modification du référentiel Person - Closes #890 - - - - - 740fe94c by Tony CHEMIT at 2018-05-19T22:35:02Z Renommage du référentiel observe_longline.TripType - Closes #919 - - - - - b227a2b3 by Tony CHEMIT at 2018-05-19T22:55:55Z Ajout de nouvelles entrées au référentiel observe_longline.VesselActivity - Closes #891 - - - - - 3486d482 by Tony CHEMIT at 2018-05-19T23:36:38Z Ajout du référentiel observe_longline.WeightDeterminationMethod - Closes #921 - - - - - 57c6f2d5 by Tony CHEMIT at 2018-05-20T00:03:02Z Ajout du référentiel observe_longline.WeightCategory - Closes #920 - - - - - 158824b7 by Tony CHEMIT at 2018-05-20T00:27:19Z Ajout du référentiel observe_common.Compagnies - Closes #896 - - - - - b77ac495 by Tony CHEMIT at 2018-05-20T01:19:02Z Ajout du référentiel observe_common.WeightMeasureMethod - Clses #899 Ajout du référentiel observe_common.LengthMeasureMethod - Closes #900 - - - - - c86f3973 by Tony CHEMIT at 2018-05-20T02:09:46Z Ajout du référentiel observe_longline.Conservation - Close #898 Ajout du référentiel observe_longline.OnBoardProcessing - Closes #897 Ajout du référentiel observe_longline.DataSource - Closes #894 Ajout du référentiel observe_longline.LogbookTripType - Clses #893 - - - - - e766283c by Tony CHEMIT at 2018-05-20T09:36:43Z use last stable of toolkit - - - - - 9955ef48 by Tony CHEMIT at 2018-05-20T09:53:52Z add missing license headers - - - - - 628fd0cb by Tony CHEMIT at 2018-05-20T11:49:28Z Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine - Closes #950 - - - - - 51631b0b by Tony CHEMIT at 2018-05-20T12:23:02Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 8710c2d8 by Tony CHEMIT at 2018-05-20T12:26:32Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-1' with non-snapshot versions[skip ci] - - - - - ea686463 by Tony CHEMIT at 2018-05-20T12:33:48Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-1' into 'master' - - - - - 6841047c by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6a408a9f by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - aba95f60 by Tony CHEMIT at 2018-05-20T12:33:51Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 412af2fd by Tony CHEMIT at 2018-05-20T12:38:59Z let build on develop branches [skip ci] - - - - - 4cc816ba by Tony CHEMIT at 2018-05-20T12:41:53Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - 84faf638 by Tony CHEMIT at 2018-05-22T19:11:57Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 09e4c050 by Tony CHEMIT at 2018-05-22T22:43:05Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - cbb0aab3 by Tony CHEMIT at 2018-05-22T22:43:09Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - 18c3e9ae by Tony CHEMIT at 2018-05-22T22:43:09Z use topia extension - - - - - f229b8ea by Tony CHEMIT at 2018-05-23T13:08:08Z Tableaux de synthèse - Closes #916 - - - - - 35611d4c by Tony CHEMIT at 2018-05-23T13:08:10Z Correction des variables dans les rapports - - - - - ad043ab9 by Tony CHEMIT at 2018-05-24T08:04:33Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - c546e43b by Tony CHEMIT at 2018-05-24T08:35:00Z Update toolkit and topia-extension - - - - - 302bcb13 by Tony CHEMIT at 2018-05-24T08:37:48Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - 3b3c0ef9 by Tony CHEMIT at 2018-05-24T08:51:04Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-2' with non-snapshot versions[skip ci] - - - - - d7d154bf by Tony CHEMIT at 2018-05-24T09:01:37Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-2' into 'master' - - - - - 13ccf475 by Tony CHEMIT at 2018-10-03T03:01:23Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3 branch with snapshot versions[skip ci] - - - - - 3dbb2da1 by Tony CHEMIT at 2018-10-03T03:01:26Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-4-SNAPSHOT development[skip ci] - - - - - 51ac8f05 by Tony CHEMIT at 2018-10-03T03:20:14Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with non-snapshot versions[skip ci] - - - - - aeeefaa4 by Tony CHEMIT at 2018-10-03T03:22:49Z fix release - - - - - e4e20924 by Tony CHEMIT at 2018-10-03T03:23:31Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 71a5e25b by Tony CHEMIT at 2018-10-03T03:23:32Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 70eb740a by Tony CHEMIT at 2018-10-03T03:23:32Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 28 changed files: - client-configuration/pom.xml - client/pom.xml - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BasketObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsContentTableUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/363bc3bd9d66db09a2342f4af8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/363bc3bd9d66db09a2342f4af8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/8.0-alpha-3
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT deleted branch release/8.0-alpha-3 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v8.0-alpha-3
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed new tag v8.0-alpha-3 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v8.0-alpha-3 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/8.0-alpha-3] [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with…
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch release/8.0-alpha-3 at ultreiaio / ird-observe Commits: 51ac8f05 by Tony CHEMIT at 2018-10-03T03:20:14Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with non-snapshot versions[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-3</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/51ac8f05c58ad8a4f4ff8e00109… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/51ac8f05c58ad8a4f4ff8e00109… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 182 commits: Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 11c0ea66 by Tony CHEMIT at 2018-05-24T14:11:57Z Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889 - - - - - 7d387fcc by Tony CHEMIT at 2018-05-24T14:12:02Z Modification du référentiel Person - Closes #890 - - - - - 7a73dd33 by Tony CHEMIT at 2018-05-24T14:12:04Z Renommage du référentiel observe_longline.TripType - Closes #919 - - - - - 1201f48d by Tony CHEMIT at 2018-05-24T14:12:29Z Ajout de nouvelles entrées au référentiel observe_longline.VesselActivity - Closes #891 - - - - - c99b0e30 by Tony CHEMIT at 2018-05-24T14:12:31Z Ajout du référentiel observe_longline.WeightDeterminationMethod - Closes #921 - - - - - 69143ab1 by Tony CHEMIT at 2018-05-24T14:12:32Z Ajout du référentiel observe_longline.WeightCategory - Closes #920 - - - - - ea9397e6 by Tony CHEMIT at 2018-05-24T14:12:34Z Ajout du référentiel observe_common.Compagnies - Closes #896 - - - - - 89a8dd97 by Tony CHEMIT at 2018-05-24T14:12:35Z Ajout du référentiel observe_common.WeightMeasureMethod - Clses #899 Ajout du référentiel observe_common.LengthMeasureMethod - Closes #900 - - - - - ea656b28 by Tony CHEMIT at 2018-05-24T14:12:37Z Ajout du référentiel observe_longline.Conservation - Close #898 Ajout du référentiel observe_longline.OnBoardProcessing - Closes #897 Ajout du référentiel observe_longline.DataSource - Closes #894 Ajout du référentiel observe_longline.LogbookTripType - Clses #893 - - - - - 332ef74f by Tony CHEMIT at 2018-05-24T14:12:37Z use last stable of toolkit - - - - - de778697 by Tony CHEMIT at 2018-05-24T14:12:37Z add missing license headers - - - - - fb49290d by Tony CHEMIT at 2018-05-24T14:12:38Z Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine - Closes #950 - - - - - db328868 by Tony CHEMIT at 2018-05-24T14:12:39Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 4a06ce41 by Tony CHEMIT at 2018-05-24T14:12:39Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 784610ce by Tony CHEMIT at 2018-05-24T14:13:20Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-1' with non-snapshot versions[skip ci] - - - - - ac9fcdaa by Tony CHEMIT at 2018-05-24T14:13:24Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - a2bafc8c by Tony CHEMIT at 2018-05-24T14:13:25Z let build on develop branches [skip ci] - - - - - 918c8cf2 by Tony CHEMIT at 2018-05-24T14:13:25Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - ba855483 by Tony CHEMIT at 2018-05-24T14:13:25Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 58c44a31 by Tony CHEMIT at 2018-05-24T14:16:12Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - 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) - - - - - 18110ae5 by Tony CHEMIT at 2018-09-25T23:36:36Z Let's generate Reference binders - - - - - 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... - - - - - dd220ec5 by Tony CHEMIT at 2018-10-01T11:23:15Z 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... - - - - - 18dec528 by Tony CHEMIT at 2018-10-01T12:37:21Z update pom - - - - - 96138fd7 by Tony CHEMIT at 2018-10-01T12:40:02Z [RAPPORTS] Les 4 requêtes sur espèces cibles ne fonctionnent pas - Closes #1101 - - - - - 7e6fa47b by Tony CHEMIT at 2018-10-01T12:42:50Z update to geotools 20.0 - - - - - ee9d7059 by Tony CHEMIT at 2018-10-01T14:18:53Z Petit renommage de libellé - Closes #1099 - - - - - 0b137008 by Tony CHEMIT at 2018-10-01T14:19:08Z Extension de fichier du rapport de validation - Closes #1102 - - - - - 69c29cee by Tony CHEMIT at 2018-10-01T14:19:20Z Widget température °C/°F : message de validation perfectible - Closes #960 (il restait une validation de température au niveau des routes) - - - - - 02e91427 by Tony CHEMIT at 2018-10-01T14:19:34Z Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - See #1100 - - - - - 06355c94 by Tony CHEMIT at 2018-10-02T02:12:57Z Apply some fixes + do not use any longer model for tab validation (jaxx 37) - - - - - 67ab0c5b by Tony CHEMIT at 2018-10-02T11:50:10Z [V8-A3] Ouverture (migration) de bases locales V5 impossible - Closes #1105 - - - - - 2c61cea2 by Tony CHEMIT at 2018-10-02T23:37:48Z Improve table navigation/move actions - - - - - 612e8156 by Tony CHEMIT at 2018-10-03T01:20:22Z improve navigation config design - - - - - 9a074550 by Tony CHEMIT at 2018-10-03T01:20:55Z comment some debug code - - - - - 595dfc21 by Tony CHEMIT at 2018-10-03T01:21:13Z fix ui prefix - - - - - 12a06934 by Tony CHEMIT at 2018-10-03T01:21:55Z add license header - - - - - 97c73e8c by Tony CHEMIT at 2018-10-03T01:22:11Z [V8] L'accès au formulaire Echantillons logbooks LL ne fonctionne pas - Closes #1109 - - - - - 9ea764ca by Tony CHEMIT at 2018-10-03T02:24:24Z update changelog - - - - - acde5ee3 by Tony CHEMIT at 2018-10-03T02:25:11Z use last toolkit - - - - - 363bc3bd by Tony CHEMIT at 2018-10-03T03:00:52Z fix jgitflow configuration - - - - - 13ccf475 by Tony CHEMIT at 2018-10-03T03:01:23Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3 branch with snapshot versions[skip ci] - - - - - 51ac8f05 by Tony CHEMIT at 2018-10-03T03:20:14Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with non-snapshot versions[skip ci] - - - - - aeeefaa4 by Tony CHEMIT at 2018-10-03T03:22:49Z fix release - - - - - 13 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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d7d154bf4b7f0cc534d172d36c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d7d154bf4b7f0cc534d172d36c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 37 commits: Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0d38cd09 by Tony CHEMIT at 2018-05-19T10:26:58Z Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889 - - - - - d9ad9a27 by Tony CHEMIT at 2018-05-19T19:21:34Z Modification du référentiel Person - Closes #890 - - - - - 740fe94c by Tony CHEMIT at 2018-05-19T22:35:02Z Renommage du référentiel observe_longline.TripType - Closes #919 - - - - - b227a2b3 by Tony CHEMIT at 2018-05-19T22:55:55Z Ajout de nouvelles entrées au référentiel observe_longline.VesselActivity - Closes #891 - - - - - 3486d482 by Tony CHEMIT at 2018-05-19T23:36:38Z Ajout du référentiel observe_longline.WeightDeterminationMethod - Closes #921 - - - - - 57c6f2d5 by Tony CHEMIT at 2018-05-20T00:03:02Z Ajout du référentiel observe_longline.WeightCategory - Closes #920 - - - - - 158824b7 by Tony CHEMIT at 2018-05-20T00:27:19Z Ajout du référentiel observe_common.Compagnies - Closes #896 - - - - - b77ac495 by Tony CHEMIT at 2018-05-20T01:19:02Z Ajout du référentiel observe_common.WeightMeasureMethod - Clses #899 Ajout du référentiel observe_common.LengthMeasureMethod - Closes #900 - - - - - c86f3973 by Tony CHEMIT at 2018-05-20T02:09:46Z Ajout du référentiel observe_longline.Conservation - Close #898 Ajout du référentiel observe_longline.OnBoardProcessing - Closes #897 Ajout du référentiel observe_longline.DataSource - Closes #894 Ajout du référentiel observe_longline.LogbookTripType - Clses #893 - - - - - e766283c by Tony CHEMIT at 2018-05-20T09:36:43Z use last stable of toolkit - - - - - 9955ef48 by Tony CHEMIT at 2018-05-20T09:53:52Z add missing license headers - - - - - 628fd0cb by Tony CHEMIT at 2018-05-20T11:49:28Z Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine - Closes #950 - - - - - 51631b0b by Tony CHEMIT at 2018-05-20T12:23:02Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 8710c2d8 by Tony CHEMIT at 2018-05-20T12:26:32Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-1' with non-snapshot versions[skip ci] - - - - - ea686463 by Tony CHEMIT at 2018-05-20T12:33:48Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-1' into 'master' - - - - - 6841047c by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6a408a9f by Tony CHEMIT at 2018-05-20T12:33:50Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - aba95f60 by Tony CHEMIT at 2018-05-20T12:33:51Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 412af2fd by Tony CHEMIT at 2018-05-20T12:38:59Z let build on develop branches [skip ci] - - - - - 4cc816ba by Tony CHEMIT at 2018-05-20T12:41:53Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - 84faf638 by Tony CHEMIT at 2018-05-22T19:11:57Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 09e4c050 by Tony CHEMIT at 2018-05-22T22:43:05Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - cbb0aab3 by Tony CHEMIT at 2018-05-22T22:43:09Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - 18c3e9ae by Tony CHEMIT at 2018-05-22T22:43:09Z use topia extension - - - - - f229b8ea by Tony CHEMIT at 2018-05-23T13:08:08Z Tableaux de synthèse - Closes #916 - - - - - 35611d4c by Tony CHEMIT at 2018-05-23T13:08:10Z Correction des variables dans les rapports - - - - - ad043ab9 by Tony CHEMIT at 2018-05-24T08:04:33Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - c546e43b by Tony CHEMIT at 2018-05-24T08:35:00Z Update toolkit and topia-extension - - - - - 302bcb13 by Tony CHEMIT at 2018-05-24T08:37:48Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - 3b3c0ef9 by Tony CHEMIT at 2018-05-24T08:51:04Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-2' with non-snapshot versions[skip ci] - - - - - d7d154bf by Tony CHEMIT at 2018-05-24T09:01:37Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-2' into 'master' - - - - - 13ccf475 by Tony CHEMIT at 2018-10-03T03:01:23Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3 branch with snapshot versions[skip ci] - - - - - 51ac8f05 by Tony CHEMIT at 2018-10-03T03:20:14Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-3' with non-snapshot versions[skip ci] - - - - - aeeefaa4 by Tony CHEMIT at 2018-10-03T03:22:49Z fix release - - - - - e4e20924 by Tony CHEMIT at 2018-10-03T03:23:31Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 71a5e25b by Tony CHEMIT at 2018-10-03T03:23:32Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 70eb740a by Tony CHEMIT at 2018-10-03T03:23:32Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 26 changed files: - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/ActivityLonglineObssUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BaitsCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BasketObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlineObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/BranchlinesCompositionObsUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsContentTableUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsTableModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/CatchLonglineObsUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3dbb2da1a20d0f085edb43ff6f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3dbb2da1a20d0f085edb43ff6f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 8.0-alpha-4-SNAPSHOT development[skip ci]
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3dbb2da1 by Tony CHEMIT at 2018-10-03T03:01:26Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-4-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>client</artifactId> @@ -820,7 +819,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -20,8 +20,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -32,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-3-SNAPSHOT</version> + <version>8.0-alpha-4-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3dbb2da1a20d0f085edb43ff6f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3dbb2da1a20d0f085edb43ff6f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/8.0-alpha-3
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed new branch release/8.0-alpha-3 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/8.0-alpha-3 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix jgitflow configuration
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 363bc3bd by Tony CHEMIT at 2018-10-03T03:00:52Z fix jgitflow configuration - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -191,10 +191,6 @@  <gitlab.stagingUrl>https://observe.ultreia.io/release</gitlab.stagingUrl> -  - <jgitflow.masterBranchName>master-7.x</jgitflow.masterBranchName> - <jgitflow.developBranchName>develop-7.x</jgitflow.developBranchName> -  <maven.deploy.skip>true</maven.deploy.skip> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/363bc3bd9d66db09a2342f4af87… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/363bc3bd9d66db09a2342f4af87… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.0
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT deleted branch release/7.0.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Deleted 1 commit: [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: c9246dae by Tony CHEMIT at 2018-10-03T02:50:36Z [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c9246daecf012c22de6c7f6b910… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c9246daecf012c22de6c7f6b910… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c9246dae by Tony CHEMIT at 2018-10-03T02:50:36Z [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.0-SNAPSHOT</version> + <version>7.0.1-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c9246daecf012c22de6c7f6b910… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c9246daecf012c22de6c7f6b910… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0.0
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed new branch release/7.0.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update changelog
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9ea764ca by Tony CHEMIT at 2018-10-03T02:24:24Z update changelog - - - - - acde5ee3 by Tony CHEMIT at 2018-10-03T02:25:11Z use last toolkit - - - - - 6 changed files: - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/532584.json - + .mvn/gitlab-cache/milestones/656748-issues.json - + .mvn/gitlab-cache/milestones/656748.json - CHANGELOG.md - pom.xml Changes: ===================================== .mvn/gitlab-cache/milestones/532584-issues.json ===================================== @@ -1,4 +1,104 @@ [ + { + "id": 14619521, + "iid": 1106, + "projectId": 2722779, + "title": "[V8-A3] Après migration d\u0027une base centrale, impossible de l\u0027ouvrir avec l\u0027application", + "description": "En V8 Alpha 3, après migration d\u0027une base centrale, impossible de l\u0027ouvrir avec l\u0027application :\n\n```\nINFO 2018-10-02T10:11:33,003 [RunObserve] ObserveRunner : 292 - Démarrage d\u0027ObServe Tue Oct 02 10:11:33 MUT 2018 []\nINFO 2018-10-02T10:11:33,490 [RunObserve] ObserveActionMap : 120 - Load 164 simple action(s).\nINFO 2018-10-02T10:11:33,491 [RunObserve] ObserveActionMap : 121 - Load 6 global action(s).\nINFO 2018-10-02T10:11:33,729 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Main UI: fr.ird.observe.client.ui.ObserveMainUI[mainFrame,0,0,800x800,invalid,hidden,layout\u003djava.awt.BorderLayout,title\u003dObServe v 8.0-alpha-3,resizable,normal,defaultCloseOperation\u003dDO_NOTHING_ON_CLOSE,rootPane\u003djavax.swing.JRootPane[,0,0,0x0,invalid,layout\u003djavax.swing.JRootPane$RootLayout,alignmentX\u003d0.0,alignmentY\u003d0.0,border\u003djavax.swing.plaf.synth.SynthBorder@20d3ed4a,flags\u003d16777673,maximumSize\u003d,minimumSize\u003d,preferredSize\u003d],rootPaneCheckingEnabled\u003dtrue]\nINFO 2018-10-02T10:11:33,730 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context UI Actions: fr.ird.observe.client.ui.content.api.spi.ObserveActionMap@35ef4c96\nINFO 2018-10-02T10:11:33,827 [RunObserve] ObserveRunner : 325 - Initialisation de l\u0027interface graphique terminée.\nINFO 2018-10-02T10:11:35,629 [ActionWorker-pool-3-thread-1] ChangeStorageAction : 89 - Start change storage with dbMode: USE_SERVER, USE_REMOTE\nINFO 2018-10-02T10:11:35,832 [ActionWorker-pool-3-thread-1] StorageUILauncher : 71 - Will init storageMain\nINFO 2018-10-02T10:11:35,834 [ActionWorker-pool-3-thread-1] StorageUILauncher$1 : 141 - will use incoming mode USE_SERVER, USE_REMOTE\nINFO 2018-10-02T10:12:09,133 [AWT-EventQueue-0] ChangeStorageAction : 89 - Start change storage with dbMode: \nINFO 2018-10-02T10:12:09,188 [AWT-EventQueue-0] StorageUILauncher : 71 - Will init storageMain\nINFO 2018-10-02T10:12:15,799 [AWT-EventQueue-0] UseRemoteConfigurationUIAction : 72 - Use remote configuration: localhost - observe_8 - admin\nINFO 2018-10-02T10:12:15,913 [AWT-EventQueue-0] DbModelHelper : 153 - Persistence model helper initialization (fr.ird.observe.spi.DbModelHelper(a)114939d4).\nINFO 2018-10-02T10:12:15,914 [AWT-EventQueue-0] DtoModelHelper : 78 - Dto model helper initialization (fr.ird.observe.spi.DtoModelHelper(a)7cf713ca).\nINFO 2018-10-02T10:12:16,026 [AWT-EventQueue-0] DtoModelHelper : 98 - Load 76 referential definitions.\nINFO 2018-10-02T10:12:16,030 [AWT-EventQueue-0] DtoModelHelper : 132 - Load 120 reference definitions.\nINFO 2018-10-02T10:12:16,030 [AWT-EventQueue-0] DtoModelHelper : 133 - Load 136 form definitions.\nINFO 2018-10-02T10:12:16,031 [AWT-EventQueue-0] DtoModelHelper : 134 - Load 76 dto referential binders.\nINFO 2018-10-02T10:12:16,032 [AWT-EventQueue-0] DtoModelHelper : 135 - Load 44 dto data binders.\nINFO 2018-10-02T10:12:16,032 [AWT-EventQueue-0] DtoModelHelper : 136 - Load 141 dto to main dto types.\nINFO 2018-10-02T10:12:16,033 [AWT-EventQueue-0] DtoModelHelper : 143 - Dto model helper is initialized (fr.ird.observe.spi.DtoModelHelper(a)7cf713ca).\nINFO 2018-10-02T10:12:16,200 [AWT-EventQueue-0] DbModelHelper : 232 - Load 76 dto referential binders.\nINFO 2018-10-02T10:12:16,200 [AWT-EventQueue-0] DbModelHelper : 233 - Load 76 entity referential binders.\nINFO 2018-10-02T10:12:16,201 [AWT-EventQueue-0] DbModelHelper : 234 - Load 44 dto data binders.\nINFO 2018-10-02T10:12:16,202 [AWT-EventQueue-0] DbModelHelper : 235 - Load 72 entity data binders.\nINFO 2018-10-02T10:12:16,202 [AWT-EventQueue-0] DbModelHelper : 247 - Persistence model helper is initialized (fr.ird.observe.spi.DbModelHelper(a)114939d4).\nINFO 2018-10-02T10:12:16,235 [AWT-EventQueue-0] ObserveServiceMainFactory : 107 - New service created: fr.ird.observe.services.local.service.DataSourceServiceLocal@2e6401fe\nINFO 2018-10-02T10:12:16,513 [AWT-EventQueue-0] MigrationVersionResourceProvider : 63 - Found 33 migration resource(s).\nERROR 2018-10-02T10:12:16,933 [AWT-EventQueue-0] ObserveActionExecutor : 123 - Action [Appliquer] failed with error null\njava.lang.NullPointerException: null\n\tat fr.ird.observe.client.ui.storage.StorageUIHandler.doChangeStorage(StorageUIHandler.java:400) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.storage.StorageUILauncher$1.doAction(StorageUILauncher.java:176) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.storage.StorageUILauncher$1.doAction(StorageUILauncher.java:130) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher.lambda$createUI$0(WizardUILancher.java:167) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker$RunnableBridge.call(ActionWorker.java:169) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker.doInBackground(ActionWorker.java:91) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat javax.swing.SwingWorker$1.call(Unknown Source) ~[?:1.8.0_161]\n\tat java.util.concurrent.FutureTask.run(Unknown Source) ~[?:1.8.0_161]\n\tat javax.swing.SwingWorker.run(Unknown Source) ~[?:1.8.0_161]\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) ~[?:1.8.0_161]\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) ~[?:1.8.0_161]\n\tat java.lang.Thread.run(Unknown Source) ~[?:1.8.0_161]\n```", + "labels": [ + "Anomalie", + "IRD-2018-01-V8", + "Immédiat" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 2, 2018 1:50:31 PM", + "createdAt": "Oct 2, 2018 8:14:18 AM" + }, + { + "id": 14619286, + "iid": 1105, + "projectId": 2722779, + "title": "[V8-A3] Ouverture (migration) de bases locales V5 impossible", + "description": "Ouverture (migration) de bases locales V5 impossible.\r\n\r\nTesté avec bases sql.gz contenant 1 marée LL, puis une autre avec 1 marée PS.\r\n\r\nBase exemple marée LL : [SRP421.sql.gz](/uploads/c9a7aada3a7ca48b0eaa66d2c6900257/SRP421.sql.gz)\r\n\r\nLog complet :\r\n```\r\nINFO 2018-10-02T09:48:53,938 [RunObserve] ObserveRunner : 285 - Initialisation des logs depuis C:\\Users\\pcauquil\\.observe\\resources-8.0-alpha-3\\observe-log4j2.xml\r\nINFO 2018-10-02T09:48:53,939 [RunObserve] ObserveRunner : 246 - Le répertoire utilisateur a été initialisé (C:\\Users\\pcauquil\\.observe).\r\nINFO 2018-10-02T09:48:53,965 [RunObserve] ObserveResourceManager : 178 - Copy i18n archive\r\nERROR 2018-10-02T09:48:53,990 [RunObserve] ObserveRunner$1 : 149 - Could not delete i18n archive C:\\Users\\pcauquil\\.observe\\resources-8.0-alpha-3\\i18n.zip\r\nINFO 2018-10-02T09:48:54,008 [RunObserve] ObserveRunner : 254 - Service de traduction chargé dans la langue français.\r\nINFO 2018-10-02T09:48:54,129 [RunObserve] ObserveRunner : 567 - Chargement du fichier de cosmétique C:\\Users\\pcauquil\\.observe\\resources-8.0-alpha-3\\observe-ui.properties\r\nINFO 2018-10-02T09:48:54,186 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Config: fr.ird.observe.client.configuration.ClientConfig@ddfa391\r\nINFO 2018-10-02T09:48:54,187 [RunObserve] ObserveServiceMainFactory : 128 - Init MainServiceFactory.\r\nINFO 2018-10-02T09:48:54,207 [RunObserve] ClassMappingLocal : 185 - 46 class(es) loaded in cache.\r\nINFO 2018-10-02T09:48:54,208 [RunObserve] ObserveServiceMainFactory : 133 - Discover service factory: fr.ird.observe.services.local.ObserveServiceFactoryLocal@326c121c\r\nINFO 2018-10-02T09:48:54,220 [RunObserve] ClassMappingClient : 185 - 46 class(es) loaded in cache.\r\nINFO 2018-10-02T09:48:54,566 [RunObserve] ObserveServiceMainFactory : 133 - Discover service factory: fr.ird.observe.services.client.ObserveServiceFactoryClient@5fd929b\r\nINFO 2018-10-02T09:48:54,567 [RunObserve] ObserveServiceMainFactory : 141 - Discover 2 service factories.\r\nINFO 2018-10-02T09:48:54,567 [RunObserve] ObserveSwingApplicationContext : 122 - Initialize services factory: fr.ird.observe.services.ObserveServiceMainFactory@61fa4c43\r\nINFO 2018-10-02T09:48:54,572 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Command line Actions: fr.ird.observe.client.ObserveCLAction@53819007\r\nINFO 2018-10-02T09:48:54,574 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Content UI manager: fr.ird.observe.client.ui.content.api.ContentUIManager@2a40146f\r\nINFO 2018-10-02T09:48:54,576 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Data sources manager: fr.ird.observe.client.db.ObserveDataSourcesManager@7668fbb8\r\nINFO 2018-10-02T09:48:54,578 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Data source configuration main factory: fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory@2ad21044\r\nINFO 2018-10-02T09:48:54,687 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Decorator service: fr.ird.observe.dto.decoration.DecoratorService@7977e8a7\r\nINFO 2018-10-02T09:48:54,731 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Text generator: fr.ird.observe.client.ObserveTextGenerator@10014c74\r\nINFO 2018-10-02T09:48:54,737 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Floating object references manager: fr.ird.observe.client.FloatingObjectPresetsManager@42408744\r\nINFO 2018-10-02T09:48:54,756 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Navigation edit model: fr.ird.observe.navigation.model.edit.ObserveEditModel@a55a5886\r\nINFO 2018-10-02T09:48:54,762 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Navigation select model: fr.ird.observe.navigation.model.select.ObserveSelectModel@f1d45cb3\r\nINFO 2018-10-02T09:48:54,767 [RunObserve] ObserveEditModelManager : 68 - Detect close edit node (fr.ird.observe.navigation.model.edit.seine.node.ObserveSeineRouteEditNode) callback: fr.ird.observe.client.navigation.RouteCloseCallback@63254fc6\r\nINFO 2018-10-02T09:48:54,775 [RunObserve] ObserveEditModelManager : 68 - Detect close edit node (fr.ird.observe.navigation.model.edit.longline.node.ObserveLonglineTripEditNode) callback: fr.ird.observe.navigation.model.edit.longline.TripLonglineCloseCallback@51133dd1\r\nINFO 2018-10-02T09:48:54,776 [RunObserve] ObserveEditModelManager : 68 - Detect close edit node (fr.ird.observe.navigation.model.edit.seine.node.ObserveSeineTripEditNode) callback: fr.ird.observe.navigation.model.edit.seine.TripSeineCloseCallback@1f748d86\r\nINFO 2018-10-02T09:48:54,779 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Navigation edit manager: fr.ird.observe.navigation.model.edit.ObserveEditModelManager@71d47f2d\r\nINFO 2018-10-02T09:48:54,801 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Validation context: fr.ird.observe.client.validation.ClientValidationContext@633324b1\r\nINFO 2018-10-02T09:48:54,837 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Validators manager: fr.ird.observe.services.validation.ValidatorsManager@544e7785\r\nINFO 2018-10-02T09:48:54,840 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Backup manager: fr.ird.observe.client.backup.BackupsManager@720cdc90\r\nINFO 2018-10-02T09:48:54,841 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Local database backup task: java.util.concurrent.ScheduledThreadPoolExecutor@34c8d7b4[Running, pool size \u003d 0, active threads \u003d 0, queued tasks \u003d 0, completed tasks \u003d 0]\r\nINFO 2018-10-02T09:48:54,847 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Swing session Helper: fr.ird.observe.client.ObserveSwingSessionHelper@38bd823f\r\nINFO 2018-10-02T09:48:54,848 [RunObserve] ObserveRunner : 509 - Base locale C:\\Users\\pcauquil\\.observe\\db non détectée.\r\nINFO 2018-10-02T09:48:54,848 [RunObserve] ObserveRunner : 518 - Base embarquée C:\\Users\\pcauquil\\.observe\\initial-database.sql.gz non détectée.\r\nINFO 2018-10-02T09:48:54,854 [RunObserve] ObserveRunner : 272 - Initialisation du contexte terminée en 1,288s.\r\nINFO 2018-10-02T09:48:54,854 [RunObserve] ObserveRunner : 292 - Démarrage d\u0027ObServe Tue Oct 02 09:48:54 MUT 2018 []\r\nINFO 2018-10-02T09:48:55,326 [RunObserve] ObserveActionMap : 120 - Load 164 simple action(s).\r\nINFO 2018-10-02T09:48:55,327 [RunObserve] ObserveActionMap : 121 - Load 6 global action(s).\r\nINFO 2018-10-02T09:48:55,627 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context Main UI: fr.ird.observe.client.ui.ObserveMainUI[mainFrame,0,0,800x800,invalid,hidden,layout\u003djava.awt.BorderLayout,title\u003dObServe v 8.0-alpha-3,resizable,normal,defaultCloseOperation\u003dDO_NOTHING_ON_CLOSE,rootPane\u003djavax.swing.JRootPane[,0,0,0x0,invalid,layout\u003djavax.swing.JRootPane$RootLayout,alignmentX\u003d0.0,alignmentY\u003d0.0,border\u003djavax.swing.plaf.synth.SynthBorder@5c839b0f,flags\u003d16777673,maximumSize\u003d,minimumSize\u003d,preferredSize\u003d],rootPaneCheckingEnabled\u003dtrue]\r\nINFO 2018-10-02T09:48:55,628 [RunObserve] ObserveSwingApplicationContext$Entries : 432 - Add to application context UI Actions: fr.ird.observe.client.ui.content.api.spi.ObserveActionMap@79e8762e\r\nINFO 2018-10-02T09:48:55,763 [RunObserve] ObserveRunner : 325 - Initialisation de l\u0027interface graphique terminée.\r\nINFO 2018-10-02T09:48:58,183 [ActionWorker-pool-3-thread-1] ChangeStorageAction : 89 - Start change storage with dbMode: CREATE_LOCAL\r\nINFO 2018-10-02T09:48:58,394 [ActionWorker-pool-3-thread-1] StorageUILauncher : 71 - Will init storageMain\r\nINFO 2018-10-02T09:48:58,396 [ActionWorker-pool-3-thread-1] StorageUILauncher$1 : 141 - will use incoming mode CREATE_LOCAL\r\nERROR 2018-10-02T09:49:45,712 [AWT-EventQueue-0] ObserveActionExecutor : 123 - Action [Appliquer] failed with error null\r\njava.lang.NullPointerException: null\r\n\tat fr.ird.observe.client.ui.storage.StorageUIHandler.doChangeStorage(StorageUIHandler.java:400) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat fr.ird.observe.client.ui.storage.StorageUILauncher$1.doAction(StorageUILauncher.java:176) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat fr.ird.observe.client.ui.storage.StorageUILauncher$1.doAction(StorageUILauncher.java:130) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher.lambda$createUI$0(WizardUILancher.java:167) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker$RunnableBridge.call(ActionWorker.java:169) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat org.nuiton.jaxx.runtime.swing.application.ActionWorker.doInBackground(ActionWorker.java:91) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\r\n\tat javax.swing.SwingWorker$1.call(Unknown Source) ~[?:1.8.0_161]\r\n\tat java.util.concurrent.FutureTask.run(Unknown Source) ~[?:1.8.0_161]\r\n\tat javax.swing.SwingWorker.run(Unknown Source) ~[?:1.8.0_161]\r\n\tat java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) ~[?:1.8.0_161]\r\n\tat java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) ~[?:1.8.0_161]\r\n\tat java.lang.Thread.run(Unknown Source) ~[?:1.8.0_161]\r\n```", + "labels": [ + "Anomalie", + "IRD-2018-01-V8", + "Immédiat" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 2, 2018 2:37:20 PM", + "createdAt": "Oct 2, 2018 7:52:51 AM" + }, { "id": 4425588, "iid": 578, @@ -18,7 +118,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -50,6 +150,205 @@ "updatedAt": "May 24, 2018 10:48:15 AM", "createdAt": "Feb 17, 2017 1:49:27 PM" }, + { + "id": 14636736, + "iid": 1109, + "projectId": 2722779, + "title": "[V8] L\u0027accès au formulaire Echantillons logbooks LL ne fonctionne pas", + "description": "L\u0027accès au formulaire Echantillons logbooks LL ne fonctionne pas. Si c\u0027est une limite connue de cette version préliminaire, ignorer ce ticket.\n\nLog :\n\n```\nINFO 2018-10-02T20:55:58,150 [AWT-EventQueue-0] ContentUIHandler : 625 - [TripLonglineSampleLogbookListUI] Close ui\nINFO 2018-10-02T20:55:58,155 [AWT-EventQueue-0] ObserveMainUIInitializer : 235 - Keep persisted selected node with id: fr.ird.observe.entities.referentiel.Program#1239832686139#0.1\nINFO 2018-10-02T20:55:58,156 [AWT-EventQueue-0] ObserveMainUIInitializer : 235 - Keep persisted selected node with id: fr.ird.observe.entities.longline.TripLongline#1503294710706#0.8860130511775176\nINFO 2018-10-02T20:55:58,156 [AWT-EventQueue-0] ObserveMainUIInitializer : 242 - Apply to select model: ProgramReference{type\u003dProgramDto, id\u003dfr.ird.observe.entities.referentiel.Program#1239832686139#0.1}\nINFO 2018-10-02T20:55:58,160 [AWT-EventQueue-0] ObserveMainUIInitializer : 242 - Apply to select model: TripLonglineReference{type\u003dTripLonglineDto, id\u003dfr.ird.observe.entities.longline.TripLongline#1503294710706#0.8860130511775176, lastUpdateDate\u003d2017-09-28 10:57:55.431}\nINFO 2018-10-02T20:55:58,171 [AWT-EventQueue-0] ContentSimpleUIModel : 72 - Dto type: class fr.ird.observe.dto.data.longline.SampleLogbookDto\nINFO 2018-10-02T20:55:58,171 [AWT-EventQueue-0] ContentSimpleUIModel : 75 - Main dto type: class fr.ird.observe.dto.data.longline.SampleLogbookDto\nINFO 2018-10-02T20:55:58,172 [AWT-EventQueue-0] ContentSimpleUIModel : 77 - Selected node: ObserveLonglineLogbookTripSampleSelectNode{parent\u003dObserveLonglineTripSelectNode, level\u003d2, disabled}\nINFO 2018-10-02T20:55:58,181 [AWT-EventQueue-0] ContentSimpleUIModel : 79 - Edit node: ObserveLonglineLogbookTripSampleEditNode{parent\u003dObserveLonglineTripEditNode, level\u003d2, disabled}\nINFO 2018-10-02T20:55:58,184 [AWT-EventQueue-0] ContentSimpleUIModel : 81 - Parent dto type: class fr.ird.observe.dto.data.longline.TripLonglineDto\nINFO 2018-10-02T20:55:58,223 [AWT-EventQueue-0] ContentSimpleUIModel : 72 - Dto type: class fr.ird.observe.dto.data.longline.SampleLogbookDto\nINFO 2018-10-02T20:55:58,224 [AWT-EventQueue-0] ContentSimpleUIModel : 75 - Main dto type: class fr.ird.observe.dto.data.longline.SampleLogbookDto\nINFO 2018-10-02T20:55:58,225 [AWT-EventQueue-0] ContentSimpleUIModel : 77 - Selected node: ObserveLonglineLogbookTripSampleSelectNode{parent\u003dObserveLonglineTripSelectNode, level\u003d2, disabled}\nINFO 2018-10-02T20:55:58,233 [AWT-EventQueue-0] ContentSimpleUIModel : 79 - Edit node: ObserveLonglineLogbookTripSampleEditNode{parent\u003dObserveLonglineTripEditNode, level\u003d2, disabled}\nINFO 2018-10-02T20:55:58,236 [AWT-EventQueue-0] ContentSimpleUIModel : 81 - Parent dto type: class fr.ird.observe.dto.data.longline.TripLonglineDto\nINFO 2018-10-02T20:55:58,321 [AWT-EventQueue-0] ContentUIHandler : 314 - [TripLonglineSampleLogbookUI] - Open ui\nINFO 2018-10-02T20:55:58,325 [AWT-EventQueue-0] TripLonglineSampleLogbookUIHandler : 77 - tripId \u003d fr.ird.observe.entities.longline.TripLongline#1503294710706#0.8860130511775176\nINFO 2018-10-02T20:55:58,325 [AWT-EventQueue-0] TripLonglineSampleLogbookUIHandler : 78 - sampleId \u003d null\nINFO 2018-10-02T20:55:58,326 [AWT-EventQueue-0] TripLonglineSampleLogbookUIHandler : 83 - [TripLonglineSampleLogbookUI] content mode CREATE\nINFO 2018-10-02T20:55:58,340 [AWT-EventQueue-0] ObserveReferentialCache : 95 - Loading 6 referential dependencies for: fr.ird.observe.dto.data.longline.SamplePartLogbookDto\nINFO 2018-10-02T20:55:58,360 [AWT-EventQueue-0] ContentUIHandler : 314 - [SamplePartLogbookUI] - Open ui\nERROR 2018-10-02T20:55:58,364 [AWT-EventQueue-0] UIHelper : 521 - Could not find id form fr.ird.observe.client.ui.content.data.longline.logbook.SamplePartLogbookUIHandler(a)a09b3be\njava.lang.IllegalStateException: Could not find id form fr.ird.observe.client.ui.content.data.longline.logbook.SamplePartLogbookUIHandler@a09b3be\n\tat fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler.loadEditBean(ContentTableUIHandler.java:197) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.data.table.ContentTableUIHandler.onEndOpenUI(ContentTableUIHandler.java:243) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.ContentUIHandler.openUI(ContentUIHandler.java:328) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.ContentUI.open(ContentUI.java:145) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.data.longline.logbook.TripLonglineSampleLogbookUIHandler.onEndOpenUI(TripLonglineSampleLogbookUIHandler.java:126) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.ContentUIHandler.openUI(ContentUIHandler.java:328) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.ContentUI.open(ContentUI.java:145) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.content.api.ContentUIManager.openContent(ContentUIManager.java:104) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.ObserveMainUIInitializer.doOpenContent(ObserveMainUIInitializer.java:299) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.ObserveMainUIInitializer.changeNavigationNode(ObserveMainUIInitializer.java:209) ~[observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat javax.swing.JTree.fireValueChanged(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.JTree$TreeSelectionRedirector.valueChanged(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.tree.DefaultTreeSelectionModel.fireValueChanged(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.tree.DefaultTreeSelectionModel.notifyPathChange(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.tree.DefaultTreeSelectionModel.setSelectionPaths(Unknown Source) [?:1.8.0_161]\n\tat fr.ird.observe.client.ui.tree.navigation.NavigationTree$1.setSelectionPaths(NavigationTree.java:110) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat javax.swing.tree.DefaultTreeSelectionModel.setSelectionPath(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.JTree.setSelectionPath(Unknown Source) [?:1.8.0_161]\n\tat fr.ird.observe.client.ui.tree.navigation.NavigationTree.selectSafeNode(NavigationTree.java:207) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.tree.navigation.NavigationTree.afterAddUnsavedNode(NavigationTree.java:345) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.tree.navigation.NavigationTree.addUnsavedNode(NavigationTree.java:327) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.actions.content.api.data.open.CreateOpenDataUIAction.closeAndCreate(CreateOpenDataUIAction.java:57) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.actions.content.api.data.list.CreateOpenDataFromListUIAction.actionPerformed(CreateOpenDataFromListUIAction.java:60) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat fr.ird.observe.client.ui.actions.content.api.AbstractContentUIAction.actionPerformed(AbstractContentUIAction.java:74) [observe-8.0-alpha-3-SNAPSHOT.jar:8.0-alpha-3-SNAPSHOT]\n\tat javax.swing.AbstractButton.fireActionPerformed(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.DefaultButtonModel.setPressed(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source) [?:1.8.0_161]\n\tat java.awt.AWTEventMulticaster.mouseReleased(Unknown Source) [?:1.8.0_161]\n\tat java.awt.AWTEventMulticaster.mouseReleased(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Component.processMouseEvent(Unknown Source) [?:1.8.0_161]\n\tat javax.swing.JComponent.processMouseEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Component.processEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Container.processEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Component.dispatchEventImpl(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Container.dispatchEventImpl(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Component.dispatchEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Container.dispatchEventImpl(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Window.dispatchEventImpl(Unknown Source) [?:1.8.0_161]\n\tat java.awt.Component.dispatchEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue.dispatchEventImpl(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue.access$500(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue$3.run(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue$3.run(Unknown Source) [?:1.8.0_161]\n\tat java.security.AccessController.doPrivileged(Native Method) [?:1.8.0_161]\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source) [?:1.8.0_161]\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue$4.run(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue$4.run(Unknown Source) [?:1.8.0_161]\n\tat java.security.AccessController.doPrivileged(Native Method) [?:1.8.0_161]\n\tat java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventQueue.dispatchEvent(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.pumpEvents(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.pumpEvents(Unknown Source) [?:1.8.0_161]\n\tat java.awt.EventDispatchThread.run(Unknown Source) [?:1.8.0_161]\n\n```", + "labels": [ + "Anomalie", + "IRD-2018-01-V8", + "Palangre" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 3, 2018 4:22:17 AM", + "createdAt": "Oct 2, 2018 7:00:01 PM" + }, + { + "id": 14534163, + "iid": 1096, + "projectId": 2722779, + "title": "Improve Open/Close API", + "description": "Brand new API that let us open-close any node at any time :) No more need to open the hole path to your data. Just go to your data and open it. Il will compute all closes/open for you.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 1, 2018 4:30:47 PM", + "createdAt": "Sep 28, 2018 12:49:41 AM" + }, + { + "id": 14455203, + "iid": 1084, + "projectId": 2722779, + "title": "Improve Move API", + "description": "The design of the API is so poor, I can\u0027t imagine how we could have done this.\n\nIn toolkit v4, we introduce a brand new API on navigation which save us now a lot of time and code, now the move API is done using less than 100 lines codes with no little if i am a Program do this, if i am a Trip do so...\n\nMoreover we ask each time the services position of data in the navigation node, kind of lame asking a view property to server... Since as we do not check if there is other changes on nodes, how could we use this position (if a new data was added on server, we don\u0027t have it, so... would be a wrong position).\n\nBetter is to only work on our navigation tree without any call to service.", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 1, 2018 4:29:08 PM", + "createdAt": "Sep 25, 2018 2:22:48 PM" + }, + { + "id": 14394764, + "iid": 1078, + "projectId": 2722779, + "title": "Improve navigation popup actions", + "description": "In v7, this popup is quite poor, we have only some of the actions available on the form.\nI propose to add in that popup any action we can perform on the selected form.\nThis is partially implemented in the v8, @pcauquil have a look and feed me back to improve this.", + "labels": [ + "Evolution", + "IRD-2018-01-V8", + "À facturer" + ], + "milestone": { + "id": 532584, + "iid": 114, + "projectId": 2722779, + "groupId": 0, + "title": "8.0-alpha-3", + "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", + "dueDate": "Sep 3, 2018 2:00:00 AM", + "startDate": "May 24, 2018 2:00:00 AM", + "state": "closed" + }, + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "closed", + "updatedAt": "Oct 1, 2018 4:30:23 PM", + "createdAt": "Sep 22, 2018 1:47:41 PM" + }, { "id": 9962652, "iid": 913, @@ -67,7 +366,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -96,7 +395,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "closed", - "updatedAt": "Sep 15, 2018 1:54:07 PM", + "updatedAt": "Sep 25, 2018 9:51:29 PM", "createdAt": "Mar 27, 2018 2:53:27 PM" }, { @@ -116,7 +415,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -145,7 +444,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "closed", - "updatedAt": "Sep 15, 2018 1:54:06 PM", + "updatedAt": "Sep 25, 2018 9:51:29 PM", "createdAt": "Mar 27, 2018 2:31:46 PM" }, { @@ -165,7 +464,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -194,7 +493,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "closed", - "updatedAt": "Sep 15, 2018 1:54:06 PM", + "updatedAt": "Sep 25, 2018 9:51:29 PM", "createdAt": "Mar 27, 2018 1:59:29 PM" }, { @@ -214,7 +513,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -263,7 +562,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -292,7 +591,7 @@ "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" }, "state": "closed", - "updatedAt": "Sep 15, 2018 1:54:06 PM", + "updatedAt": "Sep 25, 2018 9:51:29 PM", "createdAt": "Mar 27, 2018 1:30:30 PM" }, { @@ -312,7 +611,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -361,7 +660,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, @@ -410,7 +709,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" }, ===================================== .mvn/gitlab-cache/milestones/532584.json ===================================== @@ -5,7 +5,7 @@ "groupId": 0, "title": "8.0-alpha-3", "description": "Première partie du troisième lot du contrat IRD-2018-01-V8.\r\ncontient les nouveaux écrans, mais aucune des fonctionnalités avancées.", - "dueDate": "Sep 15, 2018 2:00:00 AM", + "dueDate": "Sep 3, 2018 2:00:00 AM", "startDate": "May 24, 2018 2:00:00 AM", "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/656748-issues.json ===================================== @@ -0,0 +1,372 @@ +[ + { + "id": 14518867, + "iid": 1095, + "projectId": 2722779, + "title": "General. list shortcuts keyboard", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 2:13:33 PM", + "createdAt": "Sep 27, 2018 2:13:33 PM" + }, + { + "id": 14518833, + "iid": 1094, + "projectId": 2722779, + "title": "(General) Detect where to release memory", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 2:12:15 PM", + "createdAt": "Sep 27, 2018 2:12:15 PM" + }, + { + "id": 14518801, + "iid": 1093, + "projectId": 2722779, + "title": "On validation tabs. (resume) generate a pdf rather than txt", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 2:11:01 PM", + "createdAt": "Sep 27, 2018 2:11:01 PM" + }, + { + "id": 14518782, + "iid": 1092, + "projectId": 2722779, + "title": "on validation tabs. (resume) get a button for see or download report", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 2:09:54 PM", + "createdAt": "Sep 27, 2018 2:09:54 PM" + }, + { + "id": 14515885, + "iid": 1091, + "projectId": 2722779, + "title": "On configuration tabs, Get re-launch option.", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 1:55:08 PM", + "createdAt": "Sep 27, 2018 1:55:08 PM" + }, + { + "id": 14515830, + "iid": 1090, + "projectId": 2722779, + "title": "All logs screen. set up progressive scroll", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 1:52:15 PM", + "createdAt": "Sep 27, 2018 1:52:15 PM" + }, + { + "id": 14515801, + "iid": 1089, + "projectId": 2722779, + "title": "( Exporter les données ) - sur l\u0027onglet exporter, revoir le calcul du nombre d\u0027etapes.", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 1:50:02 PM", + "createdAt": "Sep 27, 2018 1:50:02 PM" + }, + { + "id": 14515741, + "iid": 1088, + "projectId": 2722779, + "title": "(Exporter les données) Sur l\u0027onglet exporter, revoir le calcul du nombre d\u0027etapes.", + "description": "", + "labels": [], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "closed", + "updatedAt": "Sep 27, 2018 1:48:01 PM", + "createdAt": "Sep 27, 2018 1:46:43 PM" + }, + { + "id": 14515702, + "iid": 1087, + "projectId": 2722779, + "title": "( action - mise à jour du référentiel ) Il faut afficher la configuration de sauvegarde.", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 27, 2018 1:44:08 PM", + "createdAt": "Sep 27, 2018 1:44:08 PM" + }, + { + "id": 14459546, + "iid": 1085, + "projectId": 2722779, + "title": "Generate navigation API", + "description": "We could easily generate the navigation structure from his definition (do this in the toolkit project).", + "labels": [], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 25, 2018 4:18:38 PM", + "createdAt": "Sep 25, 2018 4:18:38 PM" + }, + { + "id": 14422635, + "iid": 1083, + "projectId": 2722779, + "title": "importer une base local depuis une sauvegarde ( detecter la version de la base dans la sauvegarde )", + "description": "", + "labels": [ + "Evolution" + ], + "milestone": { + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" + }, + "author": { + "_id": 2728724, + "_username": "lololololo", + "_name": "bou", + "_state": "active", + "_darkScheme": false, + "_isAdmin": false, + "_canCreateGroup": false, + "_canCreateProject": false, + "_canCreateTeam": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/72cebad411f320885423307d611f4878?s\u003d…" + }, + "state": "opened", + "updatedAt": "Sep 24, 2018 12:49:45 PM", + "createdAt": "Sep 24, 2018 12:49:45 PM" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/656748.json ===================================== @@ -0,0 +1,9 @@ +{ + "id": 656748, + "iid": 127, + "projectId": 2722779, + "groupId": 0, + "title": "Backlog - Ultreia.io", + "description": "", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,18 +1,21 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-09-23 22:45. + * Last generated at 2018-10-03 04:23. ## Version [8.0-alpha-3](https://gitlab.com/ultreiaio/ird-observe/milestones/114) Première partie du troisième lot du contrat IRD-2018-01-V8.
contient les nouveaux écrans, mais aucune des fonctionnalités avancées. -**Closed at 2018-09-15.** +**Closed at 2018-09-03.** ### Download * [Application (observe-8.0-alpha-3.zip)](https://ultreia.io/release/observe-8.0-alpha-3.zip) * [Serveur (observe-8.0-alpha-3.war)](https://ultreia.io/release/observe-8.0-alpha-3.war) ### Issues + * [[Anomalie 1105]](https://gitlab.com/ultreiaio/ird-observe/issues/1105) **[V8-A3] Ouverture (migration) de bases locales V5 impossible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1106]](https://gitlab.com/ultreiaio/ird-observe/issues/1106) **[V8-A3] Après migration d'une base centrale, impossible de l'ouvrir avec l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1109]](https://gitlab.com/ultreiaio/ird-observe/issues/1109) **[V8] L'accès au formulaire Echantillons logbooks LL ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 578]](https://gitlab.com/ultreiaio/ird-observe/issues/578) **[LL] Implanter le formulaire logbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 902]](https://gitlab.com/ultreiaio/ird-observe/issues/902) **Visualisation des données du livre de bord sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 905]](https://gitlab.com/ultreiaio/ird-observe/issues/905) **Adaptation de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -22,6 +25,9 @@ Première partie du troisième lot du contrat IRD-2018-01-V8.
contient * [[Evolution 911]](https://gitlab.com/ultreiaio/ird-observe/issues/911) **Ajout de la donnée observe_longline.CatchLogbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 912]](https://gitlab.com/ultreiaio/ird-observe/issues/912) **Ajout de la donnée observe_longline.Landing** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 913]](https://gitlab.com/ultreiaio/ird-observe/issues/913) **Ajout de la donnée observe_longline.SampleLogbook** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1078]](https://gitlab.com/ultreiaio/ird-observe/issues/1078) **Improve navigation popup actions** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 1084]](https://gitlab.com/ultreiaio/ird-observe/issues/1084) **Improve Move API** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 1096]](https://gitlab.com/ultreiaio/ird-observe/issues/1096) **Improve Open/Close API** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [8.0-alpha-2](https://gitlab.com/ultreiaio/ird-observe/milestones/113) Second lot du contrat IRD-2018-01-V8 ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.4-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.4</observeToolkitVersion>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/97c73e8c01650af5e36347a780… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/97c73e8c01650af5e36347a780… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: improve navigation config design
by Tony CHEMIT Oct. 3, 2018

Oct. 3, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 612e8156 by Tony CHEMIT at 2018-10-03T01:20:22Z improve navigation config design - - - - - 9a074550 by Tony CHEMIT at 2018-10-03T01:20:55Z comment some debug code - - - - - 595dfc21 by Tony CHEMIT at 2018-10-03T01:21:13Z fix ui prefix - - - - - 12a06934 by Tony CHEMIT at 2018-10-03T01:21:55Z add license header - - - - - 97c73e8c by Tony CHEMIT at 2018-10-03T01:22:11Z [V8] L'accès au formulaire Echantillons logbooks LL ne fonctionne pas - Closes #1109 - - - - - 18 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/NavigationConfigUIActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleConfigureNavigationConfigUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowEmptyNavigationConfigUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowLonglineNavigationConfigUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowReferentialNavigationConfigUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowSeineNavigationConfigUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/ContentTableUIEntryActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUI.jcss - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java ===================================== @@ -416,6 +416,7 @@ public class ObserveMainUIInitializer { ui.getNavigationView().addMouseListener(mouseAdapter); ui.getNavigationUI().getTree().addMouseListener(mouseAdapter); ui.getNavigationUI().addMouseListener(mouseAdapter); + ui.getNavigationUI().getHandler().init(actionMap); init(ui.getSplitpane()); init(ui.getSplitpane2()); ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/NavigationConfigUIActionSupport.java ===================================== @@ -0,0 +1,48 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.main.menu.MenuActionSupport; + +import javax.swing.Icon; +import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public abstract class NavigationConfigUIActionSupport extends MenuActionSupport { + + NavigationConfigUIActionSupport(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, Icon actionIcon, KeyStroke acceleratorKey) { + super(mainUI, actionCommandKey, label, shortDescription, null, acceleratorKey); + putValue(SMALL_ICON, actionIcon); + } + + @Override + protected void doActionPerformed(ActionEvent e) { + getMainUI().getNavigationUI().getHandler().tryToUpdateNavigationTree(); + } +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleConfigureNavigationConfigUIAction.java ===================================== @@ -0,0 +1,51 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.actions.UIActionSupport; + +import java.awt.event.ActionEvent; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ToggleConfigureNavigationConfigUIAction extends UIActionSupport { + + public static final String ACTION_NAME = ToggleConfigureNavigationConfigUIAction.class.getName(); + + public ToggleConfigureNavigationConfigUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, null, n("observe.tree.action.configure.tip"), "generate", ObserveKeyStrokes.KEY_STROKE_NAVIGATION_CONFIGURE); + } + + @Override + public void actionPerformed(ActionEvent e) { + getMainUI().getNavigationUI().getHandler().configure(); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowEmptyNavigationConfigUIAction.java ===================================== @@ -0,0 +1,44 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ToggleShowEmptyNavigationConfigUIAction extends NavigationConfigUIActionSupport { + + public static final String ACTION_NAME = ToggleShowEmptyNavigationConfigUIAction.class.getName(); + + public ToggleShowEmptyNavigationConfigUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.constant.ObserveModelType.EMPTY"), n("observe.constant.ObserveModelType.EMPTY.description"), UIHelper.getUIManagerIcon("navigation.data.seine.TripSeine-16"), ObserveKeyStrokes.KEY_STROKE_SHOW_EMPTY_PROGRAM); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowLonglineNavigationConfigUIAction.java ===================================== @@ -0,0 +1,44 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ToggleShowLonglineNavigationConfigUIAction extends NavigationConfigUIActionSupport { + + public static final String ACTION_NAME = ToggleShowLonglineNavigationConfigUIAction.class.getName(); + + public ToggleShowLonglineNavigationConfigUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.constant.ObserveModelType.LL"), n("observe.constant.ObserveModelType.LL.description"), UIHelper.getUIManagerIcon("navigation.referential.Program-16"), ObserveKeyStrokes.KEY_STROKE_SHOW_LONGLINE); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowReferentialNavigationConfigUIAction.java ===================================== @@ -0,0 +1,44 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ToggleShowReferentialNavigationConfigUIAction extends NavigationConfigUIActionSupport { + + public static final String ACTION_NAME = ToggleShowReferentialNavigationConfigUIAction.class.getName(); + + public ToggleShowReferentialNavigationConfigUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.constant.ObserveModelType.REF"), n("observe.constant.ObserveModelType.REF.description"), UIHelper.getUIManagerIcon("navigation.referentiel-16"), ObserveKeyStrokes.KEY_STROKE_SHOW_REFERENTIAL); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowSeineNavigationConfigUIAction.java ===================================== @@ -0,0 +1,44 @@ +package fr.ird.observe.client.ui.actions.content.tree; + +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.ObserveMainUI; +import fr.ird.observe.client.ui.util.UIHelper; + +import static org.nuiton.i18n.I18n.n; + +/** + * Created by tchemit on 03/10/2018. + * + * @author Tony Chemit - dev(a)tchemit.fr + */ +public class ToggleShowSeineNavigationConfigUIAction extends NavigationConfigUIActionSupport { + + public static final String ACTION_NAME = ToggleShowSeineNavigationConfigUIAction.class.getName(); + + public ToggleShowSeineNavigationConfigUIAction(ObserveMainUI mainUI) { + super(mainUI, ACTION_NAME, n("observe.constant.ObserveModelType.PS"), n("observe.constant.ObserveModelType.PS.description"), UIHelper.getUIManagerIcon("navigation.referential.Program-16"), ObserveKeyStrokes.KEY_STROKE_SHOW_SEINE); + } + +} ===================================== client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java ===================================== @@ -79,7 +79,7 @@ public abstract class ContentUIModel extends AbstractSerializableBean { private boolean addMessageOnOpen = true; protected ContentUIModel() { - prefix = "[" + getClass().getSimpleName() + "] "; + prefix = "[" + getClass().getSimpleName().replace("Model", "") + "] "; } static <U extends ContentUI> ContentUIModel newModel(U ui) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/ContentTableUIEntryActionSupport.java ===================================== @@ -1,5 +1,27 @@ package fr.ird.observe.client.ui.content.api.data.table.action; +/*- + * #%L + * ObServe :: Client + * %% + * 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 fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; @@ -45,8 +67,10 @@ public abstract class ContentTableUIEntryActionSupport extends UIActionSupport { @Override public final void actionPerformed(ActionEvent e) { if (!isEnabled()) { + log.info(String.format("Reject action: %s :: %s", getActionCommandKey(), this)); return; } + log.info(String.format("Accept action: %s :: %s", getActionCommandKey(), this)); boolean focusOwner = ui.getTable().isFocusOwner(); log.debug("table has focus? " + focusOwner); if (focusOwner) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java ===================================== @@ -37,6 +37,8 @@ import org.nuiton.jaxx.runtime.spi.UIHandler; import java.awt.Component; import java.awt.Container; +import java.awt.GridBagConstraints; +import java.awt.Insets; import java.util.Optional; /** @@ -66,7 +68,13 @@ public class ActivityLonglineLogbookSampleUIHandler extends ContentSimpleUIHandl ui.getSamplePartLogbookPanel().remove(subUI); ui.getSamplePartLogbookPanel().add(subUI.getBody()); ui.getSamplePartLogbookPanel().putClientProperty("contentUI", subUI); + ui.getTitleRightToolBar().add(subUI.getSelectToolbar(), 0); } + + ui.getActions().add(ui.getReset(), new GridBagConstraints(0, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); + ui.getActions().add(ui.getSave(), new GridBagConstraints(1, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); + ui.getActions().add(ui.getMove(), new GridBagConstraints(2, 0, 1, 1, 0.5, 0.0, 10, 1, new Insets(0, 0, 0, 0), 0, 0)); + } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java ===================================== @@ -62,6 +62,7 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb private static final Logger log = LogManager.getLogger(SamplePartLogbookUIHandler.class); private final PropertyChangeListener speciesChanged; + private boolean fromActivity; SamplePartLogbookUIHandler() { speciesChanged = evt -> onSpeciesChanged((SpeciesReference) evt.getNewValue()); @@ -70,7 +71,8 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb @Override public void beforeInit(SamplePartLogbookUI ui) { super.beforeInit(ui); - if (ui.getContextValue(Boolean.class, "fromActivity") != null) { + fromActivity = ui.getContextValue(Boolean.class, "fromActivity") != null; + if (fromActivity) { ui.removeContextValue(Boolean.class, "fromActivity"); ui.setContextValue(new SamplePartLogbookUIModel(ui, ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbook())); } else { @@ -171,12 +173,17 @@ public class SamplePartLogbookUIHandler extends ContentTableUIHandler<SampleLogb @Override public void afterInit(SamplePartLogbookUI ui) { addReferentialFilter(SamplePartLogbookDto.PROPERTY_SPECIES, incomingReferences -> { - String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId(); - if (setId == null) { - return new LinkedList<>(); + if (fromActivity) { +// FIXME We do not have the set selected here (since this is a brother of it) + String setId = ObserveSwingApplicationContext.get().getNavigationSelect().getLongline().getActivityLogbookSet().getId(); + if (setId == null) { + return incomingReferences; + } + ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId); + return new LinkedList<>(sampleSpecies.toSet()); + } else { + return incomingReferences; } - ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getSetLonglineLogbookCatchService().getSampleSpecies(setId); - return new LinkedList<>(sampleSpecies.toSet()); }); super.afterInit(ui); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookUIHandler.java ===================================== @@ -65,7 +65,12 @@ public class TripLonglineLandingLogbookUIHandler extends ContentOpenableUIHandle ui.getLandingPartPanel().remove(subUI); ui.getLandingPartPanel().add(subUI.getBody()); ui.getLandingPartPanel().putClientProperty("contentUI", subUI); + ui.getTitleRightToolBar().add(subUI.getSelectToolbar(), 0); + subUI.getSelectToolbar().setVisible(false); } + ui.getMainTabbedPane().addChangeListener( + l -> ui.getLandingPartLogbookUI().getSelectToolbar().setVisible(ui.getMainTabbedPane().getSelectedIndex() == 1) + ); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookUI.jaxx ===================================== @@ -112,6 +112,7 @@ <JButton id='reopen'/> <JButton id='close'/> <JButton id='create'/> + <JButton id='save'/>  <Table id="extraActions" fill='both' weightx='1' insets='0'> ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookUIHandler.java ===================================== @@ -58,10 +58,17 @@ class TripLonglineSampleLogbookUIHandler extends ContentOpenableUIHandler<Sample { // init floatlinesComposition tab SamplePartLogbookUI subUI = ui.getSamplePartLogbookUI(); + subUI.getModel().setStandalone(false); ui.getSamplePartLogbookPanel().remove(subUI); ui.getSamplePartLogbookPanel().add(subUI.getBody()); ui.getSamplePartLogbookPanel().putClientProperty("contentUI", subUI); + + ui.getTitleRightToolBar().add(subUI.getSelectToolbar(), 0); + subUI.getSelectToolbar().setVisible(false); } + ui.getMainTabbedPane().addChangeListener( + l -> ui.getSamplePartLogbookUI().getSelectToolbar().setVisible(ui.getMainTabbedPane().getSelectedIndex() == 1) + ); getModel().addPropertyChangeListener(TripLonglineSampleLogbookUIModel.PROPERTY_MODE, evt -> showPartsTab(evt.getNewValue() != ContentMode.CREATE)); } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUI.jaxx ===================================== @@ -23,6 +23,12 @@ <import> fr.ird.observe.client.configuration.NavigationTreeConfigBean + fr.ird.observe.client.ui.actions.content.tree.ToggleShowSeineNavigationConfigUIAction + fr.ird.observe.client.ui.actions.content.tree.ToggleShowLonglineNavigationConfigUIAction + fr.ird.observe.client.ui.actions.content.tree.ToggleShowReferentialNavigationConfigUIAction + fr.ird.observe.client.ui.actions.content.tree.ToggleShowEmptyNavigationConfigUIAction + fr.ird.observe.client.ui.actions.content.tree.ToggleConfigureNavigationConfigUIAction + static org.nuiton.i18n.I18n.t </import> <NavigationTree id='tree' /> @@ -30,16 +36,16 @@ <NavigationTreeConfigBean id='navigationConfig' javaBean='treeModel.getConfig()'/> <JPopupMenu id='configurePopup'> - <JCheckBoxMenuItem id='showSeineTrip' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JCheckBoxMenuItem id='showLonglineTrip' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JCheckBoxMenuItem id='showReferential' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JCheckBoxMenuItem id='showEmptyProgram' onActionPerformed="handler.tryToUpdateNavigationTree()"/> + <JCheckBoxMenuItem id='showSeineTrip'/> + <JCheckBoxMenuItem id='showLonglineTrip'/> + <JCheckBoxMenuItem id='showReferential'/> + <JCheckBoxMenuItem id='showEmptyProgram'/> </JPopupMenu> <JToolBar id='toolbar'> <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> - <JToggleButton id='configure' onActionPerformed='handler.configure()'/> + <JToggleButton id='configure'/> </JToolBar> </JScrollPane> ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUI.jcss ===================================== @@ -22,23 +22,27 @@ #showSeineTrip { selected: {navigationConfig.isShowSeineTrip()}; - text:"observe.constant.ObserveModelType.PS"; - toolTipText:"observe.constant.ObserveModelType.PS.description"; + _observeAction:{ToggleShowSeineNavigationConfigUIAction.ACTION_NAME}; + /*text:"observe.constant.ObserveModelType.PS"; + toolTipText:"observe.constant.ObserveModelType.PS.description";*/ } #showLonglineTrip { selected: {navigationConfig.isShowLonglineTrip()}; - text:"observe.constant.ObserveModelType.LL"; - toolTipText:"observe.constant.ObserveModelType.LL.description"; + _observeAction:{ToggleShowLonglineNavigationConfigUIAction.ACTION_NAME}; + /*text:"observe.constant.ObserveModelType.LL"; + toolTipText:"observe.constant.ObserveModelType.LL.description";*/ } #showReferential { selected: {navigationConfig.isShowReferential()}; - text:"observe.constant.ObserveModelType.REF"; - toolTipText:"observe.constant.ObserveModelType.REF.description"; + _observeAction:{ToggleShowReferentialNavigationConfigUIAction.ACTION_NAME}; + /*text:"observe.constant.ObserveModelType.REF"; + toolTipText:"observe.constant.ObserveModelType.REF.description";*/ } #showEmptyProgram { selected: {navigationConfig.isShowEmptyProgram()}; - text:"observe.constant.ObserveModelType.EMPTY"; - toolTipText:"observe.constant.ObserveModelType.EMPTY.description"; + _observeAction:{ToggleShowEmptyNavigationConfigUIAction.ACTION_NAME}; + /*text:"observe.constant.ObserveModelType.EMPTY"; + toolTipText:"observe.constant.ObserveModelType.EMPTY.description";*/ } JToggleButton { @@ -62,8 +66,9 @@ JButton { } #configure { - actionIcon:generate; - toolTipText:"observe.tree.action.configure.tip"; + _observeAction:{ToggleConfigureNavigationConfigUIAction.ACTION_NAME}; + /*actionIcon:generate; + toolTipText:"observe.tree.action.configure.tip";*/ } #tree { ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUIHandler.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.client.ui.tree.navigation; * 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>. @@ -25,19 +25,17 @@ package fr.ird.observe.client.ui.tree.navigation; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.configuration.NavigationTreeConfig; -import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.actions.UIActionSupport; +import fr.ird.observe.client.ui.content.api.spi.ObserveActionMap; import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.client.ui.util.UIHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.search.Searchable; import org.jdesktop.swingx.search.TreeSearchable; import org.nuiton.jaxx.runtime.spi.UIHandler; -import javax.swing.AbstractAction; -import javax.swing.ActionMap; -import javax.swing.InputMap; +import javax.swing.AbstractButton; import javax.swing.JComponent; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; @@ -45,7 +43,9 @@ import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; import java.awt.Color; import java.awt.Dimension; -import java.awt.event.ActionEvent; +import java.util.Objects; + +import static fr.ird.observe.client.ui.content.api.ContentUIInitializer.OBSERVE_ACTION; /** * Created by tchemit on 01/04/2018. @@ -54,7 +54,6 @@ import java.awt.event.ActionEvent; */ public class NavigationUIHandler implements UIHandler<NavigationUI> { - /** Logger */ private static final Logger log = LogManager.getLogger(NavigationUIHandler.class); private NavigationUI ui; @@ -72,80 +71,27 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { this.ui = ui; } + public void init(ObserveActionMap actionMap) { + init(actionMap, ui.getShowSeineTrip()); + init(actionMap, ui.getShowLonglineTrip()); + init(actionMap, ui.getShowReferential()); + init(actionMap, ui.getShowEmptyProgram()); + init(actionMap, ui.getConfigure()); + } + @Override public void afterInit(NavigationUI ui) { - ui.getShowSeineTrip().setIcon(UIHelper.getUIManagerIcon("navigation.referential.Program-16")); - ui.getShowLonglineTrip().setIcon(UIHelper.getUIManagerIcon("navigation.referential.Program-16")); - ui.getShowReferential().setIcon(UIHelper.getUIManagerIcon("navigation.referentiel-16")); - ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation.data.seine.TripSeine-16")); - NavigationTree tree = ui.getTree(); TreeSearchable searchable = new TreeSearchable(tree); tree.setSearchable(searchable); searchable.setMatchHighlighter(new ColorHighlighter(Color.YELLOW, Color.BLACK)); - ObserveKeyStrokes.addKeyStroke(ui.getShowSeineTrip(), ObserveKeyStrokes.KEY_STROKE_SHOW_SEINE); - ObserveKeyStrokes.addKeyStroke(ui.getShowLonglineTrip(), ObserveKeyStrokes.KEY_STROKE_SHOW_LONGLINE); - ObserveKeyStrokes.addKeyStroke(ui.getShowReferential(), ObserveKeyStrokes.KEY_STROKE_SHOW_REFERENTIAL); - ObserveKeyStrokes.addKeyStroke(ui.getShowEmptyProgram(), ObserveKeyStrokes.KEY_STROKE_SHOW_EMPTY_PROGRAM); - ObserveKeyStrokes.addKeyStroke(ui.getConfigure(), ObserveKeyStrokes.KEY_STROKE_NAVIGATION_CONFIGURE); - //FIXME (no text, so no text after...) - ui.getConfigure().setText(null); +// ui.getConfigure().setText(null); ClientConfig config = ObserveSwingApplicationContext.get().getConfig(); NavigationTreeModel treeModel = (NavigationTreeModel) tree.getModel(); treeModel.load(config); - InputMap inputMap = ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - ActionMap actionMap = ui.getActionMap(); - inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_SEINE, "showSeine"); - actionMap.put("showSeine", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - if (ui.getConfigurePopup().isVisible()) { - ui.getShowSeineTrip().doClick(); - } - ui.getConfigurePopup().setVisible(false); - } - }); - inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_LONGLINE, "showLongline"); - actionMap.put("showLongline", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - if (ui.getConfigurePopup().isVisible()) { - ui.getShowLonglineTrip().doClick(); - } - ui.getConfigurePopup().setVisible(false); - } - }); - inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_REFERENTIAL, "showReferential"); - actionMap.put("showReferential", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - if (ui.getConfigurePopup().isVisible()) { - ui.getShowReferential().doClick(); - } - ui.getConfigurePopup().setVisible(false); - } - }); - inputMap.put(ObserveKeyStrokes.KEY_STROKE_SHOW_EMPTY_PROGRAM, "showEmptyProgram"); - actionMap.put("showEmptyProgram", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - if (ui.getConfigurePopup().isVisible()) { - ui.getShowEmptyProgram().doClick(); - } - ui.getConfigurePopup().setVisible(false); - } - }); - inputMap.put(ObserveKeyStrokes.KEY_STROKE_NAVIGATION_CONFIGURE, "configure"); - actionMap.put("configure", new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - ui.getConfigure().doClick(); - } - }); - ui.getConfigurePopup().addPopupMenuListener(new PopupMenuListener() { @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) { @@ -164,7 +110,8 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { }); } - void configure() { + public void configure() { + ui.getConfigure().setSelected(true); SwingUtilities.invokeLater(() -> { JComponent c = ui.getConfigure(); JPopupMenu p = ui.getConfigurePopup(); @@ -186,7 +133,26 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { } - void tryToUpdateNavigationTree() { + protected void init(ObserveActionMap actionMap, AbstractButton editor) { + String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); + if (actionId == null) { + + return; + } + + // on a trouve une action commune + UIActionSupport action = (UIActionSupport) actionMap.get(actionId); + Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); + + if (log.isDebugEnabled()) { + log.debug("init common action " + actionId); + } + + action.initForMainUi(editor); + + } + + public void tryToUpdateNavigationTree() { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); @@ -223,19 +189,14 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { } public void collapseAll() { - NavigationTree tree = getTree(); tree.clearSelection(); tree.collapseAll(); tree.setSelectionRow(0); - } public void expandAll() { - NavigationTree tree = getTree(); tree.expandAll(); - } - } ===================================== client/src/main/java/fr/ird/observe/client/ui/util/UIHelper.java ===================================== @@ -598,9 +598,10 @@ public class UIHelper extends SwingUtil { SwingUtilities.invokeLater(component::requestFocus); } else if (ObserveSwingApplicationContext.get().getMainUI().getModel().canAcquireFocus()) { SwingUtilities.invokeLater(() -> { - log.info("ask focus for component: " + component.getName()); - boolean b = component.requestFocusInWindow(); - log.info(String.format("Will request focus %s ? %s", component.getName(), b)); + log.debug("ask focus for component: " + component.getName()); + /*boolean b =*/ + component.requestFocusInWindow(); +// log.debug(String.format("Will request focus %s ? %s", component.getName(), b)); }); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c61cea2e0b57bec3d0f72f4e6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2c61cea2e0b57bec3d0f72f4e6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve table navigation/move actions
by Tony CHEMIT Oct. 2, 2018

Oct. 2, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2c61cea2 by Tony CHEMIT at 2018-10-02T23:37:48Z Improve table navigation/move actions - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client/src/main/java/fr/ird/observe/client/ui/util/table/EditableList.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableList.java - client/src/main/java/fr/ird/observe/client/ui/util/table/EditableTableModelSupport.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableTableModelSupport.java - client/src/main/java/fr/ird/observe/client/ui/util/table/EditableTableWithCacheTableModelSupport.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/EditableTableWithCacheTableModelSupport.java - + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/SortableTableUI.java - client/src/main/java/fr/ird/observe/client/ui/util/table/AbstractSelectTableAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/AbstractSelectTableAction.java - + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/ContentTableUIEntryActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/util/table/MoveToNextEditableCellAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/MoveToNextEditableCellAction.java - client/src/main/java/fr/ird/observe/client/ui/util/table/MoveToNextEditableRowAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/MoveToNextEditableRowAction.java - client/src/main/java/fr/ird/observe/client/ui/util/table/MoveToPreviousEditableCellAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/MoveToPreviousEditableCellAction.java - client/src/main/java/fr/ird/observe/client/ui/util/table/MoveToPreviousEditableRowAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/action/MoveToPreviousEditableRowAction.java - client/src/main/java/fr/ird/observe/client/ui/util/table/AutotSelectRowAndShowPopupActionSupport.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/AutoSelectRowAndShowPopupActionSupport.java - + client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/AutoSelectWithMoveUpAndDownShowPopupAction.java - client/src/main/java/fr/ird/observe/client/ui/util/table/InlineTableAutotSelectRowAndShowPopupAction.java → client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/popup/InlineTableAutotSelectRowAndShowPopupAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesMeasurementLonglinesTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookTableModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c61cea2e0b57bec3d0f72f4e63… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2c61cea2e0b57bec3d0f72f4e63… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [V8-A3] Ouverture (migration) de bases locales V5 impossible - Closes #1105
by Tony CHEMIT Oct. 2, 2018

Oct. 2, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 67ab0c5b by Tony CHEMIT at 2018-10-02T11:50:10Z [V8-A3] Ouverture (migration) de bases locales V5 impossible - Closes #1105 - - - - - 2 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.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,6 +30,8 @@ import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.dto.FloatingObjectPreset; import fr.ird.observe.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.dto.presets.ServerDataSourceConfiguration; +import fr.ird.observe.navigation.model.edit.ObserveEditModel; +import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import io.ultreia.java4all.config.ApplicationConfig; import io.ultreia.java4all.config.ApplicationConfigInit; @@ -104,14 +106,14 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre //FIXME private final ImmutableSet<String> longlineVesselTypeIds = ImmutableSet.copyOf( Sets.newHashSet("fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.044156847891821505", - "fr.ird.observe.entities.referentiel.VesselType#1239832675736#0.8708229847859869", - "fr.ird.observe.entities.referentiel.VesselType#1239832686137#0.1")); + "fr.ird.observe.entities.referentiel.VesselType#1239832675736#0.8708229847859869", + "fr.ird.observe.entities.referentiel.VesselType#1239832686137#0.1")); private final ImmutableSet<String> seineVesselTypeIds = ImmutableSet.copyOf( Sets.newHashSet("fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.044156847891821505", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.307197212385357", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.7380146830307519", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.9086075071905084", - "fr.ird.observe.entities.referentiel.VesselType#1239832675737#0.43324169605639407")); + "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.307197212385357", + "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.7380146830307519", + "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.9086075071905084", + "fr.ird.observe.entities.referentiel.VesselType#1239832675737#0.43324169605639407")); private final SimpleDateFormat dateFormat = new SimpleDateFormat(); /** * un drapeau pour savoir s'il faut lancer l'interface graphique. Cette @@ -148,10 +150,6 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre private ImmutableList<RemoteDataSourceConfiguration> remoteDataSourceConfigurationList; private ObserveDtoGsonSupplier gsonSupplier; - static ClientConfig forTest() { - return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM),DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); - } - public ClientConfig() { this(DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); } @@ -162,13 +160,17 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre delegate.setConfigFileName(configFileName); } - private ClientConfig(ApplicationConfigInit init,String configFileName) { + private ClientConfig(ApplicationConfigInit init, String configFileName) { super(init); ApplicationConfig delegate = get(); delegate.setEncoding(StandardCharsets.UTF_8.name()); delegate.setConfigFileName(configFileName); } + static ClientConfig forTest() { + return new ClientConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.ENV, ApplicationConfigScope.SYSTEM), DEFAULT_OBSERVE_SWING_CONFIGURATION_FILENAME); + } + @Override protected Supplier<Gson> getGsonSupplier() { return gsonSupplier == null ? gsonSupplier = new ObserveDtoGsonSupplier() : gsonSupplier; @@ -217,7 +219,7 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre applicationConfig.setDefaultOption(APPLICATION_VERSION, version.getVersion()); } applicationConfig.parse(args); - if (version ==null) { + if (version == null) { removeSnapshotFromVersion(); } } @@ -364,6 +366,16 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre get().saveForUser(unsavables); } + public int getNavigationEditModelCount() { + ObserveEditModel model = getNavigationEditModel(); + return model == null ? 0 : model.count(); + } + + public int getNavigationSelectModelCount() { + ObserveSelectModel model = getNavigationSelectModel(); + return model == null ? 0 : model.count(); + } + public void removeJaxxPropertyChangeListener() { // pcs.getPropertyChangeListeners(); // List<String> tmp = new ArrayList<>(); ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java ===================================== @@ -397,11 +397,11 @@ public class StorageUIHandler implements UIHandler<StorageUI> { if (DbMode.USE_LOCAL.equals((model.getDbMode()))) { stepsCount += 2; } - int openIds = config.getNavigationEditModel().count(); + int openIds = config.getNavigationEditModelCount(); if (openIds > 0) { stepsCount += 1 + openIds; } - int selectedIds = config.getNavigationSelectModel().count(); + int selectedIds = config.getNavigationSelectModelCount(); if (selectedIds > 0) { stepsCount += 1 + selectedIds; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67ab0c5b4461d062ffd1c8549d8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/67ab0c5b4461d062ffd1c8549d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Apply some fixes + do not use any longer model for tab validation (jaxx 37)
by Tony CHEMIT Oct. 2, 2018

Oct. 2, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 06355c94 by Tony CHEMIT at 2018-10-02T02:12:57Z Apply some fixes + do not use any longer model for tab validation (jaxx 37) - - - - - 30 changed files: - 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/data/longline/LonglineDetailCompositionGenerateAllSectionsAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookSampleUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveLonglineGlobalCompositionLogbookUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveLonglineGlobalCompositionObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/GearUseFeaturesLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/CatchLonglineLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LonglineGlobalCompositionLogbookUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SetLonglineLogbookUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/06355c940abeadf6b570e101ae3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/06355c940abeadf6b570e101ae3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Petit renommage de libellé - Closes #1099
by Tony CHEMIT Oct. 1, 2018

Oct. 1, 2018

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ee9d7059 by Tony CHEMIT at 2018-10-01T14:18:53Z Petit renommage de libellé - Closes #1099 - - - - - 0b137008 by Tony CHEMIT at 2018-10-01T14:19:08Z Extension de fichier du rapport de validation - Closes #1102 - - - - - 69c29cee by Tony CHEMIT at 2018-10-01T14:19:20Z Widget température °C/°F : message de validation perfectible - Closes #960 (il restait une validation de température au niveau des routes) - - - - - 02e91427 by Tony CHEMIT at 2018-10-01T14:19:34Z Le calcul des vitesses a eu un raté après avoir fait usage de la fonction "Voulez-vous créer l'activité de fin de veille ?" - See #1100 - - - - - 6 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - services/src/main/java/fr/ird/observe/services/validation/validators/ActivitySimpleSpeedDtoValidator.java - validation/src/main/resources/fr/ird/observe/dto/data/seine/RouteDto-update-error-validation.xml Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateModel.java ===================================== @@ -41,8 +41,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.lang3.mutable.MutableInt; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState; import org.nuiton.validator.NuitonValidatorScope; @@ -75,7 +75,7 @@ public class ValidateModel extends AdminActionModel { static final String PROPERTY_VALIDATION_RESULT = "validationResult"; /** le pattern du fichier de rapport après validation */ - private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.txt"; + private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.html"; /** Logger */ private static final Logger log = LogManager.getLogger(ValidateModel.class); ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== @@ -1817,7 +1817,7 @@ observe.ui.tree.seine.nonTargetCatch=Non target catch observe.ui.tree.seine.nonTargetCatchRelease=Non target released catches observe.ui.tree.seine.nonTargetSample=Non target samples observe.ui.tree.seine.objectObservedSpecies=Object observed species -observe.ui.tree.seine.objectOperation=Object operations +observe.ui.tree.seine.objectOperation=Beacon observe.ui.tree.seine.objectSchoolEstimate=Object school estimates observe.ui.tree.seine.route.list=Routes observe.ui.tree.seine.route.unsaved=New route ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== @@ -1817,7 +1817,7 @@ observe.ui.tree.seine.nonTargetCatch=Fauna accesoria conservada o descartada observe.ui.tree.seine.nonTargetCatchRelease=Faunes accessoires libérées \#TODO observe.ui.tree.seine.nonTargetSample=Muestreos de fauna accesoria observe.ui.tree.seine.objectObservedSpecies=Fauna observada -observe.ui.tree.seine.objectOperation=Operaciones sobre el objeto +observe.ui.tree.seine.objectOperation=Baliza observe.ui.tree.seine.objectSchoolEstimate=Estimaciones banco de objetos observe.ui.tree.seine.route.list=Rutas observe.ui.tree.seine.route.unsaved=Nueva ruta ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== @@ -1817,7 +1817,7 @@ observe.ui.tree.seine.nonTargetCatch=Espèces accessoires conservées ou rejeté observe.ui.tree.seine.nonTargetCatchRelease=Espèces accessoires libérées observe.ui.tree.seine.nonTargetSample=Échantillons espèces accessoires observe.ui.tree.seine.objectObservedSpecies=Faune observée -observe.ui.tree.seine.objectOperation=Opérations sur l'objet +observe.ui.tree.seine.objectOperation=Balise observe.ui.tree.seine.objectSchoolEstimate=Estimations banc objet observe.ui.tree.seine.route.list=Routes observe.ui.tree.seine.route.unsaved=Nouvelle route ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/ActivitySimpleSpeedDtoValidator.java ===================================== @@ -29,9 +29,12 @@ import fr.ird.observe.dto.data.seine.ActivitySeineDto; import fr.ird.observe.dto.data.seine.ActivitySeineStubDto; import fr.ird.observe.dto.data.seine.RouteDto; import fr.ird.observe.dto.decoration.DecoratorService; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; import java.util.Objects; /** @@ -146,8 +149,24 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { Objects.requireNonNull(route, " could not find currentRoute in valueStack"); - ActivitySeineStubDto previousActivity = route.getPreviousActivity(activity.getId()); - + ActivitySeineStubDto previousActivity; + + if (activity.isNotPersisted()) { + // since there is no id, can't use the later method, must find out by our self previous activity + List<ActivitySeineStubDto> activitySeine = new LinkedList<>(route.getActivitySeine()); + ActivitySeineStubDto activityStub = new ActivitySeineStubDto(); + activityStub.setTime(activity.getTime()); + activitySeine.add(activityStub); + activitySeine.sort(Comparator.comparing(ActivitySeineStubDto::getTimeSecond)); + int index = activitySeine.indexOf(activityStub); + if (index > 0) { + previousActivity = activitySeine.get(index - 1); + } else { + previousActivity = null; + } + } else { + previousActivity = route.getPreviousActivity(activity.getId()); + } if (previousActivity == null) { // pas d'activity avant, rien à valider ===================================== validation/src/main/resources/fr/ird/observe/dto/data/seine/RouteDto-update-error-validation.xml ===================================== @@ -66,21 +66,6 @@ <message>observe.validation.route.invalid.time##${index}</message> </field-validator> -  - <field-validator type="collectionFieldExpression"> - <param name="mode">ALL</param> - <param name="useSensitiveContext">true</param> - <param name="expression"><![CDATA[ - previous == null || previous.seaSurfaceTemperature == null || current.seaSurfaceTemperature == null - || (previous.seaSurfaceTemperature > current.seaSurfaceTemperature ? - previous.seaSurfaceTemperature - current.seaSurfaceTemperature <= 12.0 - : current.seaSurfaceTemperature - previous.seaSurfaceTemperature <= 12.0 - ) - ]]> - </param> - <message>observe.validation.route.invalid.seaSurfaceTemperature##${index}</message> - </field-validator> -  <field-validator type="collectionFieldExpression"> <param name="mode">ALL</param> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e6fa47b9b4155cf25a2456b53… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e6fa47b9b4155cf25a2456b53… You're receiving this email because of your account on gitlab.com.

1 0