Author: tchemit Date: 2012-12-17 10:18:52 +0100 (Mon, 17 Dec 2012) New Revision: 82 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/82 Log: ajout rappel du trait en haut de chaque onglet de batch Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationTabUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -215,7 +215,7 @@ <!-- Fishing operation valid / invalid--> <row> - <cell columns="2"> + <cell> <JToolBar id='fishingOperationValidPanel' layout='{new BorderLayout()}'> <JButton id='resetValidStateButton' @@ -225,13 +225,16 @@ constraints='BorderLayout.EAST'/> </JToolBar> </cell> - <cell columns="2"> - <JRadioButton id='fishingOperationValidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> + <cell> + <HBox> + <JRadioButton id='fishingOperationValidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.TRUE)'/> + <JRadioButton id='fishingOperationInvalidRadio' + onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> + </HBox> </cell> - <cell columns="2"> - <JRadioButton id='fishingOperationInvalidRadio' - onActionPerformed='model.setFishingOperationValid(Boolean.FALSE)'/> + <cell columns="4"> + <JPanel/> </cell> </row> @@ -273,13 +276,13 @@ <!-- Saisisseur --> <row weighty='0.3'> <cell columns='6'> -<!-- <JScrollPane id='saisisseurPane' - columnHeaderView="{saisisseurHeader}" - onFocusGained='saisisseurList.requestFocus()'> - <JList id='saisisseurList' - onValueChanged='handler.selectListData(event, "saisisseur")'/> - <BeanListHeader id='saisisseurHeader' genericType='Person'/> - </JScrollPane>--> + <!-- <JScrollPane id='saisisseurPane' + columnHeaderView="{saisisseurHeader}" + onFocusGained='saisisseurList.requestFocus()'> + <JList id='saisisseurList' + onValueChanged='handler.selectListData(event, "saisisseur")'/> + <BeanListHeader id='saisisseurHeader' genericType='Person'/> + </JScrollPane>--> <BeanDoubleList id='saisisseurList' genericType='Person'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -65,7 +65,11 @@ <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> - + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> </JScrollPane> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/accidental/AccidentalBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -47,6 +47,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -300,14 +301,24 @@ List<AccidentalBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -327,6 +338,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,16 +60,16 @@ ]]></script> <BenthosBatchUIHandler id='handler' - initializer='getContextValue(BenthosBatchUIHandler.class)'/> + initializer='getContextValue(BenthosBatchUIHandler.class)'/> <BenthosBatchUIModel id='model' - initializer='getContextValue(BenthosBatchUIModel.class)'/> + initializer='getContextValue(BenthosBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> @@ -77,31 +77,38 @@ <AttachmentEditorUI id='attachmentEditor'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> + + <!-- Poids total --> + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> + </cell> + </row> - <!-- Poids total échantillonné --> - <row> - <cell> - <JLabel id='sampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> + <!-- Poids total échantillonné --> + <row> + <cell> + <JLabel id='sampleTotalWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -46,6 +46,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -331,14 +332,24 @@ List<BenthosBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -358,6 +369,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,37 +60,43 @@ ]]></script> <MacroWasteBatchUIHandler id='handler' - initializer='getContextValue(MacroWasteBatchUIHandler.class)'/> + initializer='getContextValue(MacroWasteBatchUIHandler.class)'/> <MacroWasteBatchUIModel id='model' - initializer='getContextValue(MacroWasteBatchUIModel.class)'/> + initializer='getContextValue(MacroWasteBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> + <!-- Poids total --> + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/macrowaste/MacroWasteBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -45,6 +45,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -285,14 +286,24 @@ List<MacroWasteBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText=""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -312,6 +323,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -60,48 +60,54 @@ ]]></script> <PlanktonBatchUIHandler id='handler' - initializer='getContextValue(PlanktonBatchUIHandler.class)'/> + initializer='getContextValue(PlanktonBatchUIHandler.class)'/> <PlanktonBatchUIModel id='model' - initializer='getContextValue(PlanktonBatchUIModel.class)'/> + initializer='getContextValue(PlanktonBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> + <field name='totalWeight' component='totalWeightField'/> <field name='sampleTotalWeight' component='sampleTotalWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> + <!-- Poids total --> + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - </row> + </cell> + </row> - <!-- Poids total échantillonné --> - <row> - <cell> - <JLabel id='sampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> - </cell> - </row> - </Table> + <!-- Poids total échantillonné --> + <row> + <cell> + <JLabel id='sampleTotalWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleTotalWeightField' constructorParams='this'/> + </cell> + </row> + </Table> + </JPanel> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> - <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event);'/> + <JXTable id='table' + onFocusLost='handler.saveSelectedRowIfRequired(event);'/> </JScrollPane> </JPanel> \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -46,6 +46,7 @@ import javax.swing.table.TableColumnModel; import java.util.List; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -327,14 +328,24 @@ List<PlanktonBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -354,6 +365,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-17 09:18:52 UTC (rev 82) @@ -62,61 +62,67 @@ ]]></script> <SpeciesBatchUIHandler id='handler' - initializer='getContextValue(SpeciesBatchUIHandler.class)'/> + initializer='getContextValue(SpeciesBatchUIHandler.class)'/> <SpeciesBatchUIModel id='model' - initializer='getContextValue(SpeciesBatchUIModel.class)'/> + initializer='getContextValue(SpeciesBatchUIModel.class)'/> <SwingValidatorMessageTableModel id='errorTableModel'/> <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='totalWeight' component='totalWeightField'/> - <field name='totalVracWeight' component='totalVracWeightField'/> - <field name='sampleVracWeight' component='sampleVracWeightField'/> + <field name='totalWeight' component='totalWeightField'/> + <field name='totalVracWeight' component='totalVracWeightField'/> + <field name='sampleVracWeight' component='sampleVracWeightField'/> <field name='totalHorsVracWeight' component='totalHorsVracWeightField'/> </BeanValidator> - <SpeciesFrequencyUI id='frequencyEditor' constructorParams='handler.getContext()'/> - + <SpeciesFrequencyUI id='frequencyEditor' + constructorParams='handler.getContext()'/> + <LongTextEditorUI id='longTextEditor'/> - + <AttachmentEditorUI id='attachmentEditor'/> + <JPanel constraints='BorderLayout.NORTH' layout='{new BorderLayout()}'> + <JLabel id='fishingOperationReminderLabel' + constraints='BorderLayout.NORTH'/> + <JSeparator constraints='BorderLayout.CENTER'/> + <Table id='form' fill='both' constraints='BorderLayout.SOUTH'> - <Table id='form' fill='both' constraints='BorderLayout.NORTH'> + <!-- Poids total / Poids total vrac --> + <row> + <cell anchor='west'> + <JLabel id='totalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='totalWeightField' constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='totalVracWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='totalVracWeightField' constructorParams='this'/> + </cell> + </row> - <!-- Poids total / Poids total vrac --> - <row> - <cell anchor='west'> - <JLabel id='totalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='totalWeightField' constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='totalVracWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='totalVracWeightField' constructorParams='this'/> - </cell> - </row> + <!-- Poids échantillonné vrac / Poids total hors vrac --> + <row> + <cell> + <JLabel id='sampleVracWeightLabel'/> + </cell> + <cell> + <NumberEditor id='sampleVracWeightField' constructorParams='this'/> + </cell> + <cell> + <JLabel id='totalHorsVracWeightLabel'/> + </cell> + <cell> + <JTextField id='totalHorsVracWeightField'/> + </cell> + </row> + </Table> + </JPanel> - <!-- Poids échantillonné vrac / Poids total hors vrac --> - <row> - <cell> - <JLabel id='sampleVracWeightLabel'/> - </cell> - <cell> - <NumberEditor id='sampleVracWeightField' constructorParams='this'/> - </cell> - <cell> - <JLabel id='totalHorsVracWeightLabel'/> - </cell> - <cell> - <JTextField id='totalHorsVracWeightField'/> - </cell> - </row> - </Table> <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> <JXTable id='table' onFocusLost='handler.saveSelectedRowIfRequired(event)'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIHandler.java 2012-12-17 09:18:52 UTC (rev 82) @@ -53,6 +53,7 @@ import java.util.List; import java.util.Set; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -150,8 +151,6 @@ @Override protected TableColumnModel createTableColumnModel() { - List<String> samplingOrder = getModel().getSamplingOrder(); - DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); @@ -188,7 +187,7 @@ } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY)) { + { // SortedUnsortedCategory column @@ -203,7 +202,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY)) { + { // WeightCategory column @@ -219,7 +218,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_SEX)) { + { // Sex column @@ -233,7 +232,7 @@ decorator, data); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_MATURITY)) { + { // Maturity column @@ -242,7 +241,7 @@ TuttiUI.DECIMAL3_PATTERN); } - if (samplingOrder.contains(SpeciesBatchRowModel.PROPERTY_AGE)) { + { // Age column @@ -530,14 +529,24 @@ List<SpeciesBatchRowModel> rows; + String fishingoperationText; + if (empty) { rows = null; bean = new FishingOperation(); model.setFishingOperation(null); + fishingoperationText = ""; } else { + Decorator<FishingOperation> decorator = + getDecorator(FishingOperation.class, null); + + fishingoperationText = + _("tutti.label.traitReminder", decorator.toString(bean)); + if (log.isInfoEnabled()) { - log.info("Get species batch for fishingOperation: " + bean.getId()); + log.info("Get species batch for fishingOperation: " + + bean.getId() + " - " + fishingoperationText); } rows = Lists.newArrayList(); @@ -559,6 +568,8 @@ model.setRows(rows); fishingOperationMonitor.clearModified(); + + ui.getFishingOperationReminderLabel().setText(fishingoperationText); } //------------------------------------------------------------------------// @@ -592,7 +603,9 @@ SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_SORTED_UNSORTED_CATEGORY, SpeciesBatchRowModel.PROPERTY_WEIGHT_CATEGORY, - SpeciesBatchRowModel.PROPERTY_SEX + SpeciesBatchRowModel.PROPERTY_SEX, + SpeciesBatchRowModel.PROPERTY_MATURITY, + SpeciesBatchRowModel.PROPERTY_AGE ); getModel().setSamplingOrder(samplingOrder); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-17 07:39:44 UTC (rev 81) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-17 09:18:52 UTC (rev 82) @@ -132,6 +132,7 @@ tutti.label.tab.observationIndividuel=Observations individuelles tutti.label.tab.plancton=Plancton tutti.label.tab.species=Espèces +tutti.label.traitReminder=Trait \: %s tutti.legend.frequencyConfiguration=Configuration tutti.menu.actions=Actions tutti.menu.actions.tip=Actions Modified: trunk/tutti-ui-swing/src/main/resources/icons/action-edit-comment.png =================================================================== (Binary files differ)