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

[Git][ultreiaio/ird-observe][develop] Pb arbre de navigation - traduction - débarquement/échantillon - Closes #1291
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ceb112a8 by tchemit at 2019-05-21T15:32:56Z Pb arbre de navigation - traduction - débarquement/échantillon - Closes #1291 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookNavigationTreeNode.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripLonglineLandingLogbookNavigationTreeNode.java ===================================== @@ -60,7 +60,7 @@ public class TripLonglineLandingLogbookNavigationTreeNode extends ReferenceNavig @Override public String getText() { - return isPersisted() ? super.getText() : t("observe.ui.tree.longline.logbook.sample.unsaved"); + return isPersisted() ? super.getText() : t("observe.ui.tree.longline.logbook.landing.unsaved"); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ceb112a81daa6a577e26c8dfdf6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ceb112a81daa6a577e26c8dfdf6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Diverses corrections sur le modèle LL
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 45fb2003 by tchemit at 2019-05-21T13:47:53Z Diverses corrections sur le modèle LL - - - - - 14 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -714,6 +714,8 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss ===================================== @@ -34,6 +34,10 @@ JButton { _protectFocus:true; } +BeanCheckBox { + i18nProperty:"" +} + /*#comment { minimumSize:{new Dimension(10,50)}; }*/ ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx ===================================== @@ -120,7 +120,7 @@ public void edit(BranchlineObsDto branchline) { getHandler().edit(branchline); } <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -33,7 +36,8 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.10 */ -public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> { +@GenerateJavaBeanDefinition +public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> implements JavaBean { public static final String PROPERTY_SAVED = "saved"; private static final long serialVersionUID = 1L; @@ -68,4 +72,16 @@ public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> firePropertyChange(PROPERTY_SAVED, null, true); } + + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return null; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx ===================================== @@ -281,7 +281,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='depredated'/> + <BeanCheckBox id='depredated' /> </cell> </row> @@ -397,10 +397,10 @@ <cell anchor='east'> <BeanCheckBox id='timer'/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + + + + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline CatchLonglineObsUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getTimeSinceContact()); + calendar. setTime(model.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR); branchline.setTimeSinceContact(minutes + 60L * hours); @@ -642,7 +642,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline } private void onCatchFateChanged(CatchFateLonglineReference newValue) { - if (newValue == null || !" fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { + if (newValue == null || !"fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -112,7 +112,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='canGenerate'/> + <BeanCheckBox id='canGenerate' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; /** * Created on 12/5/14. @@ -32,7 +35,8 @@ import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto * @since 3.8 */ @SuppressWarnings("WeakerAccess") -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> { +@GenerateJavaBeanDefinition +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -130,4 +134,15 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); } + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return javaBeanDefinition; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -74,6 +74,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; + _skipBindingToBean:true; } #timestampPanel { ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Shooter speed (kts) observe.common.SetLonglineObsDto.shooterUsed=Shooter used observe.common.SetLonglineObsDto.snapWeight=Snap weight (kg) observe.common.SetLonglineObsDto.swivelWeight=swivel weight (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.SetLonglineObsDto.timeBetweenHooks=time between hooks observe.common.SetLonglineObsDto.title=Fishing operation observe.common.SetLonglineObsDto.totalBasketsCount=Total baskets count @@ -2147,6 +2145,8 @@ observe.common.TargetCatchDto.table.weightCategory=Weight category observe.common.TargetCatchDto.table.weightCategory.tip=Weight category observe.common.TargetCatchDto.table.well=Well observe.common.TargetCatchDto.table.well.tip=Well +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimated by observer? +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimated by observer? observe.common.TargetCatchDto.title=Target catch observe.common.TargetCatchDto.type=Target catch observe.common.TargetCatchDto.types=Target catches ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Velocidad shooter (nd) observe.common.SetLonglineObsDto.shooterUsed=Shooter used \#TODO observe.common.SetLonglineObsDto.snapWeight=Peso snap (kg) observe.common.SetLonglineObsDto.swivelWeight=Peso de el destorcedor (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO observe.common.SetLonglineObsDto.timeBetweenHooks=Temps entre anzuelos (s) observe.common.SetLonglineObsDto.title=Operación de pesca observe.common.SetLonglineObsDto.totalBasketsCount=Número total de baskets @@ -2147,6 +2145,8 @@ observe.common.TargetCatchDto.table.weightCategory=Categoría de peso observe.common.TargetCatchDto.table.weightCategory.tip=Categoría de peso observe.common.TargetCatchDto.table.well=Tanque observe.common.TargetCatchDto.table.well.tip=Tanque +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? \#TODO observe.common.TargetCatchDto.title=Captura de atún observe.common.TargetCatchDto.type=Captura destinataria observe.common.TargetCatchDto.types=Capturas destinatarias ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -1997,8 +1997,6 @@ observe.common.SetLonglineObsDto.shooterSpeed=Vitesse shooter (nd) observe.common.SetLonglineObsDto.shooterUsed=Utilisation du shooter observe.common.SetLonglineObsDto.snapWeight=Poids snap (kg) observe.common.SetLonglineObsDto.swivelWeight=Poids de l'émerillon (kg) -observe.common.SetLonglineObsDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? -observe.common.SetLonglineObsDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.SetLonglineObsDto.timeBetweenHooks=Temps entre hameçons (s) observe.common.SetLonglineObsDto.title=Opération de pêche observe.common.SetLonglineObsDto.totalBasketsCount=Nombre total de paniers @@ -2147,6 +2145,8 @@ observe.common.TargetCatchDto.table.weightCategory=Catégorie de poids observe.common.TargetCatchDto.table.weightCategory.tip=Catégorie de poids observe.common.TargetCatchDto.table.well=Cuve observe.common.TargetCatchDto.table.well.tip=Cuve +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver=Composition estimée par l'observateur ? observe.common.TargetCatchDto.title=Thons conservés observe.common.TargetCatchDto.type=Thons conservés observe.common.TargetCatchDto.types=Thons conservés ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java ===================================== @@ -180,7 +180,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); @@ -210,7 +210,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -96,7 +96,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { request.setValidationContext(ValidationContext.UPDATE_VALIDATION_CONTEXT); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/45fb2003593810eb04965d053e7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/45fb2003593810eb04965d053e7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Diverses corrections sur le modèle LL
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9316f9c6 by tchemit at 2019-05-21T13:33:52Z Diverses corrections sur le modèle LL - - - - - 11 changed files: - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -714,6 +714,8 @@ observe.common.TargetCatchDto.table.deleteExtraMessage observe.common.TargetCatchDto.table.speciesThon.tip observe.common.TargetCatchDto.table.weightCategory.tip observe.common.TargetCatchDto.table.well.tip +observe.common.TargetCatchDto.targetCatchCompositionEstimatedByObserver +observe.common.TargetCatchDto.targetDiscardCatchCompositionEstimatedByObserver observe.common.TargetCatchDto.title observe.common.TargetCatchDto.weightCategory observe.common.TargetCatchDto.well ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/CommonTable.jcss ===================================== @@ -34,6 +34,10 @@ JButton { _protectFocus:true; } +BeanCheckBox { + i18nProperty:"" +} + /*#comment { minimumSize:{new Dimension(10,50)}; }*/ ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUI.jaxx ===================================== @@ -120,7 +120,7 @@ public void edit(BranchlineObsDto branchline) { getHandler().edit(branchline); } <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <TimeEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.BranchlineObsDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import java.util.Date; @@ -33,7 +36,8 @@ import java.util.Date; * @author Tony Chemit - dev(a)tchemit.fr * @since 3.10 */ -public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> { +@GenerateJavaBeanDefinition +public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> implements JavaBean { public static final String PROPERTY_SAVED = "saved"; private static final long serialVersionUID = 1L; @@ -68,4 +72,16 @@ public class BranchlineObsUIModel extends ContentSimpleUIModel<BranchlineObsDto> firePropertyChange(PROPERTY_SAVED, null, true); } + + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return null; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUI.jaxx ===================================== @@ -281,7 +281,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='depredated'/> + <BeanCheckBox id='depredated' /> </cell> </row> @@ -397,10 +397,10 @@ <cell anchor='east'> <BeanCheckBox id='timer'/> </cell> - <cell> - <JLabel id='timeSinceContactLabel'/> - </cell> - <cell> + + + + <cell columns="2"> <TimeEditor id='timeSinceContact' constructorParams='this' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/CatchLonglineObsUIHandler.java ===================================== @@ -503,7 +503,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline CatchLonglineObsUIModel model = getModel(); if (BooleanUtils.isTrue(branchline.getTimer())) { Calendar calendar = Calendar.getInstance(); - calendar.setTime(model.getTimeSinceContact()); + calendar. setTime(model.getTimeSinceContact()); int minutes = calendar.get(Calendar.MINUTE); int hours = calendar.get(Calendar.HOUR); branchline.setTimeSinceContact(minutes + 60L * hours); @@ -642,7 +642,7 @@ public class CatchLonglineObsUIHandler extends ContentTableUIHandler<SetLongline } private void onCatchFateChanged(CatchFateLonglineReference newValue) { - if (newValue == null || !" fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { + if (newValue == null || !"fr.ird.referential.ll.common.CatchFateLongline#1239832686125#0.3".equals(newValue.getId())) { // not discarded ui.getDiscardHealthness().setEnabled(false); ui.getHookWhenDiscarded().setEnabled(false); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUI.jaxx ===================================== @@ -112,7 +112,7 @@  <row> <cell anchor='west' fill="both"> - <BeanCheckBox id='canGenerate'/> + <BeanCheckBox id='canGenerate' beanScope="model"/> </cell> </row> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/LonglineDetailCompositionObsUIModel.java ===================================== @@ -24,6 +24,9 @@ package fr.ird.observe.client.ui.content.data.ll.observation; import fr.ird.observe.client.ui.content.api.data.simple.ContentSimpleUIModel; import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.definition.JavaBeanDefinition; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; /** * Created on 12/5/14. @@ -32,7 +35,8 @@ import fr.ird.observe.dto.data.ll.observation.SetLonglineObsDetailCompositionDto * @since 3.8 */ @SuppressWarnings("WeakerAccess") -public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> { +@GenerateJavaBeanDefinition +public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<SetLonglineObsDetailCompositionDto> implements JavaBean { public static final String PROPERTY_CAN_GENERATE = "canGenerate"; @@ -130,4 +134,15 @@ public class LonglineDetailCompositionObsUIModel extends ContentSimpleUIModel<Se firePropertyChange(PROPERTY_GENERATE_TAB_VALID, null, generateTabValid); } + /** + * Lazy helper class that manages all java bean operations. + * + * @see #javaBeanDefinition() + */ + private transient final JavaBeanDefinition javaBeanDefinition = new LonglineDetailCompositionObsUIModelJavaBeanDefinition(); + + @Override + public JavaBeanDefinition javaBeanDefinition() { + return javaBeanDefinition; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/TdrObsUI.jcss ===================================== @@ -74,6 +74,7 @@ #enableTimestamp { toolTipText:"observe.common.TdrObsDto.enableTimestamp.tip"; + _skipBindingToBean:true; } #timestampPanel { ===================================== services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java ===================================== @@ -180,7 +180,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { request.setDataIds(ImmutableSet.of(ObserveFixtures.TRIP_SEINE_ID_1, ObserveFixtures.TRIP_SEINE_ID_2)); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); @@ -210,7 +210,7 @@ public class ValidateServiceClientTest extends ServiceClientTestSupport { SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -96,7 +96,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { request.setValidationContext(ValidationContext.UPDATE_VALIDATION_CONTEXT); SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = new SeineBycatchObservedSystemConfig(); ArrayListMultimap<String, String> data = ArrayListMultimap.create(); - data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", " fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); + data.put("fr.ird.referential.common.Species#1239832684537#0.2397229787936519", "fr.ird.referential.ps.observation.ObservedSystem#0#1.0"); seineBycatchObservedSystemConfig.setData(data); request.setSeineBycatchObservedSystemConfig(seineBycatchObservedSystemConfig); request.setScopes(ImmutableSet.copyOf(NuitonValidatorScope.values())); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9316f9c66fb1e500d2778117769… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9316f9c66fb1e500d2778117769… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Débarquements ne fonctionnent pas - Closes #1286
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 555130ca by tchemit at 2019-05-21T11:12:14Z Débarquements ne fonctionnent pas - Closes #1286 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/TripLonglineLandingUI.jcss ===================================== @@ -36,6 +36,10 @@ /* CARACTERISTICS TAB ********************************************************* */ /* ***************************************************************************** */ +#dataSourceEditor { + property:dataSource; +} + /* ***************************************************************************** */ /* LANDING PART TAB *********************************************************** */ /* ***************************************************************************** */ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/555130caf86531f1506789aaf9c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/555130caf86531f1506789aaf9c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: Impossible de remplir le champ espèces - Closes #1273
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d1f46eec by tchemit at 2019-05-21T10:35:09Z Impossible de remplir le champ espèces - Closes #1273 - - - - - 8f4cb91c by tchemit at 2019-05-21T10:35:12Z Incohérence date de début date de fin - Closes #1276 - - - - - 1b404166 by tchemit at 2019-05-21T10:35:12Z update pom - - - - - 947f5102 by tchemit at 2019-05-21T10:35:12Z Editeurs d'url non actifs - Closes #1275 - - - - - 14009845 by tchemit at 2019-05-21T10:35:12Z update templates - - - - - b31008c7 by tchemit at 2019-05-21T10:35:12Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - f6dc60ee by tchemit at 2019-05-21T10:58:58Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - 6a931a52 by tchemit at 2019-05-21T10:58:59Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 24 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CloseOpenDataFromListUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/CloseOpenDataFromListUIAction.java ===================================== @@ -30,6 +30,8 @@ import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.list.ContentListUI; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static io.ultreia.java4all.i18n.I18n.n; @@ -41,6 +43,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class CloseOpenDataFromListUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(CloseOpenDataFromListUIAction.class); public static final String ACTION_NAME = CloseOpenDataFromListUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -61,7 +64,8 @@ public class CloseOpenDataFromListUIAction extends AbstractContentUIAction { CloseOpenDataUIAction.closeData(((ContentListUI) ui).getModel().getEditNode()); afterClose((ContentListUI) ui); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/list/OpenOpenDataFromListUIAction.java ===================================== @@ -28,12 +28,13 @@ import fr.ird.observe.client.ui.actions.content.api.data.open.OpenOpenDataUIActi import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.content.api.data.list.ContentListUI; import fr.ird.observe.client.ui.tree.navigation.NavigationTree; -import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.model.select.ObserveSelectNode; import fr.ird.observe.navigation.tree.ReferenceNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree; import static io.ultreia.java4all.i18n.I18n.n; @@ -47,6 +48,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class OpenOpenDataFromListUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(OpenOpenDataFromListUIAction.class); public static final String ACTION_NAME = OpenOpenDataFromListUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -74,7 +76,8 @@ public class OpenOpenDataFromListUIAction extends AbstractContentUIAction { OpenOpenDataUIAction.openData(editNode, selectedNode, id); afterOpen(contentListUI, id); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CreateOpenDataUIAction.java ===================================== @@ -31,6 +31,8 @@ import fr.ird.observe.client.ui.tree.navigation.NavigationTree; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.navigation.model.edit.CloseEditNodeVetoException; import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * Created on 11/11/16. @@ -40,6 +42,7 @@ import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; */ public class CreateOpenDataUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(CreateOpenDataUIAction.class); public static final String ACTION_NAME = CreateOpenDataUIAction.class.getName(); public CreateOpenDataUIAction(ObserveMainUI mainUI) { @@ -51,7 +54,8 @@ public class CreateOpenDataUIAction extends AbstractContentUIAction { CloseOpenDataUIAction.closeData(model.getEditNode()); tree.addUnsavedNode(parentNode); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/MoveSingleDataUIActionSupport.java ===================================== @@ -153,7 +153,8 @@ public abstract class MoveSingleDataUIActionSupport<ChildDto extends IdDto, Chil try { closeNode(editNode); } catch (CloseEditNodeVetoException e) { - UIHelper.handlingError(e); + log.error("Could not close data from callback", e); +// UIHelper.handlingError(e); return; } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/OpenOpenDataUIAction.java ===================================== @@ -36,6 +36,8 @@ import fr.ird.observe.navigation.model.edit.ObserveEditModelManager; import fr.ird.observe.navigation.model.edit.ObserveEditNode; import fr.ird.observe.navigation.model.edit.OpenEditNodeRequest; import fr.ird.observe.navigation.model.select.ObserveSelectNode; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import static fr.ird.observe.client.ui.content.api.ContentUIHandler.getNavigationTree; import static io.ultreia.java4all.i18n.I18n.n; @@ -49,6 +51,7 @@ import static io.ultreia.java4all.i18n.I18n.n; */ public class OpenOpenDataUIAction extends AbstractContentUIAction { + private static final Logger log = LogManager.getLogger(OpenOpenDataUIAction.class); public static final String ACTION_NAME = OpenOpenDataUIAction.class.getName(); private static final long serialVersionUID = 1L; @@ -83,7 +86,8 @@ public class OpenOpenDataUIAction extends AbstractContentUIAction { openData(editNode, selectedNode, id); afterOpen(openUI); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); + //UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/Common.jcss ===================================== @@ -43,4 +43,9 @@ BigTextEditor { BeanCheckBox { i18nProperty:""; horizontalTextPosition:{BeanCheckBox.LEFT}; +} + +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; } \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jaxx ===================================== @@ -125,9 +125,7 @@ public void resetEdit() { <JPanel id='contentContainer'> <JXLayer UI='{blockLayerUI}' constraints='BorderLayout.CENTER'> - <JPanel id='body'/> - </JXLayer> <Table id='actions' constraints='BorderLayout.SOUTH'/> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUI.jcss ===================================== @@ -67,3 +67,7 @@ borderPainted:false; } +#bodyScrollPane { + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; + horizontalScrollBarPolicy:{JScrollPane.HORIZONTAL_SCROLLBAR_NEVER}; +} ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jaxx ===================================== @@ -68,13 +68,13 @@ public abstract ContentListUIHandler<E, C, R, U> getHandler(); ]]></script> <JPanel id='body'> - <JScrollPane id='listPane' constraints='BorderLayout.CENTER' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> - <JPanel id='listPanel'> + <JPanel id='listPanel' constraints='BorderLayout.CENTER' > <JLabel id="emptyLabel" constraints='"empty"' styleClass="skipI18n"/> - <JList id='list' genericType='R' constraints='"list"' onMouseClicked='getHandler().onDataSelected(event)'/> + <JScrollPane id='listPane' constraints='"list"' onFocusGained='list.requestFocus()' columnHeaderView='{listHeader}'> + <JList id='list' genericType='R' onMouseClicked='getHandler().onDataSelected(event)'/> + <BeanListHeader id='listHeader' genericType='R'/> + </JScrollPane> </JPanel> - <BeanListHeader id='listHeader' genericType='R'/> - </JScrollPane> </JPanel> <Table id="actions" weightx='1' insets='0' fill="both"> ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUI.jcss ===================================== @@ -30,6 +30,7 @@ #listPane { minimumSize:{new Dimension(10,150)}; + verticalScrollBarPolicy:{JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED}; } #listPanelLayout { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIHandler.java ===================================== @@ -125,11 +125,11 @@ public abstract class ContentListUIHandler<D extends IdDto, C extends DataDto, R getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); - } else { - - getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); } +// else { +// getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); +// } }); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUI.jcss ===================================== @@ -136,3 +136,4 @@ verticalAlignment:"center"; horizontalAlignment:"center"; } + ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripLonglineUI.jaxx ===================================== @@ -80,7 +80,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt  <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> + <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table fill="both"> @@ -335,6 +336,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<TripLonglineActivityObsDt <TripMapUI id="tripMap"/> </tab> </JTabbedPane> + </JScrollPane> </JPanel>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripSeineUI.jaxx ===================================== @@ -87,7 +87,8 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) {  <JPanel id="body" layout='{new BorderLayout()}'> - <JTabbedPane id='mainTabbedPane' constraints='BorderLayout.CENTER'> + <JScrollPane id='bodyScrollPane' constraints='BorderLayout.CENTER'> + <JTabbedPane id='mainTabbedPane'> <tab id='generalTab' i18nProperty=""> <Table insets="0" fill="both" id="formGeneral"> @@ -234,6 +235,7 @@ protected boolean canEditOcean(java.util.LinkedHashSet<RouteStubDto> routes) { <TripMapUI id="tripMap"/> </tab> </JTabbedPane> + </JScrollPane> </JPanel>  ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java ===================================== @@ -404,6 +404,9 @@ public class NavigationTree extends JXTree { if (containerNode == null) { return null; } + if (!((NavigationTreeNodeSupport)containerNode).isLoaded()) { + ((NavigationTreeNodeSupport) containerNode).populateChildren(); + } // got to reference return ReferenceNode.downToReferenceNode(referenceType, editNode.getId(), containerNode); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -911,7 +911,7 @@ observe.common.DataDto.captain=Capitaine observe.common.DataDto.dataQuality=Qualité de donnée observe.common.DataDto.departureHarbour=Port de départ observe.common.DataDto.depthRecorder=Enregistreur de profondeur -observe.common.DataDto.endDate=Date de début +observe.common.DataDto.endDate=Date de fin observe.common.DataDto.haulingIdentifier=Virage observe.common.DataDto.hookLost=Hameçon perdu observe.common.DataDto.landingHarbour=Port d'arrivée @@ -921,7 +921,7 @@ observe.common.DataDto.observer=Observateur observe.common.DataDto.program=Programme observe.common.DataDto.settingIdentifier=Filage observe.common.DataDto.speciesFate=Devenir espèce -observe.common.DataDto.startDate=Date de fin +observe.common.DataDto.startDate=Date de début observe.common.DataDto.timer=Horloge observe.common.DataDto.timerTimeOnBoard=Horodatage de montée à bord observe.common.DataDto.traceCutOff=Bas de ligne coupé ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.17</version> + <version>2019.8.18</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb1af8b52cee94c5368e91ac01… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cb1af8b52cee94c5368e91ac01… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Editeurs d'url non actifs - Closes #1275
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9857e601 by tchemit at 2019-05-21T09:30:58Z Editeurs d'url non actifs - Closes #1275 - - - - - c34fdc68 by tchemit at 2019-05-21T09:31:00Z update templates - - - - - 842bb48c by tchemit at 2019-05-21T09:31:00Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - 96034c18 by tchemit at 2019-05-21T09:31:00Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - cb1af8b5 by tchemit at 2019-05-21T09:31:00Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 8 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java - pom.xml Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { ===================================== pom.xml ===================================== @@ -163,7 +163,7 @@   - + <lib.version.java4all.jaxx>3.0-alpha-51</lib.version.java4all.jaxx>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1be1078f4bf849d0ee48e093c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1be1078f4bf849d0ee48e093c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1be1078f by tchemit at 2019-05-21T09:16:03Z Ajout d'un test pour mieux comprendre le pb - Erreur création activité - See #1283 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/util/ObserveValidatorMessageTableRenderer.java ===================================== @@ -36,6 +36,7 @@ import javax.swing.JComponent; import javax.swing.JTable; import java.awt.Color; import java.awt.Component; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -59,6 +60,7 @@ public class ObserveValidatorMessageTableRenderer extends SwingValidatorMessageT @Override public String getFieldName(JTable table, String value, int row) { + Objects.requireNonNull(value,"Value can not be null!"); SwingValidatorMessageTableModel tableModel = (SwingValidatorMessageTableModel) table.getModel(); SwingValidatorMessage model = tableModel.getRow(row); JComponent editor = model.getEditor(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1be1078f4bf849d0ee48e093c73… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1be1078f4bf849d0ee48e093c73… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Pas d'accès à l'activité de fin de veille - Closes #1281
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a4430687 by tchemit at 2019-05-21T09:06:40Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Impossible d'éditer nouveau DCP - Closes #1279
by Tony CHEMIT 21 May '19

21 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 63734157 by tchemit at 2019-05-21T08:56:21Z Impossible d'éditer nouveau DCP - Closes #1279 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/save/SaveFloatingObjectSeineUIAction.java ===================================== @@ -28,13 +28,19 @@ import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.actions.content.api.data.edit.SaveEditDataUIActionSupport; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUI; import fr.ird.observe.client.ui.content.data.ps.observation.FloatingObjectUIModel; +import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.dto.data.ps.observation.FloatingObjectDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectPartDto; import fr.ird.observe.dto.data.ps.observation.FloatingObjectReference; import fr.ird.observe.dto.result.SaveResultDto; import fr.ird.observe.navigation.model.edit.ObserveEditNode; +import fr.ird.observe.navigation.tree.MultipleReferenceContainerNode; +import fr.ird.observe.navigation.tree.ReferenceNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +import java.util.function.Function; /** * Created by tchemit on 28/09/2018. @@ -68,4 +74,8 @@ public class SaveFloatingObjectSeineUIAction extends SaveEditDataUIActionSupport return true; } + @Override + protected @NotNull Function<FloatingObjectReference, ReferenceNode<FloatingObjectDto, FloatingObjectReference>> getNodeFactory(NavigationTreeNodeSupport parent) { + return ((MultipleReferenceContainerNode) parent)::newChildNode; + } } ===================================== dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java ===================================== @@ -29,19 +29,19 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { private static final long serialVersionUID = 1L; //FIXME-PROTECTED-ID public boolean isBoolean() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#0".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isText() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#3".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isInteger() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#2".equals(objectMaterialType.getId()); } //FIXME-PROTECTED-ID public boolean isFloat() { - return objectMaterialType != null && " fr.ird.referential.ps.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); + return objectMaterialType != null && "fr.ird.referential.ps.observation.ObjectMaterialType#0#1".equals(objectMaterialType.getId()); } public boolean withValidation() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/63734157250fb8d534899af3f7d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update templates
by Tony CHEMIT 20 May '19

20 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0858ceeb by tchemit at 2019-05-20T17:29:42Z update templates - - - - - 2 changed files: - .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md Changes: ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md ===================================== @@ -9,6 +9,6 @@ ``` /label ~"Anomalie" -/label ~"Contrat SFA-2017" -/milestone %"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" +/milestone %"8.0-beta-1" /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md ===================================== @@ -1,5 +1,5 @@ /label ~"Evolution" -/label ~"Contrat SFA-2017" +/label ~"IRD-2018-01-V8" /milestone %"Contrat SFA-2017" /assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0858ceeb4051a725cea28105f75… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0858ceeb4051a725cea28105f75… You're receiving this email because of your account on gitlab.com.

1 0