branch develop updated (7d68bea -> 2bdb052)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7d68bea [LL] Piloter les fonctions/formulaires disponibles en fonction du type d'activité choisi (Fixes #6702) Merge branch 'feature/6702' into develop new 32e4194 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Capture) new 34ceb86 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Avançon) new 2bdb052 [LL] Formulaire Composition détaillée / onglet "Détail Avançon" : Quelques améliorations (Fixes #6769) Merge branch 'feature/6769' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2bdb05221cf5a35d70b5b4ecf9ef20bfc4795580 Merge: 7d68bea 34ceb86 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:47 2016 +0200 [LL] Formulaire Composition détaillée / onglet "Détail Avançon" : Quelques améliorations (Fixes #6769) Merge branch 'feature/6769' into develop commit 34ceb86d18d960eaa06ed2a0c94780fab6ddc563 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:34 2016 +0200 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Avançon) commit 32e4194e841901e226d3388fa8728d3f44f56116 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:12 2016 +0200 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Capture) Summary of changes: .../ui/content/impl/longline/BranchlineUI.jaxx | 3 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 ++-- .../content/impl/longline/BranchlineUIHandler.java | 53 +++++++++++++++++++--- .../content/impl/longline/BranchlineUIModel.java | 12 +++++ .../table/impl/longline/CatchLonglineUI.jaxx | 3 +- .../table/impl/longline/CatchLonglineUI.jcss | 9 ++-- .../impl/longline/CatchLonglineUIHandler.java | 46 ++++++++++++++++--- .../table/impl/longline/CatchLonglineUIModel.java | 16 +++++++ 8 files changed, 127 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 32e4194e841901e226d3388fa8728d3f44f56116 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:12 2016 +0200 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Capture) --- .../table/impl/longline/CatchLonglineUI.jaxx | 3 +- .../table/impl/longline/CatchLonglineUI.jcss | 9 +++-- .../impl/longline/CatchLonglineUIHandler.java | 46 ++++++++++++++++++---- .../table/impl/longline/CatchLonglineUIModel.java | 16 ++++++++ 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index b6a137e..bf7b2c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -52,6 +52,7 @@ jaxx.runtime.swing.editor.bean.BeanComboBox org.nuiton.jaxx.widgets.select.FilterableDoubleList org.nuiton.jaxx.widgets.datetime.DateTimeEditor + org.nuiton.jaxx.widgets.datetime.TimeEditor java.awt.Dimension @@ -384,7 +385,7 @@ <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <NumberEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss index 251fb3d..c8e08b7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -422,11 +422,11 @@ } #timeSinceContact { - property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; - bean:{branchlineBean}; + propertyTime:{CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT}; + bean:{model}; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; - model:{branchlineBean.getTimeSinceContact()}; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.LONG_10_DIGITS_PATTERN}; + time:{model.getBranchlineTimeSinceContact()}; + showTimeEditorSlider:false; _validatorLabel:{t("observe.content.branchline.timeSinceContact")}; } @@ -439,6 +439,7 @@ date:{branchlineBean.getTimerTimeOnBoard()}; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; bean:{branchlineBean}; + showTimeEditorSlider:false; enabled:{BooleanUtils.isTrue(branchlineBean.getTimer())}; label:{t("observe.content.branchline.timerTimeOnBoard")}; _validatorLabel:{t("observe.content.branchline.timerTimeOnBoard")}; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index 20dea2b..bf75e79 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -24,9 +24,15 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import com.google.common.collect.Lists; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.ui.ObserveMainUI; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; +import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BasketDto; @@ -50,12 +56,6 @@ import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.longline.BranchlineService; import fr.ird.observe.services.service.longline.SetLonglineCatchService; import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.application.swing.ui.ObserveMainUI; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; -import fr.ird.observe.application.swing.ui.content.ContentUIModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import jaxx.runtime.context.JAXXContextEntryDef; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; @@ -63,6 +63,7 @@ import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -71,8 +72,10 @@ import javax.swing.JTable; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeListener; +import java.util.Calendar; import java.util.Collection; import java.util.Collections; +import java.util.Date; import java.util.HashSet; import java.util.LinkedList; import java.util.List; @@ -161,6 +164,8 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat POSITION_HELPER_ENTRY.setContextValue(getUi(), positionHelper); + getModel().addPropertyChangeListener(CatchLonglineUIModel.PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, + evt -> getUi().getBranchlineValidator().setChanged(true)); } @Override @@ -172,6 +177,9 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat super.openUI(); + getUi().getTimeSinceContact().getSliderHidor().setVisible(false); + getUi().getTimerTimeOnBoard().getSliderHidor().setVisible(false); + // Reset all sections LonglinePositionHelper<CatchLonglineDto> positionHelper = POSITION_HELPER_ENTRY.getContextValue(getUi()); getUi().getSection().setData(positionHelper.getSections()); @@ -204,6 +212,19 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat BranchlineDto branchline = ui.getBranchlineBean(); + if (BooleanUtils.isTrue(branchline.getTimer())) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(getModel().getBranchlineTimeSinceContact()); + int minutes = calendar.get(Calendar.MINUTE); + int hours = calendar.get(Calendar.HOUR); + branchline.setTimeSinceContact(minutes + 60L * hours); + } else { + branchline.setTimeSinceContact(null); + } + if (log.isInfoEnabled()) { + log.info("Time since contact: " + branchline.getTimeSinceContact()); + } + String openSetLonglineId = getDataContext().getSelectedSetLonglineId(); SaveResultDto saveResult = getBranchLineService().save(openSetLonglineId, branchline); saveResult.toDto(branchline); @@ -733,6 +754,7 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat } branchlineValidator.setBean(null); + getModel().setBranchlineTimeSinceContact(null); } else { @@ -749,6 +771,16 @@ public class CatchLonglineUIHandler extends ContentTableUIHandler<SetLonglineCat ui.getValidator().setBean(getBean()); } + if (BooleanUtils.isTrue(branchline.getTimer())) { + Long timeSinceContact = branchline.getTimeSinceContact(); + if (timeSinceContact != null) { + Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); + getModel().setBranchlineTimeSinceContact(timeSinceContactDate); + } + } else { + Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); + getModel().setBranchlineTimeSinceContact(timeSinceContactDate); + } branchlineValidator.setBean(branchline); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java index 02c7d51..c5ce76c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIModel.java @@ -34,6 +34,7 @@ import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; +import java.util.Date; import java.util.List; import java.util.Set; @@ -53,6 +54,8 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt public static final String PROPERTY_BRANCHLINE_TAB_VALID = "branchlineTabValid"; + public static final String PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT = "branchlineTimeSinceContact"; + public static final String PROPERTY_SHOW_INDIVIDUAL_TABS = "showIndividualTabs"; public static final Set<String> CARACTERISTIC_TAB_PROPERTIES = @@ -109,6 +112,8 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt protected boolean branchlineTabValid; + protected Date branchlineTimeSinceContact; + public CatchLonglineUIModel(CatchLonglineUI ui) { super(SetLonglineCatchDto.class, CatchLonglineDto.class, @@ -213,6 +218,17 @@ public class CatchLonglineUIModel extends ContentTableUIModel<SetLonglineCatchDt firePropertyChange(PROPERTY_BRANCHLINE_TAB_VALID, null, branchlineTabValid); } + public Date getBranchlineTimeSinceContact() { + return branchlineTimeSinceContact; + } + + public void setBranchlineTimeSinceContact(Date branchlineTimeSinceContact) { +// Date oldValue = getBranchlineTimeSinceContact(); + this.branchlineTimeSinceContact = branchlineTimeSinceContact; + firePropertyChange(PROPERTY_BRANCHLINE_TIME_SINCE_CONTACT, null, branchlineTimeSinceContact); + + } + @Override protected ContentTableModel<SetLonglineCatchDto, CatchLonglineDto> createTableModel(ObserveContentTableUI<SetLonglineCatchDto, CatchLonglineDto> ui, List<ContentTableMeta<CatchLonglineDto>> contentTableMetas) { return new CatchLonglineTableModel(ui, contentTableMetas); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 34ceb86d18d960eaa06ed2a0c94780fab6ddc563 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:34 2016 +0200 Utilisation d'un TimeEditor pour le temps depuis le déclenchement (écran Avançon) --- .../ui/content/impl/longline/BranchlineUI.jaxx | 3 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 ++-- .../content/impl/longline/BranchlineUIHandler.java | 53 +++++++++++++++++++--- .../content/impl/longline/BranchlineUIModel.java | 12 +++++ 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx index cb4c3d1..0b850a3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx @@ -37,6 +37,7 @@ jaxx.runtime.swing.editor.NumberEditor jaxx.runtime.swing.editor.bean.BeanComboBox org.nuiton.jaxx.widgets.datetime.DateTimeEditor + org.nuiton.jaxx.widgets.datetime.TimeEditor org.apache.commons.lang3.BooleanUtils @@ -125,7 +126,7 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <JLabel id='timeSinceContactLabel'/> </cell> <cell> - <NumberEditor id='timeSinceContact' constructorParams='this'/> + <TimeEditor id='timeSinceContact' constructorParams='this'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss index e3bf267..10cbff5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jcss @@ -85,9 +85,10 @@ #timeSinceContact { enabled:{BooleanUtils.isTrue(bean.getTimer())}; - property:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; - model:{bean.getTimeSinceContact()}; - numberPattern:{fr.ird.observe.application.swing.ui.UIHelper.LONG_10_DIGITS_PATTERN}; + propertyTime:{BranchlineDto.PROPERTY_TIME_SINCE_CONTACT}; + time:{model.getTimeSinceContact()}; + bean:{model}; + showTimeEditorSlider:false; _validatorLabel:{t("observe.content.branchline.timeSinceContact")}; } @@ -100,6 +101,7 @@ enabled:{BooleanUtils.isTrue(bean.getTimer())}; label:{t("observe.content.branchline.timerTimeOnBoard")}; date:{bean.getTimerTimeOnBoard()}; + showTimeEditorSlider:false; propertyDate: {BranchlineDto.PROPERTY_TIMER_TIME_ON_BOARD}; _validatorLabel:{t("observe.content.branchline.timerTimeOnBoard")}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java index bc4c6e0..e2124f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java @@ -25,22 +25,26 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.db.constants.DataContextType; -import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.BranchlineHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import fr.ird.observe.services.dto.longline.BranchlineDto; +import fr.ird.observe.services.dto.longline.BranchlineHelper; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; import org.nuiton.i18n.I18n; +import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JOptionPane; import javax.swing.event.TableModelListener; +import java.util.Calendar; +import java.util.Date; import java.util.HashSet; import java.util.Set; @@ -76,17 +80,33 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { log.info("Will edit branchline: " + branchlineDecorator.toString(branchline)); } - getModel().setBranchline(branchline); + BranchlineUIModel model = getModel(); + + model.setBranchline(branchline); BranchlineHelper.copyBranchlineDto(branchline, getBean()); if (branchline == null) { + Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); + model.setTimeSinceContact(timeSinceContactDate); + // stop edit stopEditUI(); } else { - if (getModel().isEnabled() && !getModel().isEditing()) { + if (BooleanUtils.isTrue(branchline.getTimer())) { + Long timeSinceContact = branchline.getTimeSinceContact(); + if (timeSinceContact != null) { + Date timeSinceContactDate = DateUtil.createDate(0, (int) (timeSinceContact % 60), (int) (timeSinceContact / 60f), 0, 0, 0); + model.setTimeSinceContact(timeSinceContactDate); + } + } else { + Date timeSinceContactDate = DateUtil.createDate(0, 0, 0, 0, 0, 0); + model.setTimeSinceContact(timeSinceContactDate); + } + + if (model.isEnabled() && !model.isEditing()) { startEditUI(); @@ -101,7 +121,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { SwingValidatorMessageTableModel errorTableModel = getUi().getErrorTableModel(); computeTabValidState(errorTableModel); - getModel().setModified(false); + model.setModified(false); } @@ -146,6 +166,8 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { branchlineDecorator = getDecoratorService().getDecoratorByType(BranchlineDto.class); super.initUI(); + getModel().addPropertyChangeListener(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, + evt -> getUi().getValidator().setChanged(true)); } @Override @@ -155,6 +177,9 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { log.info("OpenUI: " + getModel()); } + getUi().getTimeSinceContact().getSliderHidor().setVisible(false); + getUi().getTimerTimeOnBoard().getSliderHidor().setVisible(false); + boolean canWrite = computeCanWrite(getDataSource()); getModel().setCanWrite(canWrite); @@ -203,7 +228,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { BranchlineUI.BINDING_HOOK_OFFSET_MODEL, BranchlineUI.BINDING_TIMER_SELECTED, - BranchlineUI.BINDING_TIME_SINCE_CONTACT_MODEL, + BranchlineUI.BINDING_TIME_SINCE_CONTACT_TIME, BranchlineUI.BINDING_TIMER_TIME_ON_BOARD_DATE ); @@ -218,6 +243,20 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { BranchlineDto beanToSave = getModel().getBranchline(); BranchlineHelper.copyBranchlineDto(bean, beanToSave); + if (BooleanUtils.isTrue(bean.getTimer())) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(getModel().getTimeSinceContact()); + int minutes = calendar.get(Calendar.MINUTE); + int hours = calendar.get(Calendar.HOUR); + beanToSave.setTimeSinceContact(minutes + 60L * hours); + } else { + beanToSave.setTimeSinceContact(null); + } + + if (log.isInfoEnabled()) { + log.info("Time since contact: " + beanToSave.getTimeSinceContact()); + } + // for external models getModel().fireSaved(); @@ -346,7 +385,7 @@ public class BranchlineUIHandler extends ContentUIHandler<BranchlineDto> { boolean generalTabValid = !errorProperties.removeAll(BranchlineUIModel.GENERAL_TAB_PROPERTIES); boolean hookAndBaitTabValid = !errorProperties.removeAll(BranchlineUIModel.HOOK_AND_BAIT_TAB_PROPERTIES); - BranchlineUIModel model = getModel(); + BranchlineUIModel model = getModel(); model.setGeneralTabValid(generalTabValid); model.setHookAndBaitTabValid(hookAndBaitTabValid); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java index 159e421..87ab7fe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIModel.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.application.swing.ui.content.ContentUIModel; +import java.util.Date; import java.util.Set; /** @@ -72,6 +73,8 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { private boolean hookAndBaitTabValid; + private Date timeSinceContact; + public BranchlineUIModel() { super(BranchlineDto.class); } @@ -102,6 +105,15 @@ public class BranchlineUIModel extends ContentUIModel<BranchlineDto> { firePropertyChange(PROPERTY_HOOK_AND_BAIT_TAB_VALID, null, hookAndBaitTabValid); } + public Date getTimeSinceContact() { + return timeSinceContact; + } + + public void setTimeSinceContact(Date timeSinceContact) { + this.timeSinceContact = timeSinceContact; + firePropertyChange(BranchlineDto.PROPERTY_TIME_SINCE_CONTACT, null, getTimeSinceContact()); + } + // For external model known when a saved action was done public void fireSaved() { firePropertyChange(PROPERTY_SAVED, null, true); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 2bdb05221cf5a35d70b5b4ecf9ef20bfc4795580 Merge: 7d68bea 34ceb86 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 17:54:47 2016 +0200 [LL] Formulaire Composition détaillée / onglet "Détail Avançon" : Quelques améliorations (Fixes #6769) Merge branch 'feature/6769' into develop .../ui/content/impl/longline/BranchlineUI.jaxx | 3 +- .../ui/content/impl/longline/BranchlineUI.jcss | 8 ++-- .../content/impl/longline/BranchlineUIHandler.java | 53 +++++++++++++++++++--- .../content/impl/longline/BranchlineUIModel.java | 12 +++++ .../table/impl/longline/CatchLonglineUI.jaxx | 3 +- .../table/impl/longline/CatchLonglineUI.jcss | 9 ++-- .../impl/longline/CatchLonglineUIHandler.java | 46 ++++++++++++++++--- .../table/impl/longline/CatchLonglineUIModel.java | 16 +++++++ 8 files changed, 127 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm