Author: tchemit Date: 2013-09-24 13:19:17 +0200 (Tue, 24 Sep 2013) New Revision: 1218 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1218 Log: fixes #3341: [CAPTURE] manque l'unit?\195?\169 kg sur onglet R?\195?\169sum?\195?\169 boite Capture (poids total, poids total vrac etc.) 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/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 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 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-09-24 11:19:17 UTC (rev 1218) @@ -90,6 +90,7 @@ labelFor: {catchTotalWeightField}; _strongStyle: true; _help: {"tutti.editCatchBatch.field.catchTotalWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedWeightPanel { @@ -106,6 +107,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedWeight.tip"}; labelFor: {catchTotalSortedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedWeightField { @@ -122,6 +124,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip"}; labelFor: {catchTotalSortedTremisWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedTremisWeightField { @@ -134,6 +137,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip"}; labelFor: {catchTotalSortedCarousselWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedCarousselWeightField { @@ -146,6 +150,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.tip"}; labelFor: {catchTotalRejectedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalRejectedWeightField { @@ -158,6 +163,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip"}; labelFor: {catchTotalUnsortedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalUnsortedWeightField { 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 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) @@ -58,7 +58,6 @@ import static org.nuiton.i18n.I18n.n_; /** - * //FIXME Do weightUnit conversion... * @author tchemit <chemit@codelutin.com> * @since 0.3 */ 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 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-09-24 11:19:17 UTC (rev 1218) @@ -174,7 +174,12 @@ WeightUnit individualObservationWeightUnit) { super(CatchBatch.class, fromBeanBinder, toBeanBinder); //FIXME See if this can be configurable or guess from other weightUnits - this.catchWeightUnit = WeightUnit.KG; + if (WeightUnit.G == speciesWeightUnit && + WeightUnit.G == benthosWeightUnit) { + this.catchWeightUnit = WeightUnit.G; + } else { + this.catchWeightUnit = WeightUnit.KG; + } this.speciesWeightUnit = speciesWeightUnit; this.benthosWeightUnit = benthosWeightUnit; this.marineLitterWeightUnit = marineLitterWeightUnit; @@ -203,6 +208,10 @@ PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, this); } + public WeightUnit getCatchWeightUnit() { + return catchWeightUnit; + } + public boolean isLoadingData() { return loadingData; }