Changeset 24 for trunk

Timestamp:

Sep 6, 2019, 10:58:26 PM (5 years ago)

Author:

chronos

Message:

• Added: Search field for searching name in runners, teams and families.

Location:

trunk

Files:

• index.php (modified) (9 diffs)
• style.css (modified) (1 diff)

trunk/index.php

@@ -49 +49 @@
   function YearList($Path, $SelectedYear)
   {
-    $Output = '<div class="year-list">Year: ';
+    $Output = 'Year: ';
     $DbResult = $this->Database->query('SELECT DISTINCT(Year) AS Year FROM `Runner` ORDER BY Year ASC');
     while ($DbRow = $DbResult->fetch_assoc())
@@ -58 +58 @@
       $Output .= $Item.' ';
     }
-    $Output .= '</div>';
     return $Output;
   }
@@ -306 +305 @@
     $Output = '';
     $Output .= '<div class="page-title">Families</div>';
-
-    $Year = 0;
-    if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
-      $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
-    if ($Year == 0) $Year = $this->GetLatestYear();
-
-    $Output .= $this->YearList('/families/', $Year);
+    $Year = $this->GetYear();
+
+    $Output .= '<div class="section-title">'.$this->YearList('/families/', $Year).' Name: '.$this->ShowSearch().'</div>';
     $Where = '(IsFamily=1) AND (Year='.$Year.')';
+    if (array_key_exists('query', $_GET) and ($_GET['query'] != ''))
+    {
+      $Where .= ' AND (Name LIKE "%'.addslashes($_GET['query']).'%")';
+    }
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
@@ -426 +425 @@
     $Output = '';
     $Output .= '<div class="page-title">Teams</div>';
-
-    $Year = 0;
-    if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
-      $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
-    if ($Year == 0) $Year = $this->GetLatestYear();
-
-    $Output .= $this->YearList('/teams/', $Year);
+    $Year = $this->GetYear();
 
     $Where = '(IsFamily=0) AND (Year='.$Year.')';
+    if (array_key_exists('query', $_GET) and ($_GET['query'] != ''))
+    {
+      $Where .= ' AND (Name LIKE "%'.addslashes($_GET['query']).'%")';
+    }
+    $Output .= '<div class="section-title">'.$this->YearList('/teams/', $Year).' Name: '.$this->ShowSearch().'</div>';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
@@ -554 +552 @@
     $PrefixMultiplier = new PrefixMultiplier();
 
-    $Output = '<div class="section-title">Detailed</div>';
+    $Output = '<div class="section-title">Lap progress</div>';
     $Where = $Table.'Stat.'.$Table.'='.$Id;
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'Stat` WHERE '.$Where);
@@ -611 +609 @@
     $PageList = GetPageList($DbRow[0]);
 
-    $Output = '<div class="section-title">Daily</div>';
+    $Output = '<div class="section-title">Daily progress</div>';
     $Output .= '<div id="list_content">';
     $Output .= $PageList['Output'];
@@ -652 +650 @@
   }
 
+  function ShowSearch()
+  {
+    if (array_key_exists('query', $_GET)) $Query = $_GET['query'];
+      else $Query = '';
+    $Output = '<form action="?" method="get" style="display: inline;">';
+    $Output .= '<input type="text" size="10" name="query" value="'.$Query.'"/> '.
+      '<input type="submit" value="Search"/>';
+    $Output .= '</form>';
+    return $Output;
+  }
+
   function ShowRunners()
   {
     $Output = '<div class="page-title">Runners</div>';
-
-    $Year = 0;
-    if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
-      $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
-    if ($Year == 0) $Year = $this->GetLatestYear();
-
-    $Output .= $this->YearList('/runners/', $Year);
-
-    $Where = 'Year='.$Year;
+    $Year = $this->GetYear();
+
+    $Output .= '<div class="section-title">'.$this->YearList('/runners/', $Year).' Name: '.$this->ShowSearch().'</div>';
+    $Where = '(Year='.$Year.')';
+    if (array_key_exists('query', $_GET) and ($_GET['query'] != ''))
+    {
+      $Where .= ' AND (Name LIKE "%'.addslashes($_GET['query']).'%")';
+    }
+
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Runner` WHERE '.$Where);
     $DbRow = $DbResult->fetch_row();
@@ -736 +745 @@
   }
 
+  function GetYear()
+  {
+    $Year = 0;
+    if (count($this->PathItems) > 0)
+    {
+      $Param = $this->PathItems[count($this->PathItems) - 1];
+      if (is_numeric($this->PathItems[count($this->PathItems) - 1]))
+        $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
+    }
+    if ($Year == 0) $Year = $this->GetLatestYear();
+    return $Year;
+  }
+
   function ShowMain()
   {
@@ -741 +763 @@
     $Output .= '<p>This website collects data from offical <a href="'.$this->LeaderboardURL.'">leaderboard</a> site and tracks and presents progress of runners.</p>';
     $Output .= '<div class="page-title">Summary</div>';
-
-    $Year = 0;
-    if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
-      $Year = $this->PathItems[count($this->PathItems) - 1] * 1;
-    if ($Year == 0) $Year = $this->GetLatestYear();
-
-    $Output .= $this->YearList('/', $Year);
+    $Year = $this->GetYear();
+
+    $Output .= '<div class="section-title">'.$this->YearList('/', $Year).'</div>';
 
     $Runners = $this->GetTotals('(Year='.$Year.')');

trunk/style.css

@@ -81 +81 @@
   padding-bottom: 7px;
 }
-
-.year-list
-{
-  text-align: center;
-  padding-bottom: 7px;
-}