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

[Git][ultreiaio/ird-observe][develop] [LL] Activité logbook : petits ajustements - Closes #1362
by Tony CHEMIT 23 Jul '19

23 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a464dde5 by tchemit at 2019-07-23T12:29:14Z [LL] Activité logbook : petits ajustements - Closes #1362 - - - - - 5 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityLonglineObsUI.jaxx - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jaxx ===================================== @@ -74,7 +74,10 @@ <field name='longitude' component='coordinate'/> <field name='latitude' component='coordinate'/> - <field name='quadrant' component='coordinate'/> + <field name='endDate' component='endTimeStamp'/> + <field name='endTime' component='endTimeStamp'/> + <field name='startDate' component='startTimeStamp'/> + <field name='startTime' component='startTimeStamp'/> </BeanValidator> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityLonglineLogbookUI.jcss ===================================== @@ -36,6 +36,7 @@ #endTimeStamp { propertyDayDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_DATE}; propertyTimeDate:{ActivityLonglineLogbookUIModel.PROPERTY_END_TIME}; + showReset:true; } #coordinate { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityLonglineObsUI.jaxx ===================================== @@ -68,6 +68,8 @@ <field name='longitude' component='coordinate'/> <field name='latitude' component='coordinate'/> <field name='quadrant' component='coordinate'/> + <field name='date' component='timeStamp'/> + <field name='time' component='timeStamp'/> </BeanValidator> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-create-warning-validation.xml ===================================== @@ -41,7 +41,7 @@ </field> <field name="endDate"> - <field-validator type="mandatory" short-circuit="true"> + <field-validator type="notFilled" short-circuit="true"> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/ActivityLonglineLogbookDto-update-warning-validation.xml ===================================== @@ -41,7 +41,7 @@ </field> <field name="endDate"> - <field-validator type="mandatory" short-circuit="true"> + <field-validator type="notFilled" short-circuit="true"> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a464dde5e94c9d196988d8d45c3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a464dde5e94c9d196988d8d45c3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible de supprimer une activité LL - Closes #1361
by Tony CHEMIT 23 Jul '19

23 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6ac3a215 by tchemit at 2019-07-23T12:04:47Z Impossible de supprimer une activité LL - Closes #1361 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java ===================================== @@ -24,7 +24,10 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport; +import fr.ird.observe.client.ui.content.data.ll.logbook.ActivityLonglineLogbookUI; import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookReference; import fr.ird.observe.dto.data.ps.common.TripSeineDto; import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.navigation.model.edit.ObserveEditNode; @@ -38,7 +41,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> { +public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineLogbookDto, ActivityLonglineLogbookReference, ActivityLonglineLogbookUI> { public static final String ACTION_NAME = DeleteActivityLonglineLogbookUIAction.class.getName(); private static final Logger log = LogManager.getLogger(DeleteActivityLonglineLogbookUIAction.class); @@ -48,7 +51,7 @@ public class DeleteActivityLonglineLogbookUIAction extends DeleteOpenDataUIActio } @Override - protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) { + protected void doDelete(ActivityLonglineLogbookUI ui, ActivityLonglineLogbookDto bean, ObserveEditNode<ActivityLonglineLogbookDto> editNode) { log.info("Will delete Activity " + bean.getId()); String tripId = editNode.getParent().getId(); getServicesProvider().getActivityLonglineLogbookService().delete(bean.getId()); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java ===================================== @@ -24,7 +24,11 @@ package fr.ird.observe.client.ui.actions.content.data.ll.delete; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.open.DeleteOpenDataUIActionSupport; +import fr.ird.observe.client.ui.content.data.ll.observation.ActivityLonglineObsUI; import fr.ird.observe.client.ui.content.data.ps.common.TripSeineUI; +import fr.ird.observe.dto.data.ll.logbook.ActivityLonglineLogbookDto; +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsDto; +import fr.ird.observe.dto.data.ll.observation.ActivityLonglineObsReference; import fr.ird.observe.dto.data.ps.common.TripSeineDto; import fr.ird.observe.dto.data.ps.common.TripSeineReference; import fr.ird.observe.navigation.model.edit.ObserveEditNode; @@ -38,7 +42,7 @@ import static io.ultreia.java4all.i18n.I18n.n; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<TripSeineDto, TripSeineReference, TripSeineUI> { +public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSupport<ActivityLonglineObsDto, ActivityLonglineObsReference, ActivityLonglineObsUI> { public static final String ACTION_NAME = DeleteActivityLonglineObsUIAction.class.getName(); private static final Logger log = LogManager.getLogger(DeleteActivityLonglineObsUIAction.class); @@ -48,7 +52,7 @@ public class DeleteActivityLonglineObsUIAction extends DeleteOpenDataUIActionSup } @Override - protected void doDelete(TripSeineUI ui, TripSeineDto bean, ObserveEditNode<TripSeineDto> editNode) { + protected void doDelete(ActivityLonglineObsUI ui, ActivityLonglineObsDto bean, ObserveEditNode<ActivityLonglineObsDto> editNode) { log.info("Will delete Activity " + bean.getId()); String tripId = editNode.getParent().getId(); getServicesProvider().getActivityLonglineObsService().delete(bean.getId()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6ac3a215e68acd464c1e24b1b53… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6ac3a215e68acd464c1e24b1b53… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation (Refactor and extract navigation...
by Tony CHEMIT 23 Jul '19

23 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7d78f295 by tchemit at 2019-07-23T11:34:29Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-core/src/main/resources/icons/navigation/v7/route16.png → client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_16x16.png - client-core/src/main/resources/icons/navigation/v7/route24.png → client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_24x24.png - client-core/src/main/resources/icons/navigation/v7/trip16.png → client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_16x16.png - client-core/src/main/resources/icons/navigation/v7/trip24.png → client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_24x24.png - client-core/src/main/resources/icons/navigation/v7/floatingObject16.png → client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_16x16.png - client-core/src/main/resources/icons/navigation/v7/floatingObject24.png → client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.GearUseFeaturesLongline_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.GearUseFeaturesLongline_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.landing.LandingLongline_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.landing.LandingLongline_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.CatchLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.CatchLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v7/set16.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v7/set24.png → client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.ActivityLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.ActivityLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SampleLogbook_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/CatchLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SampleLogbook_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/CatchLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v7/activity16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/EncounterObs_16x16.png - client-core/src/main/resources/icons/navigation/v7/activity24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/EncounterObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.EncounterObs_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/SensorUsedObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.EncounterObs_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/SensorUsedObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SetLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/SetLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SetLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/SetLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.CatchLonglineObs_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/TdrObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.CatchLonglineObs_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ll/observation/TdrObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SensorUsedObs_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ps/common/GearUseFeaturesSeine_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SensorUsedObs_24x24.png → client-core/src/main/resources/icons/navigation/default/data/ps/common/GearUseFeaturesSeine_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.TripLongline_16x16.png → client-core/src/main/resources/icons/navigation/default/data/ps/common/TripSeine_16x16.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7d78f295d7228829fc495103320… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7d78f295d7228829fc495103320… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation (Refactor and extract navigation...
by Tony CHEMIT 21 Jul '19

21 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dd3a3488 by tchemit at 2019-07-21T15:01:51Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 30 changed files: - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.GearUseFeaturesLongline_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/common/GearUseFeaturesLongline_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.GearUseFeaturesLongline_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/common/GearUseFeaturesLongline_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.TripLongline_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/common/TripLongline_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.common.TripLongline_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/common/TripLongline_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.landing.LandingLongline_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/landing/LandingLongline_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.landing.LandingLongline_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/landing/LandingLongline_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.ActivityLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/ActivityLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.ActivityLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/ActivityLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.CatchLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/CatchLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.CatchLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/CatchLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SampleLogbook_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/SampleLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SampleLogbook_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/SampleLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SetLonglineLogbook_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/SetLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.logbook.SetLonglineLogbook_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/logbook/SetLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.ActivityLonglineObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/ActivityLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.ActivityLonglineObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/ActivityLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.CatchLonglineObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/CatchLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.CatchLonglineObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/CatchLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.EncounterObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/EncounterObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.EncounterObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/EncounterObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SensorUsedObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/SensorUsedObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SensorUsedObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/SensorUsedObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SetLonglineObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/SetLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.SetLonglineObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/SetLonglineObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.TdrObs_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/TdrObs_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ll.observation.TdrObs_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ll/observation/TdrObs_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ps.common.GearUseFeaturesSeine_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ps/common/GearUseFeaturesSeine_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ps.common.GearUseFeaturesSeine_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ps/common/GearUseFeaturesSeine_24x24.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ps.common.TripSeine_16x16.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ps/common/TripSeine_16x16.png - client-core/src/main/resources/icons/navigation/v8/legacy/data.ps.common.TripSeine_24x24.png → client-core/src/main/resources/icons/navigation/v8/legacy/data/ps/common/TripSeine_24x24.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dd3a34882e42ab54ba4902fa8ca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dd3a34882e42ab54ba4902fa8ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation (Refactor and extract navigation...
by Tony CHEMIT 21 Jul '19

21 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0281d0dc by tchemit at 2019-07-21T14:19:57Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowEmptyNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowLonglineNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowReferentialNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowSeineNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectEditDataAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLandingAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineObsActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineTripAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineTripAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ui/ReferenceListFromMultipleContainerNodeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/ObserveTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0281d0dc83106a6b146e03e82bd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0281d0dc83106a6b146e03e82bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation (Refactor and extract navigation...
by Tony CHEMIT 21 Jul '19

21 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 146694cc by tchemit at 2019-07-21T12:21:12Z Création de nouvelles icônes de navigation (Refactor and extract navigation icons to a separate file )- See #1358 - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ObserveResourceManager.java - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowEmptyNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowLonglineNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowReferentialNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/ToggleShowSeineNavigationConfigUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectEditDataAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLandingAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineObsActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectLonglineTripAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectReferentialAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineProgramAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineTripAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/tree/ActivityLonglinePairingTreeTable.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/TypeReferentialSynchroNode.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ui/ReferenceListFromMultipleContainerNodeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/ObserveTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/146694cc3fcc8d4261cd12963f0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/146694cc3fcc8d4261cd12963f0… You're receiving this email because of your account on gitlab.com.

1 0

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

19 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cea7ccc1 by tchemit at 2019-07-19T13:00:30Z Assouplir un contrôle de saisie - Closes #1360 - - - - - 2 changed files: - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cea7ccc175f4d308c142df01add… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cea7ccc175f4d308c142df01add… You're receiving this email because of your account on gitlab.com.

1 0

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

19 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03f87627 by tchemit at 2019-07-19T13:00:11Z Assouplir un contrôle de saisie - Closes #1360 - - - - - 4 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml Changes: ===================================== client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -543,6 +543,10 @@ public class ClientConfig extends GeneratedClientConfig implements NavigationTre } } + public boolean isVersionSnapshot() { + return getBuildVersion().isSnapshot(); + } + ////////////////////////////////////////////////// // Toutes les étapes d'actions ////////////////////////////////////////////////// ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== @@ -127,7 +127,7 @@ public abstract class ObserveRunner extends ApplicationRunner { Path i18nDirectory = config.getI18nDirectory().toPath(); - if (config.getBuildVersion().isSnapshot() && Files.exists(i18nDirectory)) { + if (config.isVersionSnapshot() && Files.exists(i18nDirectory)) { // always regenerate i18n try { Files.walk(i18nDirectory) @@ -407,14 +407,14 @@ public abstract class ObserveRunner extends ApplicationRunner { // 5 - application ui - File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory); +// File file = ObserveResourceManager.Resource.ui.getFile(resourcesDirectory); - if (!file.exists()) { - - String message = t("observe.runner.copy.default.ui.file", file); - - resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message); - } +// if (!file.exists()) { +// +// String message = t("observe.runner.copy.default.ui.file", file); +// +// resourceManager.copyResource(ObserveResourceManager.Resource.ui, file, message); +// } // 6 - resources log configuration file @@ -432,7 +432,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File reportDirectory = resourceManager.createDirectory(config, REPORT_DIRECTORY); - file = ObserveResourceManager.Resource.report.getFile(reportDirectory); + File file = ObserveResourceManager.Resource.report.getFile(reportDirectory); if (!file.exists()) { @@ -504,7 +504,7 @@ public abstract class ObserveRunner extends ApplicationRunner { File dir = config.getResourcesDirectory(); File file = ObserveResourceManager.Resource.ui.getFile(dir); - if (!file.exists()) { + if (!file.exists() || config.isVersionSnapshot()) { String message = t("observe.runner.copy.default.ui.file", file); ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-create-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetLonglineLogbookDto-update-error-validation.xml ===================================== @@ -343,8 +343,8 @@ </field> <field name="totalHooksCount"> <field-validator type="boundNumber" short-circuit="true"> - <param name="min">500.0</param> - <param name="max">5500.0</param> + <param name="min">10.0</param> + <param name="max">10000.0</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/03f8762719a4b9a28f113ebe3e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/03f8762719a4b9a28f113ebe3e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Insertion de l’échantillonnage au port - See #1261
by Tony CHEMIT 18 Jul '19

18 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a33bc21b by tchemit at 2019-07-18T12:37:46Z Insertion de l’échantillonnage au port - See #1261 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeContentTableModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIImpl.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a33bc21b158de0cf273377b384b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a33bc21b158de0cf273377b384b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Insertion de l’échantillonnage au port - See #1261
by Tony CHEMIT 18 Jul '19

18 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 5fed4fbe by tchemit at 2019-07-18T05:21:50Z Insertion de l’échantillonnage au port - See #1261 - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveMultipleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/move/MoveSingleSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookSampleAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeContentTableModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIImpl.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jaxx - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUIModel.java - + client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5fed4fbe0f91eeafbaabfa4ca93… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5fed4fbe0f91eeafbaabfa4ca93… You're receiving this email because of your account on gitlab.com.

1 0