Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4fc552d0 by Tony Chemit at 2021-01-18T17:41:08+01:00 Valider tous les écrans du modèle LL - See #1665 Composition détaillée fonctionne encore mieux \o/ - - - - - 7 changed files: - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java ===================================== @@ -172,7 +172,7 @@ public class DefaultUIInitializer<UI extends JComponent & JAXXObject> extends UI protected void init(NumberEditor editor) { initializerContext.checkFirstPass(); - editor.init(); + UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } protected void init(DateTimeEditor editor) { ===================================== client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java ===================================== @@ -175,11 +175,11 @@ public class UIInitHelper { } - public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showTimeEditorSlider) { + public static void init(JAXXObject ui, ObserveSwingValidator<?> validator, TemperatureEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { NumberEditor numberEditor = editor.getEditor(); numberEditor.setShowReset(true); numberEditor.setAutoPopup(autoPopupNumberEditor); - numberEditor.setShowPopupButton(showTimeEditorSlider); + numberEditor.setShowPopupButton(showPopupButton); String propertyName = editor.getName(); JLabel label = (JLabel) ui.getObjectById(propertyName + "Label"); Objects.requireNonNull(label, "can't find label for temperature editor " + editor); @@ -188,10 +188,10 @@ public class UIInitHelper { editor.getModel().addPropertyChangeListener("format", e -> validator.doValidate()); } - public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showTimeEditorSlider) { + public static void init(NumberEditor editor, boolean autoPopupNumberEditor, boolean showPopupButton) { editor.setShowReset(true); editor.setAutoPopup(autoPopupNumberEditor); - editor.setShowPopupButton(showTimeEditorSlider); + editor.setShowPopupButton(showPopupButton); editor.init(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java ===================================== @@ -236,7 +236,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup if (ui instanceof EditableContentUI) { validator = ((EditableContentUI<?>) ui).getValidator(); } - UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowTimeEditorSlider()); + UIInitHelper.init(ui, validator, editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } protected void init(JToolBar editor) { @@ -281,7 +281,7 @@ public class ContentUIInitializer<UI extends ContentUI> extends UIInitializerSup protected void init(NumberEditor editor) { initializerContext.checkFirstPass(); - UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowTimeEditorSlider()); + UIInitHelper.init(editor, getClientConfig().isAutoPopupNumberEditor(), getClientConfig().isShowNumberEditorButton()); } public JComponent getActionContainer() { ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jaxx ===================================== @@ -329,7 +329,7 @@ </JTabbedPane> </cell> </row> - <row> + <row weighty="1"> <cell weighty="1" fill="both"> <BigTextEditor id="comment"/> </cell> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss ===================================== @@ -137,6 +137,10 @@ _showTimeEditorSlider:false; } +#snapWeight { + enabled:{Objects.equals(true, branchlineBean.getWeightedSnap())}; +} + #swivelWeight { enabled:{Objects.equals(true, branchlineBean.getWeightedSwivel())}; } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIHandler.java ===================================== @@ -105,12 +105,15 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ResetAction.installAction(ui, ui.getReset(), new DefaultResetAdapter<>() { @Override public void onUpdate(SetDetailCompositionUI ui) { -// BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); + BranchlineDto branchline = ui.getBranchlinesTableModel().getSelectedRow(); onBranchlineChanged(null); ui.getSectionsTableModel().clear(); ui.getBasketsTableModel().clear(); ui.getBranchlinesTableModel().clear(); super.onUpdate(ui); + if (branchline != null && ui.getMainTabbedPane().getSelectedIndex() == 2) { + onBranchlineChanged(branchline); + } } }); ResetAction<SetDetailCompositionUI> action = ResetAction.prepareAction(new DefaultResetAdapter<>() { @@ -145,10 +148,10 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition // TODO Use a cache of templates on setLongline (session scope) model.getStates().getSectionTemplatesTableModel().setData(new ArrayList<>()); - BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); - if (ui.getMainTabbedPane().getSelectedIndex() == 2) { - onBranchlineChanged(selectedRow); - } +// BranchlineDto selectedRow = model.getStates().getBranchlinesTableModel().getSelectedRow(); +// if (ui.getMainTabbedPane().getSelectedIndex() == 2) { +// onBranchlineChanged(selectedRow); +// } } @Override @@ -394,7 +397,7 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ui.getValidator().setChanged(true); } - void onTimerChanged(Boolean newValue) { + void onTimerChanged(boolean newValue) { if (Objects.equals(true, newValue)) { // with timer ui.getBranchlineBean().setTimeSinceContact(0); @@ -403,4 +406,24 @@ public class SetDetailCompositionUIHandler extends GeneratedSetDetailComposition ui.getBranchlineBean().setTimeSinceContact(null); } } + + void onWeightedSnapChanged(boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getBranchlineBean().setSnapWeight(0F); + } else { + // without timer + ui.getBranchlineBean().setSnapWeight(null); + } + } + + void onWeightedSwivelChanged(boolean newValue) { + if (Objects.equals(true, newValue)) { + // with timer + ui.getBranchlineBean().setSwivelWeight(0F); + } else { + // without timer + ui.getBranchlineBean().setSwivelWeight(null); + } + } } ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUIInitializer.java ===================================== @@ -257,6 +257,18 @@ public class SetDetailCompositionUIInitializer extends ContentSimpleUIInitialize ui.getHandler().onTimerChanged(((BeanCheckBox) e.getSource()).isSelected()); } }); + UIInitHelper.setAction(ui.getWeightedSnap(), new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().onWeightedSnapChanged(((BeanCheckBox) e.getSource()).isSelected()); + } + }); + UIInitHelper.setAction(ui.getWeightedSwivel(), new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + ui.getHandler().onWeightedSwivelChanged(((BeanCheckBox) e.getSource()).isSelected()); + } + }); SetDefaultTimerTimeOnBoard.init(ui, ui.getSetDefaultTimerTimeOnBoard(), new SetDefaultTimerTimeOnBoard<SetDetailCompositionUI>() { @Override protected Date getHaulingStartTimeStamp(SetDetailCompositionUI ui) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4fc552d0f5b84ac4778de7a261... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4fc552d0f5b84ac4778de7a261... You're receiving this email because of your account on gitlab.com.