Author: tchemit Date: 2012-12-27 15:49:03 +0100 (Thu, 27 Dec 2012) New Revision: 111 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/111 Log: fixes #1903: [CAPTURE] - Macrod?\195?\169chets : Mise en place de la saisie refs #1812: [Ecran Trait] Tableaux de pmfm (quelques modifs) Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.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/EditCatchesUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2012-12-27 14:49:03 UTC (rev 111) @@ -96,6 +96,8 @@ Caracteristic getMacroWasteCategoryCaracteristic(); + Caracteristic getMacroWasteSizeCategoryCaracteristic(); + List<Zone> getAllZone(); List<Country> getAllCountry(); Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevFixtures.java 2012-12-27 14:49:03 UTC (rev 111) @@ -234,7 +234,7 @@ Caracteristic ca; - ca = createQuantitativeCaracteristic("Beaufort Scale", + ca = createQuantitativeCaracteristic("Vent Beaufort", CaracteristicEnum.FishingOperationEnvironment.name()); createCaracteristicQuantitativeValue(ca, "Calme"); @@ -246,19 +246,19 @@ createCaracteristicQuantitativeValue(ca, "Coup de vent"); createCaracteristicQuantitativeValue(ca, "Fort coup de vent"); - ca = createQuantitativeCaracteristic("Sea State", + ca = createQuantitativeCaracteristic("État de la mer", CaracteristicEnum.FishingOperationEnvironment.name()); createCaracteristicQuantitativeValue(ca, "Mer calme"); createCaracteristicQuantitativeValue(ca, "Mer agitée"); - createNumberCaracteristic("Wind direction", + createNumberCaracteristic("Direction du vent", CaracteristicEnum.FishingOperationEnvironment.name()); - createNumberCaracteristic("Gear Shooting Start Depth", + createNumberCaracteristic("Profondeur (début de traine)", CaracteristicEnum.FishingOperationEnvironment.name()); - createNumberCaracteristic("Gear Shooting End Depth", + createNumberCaracteristic("Profondeur (fin de traine)", CaracteristicEnum.FishingOperationEnvironment.name()); createNumberCaracteristic("Ouverture horizontale", @@ -274,33 +274,33 @@ createBooleanCaracteristic("Géométrie mesurée", CaracteristicEnum.FishingOperationGear.name()); - createNumberCaracteristic("Gear Shooting Start Surface Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Gear Shooting End Surface Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Average Surface Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); + createNumberCaracteristic("Température Surface_S", + CaracteristicEnum.FishingOperationHydrologic_surfaceTemperature.name()); + createNumberCaracteristic("Température Surface_E", + CaracteristicEnum.FishingOperationHydrologic_surfaceTemperature.name()); + createNumberCaracteristic("Température Surface_A", + CaracteristicEnum.FishingOperationHydrologic_surfaceTemperature.name()); - createNumberCaracteristic("Gear Shooting Start Bottom Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Gear Shooting End Bottom Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Average Bottom Temperature", - CaracteristicEnum.FishingOperationHydrologic.name()); + createNumberCaracteristic("Température fond_S", + CaracteristicEnum.FishingOperationHydrologic_bottomTemperature.name()); + createNumberCaracteristic("Température fond_E", + CaracteristicEnum.FishingOperationHydrologic_bottomTemperature.name()); + createNumberCaracteristic("Température fond_A", + CaracteristicEnum.FishingOperationHydrologic_bottomTemperature.name()); - createNumberCaracteristic("Gear Shooting Start Surface Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Gear Shooting End Surface Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Average Surface Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); + createNumberCaracteristic("Salinité surface_S", + CaracteristicEnum.FishingOperationHydrologic_surfaceSalinity.name()); + createNumberCaracteristic("Salinité surface_E", + CaracteristicEnum.FishingOperationHydrologic_surfaceSalinity.name()); + createNumberCaracteristic("Salinité surface_A", + CaracteristicEnum.FishingOperationHydrologic_surfaceSalinity.name()); - createNumberCaracteristic("Gear Shooting Start Bottom Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Gear Shooting End Bottom Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); - createNumberCaracteristic("Average Bottom Salinity", - CaracteristicEnum.FishingOperationHydrologic.name()); + createNumberCaracteristic("Salinité fond_S", + CaracteristicEnum.FishingOperationHydrologic_bottomSalinity.name()); + createNumberCaracteristic("Salinité fond_E", + CaracteristicEnum.FishingOperationHydrologic_bottomSalinity.name()); + createNumberCaracteristic("Salinité fond_A", + CaracteristicEnum.FishingOperationHydrologic_bottomSalinity.name()); createNumberCaracteristic("Mesure au cm par un observateur (carapace)", CaracteristicEnum.SpeciesFrequency.name()); @@ -347,11 +347,39 @@ ca = createQuantitativeCaracteristic("MacroWaste", CaracteristicEnum.MacroWasteCategory.name()); - createCaracteristicQuantitativeValue(ca, "Pneu"); - createCaracteristicQuantitativeValue(ca, "Plastique"); - createCaracteristicQuantitativeValue(ca, "Machine à laver"); - createCaracteristicQuantitativeValue(ca, "Métal"); + createCaracteristicQuantitativeValue(ca, "Bottle"); + createCaracteristicQuantitativeValue(ca, "Sheet"); + createCaracteristicQuantitativeValue(ca, "Bag"); + createCaracteristicQuantitativeValue(ca, "Caps/ lids"); + createCaracteristicQuantitativeValue(ca, "Fishing line (monofilament)"); + createCaracteristicQuantitativeValue(ca, "Fishing line (entangled)"); + createCaracteristicQuantitativeValue(ca, "Synthetic rope"); + createCaracteristicQuantitativeValue(ca, "Cable ties"); + createCaracteristicQuantitativeValue(ca, "Strapping band"); + createCaracteristicQuantitativeValue(ca, "Crates abd containers"); + createCaracteristicQuantitativeValue(ca, "Boots"); + createCaracteristicQuantitativeValue(ca, "Balloons"); + createCaracteristicQuantitativeValue(ca, "bobbins (fishing)"); + createCaracteristicQuantitativeValue(ca, "tyre"); + createCaracteristicQuantitativeValue(ca, "glove"); + createCaracteristicQuantitativeValue(ca, "diapers"); + createCaracteristicQuantitativeValue(ca, "cotton buds"); + createCaracteristicQuantitativeValue(ca, "cigarette butts"); + createCaracteristicQuantitativeValue(ca, "condoms"); + createCaracteristicQuantitativeValue(ca, "syringes"); + createCaracteristicQuantitativeValue(ca, "sanitary towels / tampon"); + createCaracteristicQuantitativeValue(ca, "jar"); + createCaracteristicQuantitativeValue(ca, "piece"); + ca = createQuantitativeCaracteristic("MacroWaste Size category", + CaracteristicEnum.MacroWasteSizeCategory.name()); + createCaracteristicQuantitativeValue(ca, "<5*5cm = 25cm²"); + createCaracteristicQuantitativeValue(ca, "<10*10cm = 100cm²"); + createCaracteristicQuantitativeValue(ca, "<20*20cm = 400cm²"); + createCaracteristicQuantitativeValue(ca, "<50*50cm = 2500cm²"); + createCaracteristicQuantitativeValue(ca, "<100*100cm = 1m²"); + createCaracteristicQuantitativeValue(ca, ">100*100cm = 1m²"); + ca = createQuantitativeCaracteristic("Sorted / Unsorted Category", CaracteristicEnum.SpeciesSortedUnsorted.name()); createCaracteristicQuantitativeValue(ca, "Vrac"); @@ -360,8 +388,8 @@ ca = createQuantitativeCaracteristic("Species Sex Category", CaracteristicEnum.SpeciesSex.name()); createCaracteristicQuantitativeValue(ca, "Male"); - createCaracteristicQuantitativeValue(ca, "Female"); - createCaracteristicQuantitativeValue(ca, "Unknown"); + createCaracteristicQuantitativeValue(ca, "Femelle"); + createCaracteristicQuantitativeValue(ca, "Indéterminé"); ca = createQuantitativeCaracteristic("Species Maturity Category", CaracteristicEnum.SpeciesMaturity.name()); Modified: trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-persistence-dev/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2012-12-27 14:49:03 UTC (rev 111) @@ -107,13 +107,17 @@ enum CaracteristicEnum { FishingOperationEnvironment, FishingOperationGear, - FishingOperationHydrologic, + FishingOperationHydrologic_bottomTemperature, + FishingOperationHydrologic_surfaceTemperature, + FishingOperationHydrologic_bottomSalinity, + FishingOperationHydrologic_surfaceSalinity, SpeciesFrequency, SpeciesSizeCategory, SpeciesSex, SpeciesSortedUnsorted, SpeciesMaturity, - MacroWasteCategory + MacroWasteCategory, + MacroWasteSizeCategory } /** @@ -264,7 +268,13 @@ @Override public List<Caracteristic> getAllFishingOperationHydrologicCaracteristic() { - return getAllCaracteristicByCategory(CaracteristicEnum.FishingOperationHydrologic.name()); + + List<Caracteristic> result = Lists.newArrayList(); + result.addAll(getAllCaracteristicByCategory(CaracteristicEnum.FishingOperationHydrologic_bottomSalinity.name())); + result.addAll(getAllCaracteristicByCategory(CaracteristicEnum.FishingOperationHydrologic_surfaceSalinity.name())); + result.addAll(getAllCaracteristicByCategory(CaracteristicEnum.FishingOperationHydrologic_bottomTemperature.name())); + result.addAll(getAllCaracteristicByCategory(CaracteristicEnum.FishingOperationHydrologic_surfaceTemperature.name())); + return result; } @Override @@ -297,6 +307,11 @@ return getCaracteristicByCategory(CaracteristicEnum.MacroWasteCategory.name()); } + @Override + public Caracteristic getMacroWasteSizeCategoryCaracteristic() { + return getCaracteristicByCategory(CaracteristicEnum.MacroWasteSizeCategory.name()); + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2012-12-27 14:49:03 UTC (rev 111) @@ -238,6 +238,12 @@ return driver.getMacroWasteCategoryCaracteristic(); } + @Override + public Caracteristic getMacroWasteSizeCategoryCaracteristic() { + checkDriverExists(); + return driver.getMacroWasteSizeCategoryCaracteristic(); + } + //------------------------------------------------------------------------// //-- Program methods --// //------------------------------------------------------------------------// 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-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2012-12-27 14:49:03 UTC (rev 111) @@ -191,15 +191,10 @@ editable: false; } -#otherTable { - border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.other"))}; +#macroWasteTable { + border: {BorderFactory.createTitledBorder(_("tutti.legend.catch.macroWaste"))}; } -#planktonObservedCheckBox { - text: "tutti.label.catches.planktonObserved"; - selected: {model.isPlanktonObserved()}; -} - #macroWasteTotalWeightLabel { text: "tutti.label.catches.macroWasteTotalWeight"; labelFor: {macroWasteTotalWeightField}; @@ -212,11 +207,6 @@ numberPattern: {INT_6_DIGITS_PATTERN}; } -#accidentalObservedCheckBox { - text: "tutti.label.catches.accidentalObserved"; - selected: {model.isAccidentalObserved()}; -} - #importPupitriButton { actionIcon: "pupitri-import"; text: "tutti.action.pupitri-import"; 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-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2012-12-27 14:49:03 UTC (rev 111) @@ -88,9 +88,6 @@ <field name='benthosTotalUnsortedWeight' component='benthosTotalUnsortedWeightField'/> - <field name='planktonObserved' component='planktonObservedCheckBox'/> - <field name='accidentalObserved' component='accidentalObservedCheckBox'/> - <field name='macroWasteTotalWeight' component='macroWasteTotalWeightField'/> </BeanValidator> @@ -240,23 +237,8 @@ </row> <row> <cell> - <Table id='otherTable' fill='both'> + <Table id='macroWasteTable' fill='both'> - <!-- 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'> 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-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2012-12-27 14:49:03 UTC (rev 111) @@ -63,16 +63,12 @@ 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_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) @@ -85,8 +81,6 @@ 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_TOTAL_SAMPLE_WEIGHT, PROPERTY_MACRO_WASTE_TOTAL_WEIGHT @@ -102,8 +96,6 @@ 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_TOTAL_SAMPLE_WEIGHT, PROPERTY_MACRO_WASTE_TOTAL_WEIGHT @@ -125,8 +117,6 @@ protected Float benthosTotalSampleSortedWeight; - protected boolean planktonObserved; - protected Float planktonTotalWeight; protected Float planktonTotalSampleWeight; @@ -143,8 +133,6 @@ protected Float catchTotalUnsortedWeight; - protected boolean accidentalObserved; - protected FishingOperation fishingOperation; public EditCatchesUIModel() { @@ -291,26 +279,6 @@ 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; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchRowModel.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchRowModel.java 2012-12-27 14:49:03 UTC (rev 111) @@ -45,20 +45,31 @@ public static final String PROPERTY_MACRO_WASTE_CATEGORY = "macroWasteCategory"; + public static final String PROPERTY_MACRO_WASTE_SIZE_CATEGORY = "macroWasteSizeCategory"; + public static final String PROPERTY_WEIGHT = "weight"; + public static final String PROPERTY_NUMBER= "number"; + public static final String PROPERTY_COMMENT = "comment"; public static final String PROPERTY_ATTACHMENTS = "attachments"; /** - * macroWaste category. + * MacroWaste category. * * @since 0.2 */ protected CaracteristicQualitativeValue macroWasteCategory; /** + * MacroWaste size category. + * + * @since 0.3 + */ + protected CaracteristicQualitativeValue macroWasteSizeCategory; + + /** * Observed weight. * * @since 0.2 @@ -66,6 +77,13 @@ protected Float weight; /** + * Observed number. + * + * @since 0.3 + */ + protected Integer number; + + /** * Comment on this batch. * * @since 0.2 @@ -106,6 +124,16 @@ firePropertyChange(PROPERTY_MACRO_WASTE_CATEGORY, oldValue, macroWasteCategory); } + public CaracteristicQualitativeValue getMacroWasteSizeCategory() { + return macroWasteSizeCategory; + } + + public void setMacroWasteSizeCategory(CaracteristicQualitativeValue macroWasteSizeCategory) { + Object oldValue = getMacroWasteSizeCategory(); + this.macroWasteSizeCategory = macroWasteSizeCategory; + firePropertyChange(PROPERTY_MACRO_WASTE_SIZE_CATEGORY, oldValue, macroWasteSizeCategory); + } + public Float getWeight() { return weight; } @@ -116,6 +144,16 @@ firePropertyChange(PROPERTY_WEIGHT, oldValue, weight); } + public Integer getNumber() { + return number; + } + + public void setNumber(Integer number) { + Object oldValue = getNumber(); + this.number = number; + firePropertyChange(PROPERTY_NUMBER, oldValue, number); + } + public String getComment() { return comment; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2012-12-27 14:49:03 UTC (rev 111) @@ -44,11 +44,21 @@ n_("tutti.table.macrowaste.batch.header.macroWasteCategory"), n_("tutti.table.macrowaste.batch.header.macroWasteCategory")); + public static final ColumnIdentifier<MacroWasteBatchRowModel> MACRO_WASTE_SIZE_CATEGORY = ColumnIdentifier.newId( + MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_SIZE_CATEGORY, + n_("tutti.table.macrowaste.batch.header.macroWasteSizeCategory"), + n_("tutti.table.macrowaste.batch.header.macroWasteSizeCategory")); + public static final ColumnIdentifier<MacroWasteBatchRowModel> WEIGHT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_WEIGHT, n_("tutti.table.macrowaste.batch.header.weight"), n_("tutti.table.macrowaste.batch.header.weight")); + public static final ColumnIdentifier<MacroWasteBatchRowModel> NUMBER = ColumnIdentifier.newId( + MacroWasteBatchRowModel.PROPERTY_NUMBER, + n_("tutti.table.macrowaste.batch.header.number"), + n_("tutti.table.macrowaste.batch.header.number")); + public static final ColumnIdentifier<MacroWasteBatchRowModel> COMMENT = ColumnIdentifier.newId( MacroWasteBatchRowModel.PROPERTY_COMMENT, n_("tutti.table.macrowaste.batch.header.comment"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchUIHandler.java 2012-12-27 14:49:03 UTC (rev 111) @@ -67,7 +67,9 @@ public MacroWasteBatchUIHandler(TuttiUI<?, ?> parentUi, MacroWasteBatchUI ui) { super(parentUi, MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_CATEGORY, + MacroWasteBatchRowModel.PROPERTY_MACRO_WASTE_SIZE_CATEGORY, MacroWasteBatchRowModel.PROPERTY_WEIGHT, + MacroWasteBatchRowModel.PROPERTY_NUMBER, MacroWasteBatchRowModel.PROPERTY_COMMENT); this.ui = ui; } @@ -113,6 +115,17 @@ decorator, persistenceService.getMacroWasteCategoryCaracteristic().getQualitativeValue()); } + { + // MacroWaste Size Category column + + Decorator<CaracteristicQualitativeValue> decorator = getDecorator( + CaracteristicQualitativeValue.class, null); + + addComboDataColumnToModel(columnModel, + MacroWasteBatchTableModel.MACRO_WASTE_SIZE_CATEGORY, + decorator, persistenceService.getMacroWasteSizeCategoryCaracteristic().getQualitativeValue()); + } + { // Weight column addFloatColumnToModel(columnModel, @@ -120,6 +133,13 @@ TuttiUI.DECIMAL3_PATTERN); } + { // Number column + + addIntegerColumnToModel(columnModel, + MacroWasteBatchTableModel.NUMBER, + TuttiUI.INT_3_DIGITS_PATTERN); + } + { // Comment column addColumnToModel(columnModel, @@ -225,6 +245,7 @@ @Override protected boolean isRowValid(MacroWasteBatchRowModel row) { boolean result = row.getMacroWasteCategory() != null && + row.getMacroWasteSizeCategory() != null && row.getWeight() != null; return result; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchUIHandler.java 2012-12-27 14:49:03 UTC (rev 111) @@ -112,14 +112,6 @@ DefaultTableColumnModelExt columnModel = new DefaultTableColumnModelExt(); - { - // Species to confirm column - - addBooleanColumnToModel(columnModel, - PlanktonBatchTableModel.SPECIES_TO_CONFIRM, - getTable()); - } - List<Species> allSpecies = persistenceService.getAllSpecies(); { @@ -181,6 +173,14 @@ n_("tutti.tooltip.attachment.none")), PlanktonBatchTableModel.ATTACHMENTS); } + + { + // Species to confirm column + + addBooleanColumnToModel(columnModel, + PlanktonBatchTableModel.SPECIES_TO_CONFIRM, + getTable()); + } return columnModel; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTabUIHandler.java 2012-12-27 14:49:03 UTC (rev 111) @@ -162,6 +162,8 @@ } }; table.getSelectionModel().addListSelectionListener(listener); + + table.getTableHeader().setReorderingAllowed(false); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTabUIHandler.java 2012-12-27 14:49:03 UTC (rev 111) @@ -162,6 +162,8 @@ } }; table.getSelectionModel().addListSelectionListener(listener); + + table.getTableHeader().setReorderingAllowed(false); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2012-12-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTabUIHandler.java 2012-12-27 14:49:03 UTC (rev 111) @@ -90,15 +90,15 @@ addColumnToModel(columnModel, HydrologyTableModel.GEAR_SHOOTING_START_VALUE); } - + { - addColumnToModel(columnModel, HydrologyTableModel.AVERAGE_VALUE); + addColumnToModel(columnModel, HydrologyTableModel.GEAR_SHOOTING_END_VALUE); } - + { - addColumnToModel(columnModel, HydrologyTableModel.GEAR_SHOOTING_END_VALUE); + addColumnToModel(columnModel, HydrologyTableModel.AVERAGE_VALUE); } @@ -180,6 +180,8 @@ } }; table.getSelectionModel().addListSelectionListener(listener); + + table.getTableHeader().setReorderingAllowed(false); } 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-27 13:30:53 UTC (rev 110) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2012-12-27 14:49:03 UTC (rev 111) @@ -55,11 +55,11 @@ 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.macroWasteTotalWeight=Poids total tutti.label.catches.planktonObserved=Plancton observé ? tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total -tutti.label.catches.speciesTotalSampleSortedWeight=Poids total vrac échantillon +tutti.label.catches.speciesTotalSampleSortedWeight=Poids total vrac échantillonné tutti.label.catches.speciesTotalSortedWeight=Poids total vrac tutti.label.catches.speciesTotalUnsortedWeight=Poids total hors vrac tutti.label.catches.speciesTotalWeight=Poids total @@ -149,6 +149,7 @@ tutti.label.tab.species=Espèces tutti.label.traitReminder=Trait \: %s tutti.legend.catch.benthos=Benthos +tutti.legend.catch.macroWaste=Macro déchets tutti.legend.catch.other=Autres tutti.legend.catch.species=Espèces tutti.legend.catch.total=Capture @@ -203,8 +204,8 @@ tutti.table.fishing.gearShooting.keys.verticalAperture=Ouverture verticale tutti.table.fishing.gearShooting.keys.warpLength=Longueur des funes tutti.table.fishing.hydrology.header.averageValue=Moyenne -tutti.table.fishing.hydrology.header.gearShootingEndValue=Début de traîne -tutti.table.fishing.hydrology.header.gearShootingStartValue=Fin de traîne +tutti.table.fishing.hydrology.header.gearShootingEndValue=Fin de traîne +tutti.table.fishing.hydrology.header.gearShootingStartValue=Début de traîne tutti.table.fishing.hydrology.header.key=Clé tutti.table.fishing.hydrology.keys.key3=Clé 3 tutti.table.fishing.hydrology.keys.key4=Clé 4 @@ -216,6 +217,8 @@ tutti.table.macrowaste.batch.header.comment=Commentaire tutti.table.macrowaste.batch.header.file=Pièces jointes tutti.table.macrowaste.batch.header.macroWasteCategory=Catégorie +tutti.table.macrowaste.batch.header.macroWasteSizeCategory=Catégorie de taille +tutti.table.macrowaste.batch.header.number=Nombre tutti.table.macrowaste.batch.header.weight=Poids tutti.table.plankton.batch.header.comment=Commentaire tutti.table.plankton.batch.header.elevationRate=Fraction d'élévation