Changeset 14 for trunk

Timestamp:

Aug 29, 2019, 9:13:06 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved summary to show total distance and money.

File:

• trunk/index.php (modified) (6 diffs)

trunk/index.php

@@ -39 +39 @@
       '<a href="'.$this->Link('/runners').'">Runners</a> '.
       '<a href="'.$this->Link('/teams').'">Teams</a> '.
-      '<a href="'.$this->Link('/families').'">Families</a>'.
+      '<a href="'.$this->Link('/families').'">Families</a> '.      
       '</div>';
     return($Output);
@@ -199 +199 @@
             'Money' => $Item['Money'],
           ));
+        } else
+        {
+          echo('Unsupported type '.$Item['Type'].'. ');
         }
       }    
@@ -280 +283 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Gender = array('', 'Male', 'Female', 'Child');
+    $Gender = array('', 'Man', 'Woman', 'Kid');
     $Output .= '<div id="list_content">';
     $Output .= $PageList['Output'];
     $TableColumns = array(
       array('Name' => 'Name', 'Title' => 'Name'),
-      array('Name' => 'Gender', 'Title' => 'Gender'),
+      array('Name' => 'Gender', 'Title' => 'Category'),
       array('Name' => 'Distance', 'Title' => 'Distance'),
       array('Name' => 'Money', 'Title' => 'Money'),
@@ -393 +396 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Gender = array('', 'Male', 'Female', 'Child');
+    $Gender = array('', 'Men', 'Woman', 'Kid');
     $Output .= '<div id="list_content">';
     $Output .= $PageList['Output'];
     $TableColumns = array(
       array('Name' => 'Name', 'Title' => 'Name'),
-      array('Name' => 'Gender', 'Title' => 'Gender'),
+      array('Name' => 'Gender', 'Title' => 'Category'),
       array('Name' => 'Distance', 'Title' => 'Distance'),
       array('Name' => 'Money', 'Title' => 'Money'),
@@ -441 +444 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Gender = array('', 'Male', 'Female', 'Child');
+    $Gender = array('', 'Man', 'Woman', 'Kid');
     $Output .= '<div id="list_content">';
     $Output .= $PageList['Output'];
     $TableColumns = array(
       array('Name' => 'Name', 'Title' => 'Name'),
-      array('Name' => 'Gender', 'Title' => 'Gender'),
+      array('Name' => 'Gender', 'Title' => 'Category'),
       array('Name' => 'Distance', 'Title' => 'Distance'),
       array('Name' => 'Money', 'Title' => 'Money'),
@@ -591 +594 @@
   }
 
+  function GetTotals($Where = '1', $Table = 'Runner')
+  {
+    $DbResult = $this->Database->query('SELECT (SELECT COUNT(*) FROM '.$Table.' WHERE '.$Where.') AS TotalCount, '.
+      '(SELECT SUM(Distance) FROM '.$Table.'Stat LEFT JOIN '.$Table.' ON '.$Table.'.Id='.$Table.'Stat.'.$Table.' WHERE '.$Where.') AS TotalDistance, '.
+      '(SELECT SUM(Money) FROM '.$Table.'Stat LEFT JOIN '.$Table.' ON '.$Table.'.Id='.$Table.'Stat.'.$Table.' WHERE '.$Where.') AS TotalMoney');      
+    $DbRow = $DbResult->fetch_assoc();
+    return $DbRow;
+  }
+
   function ShowMain()
   {
     $Output = '';
-    $DbResult = $this->Database->select('Runner', 'COUNT(*) AS Total');
-    $DbRow = $DbResult->fetch_assoc();
-    $RunnersCount = $DbRow['Total'];
-
-    $Output = '';
-    $DbResult = $this->Database->select('Runner', 'COUNT(*) AS Total', 'Gender=1');
-    $DbRow = $DbResult->fetch_assoc();
-    $MenCount = $DbRow['Total'];
-
-    $Output = '';
-    $DbResult = $this->Database->select('Runner', 'COUNT(*) AS Total', 'Gender=2');
-    $DbRow = $DbResult->fetch_assoc();
-    $WomenCount = $DbRow['Total'];
-
-    $Output = '';
-    $DbResult = $this->Database->select('Runner', 'COUNT(*) AS Total', 'Gender=3');
-    $DbRow = $DbResult->fetch_assoc();
-    $KidsCount = $DbRow['Total'];
-
-    $DbResult = $this->Database->select('Team', 'COUNT(*) AS Total', 'IsFamily=0');
-    $DbRow = $DbResult->fetch_assoc();
-    $TeamsCount = $DbRow['Total'];
-
-    $DbResult = $this->Database->select('Team', 'COUNT(*) AS Total', 'IsFamily=1');
-    $DbRow = $DbResult->fetch_assoc();
-    $FamiliesCount = $DbRow['Total'];
+    $Runners = $this->GetTotals();
+    $Men = $this->GetTotals('Runner.Gender=1', 'Runner');
+    $Women = $this->GetTotals('Runner.Gender=2', 'Runner');
+    $Kids = $this->GetTotals('Runner.Gender=3', 'Runner');
+    $Teams = $this->GetTotals('Team.IsFamily=0', 'Team');
+    $Families = $this->GetTotals('Team.IsFamily=1', 'Team');
     
+    $Output .= '<p>This website collects data from offical <a href="http://leaderboard.teribear.cz/">leaderboard</a> site and track and present progress of runners.</p>';
     $Output .= '<div class="page-title">Summary</div>';
     $Output .= '<table class="WideTable">';
-    $Output .= '<tr><th>Category</th><th>Total count</th></tr>';
-    $Output .= '<tr><td>Runners</td><td>'.$RunnersCount.'</td></tr>';
-    $Output .= '<tr><td>Men</td><td>'.$MenCount.'</td></tr>';
-    $Output .= '<tr><td>Women</td><td>'.$WomenCount.'</td></tr>';
-    $Output .= '<tr><td>Kids</td><td>'.$KidsCount.'</td></tr>';
-    $Output .= '<tr><td>Teams</td><td>'.$TeamsCount.'</td></tr>';
-    $Output .= '<tr><td>Families</td><td>'.$FamiliesCount.'</td></tr>';
+    $Output .= '<tr><th>Category</th><th>Count</th><th>Distance [km]</th><th>Money [Kč]</th></tr>';
+    $Output .= '<tr><td>Everyone</td><td>'.$Runners['TotalCount'].'</td><td>'.$Runners['TotalDistance'].'</td><td>'.$Runners['TotalMoney'].'</td></tr>';
+    $Output .= '<tr><td>Men</td><td>'.$Men['TotalCount'].'</td><td>'.$Men['TotalDistance'].'</td><td>'.$Men['TotalMoney'].'</td></tr>';
+    $Output .= '<tr><td>Women</td><td>'.$Women['TotalCount'].'</td><td>'.$Women['TotalDistance'].'</td><td>'.$Women['TotalMoney'].'</td></tr>';
+    $Output .= '<tr><td>Kids</td><td>'.$Kids['TotalCount'].'</td><td>'.$Kids['TotalDistance'].'</td><td>'.$Kids['TotalMoney'].'</td></tr>';
+    $Output .= '<tr><td>Teams</td><td>'.$Teams['TotalCount'].'</td><td>'.$Teams['TotalDistance'].'</td><td>'.$Teams['TotalMoney'].'</td></tr>';
+    $Output .= '<tr><td>Families</td><td>'.$Families['TotalCount'].'</td><td>'.$Families['TotalDistance'].'</td><td>'.$Families['TotalMoney'].'</td></tr>';
     $Output .= '</table>';