Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d6ebc6af by Tony Chemit at 2021-05-28T10:01:33+02:00 Migration des TargetCatch de la v7/8 vers Catch de la v9 : Méthode d'aquisition - Closes #1870 - - - - - 3 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -154,6 +154,7 @@ observe.data.ps.observation.Activity.vesselActivity observe.data.ps.observation.Activity.vesselSpeed observe.data.ps.observation.Activity.wind observe.data.ps.observation.Catch.catchWeight +observe.data.ps.observation.Catch.informationSource observe.data.ps.observation.Catch.meanLength observe.data.ps.observation.Catch.meanWeight observe.data.ps.observation.Catch.reasonForDiscard ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUI.jaxx ===================================== @@ -31,6 +31,7 @@ fr.ird.observe.dto.referential.common.SpeciesReference fr.ird.observe.dto.referential.common.WeightMeasureMethodReference fr.ird.observe.dto.referential.ps.observation.ReasonForDiscardReference + fr.ird.observe.dto.referential.ps.observation.InformationSourceReference fr.ird.observe.client.datasource.editor.api.content.data.table.* fr.ird.observe.client.datasource.validation.ObserveSwingValidator @@ -101,11 +102,6 @@ <cell weightx='1' anchor='east'> <NumberEditor id='catchWeight' styleClass="float3"/> </cell> - <cell anchor='east'> - <JToolBar id='catchWeightComputedAction'> - <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/> - </JToolBar> - </cell> </row> <!-- weightMeasureMethod --> @@ -127,11 +123,6 @@ <NumberEditor id='totalCount' styleClass="int6"/> </cell> - <cell anchor='east'> - <JToolBar id='totalCountComputedAction'> - <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/> - </JToolBar> - </cell> </row> <!-- weight moyen --> @@ -142,11 +133,6 @@ <cell weightx='1'> <NumberEditor id='meanWeight' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='meanWeightComputedAction'> - <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/> - </JToolBar> - </cell> </row> <!-- taille moyenne --> @@ -157,11 +143,6 @@ <cell weightx='1'> <NumberEditor id='meanLength' styleClass="float2"/> </cell> - <cell anchor='east'> - <JToolBar id='meanLengthComputedAction'> - <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/> - </JToolBar> - </cell> </row> <!-- well --> @@ -174,6 +155,16 @@ </cell> </row> + <!-- informationSource --> + <row> + <cell> + <JLabel id='informationSourceLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='informationSource' genericType='InformationSourceReference'/> + </cell> + </row> + <!-- comment --> <row> <cell columns='3' weighty='1'> @@ -183,4 +174,8 @@ </Table> + <JButton id='catchWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetCatchWeightComputed()'/> + <JButton id='totalCountComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetTotalCountComputed()'/> + <JButton id='meanWeightComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanWeightComputed()'/> + <JButton id='meanLengthComputedInformation' styleClass='computedDataInformation' onActionPerformed='getHandler().resetMeanLengthComputed()'/> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetCatchUIHandler.java ===================================== @@ -161,4 +161,12 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { return result; } + @Override + public void initActions() { + ui.getCatchWeight().getRightToolbar().add(ui.getCatchWeightComputedInformation()); + ui.getTotalCount().getRightToolbar().add(ui.getTotalCountComputedInformation()); + ui.getMeanWeight().getRightToolbar().add(ui.getMeanWeightComputedInformation()); + ui.getMeanLength().getRightToolbar().add(ui.getMeanLengthComputedInformation()); + super.initActions(); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6ebc6aff59f414f63c18d74fb... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/d6ebc6aff59f414f63c18d74fb... You're receiving this email because of your account on gitlab.com.