Changeset 31 for trunk

Timestamp:

Sep 21, 2019, 8:56:17 PM (5 years ago)

Author:

chronos

Message:

• Modified: Merged almost same code for teams and families.

File:

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

trunk/index.php

@@ -318 +318 @@
   }
 
+  function ShowTeams()
+  {
+    return $this->ShowTeamsInternal('Teams', 'Team', 'teams', 'team', 'Team', '(IsFamily=0)');
+  }
+
   function ShowFamilies()
   {
+    return $this->ShowTeamsInternal('Families', 'Family', 'families', 'family', 'Team', '(IsFamily=1)');
+  }
+
+  function ShowTeamsInternal($Title, $TitleItem, $UrlDir, $UrlDirItem, $Table, $Where = '1')
+  {
     $Output = '';
-    $Output .= '<div class="page-title">Families</div>';
+    $Output .= '<div class="page-title">'.$Title.'</div>';
     $Year = $this->GetYear();
 
-    $Output .= '<div class="section-title">'.$this->YearList('/families/', $Year).' Name: '.$this->ShowSearch().'</div>';
-    $Where = '(IsFamily=1) AND (Year='.$Year.')';
+    $Where = '(Year='.$Year.') AND '.$Where;
     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);
+    $Output .= '<div class="section-title">'.$this->YearList('/'.$UrlDir.'/', $Year, $Table).' Name: '.$this->ShowSearch().'</div>';
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.$Where);
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
@@ -360 +370 @@
     while($Item = $DbResult->fetch_assoc())
     {
-      if ($Item['Name'] == '') $Item['Name'] = 'Family '.$Item['WebId'];
+      if ($Item['Name'] == '') $Item['Name'] = $TitleItem.' '.$Item['WebId'];
       $Output .= '<tr>'.
-        '<td><a href="'.$this->Link('/family/'.$Item['Id'].'/').'">'.$Item['Name'].'</a></td>'.
+        '<td><a href="'.$this->Link('/'.$UrlDirItem.'/'.$Item['Id'].'/').'">'.$Item['Name'].'</a></td>'.
         '<td>'.$Item['RunnersCount'].'</td>'.
         '<td>'.$Item['Distance'].'</td>'.
@@ -378 +388 @@
   }
 
-  function ShowFamily()
-  {
-    $Output = '';
-
-    $TeamId = 1;
-    if ((count($this->PathItems) > 0) and ($this->PathItems[count($this->PathItems) - 1] != ''))
-      $TeamId = $this->PathItems[count($this->PathItems) - 1];
-    if (!is_numeric($TeamId)) die('FamilyId needs to be numeric');
-
-    $DbResult = $this->Database->query('SELECT Team.*, '.
-      '(SELECT COUNT(*) FROM Runner WHERE Runner.Team=Team.Id) AS RunnerCount, '.
-      '(SELECT TeamStat.Distance FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY TeamStat.Time DESC LIMIT 1) AS Distance, '.
-      '(SELECT TeamStat.Money FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) AS Money, '.
-      '(SELECT TeamStat.Rank FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) AS Rank '.
-      'FROM Team WHERE Id='.$TeamId.' AND IsFamily=1');
-    $DbRow = $DbResult->fetch_assoc();
-    $Output .= '<div class="page-title">Family '.$DbRow['Name'].'</div>';
-    $Output .= '<div class="section-title">'.$this->ItemsYearList('/family/', $RunnerId, '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>';
-
-    $Where = 'Team='.$TeamId;
-
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Runner` WHERE '.$Where);
-    $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
-
-    $Gender = array('', 'Man', 'Woman', 'Kid');
-    $Output .= '<div id="list_content">';
-    $Output .= $PageList['Output'];
-    $TableColumns = array(
-      array('Name' => 'Name', 'Title' => 'Name'),
-      array('Name' => 'Gender', 'Title' => 'Category'),
-      array('Name' => 'Distance', 'Title' => 'Distance'),
-      array('Name' => 'Money', 'Title' => 'Money'),
-      array('Name' => 'Rank', 'Title' => 'Rank'),
-      array('Name' => 'Time', 'Title' => 'Last change'),
-    );
-    $Order = GetOrderTableHeader($TableColumns, 'Distance', 1);
-    $Output .= '<table class="WideTable">';
-    $Output .= $Order['Output'];
-    $DbResult = $this->Database->select('Runner', '*, '.
-      '(SELECT RunnerStat.Distance FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Distance'.
-      ', (SELECT RunnerStat.Money FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Money'.
-      ', (SELECT RunnerStat.Time FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Time'.
-      ', (SELECT RunnerStat.Rank FROM RunnerStat WHERE RunnerStat.Runner=Runner.Id ORDER BY Time DESC LIMIT 1) AS Rank',
-      $Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
-    {
-      $Output .= '<tr>'.
-        '<td><a href="'.$this->Link('/runner/'.$Item['Id'].'/').'">'.$Item['Name'].'</a></td>'.
-        '<td>'.$Gender[$Item['Gender']].'</td>'.
-        '<td>'.$Item['Distance'].'</td>'.
-        '<td>'.$Item['Money'].'</td>'.
-        '<td>'.$Item['Rank'].'</td>'.
-        '<td>'.$this->RunningState(MysqlDateTimeToTime($Item['Time'])).'</td>'.
-        '</tr>';
-    }
-    $Output .= '</table>';
-    $Output .= $PageList['Output'];
-    $Output .= '</div><br>';
-
-    $Output .= $this->ShowDetailed('Team', $TeamId);
-    $Output .= $this->ShowDaily('Team', $TeamId);
-
-    return($Output);
-  }
-
-  function ShowTeams()
-  {
-    $Output = '';
-    $Output .= '<div class="page-title">Teams</div>';
-    $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, 'Team').' Name: '.$this->ShowSearch().'</div>';
-
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
-    $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
-
-    $Output .= '<div id="list_content">';
-    $Output .= $PageList['Output'];
-    $TableColumns = array(
-      array('Name' => 'Name', 'Title' => 'Name'),
-      array('Name' => 'RunnersCount', 'Title' => 'Runners'),
-      array('Name' => 'Distance', 'Title' => 'Distance'),
-      array('Name' => 'Money', 'Title' => 'Money'),
-      array('Name' => 'DistanceRunner', 'Title' => 'Distance per runner'),
-      array('Name' => 'MoneyRunner', 'Title' => 'Money per runner'),
-      array('Name' => 'Rank', 'Title' => 'Rank'),
-    );
-    $Order = GetOrderTableHeader($TableColumns, 'Distance', 1);
-    $Output .= '<table class="WideTable">';
-    $Output .= $Order['Output'];
-    $DbResult = $this->Database->select('Team', '*, '.
-      '(SELECT COUNT(*) FROM Runner WHERE Runner.Team=Team.Id) AS RunnersCount, '.
-      '(SELECT TeamStat.Distance FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY TeamStat.Time DESC LIMIT 1) AS Distance, '.
-      '(SELECT TeamStat.Money FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) AS Money, '.
-      '(SELECT TeamStat.Time FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) AS Time, '.
-      '(SELECT TeamStat.Rank FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) AS Rank, '.
-      'ROUND((SELECT TeamStat.Distance FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY TeamStat.Time DESC LIMIT 1) / (SELECT COUNT(*) FROM Runner WHERE Runner.Team=Team.Id), 1) AS DistanceRunner, '.
-      'ROUND((SELECT TeamStat.Money FROM TeamStat WHERE TeamStat.Team=Team.Id ORDER BY Time DESC LIMIT 1) / (SELECT COUNT(*) FROM Runner WHERE Runner.Team=Team.Id)) AS MoneyRunner',
-      $Where.$Order['SQL'].$PageList['SQLLimit']);
-    while($Item = $DbResult->fetch_assoc())
-    {
-      if ($Item['Name'] == '') $Item['Name'] = 'Team '.$Item['WebId'];
-      $Output .= '<tr>'.
-        '<td><a href="'.$this->Link('/team/'.$Item['Id'].'/').'">'.$Item['Name'].'</a></td>'.
-        '<td>'.$Item['RunnersCount'].'</td>'.
-        '<td>'.$Item['Distance'].'</td>'.
-        '<td>'.$Item['Money'].'</td>'.
-        '<td>'.$Item['DistanceRunner'].'</td>'.
-        '<td>'.$Item['MoneyRunner'].'</td>'.
-        '<td>'.$Item['Rank'].'</td>'.
-        '</tr>';
-    }
-    $Output .= '</table>';
-    $Output .= $PageList['Output'];
-    $Output .= '</div>';
-
-    return($Output);
-  }
-
   function RunningState($Time)
   {
@@ -514 +397 @@
 
   function ShowTeam()
+  {
+    return $this->ShowTeamInternal('Team', 'team');
+  }
+
+  function ShowFamily()
+  {
+    return $this->ShowTeamInternal('Family', 'family');
+  }
+
+  function ShowTeamInternal($Title, $UrlDir)
   {
     $Output = '';
@@ -529 +422 @@
       'FROM Team WHERE Id='.$TeamId);
     $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="page-title">'.$Title.' '.$DbRow['Name'].'</div>';
+    $Output .= '<div class="section-title">'.$this->ItemsYearList('/'.$UrlDir.'/', $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>';