Author: tchemit Date: 2012-12-21 21:27:17 +0100 (Fri, 21 Dec 2012) New Revision: 104 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/104 Log: refs #1804: Onglet captures (review as seen with Vincent) Added: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.css 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/BenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.css 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/PlanktonBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.css 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/SpeciesBatchUIModel.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2012-12-21 20:27:17 UTC (rev 104) @@ -40,8 +40,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.hydrology.HydrologyTabUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListSelectionEvent; +import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -53,9 +52,6 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; -import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionListener; -import jaxx.runtime.swing.editor.bean.BeanDoubleListModel; /** @@ -174,24 +170,24 @@ persistenceService.getAllPerson(), model.getSaisisseur()); final BeanDoubleListModel<Person> saisisseurModel = ui.getSaisisseurList().getModel(); - saisisseurModel.getSelectedModel().addListDataListener(new ListDataListener() { +// saisisseurModel.getSelectedModel().addListDataListener(new ListDataListener() { +// +// public void intervalAdded(ListDataEvent e) { +// log.info(">>>>>>>>>> intervalAdded " + saisisseurModel.getSelected()); +// ui.getModel().setSaisisseur(saisisseurModel.getSelected()); +// } +// +// public void intervalRemoved(ListDataEvent e) { +// log.info(">>>>>>>>>> intervalRemoved " + saisisseurModel.getSelected()); +// ui.getModel().setSaisisseur(saisisseurModel.getSelected()); +// } +// +// public void contentsChanged(ListDataEvent e) { +// log.info(">>>>>>>>>> contentsChanged " + saisisseurModel.getSelected()); +// ui.getModel().setSaisisseur(saisisseurModel.getSelected()); +// } +// }); - public void intervalAdded(ListDataEvent e) { - log.info(">>>>>>>>>> intervalAdded " + saisisseurModel.getSelected()); - ui.getModel().setSaisisseur(saisisseurModel.getSelected()); - } - - public void intervalRemoved(ListDataEvent e) { - log.info(">>>>>>>>>> intervalRemoved " + saisisseurModel.getSelected()); - ui.getModel().setSaisisseur(saisisseurModel.getSelected()); - } - - public void contentsChanged(ListDataEvent e) { - log.info(">>>>>>>>>> contentsChanged " + saisisseurModel.getSelected()); - ui.getModel().setSaisisseur(saisisseurModel.getSelected()); - } - }); - String programId = context.getProgramId(); Program program = persistenceService.getProgram(programId); @@ -301,7 +297,7 @@ } public void selectFishingOperation(FishingOperation bean) { - + if (fishingOperationMonitor.wasModified()) { // previous fishingOperation was modified, let's save it @@ -324,7 +320,7 @@ } // persist current fishingOperation - parentUi.getHandler().saveFishingOperation(toSave, false); + parentUi.getHandler().saveFishingOperation(toSave); } } @@ -364,6 +360,9 @@ // update saisissuer selection List<Person> saisisseur = model.getSaisisseur(); + if (log.isInfoEnabled()) { + log.info("Selected saisisseurs: " + saisisseur.size()); + } ui.getSaisisseurList().getModel().setSelected(saisisseur); // update model empty property Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.css 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.css 2012-12-21 20:27:17 UTC (rev 104) @@ -41,18 +41,40 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#benthosSampleTotalWeightLabel { - text: "tutti.label.catches.benthosSampleTotalWeight"; - labelFor: {benthosSampleTotalWeightField}; +#benthosTotalSortedWeightLabel { + text: "tutti.label.catches.benthosTotalSortedWeight"; + labelFor: {benthosTotalSortedWeightField}; } -#benthosSampleTotalWeightField { - property: "benthosSampleTotalWeight"; - model: {model.getBenthosSampleTotalWeight()}; +#benthosTotalSortedWeightField { + property: "benthosTotalSortedWeight"; + model: {model.getBenthosTotalSortedWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } +#benthosTotalSampleSortedWeightLabel { + text: "tutti.label.catches.benthosTotalSampleSortedWeight"; + labelFor: {benthosTotalSampleSortedWeightField}; +} + +#benthosTotalSampleSortedWeightField { + property: "benthosTotalSampleSortedWeight"; + model: {model.getBenthosTotalSampleSortedWeight()}; + useFloat: false; + numberPattern: {INT_6_DIGITS_PATTERN}; +} + +#benthosTotalUnsortedWeightLabel { + text: "tutti.label.catches.benthosTotalUnsortedWeight"; + labelFor: {benthosTotalUnsortedWeightField}; +} + +#benthosTotalUnsortedWeightField { + text: {getStringValue(model.getBenthosTotalUnsortedWeight())}; + editable: false; +} + #table { selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; 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-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUI.jaxx 2012-12-21 20:27:17 UTC (rev 104) @@ -43,6 +43,7 @@ java.awt.Color static org.nuiton.i18n.I18n._ + static jaxx.runtime.SwingUtil.getStringValue </import> <script><![CDATA[ @@ -68,8 +69,12 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='benthosTotalWeight' component='benthosTotalWeightField'/> - <field name='benthosSampleTotalWeight' - component='benthosSampleTotalWeightField'/> + <field name='benthosTotalSortedWeight' + component='benthosTotalSortedWeightField'/> + <field name='benthosTotalSampleSortedWeight' + component='benthosTotalSampleSortedWeightField'/> + <field name='benthosTotalUnsortedWeight' + component='benthosTotalUnsortedWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> @@ -78,7 +83,7 @@ <Table id='form' fill='both' constraints='BorderLayout.NORTH'> - <!-- Poids total --> + <!-- Poids total / Poids total vrac --> <row> <cell anchor='west'> <JLabel id='benthosTotalWeightLabel'/> @@ -86,17 +91,30 @@ <cell weightx='1.0'> <NumberEditor id='benthosTotalWeightField' constructorParams='this'/> </cell> + <cell anchor='west'> + <JLabel id='benthosTotalSortedWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='benthosTotalSortedWeightField' + constructorParams='this'/> + </cell> </row> - <!-- Poids total échantillonné --> + <!-- Poids échantillonné vrac / Poids total hors vrac --> <row> <cell> - <JLabel id='benthosSampleTotalWeightLabel'/> + <JLabel id='benthosTotalSampleSortedWeightLabel'/> </cell> <cell> - <NumberEditor id='benthosSampleTotalWeightField' + <NumberEditor id='benthosTotalSampleSortedWeightField' constructorParams='this'/> </cell> + <cell> + <JLabel id='benthosTotalUnsortedWeightLabel'/> + </cell> + <cell> + <JTextField id='benthosTotalUnsortedWeightField'/> + </cell> </row> </Table> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIModel.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/benthos/BenthosBatchUIModel.java 2012-12-21 20:27:17 UTC (rev 104) @@ -38,7 +38,9 @@ public BenthosBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT); + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT); } public Float getBenthosTotalWeight() { @@ -49,11 +51,27 @@ catchesUIModel.setBenthosTotalWeight(benthosTotalWeight); } - public Float getBenthosSampleTotalWeight() { - return catchesUIModel.getBenthosSampleTotalWeight(); + public Float getBenthosTotalSampleSortedWeight() { + return catchesUIModel.getBenthosTotalSampleSortedWeight(); } - public void setBenthosSampleTotalWeight(Float benthosSampleTotalWeight) { - catchesUIModel.setBenthosSampleTotalWeight(benthosSampleTotalWeight); + public void setBenthosTotalSampleSortedWeight(Float benthosTotalSampleSortedWeight) { + catchesUIModel.setBenthosTotalSampleSortedWeight(benthosTotalSampleSortedWeight); } + + public Float getBenthosTotalSortedWeight() { + return catchesUIModel.getBenthosTotalSortedWeight(); + } + + public void setBenthosTotalSortedWeight(Float benthosTotalSortedWeight) { + catchesUIModel.setBenthosTotalSortedWeight(benthosTotalSortedWeight); + } + + public Float getBenthosTotalUnsortedWeight() { + return catchesUIModel.getBenthosTotalUnsortedWeight(); + } + + public void setBenthosTotalUnsortedWeight(Float benthosTotalUnsortedWeight) { + catchesUIModel.setBenthosTotalUnsortedWeight(benthosTotalUnsortedWeight); + } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2012-12-21 20:27:17 UTC (rev 104) @@ -29,26 +29,72 @@ showReset: true; } -#speciesTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.speciesCatches"))}; +#catchTable { + border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.total"))}; } -#benthosTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.benthosCatches"))}; +#catchTotalWeightLabel { + text: "tutti.label.catches.catchTotalWeight"; + labelFor: {catchTotalWeightField}; } -#planktonTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.planktonCatches"))}; +#catchTotalWeightField { + property: "catchTotalWeight"; + model: {model.getCatchTotalWeight()}; + useFloat: false; + numberPattern: {INT_6_DIGITS_PATTERN}; } -#macroWasteTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.macroWasteCatches"))}; +#catchTotalSortedTremisWeightLabel { + text: "tutti.label.catches.catchTotalSortedTremisWeight"; + labelFor: {catchTotalSortedTremisWeightField}; } -#accidentalTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.accidentalCatches"))}; +#catchTotalSortedTremisWeightField { + property: "catchTotalSortedTremisWeight"; + model: {model.getCatchTotalSortedTremisWeight()}; + useFloat: false; + numberPattern: {INT_6_DIGITS_PATTERN}; } +#catchTotalSortedCarousselWeightLabel { + text: "tutti.label.catches.catchTotalSortedCarousselWeight"; + labelFor: {catchTotalSortedCarousselWeightField}; +} + +#catchTotalSortedCarousselWeightField { + property: "catchTotalSortedCarousselWeight"; + model: {model.getCatchTotalSortedCarousselWeight()}; + useFloat: false; + numberPattern: {INT_6_DIGITS_PATTERN}; +} + +#catchTotalRejectedWeightLabel { + text: "tutti.label.catches.catchTotalRejectedWeight"; + labelFor: {catchTotalRejectedWeightField}; +} + +#catchTotalRejectedWeightField { + property: "catchTotalRejectedWeight"; + model: {model.getCatchTotalRejectedWeight()}; + useFloat: false; + numberPattern: {INT_6_DIGITS_PATTERN}; +} + +#catchTotalUnsortedWeightLabel { + text: "tutti.label.catches.catchTotalUnsortedWeight"; + labelFor: {catchTotalUnsortedWeightField}; +} + +#catchTotalUnsortedWeightField { + editable: false; + text: {getStringValue(model.getCatchTotalUnsortedWeight())}; +} + +#speciesTable { + border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.species"))}; +} + #speciesTotalWeightLabel { text: "tutti.label.catches.speciesTotalWeight"; labelFor: {speciesTotalWeightField}; @@ -73,14 +119,14 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#speciesSampleSortedWeightLabel { - text: "tutti.label.catches.speciesSampleSortedWeight"; - labelFor: {speciesSampleSortedWeightField}; +#speciesTotalSampleSortedWeightLabel { + text: "tutti.label.catches.speciesTotalSampleSortedWeight"; + labelFor: {speciesTotalSampleSortedWeightField}; } -#speciesSampleSortedWeightField { - property: "speciesSampleSortedWeight"; - model: {model.getSpeciesSampleSortedWeight()}; +#speciesTotalSampleSortedWeightField { + property: "speciesTotalSampleSortedWeight"; + model: {model.getSpeciesTotalSampleSortedWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } @@ -95,6 +141,10 @@ editable: false; } +#benthosTable { + border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.benthos"))}; +} + #benthosTotalWeightLabel { text: "tutti.label.catches.benthosTotalWeight"; labelFor: {benthosTotalWeightField}; @@ -107,42 +157,49 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#benthosSampleTotalWeightLabel { - text: "tutti.label.catches.benthosSampleTotalWeight"; - labelFor: {benthosSampleTotalWeightField}; +#benthosTotalSortedWeightLabel { + text: "tutti.label.catches.benthosTotalSortedWeight"; + labelFor: {benthosTotalSortedWeightField}; } -#benthosSampleTotalWeightField { - property: "benthosSampleTotalWeight"; - model: {model.getBenthosSampleTotalWeight()}; +#benthosTotalSortedWeightField { + property: "benthosTotalSortedWeight"; + model: {model.getBenthosTotalSortedWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } -#planktonTotalWeightLabel { - text: "tutti.label.catches.planktonTotalWeight"; - labelFor: {planktonTotalWeightField}; +#benthosTotalSampleSortedWeightLabel { + text: "tutti.label.catches.benthosTotalSampleSortedWeight"; + labelFor: {benthosTotalSampleSortedWeightField}; } -#planktonTotalWeightField { - property: "planktonTotalWeight"; - model: {model.getPlanktonTotalWeight()}; +#benthosTotalSampleSortedWeightField { + property: "benthosTotalSampleSortedWeight"; + model: {model.getBenthosTotalSampleSortedWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } -#planktonSampleTotalWeightLabel { - text: "tutti.label.catches.planktonSampleTotalWeight"; - labelFor: {planktonSampleTotalWeightField}; +#benthosTotalUnsortedWeightLabel { + text: "tutti.label.catches.benthosTotalUnsortedWeight"; + labelFor: {benthosTotalUnsortedWeightField}; } -#planktonSampleTotalWeightField { - property: "planktonSampleTotalWeight"; - model: {model.getPlanktonSampleTotalWeight()}; - useFloat: false; - numberPattern: {INT_6_DIGITS_PATTERN}; +#benthosTotalUnsortedWeightField { + text: {getStringValue(model.getBenthosTotalUnsortedWeight())}; + editable: false; } +#otherTable { + border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.other"))}; +} + +#planktonObservedCheckBox { + text: "tutti.label.catches.planktonObserved"; + selected: {model.isPlanktonObserved()}; +} + #macroWasteTotalWeightLabel { text: "tutti.label.catches.macroWasteTotalWeight"; labelFor: {macroWasteTotalWeightField}; @@ -155,6 +212,11 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } +#accidentalObservedCheckBox { + text: "tutti.label.catches.accidentalObserved"; + selected: {model.isAccidentalObserved()}; +} + #importPupitriButton { actionIcon: "pupitri-import"; text: "tutti.action.pupitri-import"; @@ -163,3 +225,5 @@ #observationIndividuelTab { enabled: {false}; } + +//#catchesCaracteristicsTabScrollPane { } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2012-12-21 20:27:17 UTC (rev 104) @@ -66,22 +66,31 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> - <field name='speciesTotalWeight' - component='speciesTotalWeightField'/> + <field name='catchTotalWeight' component='catchTotalWeightField'/> + <field name='catchTotalSortedTremisWeight' + component='catchTotalSortedTremisWeightField'/> + <field name='catchTotalSortedCarousselWeight' + component='catchTotalSortedCarousselWeightField'/> + <field name='catchTotalRejectedWeight' + component='catchTotalRejectedWeightField'/> + <field name='speciesTotalSortedWeight' component='speciesTotalSortedWeightField'/> - <field name='speciesSampleSortedWeight' - component='speciesSampleSortedWeightField'/> + <field name='speciesTotalSampleSortedWeight' + component='speciesTotalSampleSortedWeightField'/> <field name='speciesTotalUnsortedWeight' component='speciesTotalUnsortedWeightField'/> - <field name='benthosTotalWeight' - component='benthosTotalWeightField'/> - <field name='benthosSampleTotalWeight' - component='benthosSampleTotalWeightField'/> - <field name='planktonTotalWeight' - component='planktonTotalWeightField'/> - <field name='planktonSampleTotalWeight' - component='planktonSampleTotalWeightField'/> + + <field name='benthosTotalSortedWeight' + component='benthosTotalSortedWeightField'/> + <field name='benthosTotalSampleSortedWeight' + component='benthosTotalSampleSortedWeightField'/> + <field name='benthosTotalUnsortedWeight' + component='benthosTotalUnsortedWeightField'/> + + <field name='planktonObserved' component='planktonObservedCheckBox'/> + <field name='accidentalObserved' component='accidentalObservedCheckBox'/> + <field name='macroWasteTotalWeight' component='macroWasteTotalWeightField'/> </BeanValidator> @@ -89,133 +98,193 @@ <JTabbedPane id='tabPane' constraints='BorderLayout.CENTER'> <tab id='catchesCaracteristicsTab' title='tutti.label.tab.catchesCaracteristics'> - <JXTitledPanel id='catchesTabsFishingOperationReminderLabel'> - <JPanel layout='{new BorderLayout()}'> - <Table id="catchesForm" fill='both' weightx='1' - constraints='BorderLayout.NORTH'> - <row> - <cell columns="2"> - <Table id='speciesTable' fill='both'> + <JXTitledPanel id='catchesCaracteristicsTabPane'> + <JScrollPane id='catchesCaracteristicsTabScrollPane'> + <JPanel layout='{new BorderLayout()}'> + <Table id="catchesForm" fill='both' weightx='1' + constraints='BorderLayout.NORTH'> + <row> + <cell> + <Table id='catchTable' fill='both'> - <!-- Poids total / Poids total vrac --> - <row> - <cell anchor='west'> - <JLabel id='speciesTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='speciesTotalWeightField' - constructorParams='this'/> - </cell> - <cell anchor='west'> - <JLabel id='speciesTotalSortedWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='speciesTotalSortedWeightField' - constructorParams='this'/> - </cell> - </row> + <!-- Poids total capture --> + <row> + <cell anchor='west'> + <JLabel id='catchTotalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='catchTotalWeightField' + constructorParams='this'/> + </cell> + <cell columns="2"> + </cell> + </row> + <!-- Poids total trié balance tremis / caroussel--> + <row> + <cell anchor='west'> + <JLabel id='catchTotalSortedTremisWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='catchTotalSortedTremisWeightField' + constructorParams='this'/> + </cell> + <cell> + <JLabel id='catchTotalSortedCarousselWeightLabel'/> + </cell> + <cell> + <NumberEditor id='catchTotalSortedCarousselWeightField' + constructorParams='this'/> + </cell> + </row> - <!-- Poids échantillonné vrac / Poids total hors vrac --> - <row> - <cell> - <JLabel id='speciesSampleSortedWeightLabel'/> - </cell> - <cell> - <NumberEditor id='speciesSampleSortedWeightField' - constructorParams='this'/> - </cell> - <cell> - <JLabel id='speciesTotalUnsortedWeightLabel'/> - </cell> - <cell> - <JTextField id='speciesTotalUnsortedWeightField'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell weightx="0.5"> - <Table id='benthosTable' fill='both'> + <!-- Poids total rejeté / Poids total hors vrac --> + <row> + <cell> + <JLabel id='catchTotalRejectedWeightLabel'/> + </cell> + <cell> + <NumberEditor id='catchTotalRejectedWeightField' + constructorParams='this'/> + </cell> + <cell> + <JLabel id='catchTotalUnsortedWeightLabel'/> + </cell> + <cell> + <JTextField id='catchTotalUnsortedWeightField'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='speciesTable' fill='both'> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='benthosTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='benthosTotalWeightField' - constructorParams='this'/> - </cell> - </row> + <!-- Poids total capture / Poids total vrac --> + <row> + <cell anchor='west'> + <JLabel id='speciesTotalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='speciesTotalWeightField' + constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='speciesTotalSortedWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='speciesTotalSortedWeightField' + constructorParams='this'/> + </cell> + </row> - <!-- Poids total échantillonné --> - <row> - <cell> - <JLabel id='benthosSampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='benthosSampleTotalWeightField' - constructorParams='this'/> - </cell> - </row> - </Table> - </cell> - <cell weightx="0.5"> - <Table id='planktonTable' fill='both'> + <!-- Poids total échantillonné vrac / Poids total hors vrac --> + <row> + <cell> + <JLabel id='speciesTotalSampleSortedWeightLabel'/> + </cell> + <cell> + <NumberEditor id='speciesTotalSampleSortedWeightField' + constructorParams='this'/> + </cell> + <cell> + <JLabel id='speciesTotalUnsortedWeightLabel'/> + </cell> + <cell> + <JTextField id='speciesTotalUnsortedWeightField'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='benthosTable' fill='both'> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='planktonTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='planktonTotalWeightField' - constructorParams='this'/> - </cell> - </row> + <!-- Poids total capture / Poids total vrac --> + <row> + <cell anchor='west'> + <JLabel id='benthosTotalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='benthosTotalWeightField' + constructorParams='this'/> + </cell> + <cell anchor='west'> + <JLabel id='benthosTotalSortedWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='benthosTotalSortedWeightField' + constructorParams='this'/> + </cell> + </row> - <!-- Poids total échantillonné --> - <row> - <cell> - <JLabel id='planktonSampleTotalWeightLabel'/> - </cell> - <cell> - <NumberEditor id='planktonSampleTotalWeightField' - constructorParams='this'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns="2"> - <Table id='macroWasteTable' fill='both'> + <!-- Poids total échantillonné vrac / Poids total hors vrac --> + <row> + <cell> + <JLabel id='benthosTotalSampleSortedWeightLabel'/> + </cell> + <cell> + <NumberEditor id='benthosTotalSampleSortedWeightField' + constructorParams='this'/> + </cell> + <cell> + <JLabel id='benthosTotalUnsortedWeightLabel'/> + </cell> + <cell> + <JTextField id='benthosTotalUnsortedWeightField'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <Table id='otherTable' fill='both'> - <!-- Poids total --> - <row> - <cell anchor='west'> - <JLabel id='macroWasteTotalWeightLabel'/> - </cell> - <cell weightx='1.0'> - <NumberEditor id='macroWasteTotalWeightField' - constructorParams='this'/> - </cell> - </row> - </Table> - </cell> - </row> - <!-- Actions d'import --> - <row> - <cell columns='6'> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton id='importPupitriButton' - onActionPerformed='handler.importPupitri()'/> - </JPanel> - </cell> - </row> - </Table> - </JPanel> + <!-- Plankton observed --> + <row> + <cell columns='2'> + <JCheckBox id='planktonObservedCheckBox' + onItemStateChanged='handler.setBoolean(event, "planktonObserved")'/> + </cell> + </row> + <!-- Accidental observed --> + <row> + <cell columns='2'> + <JCheckBox id='accidentalObservedCheckBox' + onItemStateChanged='handler.setBoolean(event, "accidentalObserved")'/> + </cell> + </row> + + <!-- Poids total Macro dechet --> + <row> + <cell anchor='west'> + <JLabel id='macroWasteTotalWeightLabel'/> + </cell> + <cell weightx='1.0'> + <NumberEditor id='macroWasteTotalWeightField' + constructorParams='this'/> + </cell> + </row> + + + </Table> + </cell> + </row> + + <!-- Actions d'import --> + <row> + <cell> + <JPanel layout='{new GridLayout(1,0)}'> + <JButton id='importPupitriButton' + onActionPerformed='handler.importPupitri()'/> + </JPanel> + </cell> + </row> + </Table> + </JPanel> + </JScrollPane> </JXTitledPanel> </tab> <tab id='speciesTab' title='tutti.label.tab.species'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2012-12-21 20:27:17 UTC (rev 104) @@ -71,11 +71,11 @@ EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT, + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_WEIGHT, - EditCatchesUIModel.PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT, + EditCatchesUIModel.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, EditCatchesUIModel.PROPERTY_PLANKTON_TOTAL_WEIGHT, - EditCatchesUIModel.PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT, + EditCatchesUIModel.PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT, EditCatchesUIModel.PROPERTY_MACRO_WASTE_TOTAL_WEIGHT); } @@ -149,7 +149,7 @@ fishingOperationMonitor.clearModified(); - ui.getCatchesTabsFishingOperationReminderLabel().setTitle(fishingOperationText); + ui.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); ui.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getPlanktonTabFishingOperationReminderLabel().setTitle(fishingOperationText); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2012-12-21 20:27:17 UTC (rev 104) @@ -37,24 +37,42 @@ private static final long serialVersionUID = 1L; + public static final String PROPERTY_CATCH_TOTAL_WEIGHT = "catchTotalWeight"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT = "catchTotalSortedTremisWeight"; + + public static final String PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT = "catchTotalSortedCarousselWeight"; + + public static final String PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT = "catchTotalRejectedWeight"; + + public static final String PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT = "catchTotalUnsortedWeight"; + public static final String PROPERTY_SPECIES_TOTAL_WEIGHT = "speciesTotalWeight"; public static final String PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT = "speciesTotalSortedWeight"; - public static final String PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT = "speciesSampleSortedWeight"; + public static final String PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT = "speciesTotalSampleSortedWeight"; public static final String PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT = "speciesTotalUnsortedWeight"; public static final String PROPERTY_BENTHOS_TOTAL_WEIGHT = "benthosTotalWeight"; - public static final String PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT = "benthosSampleTotalWeight"; + public static final String PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT = "benthosTotalSortedWeight"; + public static final String PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT = "benthosTotalUnsortedWeight"; + + public static final String PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT = "benthosTotalSampleSortedWeight"; + + public static final String PROPERTY_PLANKTON_OBSERVED = "planktonObserved"; + public static final String PROPERTY_PLANKTON_TOTAL_WEIGHT = "planktonTotalWeight"; - public static final String PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT = "planktonSampleTotalWeight"; + public static final String PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT = "planktonTotalSampleWeight"; public static final String PROPERTY_MACRO_WASTE_TOTAL_WEIGHT = "macroWasteTotalWeight"; + public static final String PROPERTY_ACCIDENTAL_OBSERVED = "accidentalObserved"; + public static final String PROPERTY_FISHING_OPERATION = "fishingOperation"; protected static final Binder<FishingOperation, EditCatchesUIModel> fromBeanBinder = BinderModelBuilder.newEmptyBuilder(FishingOperation.class, EditCatchesUIModel.class) @@ -62,11 +80,15 @@ PROPERTY_SPECIES_TOTAL_WEIGHT, PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, - PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT, + PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, PROPERTY_BENTHOS_TOTAL_WEIGHT, - PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT, + PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, + PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, + PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, + PROPERTY_PLANKTON_OBSERVED, + PROPERTY_ACCIDENTAL_OBSERVED, PROPERTY_PLANKTON_TOTAL_WEIGHT, - PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT, + PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT, PROPERTY_MACRO_WASTE_TOTAL_WEIGHT ).toBinder(); @@ -75,11 +97,15 @@ PROPERTY_SPECIES_TOTAL_WEIGHT, PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, - PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT, + PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, PROPERTY_BENTHOS_TOTAL_WEIGHT, - PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT, + PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, + PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, + PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, + PROPERTY_PLANKTON_OBSERVED, + PROPERTY_ACCIDENTAL_OBSERVED, PROPERTY_PLANKTON_TOTAL_WEIGHT, - PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT, + PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT, PROPERTY_MACRO_WASTE_TOTAL_WEIGHT ).toBinder(); @@ -87,20 +113,38 @@ protected Float speciesTotalSortedWeight; - protected Float speciesSampleSortedWeight; + protected Float speciesTotalSampleSortedWeight; protected Float speciesTotalUnsortedWeight; protected Float benthosTotalWeight; - protected Float benthosSampleTotalWeight; + protected Float benthosTotalSortedWeight; + protected Float benthosTotalUnsortedWeight; + + protected Float benthosTotalSampleSortedWeight; + + protected boolean planktonObserved; + protected Float planktonTotalWeight; - protected Float planktonSampleTotalWeight; + protected Float planktonTotalSampleWeight; protected Float macroWasteTotalWeight; + protected Float catchTotalWeight; + + protected Float catchTotalSortedTremisWeight; + + protected Float catchTotalSortedCarousselWeight; + + protected Float catchTotalRejectedWeight; + + protected Float catchTotalUnsortedWeight; + + protected boolean accidentalObserved; + protected FishingOperation fishingOperation; public EditCatchesUIModel() { @@ -117,6 +161,56 @@ firePropertyChange(PROPERTY_FISHING_OPERATION, oldValue, fishingOperation); } + public Float getCatchTotalWeight() { + return catchTotalWeight; + } + + public void setCatchTotalWeight(Float catchTotalWeight) { + Object oldValue = getCatchTotalWeight(); + this.catchTotalWeight = catchTotalWeight; + firePropertyChange(PROPERTY_CATCH_TOTAL_WEIGHT, oldValue, catchTotalWeight); + } + + public Float getCatchTotalSortedTremisWeight() { + return catchTotalSortedTremisWeight; + } + + public void setCatchTotalSortedTremisWeight(Float catchTotalSortedTremisWeight) { + Object oldValue = getCatchTotalSortedTremisWeight(); + this.catchTotalSortedTremisWeight = catchTotalSortedTremisWeight; + firePropertyChange(PROPERTY_CATCH_TOTAL_SORTED_TREMIS_WEIGHT, oldValue, catchTotalSortedTremisWeight); + } + + public Float getCatchTotalSortedCarousselWeight() { + return catchTotalSortedCarousselWeight; + } + + public void setCatchTotalSortedCarousselWeight(Float catchTotalSortedCarousselWeight) { + Object oldValue = getCatchTotalSortedCarousselWeight(); + this.catchTotalSortedCarousselWeight = catchTotalSortedCarousselWeight; + firePropertyChange(PROPERTY_CATCH_TOTAL_SORTED_CAROUSSEL_WEIGHT, oldValue, catchTotalSortedCarousselWeight); + } + + public Float getCatchTotalRejectedWeight() { + return catchTotalRejectedWeight; + } + + public void setCatchTotalRejectedWeight(Float catchTotalRejectedWeight) { + Object oldValue = getCatchTotalRejectedWeight(); + this.catchTotalRejectedWeight = catchTotalRejectedWeight; + firePropertyChange(PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, oldValue, catchTotalRejectedWeight); + } + + public Float getCatchTotalUnsortedWeight() { + return catchTotalUnsortedWeight; + } + + public void setCatchTotalUnsortedWeight(Float catchTotalUnsortedWeight) { + Object oldValue = getCatchTotalUnsortedWeight(); + this.catchTotalUnsortedWeight = catchTotalUnsortedWeight; + firePropertyChange(PROPERTY_CATCH_TOTAL_UNSORTED_WEIGHT, oldValue, catchTotalUnsortedWeight); + } + public Float getSpeciesTotalWeight() { return speciesTotalWeight; } @@ -137,14 +231,14 @@ firePropertyChange(PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, oldValue, speciesTotalSortedWeight); } - public Float getSpeciesSampleSortedWeight() { - return speciesSampleSortedWeight; + public Float getSpeciesTotalSampleSortedWeight() { + return speciesTotalSampleSortedWeight; } - public void setSpeciesSampleSortedWeight(Float speciesSampleSortedWeight) { - Object oldValue = getSpeciesSampleSortedWeight(); - this.speciesSampleSortedWeight = speciesSampleSortedWeight; - firePropertyChange(PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT, oldValue, speciesSampleSortedWeight); + public void setSpeciesTotalSampleSortedWeight(Float speciesTotalSampleSortedWeight) { + Object oldValue = getSpeciesTotalSampleSortedWeight(); + this.speciesTotalSampleSortedWeight = speciesTotalSampleSortedWeight; + firePropertyChange(PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT, oldValue, speciesTotalSampleSortedWeight); } public Float getSpeciesTotalUnsortedWeight() { @@ -167,16 +261,56 @@ firePropertyChange(PROPERTY_BENTHOS_TOTAL_WEIGHT, oldValue, benthosTotalWeight); } - public Float getBenthosSampleTotalWeight() { - return benthosSampleTotalWeight; + public Float getBenthosTotalSampleSortedWeight() { + return benthosTotalSampleSortedWeight; } - public void setBenthosSampleTotalWeight(Float benthosSampleTotalWeight) { - Object oldValue = getBenthosSampleTotalWeight(); - this.benthosSampleTotalWeight = benthosSampleTotalWeight; - firePropertyChange(PROPERTY_BENTHOS_SAMPLE_TOTAL_WEIGHT, oldValue, benthosSampleTotalWeight); + public void setBenthosTotalSampleSortedWeight(Float benthosTotalSampleSortedWeight) { + Object oldValue = getBenthosTotalSampleSortedWeight(); + this.benthosTotalSampleSortedWeight = benthosTotalSampleSortedWeight; + firePropertyChange(PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_WEIGHT, oldValue, benthosTotalSampleSortedWeight); } + public Float getBenthosTotalSortedWeight() { + return benthosTotalSortedWeight; + } + + public void setBenthosTotalSortedWeight(Float benthosTotalSortedWeight) { + Object oldValue = getBenthosTotalSortedWeight(); + this.benthosTotalSortedWeight = benthosTotalSortedWeight; + firePropertyChange(PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, oldValue, benthosTotalSortedWeight); + } + + public Float getBenthosTotalUnsortedWeight() { + return benthosTotalUnsortedWeight; + } + + public void setBenthosTotalUnsortedWeight(Float benthosTotalUnsortedWeight) { + Object oldValue = getBenthosTotalUnsortedWeight(); + this.benthosTotalUnsortedWeight = benthosTotalUnsortedWeight; + firePropertyChange(PROPERTY_BENTHOS_TOTAL_UNSORTED_WEIGHT, oldValue, benthosTotalUnsortedWeight); + } + + public boolean isPlanktonObserved() { + return planktonObserved; + } + + public void setPlanktonObserved(boolean planktonObserved) { + Object oldValue = isPlanktonObserved(); + this.planktonObserved = planktonObserved; + firePropertyChange(PROPERTY_PLANKTON_OBSERVED, oldValue, planktonObserved); + } + + public boolean isAccidentalObserved() { + return accidentalObserved; + } + + public void setAccidentalObserved(boolean accidentalObserved) { + Object oldValue = isAccidentalObserved(); + this.accidentalObserved = accidentalObserved; + firePropertyChange(PROPERTY_ACCIDENTAL_OBSERVED, oldValue, accidentalObserved); + } + public Float getPlanktonTotalWeight() { return planktonTotalWeight; } @@ -187,14 +321,14 @@ firePropertyChange(PROPERTY_PLANKTON_TOTAL_WEIGHT, oldValue, planktonTotalWeight); } - public Float getPlanktonSampleTotalWeight() { - return planktonSampleTotalWeight; + public Float getPlanktonTotalSampleWeight() { + return planktonTotalSampleWeight; } - public void setPlanktonSampleTotalWeight(Float planktonSampleTotalWeight) { - Object oldValue = getPlanktonSampleTotalWeight(); - this.planktonSampleTotalWeight = planktonSampleTotalWeight; - firePropertyChange(PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT, oldValue, planktonSampleTotalWeight); + public void setPlanktonTotalSampleWeight(Float planktonTotalSampleWeight) { + Object oldValue = getPlanktonTotalSampleWeight(); + this.planktonTotalSampleWeight = planktonTotalSampleWeight; + firePropertyChange(PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT, oldValue, planktonTotalSampleWeight); } public Float getMacroWasteTotalWeight() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.css 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.css 2012-12-21 20:27:17 UTC (rev 104) @@ -41,14 +41,14 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#planktonSampleTotalWeightLabel { - text: "tutti.label.catches.planktonSampleTotalWeight"; - labelFor: {planktonSampleTotalWeightField}; +#planktonTotalSampleWeightLabel { + text: "tutti.label.catches.planktonTotalSampleWeight"; + labelFor: {planktonTotalSampleWeightField}; } -#planktonSampleTotalWeightField { - property: "planktonSampleTotalWeight"; - model: {model.getPlanktonSampleTotalWeight()}; +#planktonTotalSampleWeightField { + property: "planktonTotalSampleWeight"; + model: {model.getPlanktonTotalSampleWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } 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-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUI.jaxx 2012-12-21 20:27:17 UTC (rev 104) @@ -67,8 +67,8 @@ <BeanValidator id='validator' bean='model' errorTableModel='errorTableModel' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='planktonTotalWeight' component='planktonTotalWeightField'/> - <field name='planktonSampleTotalWeight' - component='planktonSampleTotalWeightField'/> + <field name='planktonTotalSampleWeight' + component='planktonTotalSampleWeightField'/> </BeanValidator> <LongTextEditorUI id='longTextEditor'/> @@ -90,10 +90,10 @@ <!-- Poids total échantillonné --> <row> <cell> - <JLabel id='planktonSampleTotalWeightLabel'/> + <JLabel id='planktonTotalSampleWeightLabel'/> </cell> <cell> - <NumberEditor id='planktonSampleTotalWeightField' + <NumberEditor id='planktonTotalSampleWeightField' constructorParams='this'/> </cell> </row> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIModel.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/plankton/PlanktonBatchUIModel.java 2012-12-21 20:27:17 UTC (rev 104) @@ -38,7 +38,7 @@ public PlanktonBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel, EditCatchesUIModel.PROPERTY_PLANKTON_TOTAL_WEIGHT, - EditCatchesUIModel.PROPERTY_PLANKTON_SAMPLE_TOTAL_WEIGHT); + EditCatchesUIModel.PROPERTY_PLANKTON_TOTAL_SAMPLE_WEIGHT); } public Float getPlanktonTotalWeight() { @@ -49,11 +49,11 @@ catchesUIModel.setPlanktonTotalWeight(planktonTotalWeight); } - public Float getPlanktonSampleTotalWeight() { - return catchesUIModel.getPlanktonSampleTotalWeight(); + public Float getPlanktonTotalSampleWeight() { + return catchesUIModel.getPlanktonTotalSampleWeight(); } - public void setPlanktonSampleTotalWeight(Float planktonSampleTotalWeight) { - catchesUIModel.setPlanktonSampleTotalWeight(planktonSampleTotalWeight); + public void setPlanktonTotalSampleWeight(Float planktonTotalSampleWeight) { + catchesUIModel.setPlanktonTotalSampleWeight(planktonTotalSampleWeight); } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.css 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.css 2012-12-21 20:27:17 UTC (rev 104) @@ -53,14 +53,14 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#speciesSampleSortedWeightLabel { - text: "tutti.label.catches.speciesSampleSortedWeight"; - labelFor: {speciesSampleSortedWeightField}; +#speciesTotalSampleSortedWeightLabel { + text: "tutti.label.catches.speciesTotalSampleSortedWeight"; + labelFor: {speciesTotalSampleSortedWeightField}; } -#speciesSampleSortedWeightField { - property: "speciesSampleSortedWeight"; - model: {model.getSpeciesSampleSortedWeight()}; +#speciesTotalSampleSortedWeightField { + property: "speciesTotalSampleSortedWeight"; + model: {model.getSpeciesTotalSampleSortedWeight()}; useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; } 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-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUI.jaxx 2012-12-21 20:27:17 UTC (rev 104) @@ -71,8 +71,8 @@ <field name='speciesTotalWeight' component='speciesTotalWeightField'/> <field name='speciesTotalSortedWeight' component='speciesTotalSortedWeightField'/> - <field name='speciesSampleSortedWeight' - component='speciesSampleSortedWeightField'/> + <field name='speciesTotalSampleSortedWeight' + component='speciesTotalSampleSortedWeightField'/> <field name='speciesTotalUnsortedWeight' component='speciesTotalUnsortedWeightField'/> </BeanValidator> @@ -105,10 +105,10 @@ <!-- Poids échantillonné vrac / Poids total hors vrac --> <row> <cell> - <JLabel id='speciesSampleSortedWeightLabel'/> + <JLabel id='speciesTotalSampleSortedWeightLabel'/> </cell> <cell> - <NumberEditor id='speciesSampleSortedWeightField' + <NumberEditor id='speciesTotalSampleSortedWeightField' constructorParams='this'/> </cell> <cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIModel.java 2012-12-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/species/SpeciesBatchUIModel.java 2012-12-21 20:27:17 UTC (rev 104) @@ -56,7 +56,7 @@ EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_UNSORTED_WEIGHT, - EditCatchesUIModel.PROPERTY_SPECIES_SAMPLE_SORTED_WEIGHT); + EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_WEIGHT); this.samplingTreeModel = new SpeciesBatchTreeModel(); } @@ -76,12 +76,12 @@ catchesUIModel.setSpeciesTotalSortedWeight(speciesTotalSortedWeight); } - public Float getSpeciesSampleSortedWeight() { - return catchesUIModel.getSpeciesSampleSortedWeight(); + public Float getSpeciesTotalSampleSortedWeight() { + return catchesUIModel.getSpeciesTotalSampleSortedWeight(); } - public void setSpeciesSampleSortedWeight(Float speciesSampleSortedWeight) { - catchesUIModel.setSpeciesSampleSortedWeight(speciesSampleSortedWeight); + public void setSpeciesTotalSampleSortedWeight(Float speciesSampleSortedWeight) { + catchesUIModel.setSpeciesTotalSampleSortedWeight(speciesSampleSortedWeight); } public Float getSpeciesTotalUnsortedWeight() { 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-21 17:33:19 UTC (rev 103) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-21 20:27:17 UTC (rev 104) @@ -45,12 +45,21 @@ tutti.label.attachmentEditor.file=Fichier tutti.label.attachmentEditor.fileComment=Commentaire tutti.label.attachmentEditor.fileName=Nom -tutti.label.catches.benthosSampleTotalWeight=Poids total échantillonné +tutti.label.catches.accidentalObserved=Captures accidentelles observées ? +tutti.label.catches.benthosTotalSampleSortedWeight=Poids total vrac échantillonné +tutti.label.catches.benthosTotalSortedWeight=Poids total vrac +tutti.label.catches.benthosTotalUnsortedWeight=Poids total hors vrac tutti.label.catches.benthosTotalWeight=Poids total -tutti.label.catches.macroWasteTotalWeight=Poids total -tutti.label.catches.planktonSampleTotalWeight=Poids total échantillonné +tutti.label.catches.catchTotalRejectedWeight=Poids total rejeté +tutti.label.catches.catchTotalSortedCarousselWeight=Poids total vrac (Caroussel) +tutti.label.catches.catchTotalSortedTremisWeight=Poids total vrac (Tremis) +tutti.label.catches.catchTotalUnsortedWeight=Poids total hors vrac +tutti.label.catches.catchTotalWeight=Poids total +tutti.label.catches.macroWasteTotalWeight=Poids total Macro déchets +tutti.label.catches.planktonObserved=Plancton observé ? +tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.catches.speciesSampleSortedWeight=Poids total vrac échantillon +tutti.label.catches.speciesTotalSampleSortedWeight=Poids total vrac échantillon tutti.label.catches.speciesTotalSortedWeight=Poids total vrac tutti.label.catches.speciesTotalUnsortedWeight=Poids total hors vrac tutti.label.catches.speciesTotalWeight=Poids total @@ -138,12 +147,12 @@ tutti.label.tab.plancton=Plancton tutti.label.tab.species=Espèces tutti.label.traitReminder=Trait \: %s -tutti.legend.accidentalCatches=Captures accidentelles -tutti.legend.benthosCatches=Captures benthos +tutti.legend.catch.benthos=Benthos +tutti.legend.catch.other=Autres +tutti.legend.catch.species=Espèces +tutti.legend.catch.total=Capture tutti.legend.frequencyConfiguration=Configuration -tutti.legend.macroWasteCatches=Captures macro déchets -tutti.legend.planktonCatches=Captures plancton -tutti.legend.speciesCatches=Captures espèces +tutti.legend.macroWasteCatches=Macro déchets tutti.menu.actions=Actions tutti.menu.actions.tip=Actions tutti.menu.file=Fichier