Changeset 377

Timestamp:

06/20/09 07:25:06 (11 years ago)

Author:

kovell

Message:

Improve summary efficiency display - select millions or billions depending on isk value

Location:

dev/common/includes

Files:

• class.killsummarytable.php (modified) (2 diffs)
• class.killsummarytable.public.php (modified) (1 diff)

dev/common/includes/class.killsummarytable.php

@@ -472 +472 @@
             {
                 $efficiency = round($this->tkisk_ / (($this->tkisk_ + $this->tlisk_) == 0 ? 1 : ($this->tkisk_ + $this->tlisk_)) * 100, 2);
-
+                                if($this->tkisk_ + $this->tlisk_ < 2000000000)
                 $html .= '<table style="text-align:center; width:90%;" border=0 cellspacing=2>'
                     .'<tr align=center>
@@ -480 +480 @@
                     </tr>
                    </table>';
+                                else
+                $html .= '<table style="text-align:center; width:90%;" border=0 cellspacing=2>'
+                    .'<tr align=center>
+                        <td width=30%><span style="text-align:right;" class="killcount">' .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000000, 2).'B ISK)</span></td>
+                        <td width=30%><span style="text-align:center;" class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000000, 2).'B ISK)</span></td>
+                        <td width=30%><span style="text-align:left;" class="efficency">'.$efficiency.'% Efficiency (ISK)</span></td>
+                    </tr>
+                   </table>';
             }
             else
             {
-                $html .= '<table style="width:100%" border=0 cellspacing=2>'
-                         .'<tr align=center><td style="width:51%;"><span style="text-align:right;" class="killcount">'
-                         .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000000, 2).'B ISK)</span></td><td style="width:49%;"><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000000, 2).'B ISK)</span></td></tr></table>';
+                                if($this->tkisk_ + $this->tlisk_ < 2000000000)
+                                        $html .= '<table style="width:100%" border=0 cellspacing=2>'
+                                                .'<tr align=center><td style="width:51%;"><span style="text-align:right;" class="killcount">'
+                                                .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</span></td><td style="width:49%;"><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000, 2).'M ISK)</span></td></tr></table>';
+                                else
+                                        $html .= '<table style="width:100%" border=0 cellspacing=2>'
+                                                .'<tr align=center><td style="width:51%;"><span style="text-align:right;" class="killcount">'
+                                                .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000000, 2).'B ISK)</span></td><td style="width:49%;"><span class="losscount">'.$this->tlcount_.' Ships lost ('.round($this->tlisk_/1000000000, 2).'B ISK)</span></td></tr></table>';
             }
         }

dev/common/includes/class.killsummarytable.public.php

@@ -200 +200 @@
         if (config::get('summarytable_summary'))
         {
-            $html .= '<table width=100% border=0 cellspacing=2>'
-                     .'<tr align=center><td class="killcount">'
-                     .$this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</td></tr></table>';
+                        $html .= '<table width=100% border=0 cellspacing=2>'
+                                .'<tr align=center><td class="killcount">';
+                        if($this->tkisk_ < 1000000000)
+                                $html .= $this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000, 2).'M ISK)</td></tr></table>';
+                        else
+                                $html .= $this->tkcount_.' Ships killed ('.round($this->tkisk_/1000000000, 2).'B ISK)</td></tr></table>';
+
         }