Author: spadkins
Date: Wed Jan 28 09:21:24 2009
New Revision: 12470
Modified:
p5ee/trunk/App-Widget/lib/App/Widget.pm
Log:
0002039: Negative dollar amounts formatted wrong (i.e. himBH1000.00), Fix rank
display "2 of 7", not "2"
Modified: p5ee/trunk/App-Widget/lib/App/Widget.pm
==============================================================================
--- p5ee/trunk/App-Widget/lib/App/Widget.pm (original)
+++ p5ee/trunk/App-Widget/lib/App/Widget.pm Wed Jan 28 09:21:24 2009
@@ -507,6 +507,10 @@
&App::sub_entry if ($App::trace);
my ($self, $value, $format_options, $values) = @_;
+ if ($format_options->{relationship} eq "rank") {
+ return $value;
+ }
+
my $formatted_value = $value;
if (! defined $formatted_value) {
@@ -543,7 +547,7 @@
my $int = $4;
my $frac = $5;
my $pct = $6;
- my $scale_up = $7;
+ my $scale_up = $7;
my $scale = $8;
if ($scale ne "") {
if (defined $scale_abbr{$scale}) {
@@ -589,7 +593,12 @@
# do nothing for now. Just do not append the "$"
}
else {
- $formatted_value = '$' . $formatted_value;
+ if ($formatted_value =~ /^-\d/) {
+ $formatted_value =~ s/^-/-\$/;
+ }
+ else {
+ $formatted_value = '$' . $formatted_value;
+ }
}
}
if ($negated) {
