Author: kmorin Date: 2013-02-21 12:17:08 +0100 (Thu, 21 Feb 2013) New Revision: 453 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/453 Log: fixes #1991 Affichage de la distance parcourue en milles marin via un popup au survole de la distance en m?\195?\168tres Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-21 09:19:02 UTC (rev 452) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-02-21 11:17:08 UTC (rev 453) @@ -411,7 +411,6 @@ #trawlDistanceLabel { text: "tutti.label.fishingOperation.trawlDistance"; labelFor: {trawlDistanceField}; - toolTipText: {getStringValue(model.getTrawlDistance() != null ? model.getTrawlDistance() / 1852 : null)}; } #trawlDistanceField { @@ -420,7 +419,7 @@ useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; enabled: {!model.isFishingOperationRectiligne()}; - toolTipText: {getStringValue(model.getTrawlDistance() != null ? model.getTrawlDistance() / 1852 : null)}; + toolTipText: {_("tutti.tooltip.distanceInMilles", TuttiUIUtil.getDistanceInMilles(model.getTrawlDistance()))}; } #durationLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-02-21 09:19:02 UTC (rev 452) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-02-21 11:17:08 UTC (rev 453) @@ -340,9 +340,20 @@ (Math.PI / 2 - Math.asin(Math.sin(eLat) * Math.sin(sLat) + Math.cos(eLong - sLong) * Math.cos(eLat) * Math.cos(sLat))); return d.intValue(); - } + public static String getDistanceInMilles(Float distance) { + String distanceText; + if (distance != null) { + Float distanceInMilles = distance / 1852; + distanceText = String.format("%.3f", distanceInMilles); + + } else { + distanceText = ""; + } + return distanceText; + } + public static String getWeightStringValue(Float weight) { String textValue; if (weight != null) { 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 2013-02-21 09:19:02 UTC (rev 452) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-21 11:17:08 UTC (rev 453) @@ -479,6 +479,7 @@ tutti.to.be.done=< A FAIRE > tutti.tooltip.attachment.none=Pas de pièce-jointes tutti.tooltip.comment.none=Pas de commentaire +tutti.tooltip.distanceInMilles=%s milles marins tutti.ui.common.error=Erreur tutti.validator.error.comment.too.long=Taille de commentaire trop longue (limitée à %s caractères) tutti.validator.error.createSpeciesBatch.batchWeight.invalidValue=Le poids du lot doit être strictement positif