Author: tchemit Date: 2014-01-16 15:36:24 +0100 (Thu, 16 Jan 2014) New Revision: 1491 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1491 Log: fixes #3839: [CAPTURE] ne pas calculer les poids totaux esp?\195?\168ces ou benthos quand il y a ?\195?\169chantillonage de la capture avant trie Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 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/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html =================================================================== --- trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/help/fr/editFishingOperation.html 2014-01-16 14:36:24 UTC (rev 1491) @@ -279,9 +279,9 @@ : si la valeur du Poids total NON TRIE est non nulle, la valeur calculée dans ce champ n'a aucune signification car l'application va sommer un VRAC qui doit être élevé avec un HORS VRAC qui n'est par - définition pas élevé. Cette anomalie de la 3.0 sera corrigée dans une - version - ultérieure. + définition pas élevé. + <br/> + Dans ce cas un message remplace la valeur calculée. </dd> <dt>Poids total VRAC</dt> <dd> @@ -306,8 +306,9 @@ style="font-weight: bold;">ATTENTION</span> : si la valeur du Poids total NON TRIE est non nulle, la valeur calculée dans ce champ n'a aucune signification car l'application va sommer un vrac qui doit - être élevé avec un hrs vrac qui n'est par définition pas élevé. Cette - anomalie sera corrigée dans une version ultérieure. + être élevé avec un hrs vrac qui n'est par définition pas élevé. + <br/> + Dans ce cas un message remplace la valeur calculée. </dd> <dt>Poids total VRAC</dt> <dd> 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 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2014-01-16 14:36:24 UTC (rev 1491) @@ -191,7 +191,8 @@ } #speciesTotalWeightField { - text: {getWeightStringValue(model.getSpeciesTotalComputedWeight())}; + text: {handler.getWeightStringValueForTotalWeight(model.getCatchTotalRejectedWeight(), model.getSpeciesTotalComputedWeight())}; + disabledTextColor: {handler.getWeightColorForTotalWeight(model.getCatchTotalRejectedWeight(), model.getSpeciesTotalComputedWeight())}; _computed: true; _help: {"tutti.editCatchBatch.field.speciesTotalWeight.help"}; } @@ -256,7 +257,8 @@ } #benthosTotalWeightField { - text: {getWeightStringValue(model.getBenthosTotalComputedWeight())}; + text: {handler.getWeightStringValueForTotalWeight(model.getCatchTotalRejectedWeight(), model.getBenthosTotalComputedWeight())}; + disabledTextColor: {handler.getWeightColorForTotalWeight(model.getCatchTotalRejectedWeight(), model.getBenthosTotalComputedWeight())}; _computed: true; _help: {"tutti.editCatchBatch.field.benthosTotalWeight.help"}; } 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 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2014-01-16 14:36:24 UTC (rev 1491) @@ -26,9 +26,8 @@ import com.google.common.collect.Sets; import fr.ifremer.shared.application.swing.tab.TabHandler; +import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUI; -import fr.ifremer.tutti.ui.swing.content.operation.FishingOperationsUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; @@ -40,7 +39,6 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.CardLayout2Ext; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; @@ -51,7 +49,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import java.awt.Container; +import java.awt.Color; import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -589,22 +587,28 @@ } } -// public String buildReminderLabelTitle(Species species, -// Iterable<SampleCategory<?>> categories, -// String prefix, -// String suffix) { -// StringBuilder title = new StringBuilder(prefix); -// -// title.append(" - [").append(decorate(species)).append("]"); -// -// for (SampleCategory<?> sampleCategory : categories) { -// if (sampleCategory.getCategoryValue() != null) { -// title.append(" - "); -// title.append(decorate(sampleCategory.getCategoryValue())); -// } -// } -// -// title.append(" - ").append(suffix); -// return title.toString(); -// } + public String getWeightStringValueForTotalWeight(Float rejectWeight, Float totalWeight) { + String result; + if (rejectWeight == null || totalWeight == null) { + + // no reject weight, so can let this weight + result = TuttiEntities.getWeightStringValue(totalWeight); + } else { + result = _("tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed"); + } + return result; + } + + public Color getWeightColorForTotalWeight(Float rejectWeight, Float totalWeight) { + //jTextField.setDisabledTextColor( + Color result; + if (rejectWeight == null || totalWeight == null) { + + // no reject weight, so can let this weight + result = getConfig().getColorComputedWeights(); + } else { + result = Color.RED; + } + return result; + } } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-01-16 14:36:24 UTC (rev 1491) @@ -564,6 +564,7 @@ tutti.editCatchBatch.field.catchTotalWeight.tip= tutti.editCatchBatch.field.marineLitterTotalWeight= tutti.editCatchBatch.field.marineLitterTotalWeight.tip= +tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight= tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip= tutti.editCatchBatch.field.speciesTotalSortedWeight= 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 2014-01-16 14:35:57 UTC (rev 1490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-01-16 14:36:24 UTC (rev 1491) @@ -557,6 +557,7 @@ tutti.editCatchBatch.field.catchTotalWeight.tip=Poids total de la capture (sauf macro déchets et captures accidentelles) tutti.editCatchBatch.field.marineLitterTotalWeight=Poids TOTAL tutti.editCatchBatch.field.marineLitterTotalWeight.tip=Poids total des macro déchets dans la capture +tutti.editCatchBatch.field.speciesOrBenthosTotalWeight.not.computed=poids non calculable dans ce contexte tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.) tutti.editCatchBatch.field.speciesTotalSortedWeight=Poids total VRAC