changed layout and more information

diff --git a/ND/Include.pm b/ND/Include.pm
index 421d81ea044e47f3149b0a4d1c24787235cc0113..27d0eb11a912aadf122523295be6ef8951df1fa4 100644 (file)
--- a/ND/Include.pm
+++ b/ND/Include.pm
@@ -50,14 +50,20 @@ sub parseValue {
 }
 
 sub prettyValue {
-       my ($value) = @_;
+       my ($value,$decimals) = @_;
        my $unit = '';
        my @units = ('k','M','G','T');
        for (my $i = 0; $value >= 1000;$i++){
                $value /= 1000;
                $unit = $units[$i];
        }
-       return sprintf('%.2f%s', $value,$unit);
+       unless (defined $decimals){
+               $decimals = '.0';
+               $decimals = '.1' if $value < 100 && $unit;
+               $decimals = '.2' if $value < 10 && $unit;
+       }
+
+       return sprintf('%'.$decimals.'f%s', $value,$unit);
 }
 
 

diff --git a/ND/Web/Pages/Check.pm b/ND/Web/Pages/Check.pm
index c36382e8f37388ef432b247184db349e95665d3b..832eeb9b6d21c4dde9944682a46f9b928ab0f357 100644 (file)
--- a/ND/Web/Pages/Check.pm
+++ b/ND/Web/Pages/Check.pm
@@ -79,7 +79,16 @@ sub render_body {
                $extra_columns = ", planet_status,hit_us, alliance,relationship";
        }
 
-       my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race, size, score, value, xp, sizerank, scorerank, valuerank, xprank, p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue  $extra_columns from current_planet_stats p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc});
+       my $query = $DBH->prepare(qq{Select id,coords(x,y,z), ((ruler || ' OF ') || p.planet) as planet,race,
+               size, size_gain, size_gain_day,
+               score,score_gain,score_gain_day,
+               value,value_gain,value_gain_day,
+               xp,xp_gain,xp_gain_day,
+               sizerank,sizerank_gain,sizerank_gain_day,
+               scorerank,scorerank_gain,scorerank_gain_day,
+               valuerank,valuerank_gain,valuerank_gain_day,
+               xprank,xprank_gain,xprank_gain_day,
+               p.value - p.size*200 - coalesce(c.metal+c.crystal+c.eonium,0)/150 - coalesce(c.structures,(SELECT avg(structures) FROM covop_targets)::int)*1500 AS fleetvalue,(c.metal+c.crystal+c.eonium)/100 AS resvalue  $extra_columns from current_planet_stats_full p LEFT OUTER JOIN covop_targets c ON p.id = c.planet where x = ? AND y = ? $where order by x,y,z asc});
 
        if (defined $z){
                $query->execute($x,$y,$z);
@@ -92,26 +101,27 @@ sub render_body {
        my @planets;
        my $planet_id = undef;
        my $i = 0;
-       while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
-                       ,$fleetvalue,$resvalue,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
-               $planet_id = $id;
-               my %planet = (Coords => $coords, Planet => $planet, Race => $race, Size => "$size ($sizerank)"
-                       , Score => "$score ($scorerank)", Value => "$value ($valuerank)", XP => "$xp ($xprank)"
-                       , FleetValue => "$fleetvalue ($resvalue)");
+       while (my $planet = $query->fetchrow_hashref){
+               $planet_id = $planet->{id};
+               for my $type (qw/size score value xp/){
+                       #$planet->{$type} = prettyValue($planet->{$type});
+                       $planet->{$type} =~ s/(^[-+]?\d+?(?=(?>(?:\d{3})+)(?!\d))|\G\d{3}(?=\d))/$1,/g; #Add comma for ever 3 digits, i.e. 1000 => 1,000
+                       $planet->{"${type}img"} = 'stay';
+                       $planet->{"${type}img"} = 'up' if $planet->{"${type}_gain_day"} > 0;
+                       $planet->{"${type}img"} = 'down' if $planet->{"${type}_gain_day"} < 0;
+                       $planet->{"${type}rankimg"} = 'stay';
+                       $planet->{"${type}rankimg"} = 'up' if $planet->{"${type}rank_gain_day"} < 0;
+                       $planet->{"${type}rankimg"} = 'down' if $planet->{"${type}rank_gain_day"} > 0;
+               }
                if ($self->isMember && ($self->isOfficer || $self->isBC)){
-                       $planet{HitUs} = $hit_us;
-                       $planet{Alliance} = "$alliance ($relationship)";
-                       $planet{Nick} = "$nick ($planet_status)";
-                       $planet{PlanetStatus} = $planet_status;
-                       $planet{Relationship} = $relationship;
-                       #$planet{isBC} = 1;
-                       if ($z && $alliance eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){
-                               log_message $ND::UID,"BC browsing ND planet $coords tick $self->{TICK}";
+                       if ($z && $planet->{alliance} eq 'NewDawn' && not ($self->isHC || $self->isOfficer)){
+                               log_message $ND::UID,"BC browsing ND planet $planet->{coords} tick $self->{TICK}";
                        }
                }
                $i++;
-               $planet{ODD} = $i % 2;
-               push @planets,\%planet;
+               $planet->{ODD} = $i % 2;
+               delete $planet->{id};
+               push @planets,$planet;
        }
        $BODY->param(Planets => \@planets);
 

diff --git a/images/down.png b/images/down.png
new file mode 100644 (file)
index 0000000..69663f9
Binary files /dev/null and b/images/down.png differ

diff --git a/images/stay.png b/images/stay.png
new file mode 100644 (file)
index 0000000..e428243
Binary files /dev/null and b/images/stay.png differ

diff --git a/images/up.png b/images/up.png
new file mode 100644 (file)
index 0000000..698a42a
Binary files /dev/null and b/images/up.png differ

diff --git a/templates/check.tmpl b/templates/check.tmpl
index c4c10f0308733b6de29a0375611d9be602e303eb..efdd9ab68dc8da46c9c0add0257fd369089e6ede 100644 (file)
--- a/templates/check.tmpl
+++ b/templates/check.tmpl
@@ -1,15 +1,31 @@
 <p><TMPL_IF Arbiter><TMPL_VAR NAME=Arbiter><TMPL_ELSE><a href="/<TMPL_VAR NAME=PAGE>?cmd=arbiter&amp;coords=<TMPL_VAR ESCAPE=URL NAME=Coords>">Do arbiter check on gal</a></TMPL_IF></p>
 <table>
-       <tr><th>Coords</th><th>Planet</th><th>Race</th><th>Size (rank)</th><th>Score (rank)</th><th>Value (rank)</th>
-               <th>XP (rank)</th><th>Fleet (Resouce) value</th><TMPL_IF isBC><th>Nick</th><th>Hit us</th><th>Alliance</th></TMPL_IF>
+       <tr align="center"><th colspan="4">Rank</th>
+       </tr>
+       <tr><th>Size</th><th>Score</th><th>Value </th> <th>XP</th><th>Coords</th><th>Planet</th><th>Race</th><th>Size</th><th>Score</th><th>Value </th>
+               <th>XP</th><th>Fleet (Resouce) value</th><TMPL_IF isBC><th>Nick</th><th>Hit us</th><th>Alliance</th></TMPL_IF>
        </tr>
        <TMPL_LOOP Planets>
-       <tr align="center" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
-               <td><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
-               <td><TMPL_VAR NAME=Planet></td><td><TMPL_VAR NAME=Race></td><td><TMPL_VAR NAME=Size></td>
-               <td><TMPL_VAR NAME=Score></td><td><TMPL_VAR NAME=Value></td><td><TMPL_VAR NAME=XP></td>
-               <td><TMPL_VAR NAME=FleetValue></td><TMPL_IF isBC><td class="<TMPL_VAR NAME=PlanetStatus>"><a href="intel?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick></a></td><td><TMPL_VAR NAME=HitUs></td>
-               <td class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance></td></TMPL_IF>
+       <tr align="right" class="<TMPL_IF ODD>odd<TMPL_ELSE>even</TMPL_IF>">
+
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=SizeRank_Gain_day> Today | <TMPL_VAR NAME=SizeRank_Gain> Tick"><TMPL_VAR NAME=SizeRank> <img src="/images/<TMPL_VAR NAME=SizeRankImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=ScoreRank_Gain_day> Today | <TMPL_VAR NAME=ScoreRank_Gain> Tick"><TMPL_VAR NAME=ScoreRank> <img src="/images/<TMPL_VAR NAME=ScoreRankImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=ValueRank_Gain_day> Today | <TMPL_VAR NAME=ValueRank_Gain> Tick"><TMPL_VAR NAME=ValueRank> <img src="/images/<TMPL_VAR NAME=ValueRankImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=XPRank_Gain_day> Today | <TMPL_VAR NAME=XPRank_Gain> Tick"><TMPL_VAR NAME=XPRank> <img src="/images/<TMPL_VAR NAME=XPRankImg>.png" alt="<TMPL_VAR NAME=XPImg>"/> </td>
+
+               <td align="left"><a href="/<TMPL_VAR NAME=PAGE>?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Coords></a></td>
+               <td align="center"><TMPL_VAR NAME=Planet></td>
+               <td align="center"><TMPL_VAR NAME=Race></td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Size_Gain_day> Today | <TMPL_VAR NAME=Size_Gain> Tick"><TMPL_VAR NAME=Size> <img src="/images/<TMPL_VAR NAME=SizeImg>.png" alt="<TMPL_VAR NAME=SizeImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Score_Gain_day> Today | <TMPL_VAR NAME=Score_Gain> Tick"><TMPL_VAR NAME=Score> <img src="/images/<TMPL_VAR NAME=ScoreImg>.png" alt="<TMPL_VAR NAME=ScoreImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=Value_Gain_day> Today | <TMPL_VAR NAME=Value_Gain> Tick"><TMPL_VAR NAME=Value> <img src="/images/<TMPL_VAR NAME=ValueImg>.png" alt="<TMPL_VAR NAME=ValueImg>"/> </td>
+               <td style="padding-left: 0.5em" title="<TMPL_VAR NAME=XP_Gain_day> Today | <TMPL_VAR NAME=XP_Gain> Tick"><TMPL_VAR NAME=XP> <img src="/images/<TMPL_VAR NAME=XPImg>.png" alt="<TMPL_VAR NAME=XPImg>"/> </td>
+               <td align="center"><TMPL_VAR NAME=FleetValue> (<TMPL_VAR NAME=ResValue>)</td>
+               <TMPL_IF isBC>
+                       <td align="center" class="<TMPL_VAR NAME=Planet_Status>"><a href="intel?coords=<TMPL_VAR NAME=Coords>"><TMPL_VAR NAME=Nick>(<TMPL_VAR NAME=Planet_Status>)</a></td>
+                       <td align="center"><TMPL_VAR NAME=Hit_Us></td>
+                       <td align="center" class="<TMPL_VAR NAME=Relationship>"><TMPL_VAR NAME=Alliance></td>
+               </TMPL_IF>
        </tr>
 
        </TMPL_LOOP>