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

[Git][ultreiaio/ird-observe][develop] Improve ui handlers.
by Tony CHEMIT 04 Oct '18

04 Oct '18

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

1 0

[Git][ultreiaio/ird-observe][develop] Fix some coordinates validation - Closes #1113
by Tony CHEMIT 04 Oct '18

04 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 757bd9cd by Tony CHEMIT at 2018-10-04T07:17:50Z Fix some coordinates validation - Closes #1113 - - - - - 13 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineObsDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-create-error-validation.xml ===================================== @@ -98,7 +98,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineLogbookDto-update-error-validation.xml ===================================== @@ -83,7 +83,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-create-error-validation.xml ===================================== @@ -99,7 +99,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/ActivityLonglineObsDto-update-error-validation.xml ===================================== @@ -84,7 +84,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-create-error-validation.xml ===================================== @@ -43,7 +43,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SampleLogbookDto-update-error-validation.xml ===================================== @@ -44,7 +44,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.activity.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.sample.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -217,7 +217,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -283,7 +283,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -349,7 +349,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> @@ -415,7 +415,7 @@ <field-validator type="quadrantDto" short-circuit="true"> <param name="ocean">currentTripLongline.ocean</param> <message> - observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.getLabel()} + observe.validation.setLongline.invalid.quadrant##${currentTripLongline.ocean.label} </message> </field-validator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/longline/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -250,20 +250,6 @@ </message> </field-validator> -  - <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 03 Oct '18

03 Oct '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ee943c1 by Tony CHEMIT at 2018-10-03T13:06:02Z [V8] L'enregistrement d'une activité logbook LL échoue lorsque l'on tente des créer des activités logbook dans une marée issue d'une marée d'observation saisie en V5 - See #1108 Add some logs - - - - - 7c802fc7 by Tony CHEMIT at 2018-10-03T13:06:20Z optimize dependencies - - - - - 22eeaf27 by Tony CHEMIT at 2018-10-03T15:35:05Z Some data (in table forms) order is not deterministic - Closes #1112 - - - - - 5 changed files: - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/content/data/longline/save/SaveActivityLonglineLogbookUIAction.java - persistence/src/main/models/Observe-04-data-seine.model - persistence/src/main/models/Observe-05-data-longline-obs.model - persistence/src/main/models/Observe-06-data-longline-logbook.model Changes: ===================================== client/pom.xml ===================================== @@ -389,6 +389,10 @@ <artifactId>java-lang</artifactId> <scope>compile</scope> </dependency> + <dependency> + <groupId>io.ultreia.java4all</groupId> + <artifactId>java-bean</artifactId> + </dependency>  ===================================== 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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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 03 Oct '18

03 Oct '18

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