Changeset 29 for trunk

Timestamp:

Sep 17, 2019, 10:58:51 PM (5 years ago)

Author:

chronos

Message:

• Added: Show links to previous years for individual runners and teams.

Location:

trunk

Files:

• Run.php (modified) (3 diffs)
• index.php (modified) (6 diffs)

trunk/Run.php

@@ -8 +8 @@
   var $ChipNumber;
 
-  function AddIfNotExist()
+  function AddIfNotExist($ReturnQuery = false)
   {
     $DbResult = $this->Database->select('Runner', '*',
@@ -14 +14 @@
     if ($DbResult->num_rows == 0)
     {
-      $this->Database->insert('Runner', array(
+      $Result = $this->Database->GetInsert('Runner', array(
         'Name' => $this->Name,
         'Gender' => $this->Gender,
@@ -20 +20 @@
         'ChipNumber' => $this->ChipNumber,
       ));
-      $Result = 1;
       $this->Id = $this->Database->insert_id;
     } else {
-      $Result = 0;
       $DbRow = $DbResult->fetch_assoc();
       $this->Id = $DbRow['Id'];

trunk/index.php

@@ -47 +47 @@
   }
 
-  function YearList($Path, $SelectedYear)
+  function YearList($Path, $SelectedYear, $Table = 'Runner', $Where = '1')
   {
     $Output = 'Year: ';
-    $DbResult = $this->Database->query('SELECT DISTINCT(Year) AS Year FROM `Runner` ORDER BY Year ASC');
+    $DbResult = $this->Database->query('SELECT DISTINCT(Year) AS Year FROM `'.$Table.'` WHERE '.$Where.' ORDER BY Year ASC');
     while ($DbRow = $DbResult->fetch_assoc())
     {
@@ -56 +56 @@
       $Item = '<a href="'.$this->Link($Path.$Year.'/').'">'.$Year.'</a>';
       if ($SelectedYear == $Year) $Item = '<strong>'.$Item.'</strong>';
+      $Output .= $Item.' ';
+    }
+    return $Output;
+  }
+
+  function ItemsYearList($Path, $SelectedId, $Table = 'Runner', $Where = '1')
+  {
+    $Output = 'Year: ';
+    $DbResult = $this->Database->query('SELECT T1.Id AS Id, T2.Year AS Year FROM (SELECT DISTINCT(Id) AS Id FROM `'.$Table.'` WHERE '.$Where.' ORDER BY Year ASC) AS T1 '.
+      'LEFT JOIN '.$Table.' AS T2 ON T1.Id=T2.Id');
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
+      $Item = '<a href="'.$this->Link($Path.$DbRow['Id'].'/').'">'.$DbRow['Year'].'</a>';
+      if ($SelectedId == $DbRow['Id']) $Item = '<strong>'.$Item.'</strong>';
       $Output .= $Item.' ';
     }
@@ -435 +449 @@
       $Where .= ' AND (Name LIKE "%'.addslashes($_GET['query']).'%")';
     }
-    $Output .= '<div class="section-title">'.$this->YearList('/teams/', $Year).' Name: '.$this->ShowSearch().'</div>';
+    $Output .= '<div class="section-title">'.$this->YearList('/teams/', $Year, 'Team').' Name: '.$this->ShowSearch().'</div>';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
@@ -509 +523 @@
     $DbRow = $DbResult->fetch_assoc();
     $Output .= '<div class="page-title">Team '.$DbRow['Name'].'</div>';
+    $Output .= '<div class="section-title">'.$this->ItemsYearList('/team/', $TeamId, 'Team', 'Name="'.$DbRow['Name'].'"').'</div>';
     $Output .= '<div class="section-title">Runners: '.$DbRow['RunnerCount'].', Distance: '.$DbRow['Distance'].' km, Money: '.$DbRow['Money'].' Kč, Rank: '.$DbRow['Rank'].'</div>';
 
@@ -677 +692 @@
     $Year = $this->GetYear();
 
-    $Output .= '<div class="section-title">'.$this->YearList('/runners/', $Year).' Name: '.$this->ShowSearch().'</div>';
+    $Output .= '<div class="section-title">'.$this->YearList('/runners/', $Year, 'Runner').' Name: '.$this->ShowSearch().'</div>';
     $Where = '(Year='.$Year.')';
     if (array_key_exists('query', $_GET) and ($_GET['query'] != ''))
@@ -741 +756 @@
     if ($DbRow['TeamName'] != '')
       $Output .= '<div class="section-title"><a href="'.$this->Link('/team/'.$DbRow['TeamId']).'">'.$DbRow['TeamName'].'</a></div>';
+    $Output .= '<div class="section-title">'.$this->ItemsYearList('/runner/', $RunnerId, 'Runner', 'Name="'.$DbRow['Name'].'"').'</div>';
 
     $Output .= $this->ShowDetailed('Runner', $RunnerId);