Changeset 5 for trunk

Timestamp:

Sep 12, 2018, 1:43:54 AM (6 years ago)

Author:

chronos

Message:

• Added: Show lap duration, length and speed.

Location:

trunk

Files:

• PrefixMultiplier.php (added)
• index.php (modified) (5 diffs)

trunk/index.php

@@ -5 +5 @@
 include_once('Global.php');
 include_once('Run.php');
+include_once('PrefixMultiplier.php');
 
 session_start();
@@ -56 +57 @@
   }
 
-  function QueryRunners($Category, $Page, $TeamId, $Query = '', $StartNumber = '')
-  {
-    $URL = 'http://leaderboard.teribear.cz/Home/GetRunners?category='.$Category.'&page='.$Page.'&teamId='.$TeamId.'&query='.$Query;
-    if ($Category != '') $URL .= '&startNumber='.$StartNumber;
+  // Query: text from name
+  // Page: index of page, one page is 30 items
+  // Category: '', all, men, woman, kids, families, teams
+  // TeamId: id of team
+  // Count: number of items per page, default 30
+  function QueryRunners($Category, $Page, $TeamId, $Query = null, $StartNumber = null, $Count = null)
+  {
+    $URL = 'http://leaderboard.teribear.cz/Home/GetRunners?category='.$Category.'&page='.$Page.'&teamId='.$TeamId;
+    if ($Count != null) $URL .= '&count='.$Count;
+    if ($Query != null) $URL .= '&query='.$Query;
+    if ($Category != null) $URL .= '&startNumber='.$StartNumber;
     $Content = file_get_contents($URL);
     $JSON = json_decode($Content, true);
@@ -175 +183 @@
   function ShowRunner()
   {
+    $PrefixMultiplier = new PrefixMultiplier();
     $Output = '';
 
@@ -197 +206 @@
     $TableColumns = array(
       array('Name' => 'Time', 'Title' => 'Time'),
-      array('Name' => 'Distance', 'Title' => 'Distance'),
-      array('Name' => 'Money', 'Title' => 'Money'),
+      array('Name' => 'Distance', 'Title' => 'Distance [km]'),
+      array('Name' => 'Money', 'Title' => 'Money [Kč]'),
       array('Name' => 'Rank', 'Title' => 'Rank'),
+      array('Name' => 'Duration', 'Title' => 'Duration'),
+      array('Name' => 'Length', 'Title' => 'Length [km]'),
+      array('Name' => 'Speed', 'Title' => 'Speed [km/hour]'),
     );
     $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
     $Output .= '<table class="WideTable">';
     $Output .= $Order['Output'];
-    $DbResult = $this->Database->select('RunnerStat', '*',
-      $Where.$Order['SQL'].$PageList['SQLLimit']);
+    $DbResult = $this->Database->query('SELECT *'.
+      ', (SELECT RunnerStat.Time - B.Time FROM RunnerStat AS B WHERE (B.Time < RunnerStat.Time) AND (B.Runner = RunnerStat.Runner) ORDER BY B.Time DESC LIMIT 1) AS Duration'.
+      ', (SELECT RunnerStat.Distance - B.Distance FROM RunnerStat AS B WHERE (B.Time < RunnerStat.Time) AND (B.Runner = RunnerStat.Runner) ORDER BY B.Time DESC LIMIT 1) AS Length'.
+      ', NULL AS Speed'.
+      ' FROM RunnerStat'.
+      ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
     while($MeetItem = $DbResult->fetch_assoc())
     {
@@ -212 +228 @@
         '<td>'.$MeetItem['Distance'].'</td>'.
         '<td>'.$MeetItem['Money'].'</td>'.
-        '<td>'.$MeetItem['Rank'].'</td>'.
-        '</tr>';
+        '<td>'.$MeetItem['Rank'].'</td>';
+      if ($MeetItem['Duration'] != null) $Output .= '<td>'.$PrefixMultiplier->Add($MeetItem['Duration'], '', 4, 'Time').'</td>';
+        else $Output .= '<td>&nbsp;</td>';
+      $Output .= '<td>'.$MeetItem['Length'].'</td>';
+      if ($MeetItem['Duration'] > 0) $Output .= '<td>'.$PrefixMultiplier->Add($MeetItem['Length'] / $MeetItem['Duration'] * 3600, '', 4, 'Decimal').'</td>';
+        else $Output .= '<td>&nbsp;</td>';
+      $Output .= '</tr>';
     }
     $Output .= '</table>';