Changeset 15 for trunk

Timestamp:

Sep 5, 2019, 9:47:21 AM (5 years ago)

Author:

chronos

Message:

• Added: Support for storing data for multiple years.
• Modified: Improved data synchronization to sync data only if they were changed. Checked with hash function agains previous stored value.

Location:

trunk

Files:

• SQL/Structure.sql (modified) (7 diffs)
• SQL/Upgrade.txt (added)
• index.php (modified) (14 diffs)
• style.css (modified) (2 diffs)

trunk/SQL/Structure.sql

@@ -4 +4 @@
 --
 -- Host: localhost:3306
--- Generation Time: Aug 29, 2019 at 12:02 AM
+-- Generation Time: Sep 05, 2019 at 09:42 AM
 -- Server version: 10.3.17-MariaDB-0ubuntu0.19.04.1
 -- PHP Version: 7.2.19-0ubuntu0.19.04.2
@@ -20 +20 @@
 -- Database: `teribear`
 --
-CREATE DATABASE IF NOT EXISTS `teribear` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
-USE `teribear`;
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `Import`
+--
+
+CREATE TABLE `Import` (
+  `Id` int(11) NOT NULL,
+  `Time` datetime NOT NULL,
+  `Hash` varchar(255) NOT NULL,
+  `ItemCount` int(11) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- --------------------------------------------------------
@@ -34 +45 @@
   `Gender` int(11) NOT NULL,
   `Team` int(11) DEFAULT NULL,
-  `ChipNumber` int(11) NOT NULL
+  `ChipNumber` int(11) NOT NULL,
+  `Year` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT;
 
@@ -62 +74 @@
   `Name` varchar(255) NOT NULL,
   `WebId` int(11) NOT NULL,
-  `IsFamily` int(11) NOT NULL
+  `IsFamily` int(11) NOT NULL,
+  `Year` int(11) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT;
 
@@ -83 +96 @@
 -- Indexes for dumped tables
 --
+
+--
+-- Indexes for table `Import`
+--
+ALTER TABLE `Import`
+  ADD PRIMARY KEY (`Id`);
 
 --
@@ -116 +135 @@
 
 --
+-- AUTO_INCREMENT for table `Import`
+--
+ALTER TABLE `Import`
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
+--
 -- AUTO_INCREMENT for table `Runner`
 --
 ALTER TABLE `Runner`
-  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=18158;
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=31205;
 --
 -- AUTO_INCREMENT for table `RunnerStat`
 --
 ALTER TABLE `RunnerStat`
-  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=136448;
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=250219;
 --
 -- AUTO_INCREMENT for table `Team`
@@ -134 +158 @@
 --
 ALTER TABLE `TeamStat`
-  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=4088;
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=55625;
 --
 -- Constraints for dumped tables

trunk/index.php

@@ -28 +28 @@
   var $Database;
   var $Config;
+  var $Year;
 
   function __construct()
   {
+  }
+
+  function GetLatestYear()
+  {
+    $Year = 0;
+    $DbResult = $this->Database->query('SELECT DISTINCT(Year) AS Year FROM `Runner` ORDER BY Year DESC');
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $Year = $DbRow['Year'];
+    }
+    return $Year;
+  }
+
+  function YearList($Path, $SelectedYear)
+  {
+    $Output = '<div class="year-list">Year: ';
+    $DbResult = $this->Database->query('SELECT DISTINCT(Year) AS Year FROM `Runner` ORDER BY Year ASC');
+    while ($DbRow = $DbResult->fetch_assoc())
+    {
+      $Year = $DbRow['Year'];
+      $Item = '<a href="'.$this->Link($Path.$Year.'/').'">'.$Year.'</a>';
+      if ($SelectedYear == $Year) $Item = '<strong>'.$Item.'</strong>';
+      $Output .= $Item.' ';
+    }
+    $Output .= '</div>';
+    return $Output;
   }
 
@@ -37 +65 @@
     $Output = '<div>'.
       '<a href="'.$this->Link('/').'">Summary</a> '.
-      '<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('/runners/').'">Runners</a> '.
+      '<a href="'.$this->Link('/teams/').'">Teams</a> '.
+      '<a href="'.$this->Link('/families/').'">Families</a> '.
       '</div>';
     return($Output);
@@ -65 +93 @@
   function QueryRunners($Category, $Page = 0, $TeamId = null, $Query = null, $StartNumber = null, $Count = null)
   {
-    $URL = 'http://leaderboard.teribear.cz/Home/GetRunners?category='.$Category;
-    if ($Page != 0) $URL .= '&page='.$Page;
-    if ($TeamId != null) $URL .= '&teamId='.$TeamId;
-    if ($Count != null) $URL .= '&count='.$Count;
-    if ($Query != null) $URL .= '&query='.$Query;
-    if ($StartNumber != null) $URL .= '&startNumber='.$StartNumber;
-    $Content = file_get_contents($URL);
-    $JSON = json_decode($Content, true);
-    //print_r($JSON);
-    return $JSON;
+      $URL = 'http://leaderboard.teribear.cz/Home/GetRunners?category='.$Category;
+      if ($Page != 0) $URL .= '&page='.$Page;
+      if ($TeamId != null) $URL .= '&teamId='.$TeamId;
+      if ($Count != null) $URL .= '&count='.$Count;
+      if ($Query != null) $URL .= '&query='.$Query;
+      if ($StartNumber != null) $URL .= '&startNumber='.$StartNumber;
+      $Content = file_get_contents($URL);
+      $JSON = json_decode($Content, true);
+      //print_r($JSON);
+      return $JSON;
+  }
+
+  function QueryRunnersAll($Category = 'all')
+  {
+    $ItemsPerPage = 30;
+    $MaxCount = 450 * 30;
+    $Result = array();
+    $I = 0;
+    while (true)
+    {
+      $Page = $I * $MaxCount / $ItemsPerPage;
+      $JSON = $this->QueryRunners($Category, $Page, null, null, null, $MaxCount);
+      foreach ($JSON['items'] as $Item)
+      {
+        $Result[] = $Item;
+      }
+      if ($JSON['last'] == 'true') break;
+      if ($I > 10) break; // Safe limit if last would not work
+      $I++;
+    }
+    return $Result;
   }
 
@@ -83 +132 @@
     $this->Database->query('DELETE FROM TeamStat');
     $this->Database->query('DELETE FROM Team');
-  }
-
-  function ShowSync()  
-  {
-    $ItemsPerPage = 30;
-    $MaxCount = 450 * 30;
+    $this->Database->query('DELETE FROM Import');
+  }
+
+  function Sync($Items, $Time)
+  {
+    $Year = date("Y", $Time);
 
     // Load all runners
@@ -97 +146 @@
     $Runners = array();
     $DbResult = $this->Database->query('SELECT Runner.Id, Runner.ChipNumber, '.
-      '(SELECT RunnerStat.Distance FROM RunnerStat WHERE (RunnerStat.Runner = Runner.Id) ORDER BY RunnerStat.Distance DESC LIMIT 1) AS Distance FROM Runner');
+      '(SELECT RunnerStat.Distance FROM RunnerStat WHERE (RunnerStat.Runner = Runner.Id) ORDER BY RunnerStat.Distance DESC LIMIT 1) AS Distance '.
+      'FROM Runner WHERE Year='.$Year);
     while ($DbRow = $DbResult->fetch_assoc())
     {
@@ -110 +160 @@
     $Teams = array();
     $DbResult = $this->Database->query('SELECT Team.Id, Team.WebId, '.
-      '(SELECT TeamStat.Distance FROM TeamStat WHERE (TeamStat.Team = Team.Id) ORDER BY TeamStat.Distance DESC LIMIT 1) AS Distance FROM Team');
+      '(SELECT TeamStat.Distance FROM TeamStat WHERE (TeamStat.Team = Team.Id) ORDER BY TeamStat.Distance DESC LIMIT 1) AS Distance '.
+      'FROM Team WHERE Year='.$Year);
     while ($DbRow = $DbResult->fetch_assoc())
     {
@@ -116 +167 @@
     }
 
+    $Queries = array();
+    foreach ($Items as $Item)
+    {
+      if (($Item['Type'] == 'child') or ($Item['Type'] == 'woman') or ($Item['Type'] == 'man'))
+      {
+        if (!array_key_exists($Item['ChipNumber'], $Runners))
+        {
+          if ($Item['TeamId'] == null)
+          {
+            $TeamId = null;
+          } else
+          {
+          if (!array_key_exists($Item['TeamId'], $Teams))
+          {
+            $TeamId = $NextTeamId;
+            $Queries[] = $this->Database->GetInsert('Team', array(
+              'Id' => $TeamId,
+              'Name' => '',
+              'WebId' => $Item['TeamId'],
+              'Year' => $Year,
+            ));
+            $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1);
+            $NextTeamId++;
+          } else
+            $TeamId = $Teams[$Item['TeamId']]['Id'];
+          }
+
+          $Gender = 0;
+          if ($Item['Type'] == 'man') $Gender = 1;
+          if ($Item['Type'] == 'woman') $Gender = 2;
+          if ($Item['Type'] == 'child') $Gender = 3;
+          $RunnerId = $NextRunnerId;
+          $Queries[] = $this->Database->GetInsert('Runner', array(
+            'Id' => $RunnerId,
+            'Name' => $Item['Name'],
+            'Gender' => $Gender,
+            'Team' => $TeamId,
+            'ChipNumber' => $Item['ChipNumber'],
+            'Year' => $Year,
+          ));
+          $Runners[$Item['ChipNumber']] = array('Id' => $RunnerId, 'Distance' => -1);
+          $NextRunnerId++;
+        } else
+          $RunnerId = $Runners[$Item['ChipNumber']]['Id'];
+
+        if ($Runners[$Item['ChipNumber']]['Distance'] < $Item['OverallDistance'])
+        $Queries[] = $this->Database->GetInsert('RunnerStat', array(
+          'Time' => TimeToMysqlDateTime($Time),
+          'Runner' => $RunnerId,
+          'Distance' => $Item['OverallDistance'],
+          'Rank' => $Item['Pos'],
+          'Money' => $Item['Money'],
+        ));
+      } else
+      if (($Item['Type'] == 'team') or ($Item['Type'] == 'rodina'))
+      {
+        if (!array_key_exists($Item['GroupId'], $Teams))
+        {
+          if ($Item['Type'] == 'rodina') $IsFamily = 1;
+            else $IsFamily = 0;
+          $Queries[] = $this->Database->GetInsert('Team', array(
+            'Id' => $NextTeamId,
+            'Name' => $Item['Name'],
+            'WebId' => $Item['GroupId'],
+            'IsFamily' => $IsFamily,
+            'Year' => $Year,
+          ));
+          $TeamId = $NextTeamId;
+          $Teams[$Item['GroupId']] = array('Id' => $NextTeamId, 'Distance' => -1);
+          $NextTeamId++;
+        } else
+          $TeamId = $Teams[$Item['GroupId']]['Id'];
+
+        if ($Teams[$Item['GroupId']]['Distance'] < $Item['OverallDistance'])
+        $Queries[] = $this->Database->GetInsert('TeamStat', array(
+          'Time' => TimeToMysqlDateTime($Time),
+          'Team' => $TeamId,
+          'Distance' => $Item['OverallDistance'],
+          'Rank' => $Item['Pos'],
+          'Money' => $Item['Money'],
+        ));
+      } else
+      {
+        echo('Unsupported type '.$Item['Type'].'. ');
+      }
+    }
+    //print_r($Queries);
+    $this->Database->Transaction($Queries);
+  }
+
+  function ShowSync()
+  {
     $Time = time();
-    for ($i = 0; $i < 2; $i++)
-    {
-      $Queries = array();
-      $Page = $i * $MaxCount / $ItemsPerPage;
-      $Response = $this->QueryRunners('all', $Page, null, null, null, $MaxCount);
-      foreach ($Response['items'] as $Item)
-      {
-        if (($Item['Type'] == 'child') or ($Item['Type'] == 'woman') or ($Item['Type'] == 'man'))
-        {
-          if (!array_key_exists($Item['ChipNumber'], $Runners))
-          {
-            if ($Item['TeamId'] == null) 
-            {
-              $TeamId = null;
-            } else
-            {
-            if (!array_key_exists($Item['TeamId'], $Teams))
-            {
-              $TeamId = $NextTeamId;            
-              $Queries[] = $this->Database->GetInsert('Team', array(
-                'Id' => $TeamId,
-                'Name' => '',
-                'WebId' => $Item['TeamId'],
-              ));
-              $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1);
-              $NextTeamId++;
-            } else 
-              $TeamId = $Teams[$Item['TeamId']]['Id'];
-            }
-
-            $Gender = 0;
-            if ($Item['Type'] == 'man') $Gender = 1;
-            if ($Item['Type'] == 'woman') $Gender = 2;
-            if ($Item['Type'] == 'child') $Gender = 3;
-            $RunnerId = $NextRunnerId;
-            $Queries[] = $this->Database->GetInsert('Runner', array(
-              'Id' => $RunnerId,
-              'Name' => $Item['Name'],
-              'Gender' => $Gender,
-              'Team' => $TeamId,
-              'ChipNumber' => $Item['ChipNumber'],
-            ));
-            $Runners[$Item['ChipNumber']] = array('Id' => $RunnerId, 'Distance' => -1);
-            $NextRunnerId++;
-          } else 
-            $RunnerId = $Runners[$Item['ChipNumber']]['Id'];
-
-          if ($Runners[$Item['ChipNumber']]['Distance'] < $Item['OverallDistance'])
-          $Queries[] = $this->Database->GetInsert('RunnerStat', array(
-            'Time' => TimeToMysqlDateTime($Time),
-            'Runner' => $RunnerId,
-            'Distance' => $Item['OverallDistance'],
-            'Rank' => $Item['Pos'],
-            'Money' => $Item['Money'],
-          ));
-        } else
-        if (($Item['Type'] == 'team') or ($Item['Type'] == 'rodina'))
-        {
-          if (!array_key_exists($Item['GroupId'], $Teams))
-          {
-            if ($Item['Type'] == 'rodina') $IsFamily = 1; 
-              else $IsFamily = 0;
-            $Queries[] = $this->Database->GetInsert('Team', array(
-              'Id' => $NextTeamId,
-              'Name' => $Item['Name'],
-              'WebId' => $Item['GroupId'],
-              'IsFamily' => $IsFamily,
-            ));
-            $TeamId = $NextTeamId;            
-            $Teams[$Item['GroupId']] = array('Id' => $NextTeamId, 'Distance' => -1);
-            $NextTeamId++;
-          } else 
-            $TeamId = $Teams[$Item['GroupId']]['Id'];
- 
-          if ($Teams[$Item['GroupId']]['Distance'] < $Item['OverallDistance'])
-          $Queries[] = $this->Database->GetInsert('TeamStat', array(
-            'Time' => TimeToMysqlDateTime($Time),
-            'Team' => $TeamId,
-            'Distance' => $Item['OverallDistance'],
-            'Rank' => $Item['Pos'],
-            'Money' => $Item['Money'],
-          ));
-        } else
-        {
-          echo('Unsupported type '.$Item['Type'].'. ');
-        }
-      }    
-      //print_r($Queries);
-      $this->Database->Transaction($Queries);
+    $Items = $this->QueryRunnersAll();
+    //print_r($Items);
+    $Hash = md5(serialize($Items));
+
+    $DbResult = $this->Database->query('SELECT * FROM Import ORDER BY Time DESC LIMIT 1');
+    if ($DbResult->num_rows > 0)
+    {
+      $Import = $DbResult->fetch_assoc();
+    } else $Import = array('Hash' => '');
+    if ($Import['Hash'] != $Hash)
+    {
+      $this->Sync($Items, $Time);
+      $this->Database->insert('Import', array(
+        'Time' => TimeToMysqlDateTime($Time),
+        'Hash' => $Hash,
+        'ItemCount' => count($Items)
+      ));
     }
   }
@@ -214 +285 @@
     $Output .= '<div class="page-title">Families</div>';
 
-    $Where = 'IsFamily=1';
+    $Year = 1;
+    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);
+    $Where = '(IsFamily=1) AND (Year='.$Year.')';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
@@ -326 +403 @@
     $Output .= '<div class="page-title">Teams</div>';
 
-    //$Where = 'Name != ""';
-    $Where = 'IsFamily=0';
+    $Year = 1;
+    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);
+
+    $Where = '(IsFamily=0) AND (Year='.$Year.')';
 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE '.$Where);
@@ -436 +519 @@
   function ShowRunners()
   {
-    $Output = '';
-    $Output .= '<div class="page-title">Runners</div>';
-
-    $Where = '1';
+    $Output = '<div class="page-title">Runners</div>';
+
+    $Year = 1;
+    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;
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Runner` WHERE '.$Where);
     $DbRow = $DbResult->fetch_row();
@@ -565 +654 @@
     );
     $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
-    $Output .= '<table class="WideTable">';
+    $Output .= '<table class="2018/WideTable">';
     $Output .= $Order['Output'];
     $DbResult = $this->Database->query('SELECT * '.
@@ -598 +687 @@
     $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');      
+      '(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;
@@ -606 +695 @@
   {
     $Output = '';
-    $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 .= '<p>This website collects data from offical <a href="http://leaderboard.teribear.cz/">leaderboard</a> site and tracks and presents progress of runners.</p>';
+    $Output .= '<div class="page-title">Summary '.$Year.'</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);
+
+    $Runners = $this->GetTotals('(Year='.$Year.')');
+    $Men = $this->GetTotals('(Runner.Gender=1) AND (Year='.$Year.')', 'Runner');
+    $Women = $this->GetTotals('(Runner.Gender=2) AND (Year='.$Year.')', 'Runner');
+    $Kids = $this->GetTotals('(Runner.Gender=3) AND (Year='.$Year.')', 'Runner');
+    $Teams = $this->GetTotals('(Team.IsFamily=0) AND (Year='.$Year.')', 'Team');
+    $Families = $this->GetTotals('(Team.IsFamily=1) AND (Year='.$Year.')', 'Team');
+
     $Output .= '<table class="WideTable">';
     $Output .= '<tr><th>Category</th><th>Count</th><th>Distance [km]</th><th>Money [Kč]</th></tr>';
@@ -663 +760 @@
     $Output = '';
 
-    if(count($this->PathItems) > 0)
-    {
-      if($this->PathItems[0] == 'sync') $Output .= $this->ShowSync();
-      //else if($this->PathItems[0] == 'empty') $Output .= $this->ShowEmpty();
-      else if($this->PathItems[0] == 'runner') $Output .= $this->ShowRunner();
-      else if($this->PathItems[0] == 'runners') $Output .= $this->ShowRunners();
-      else if($this->PathItems[0] == 'team') $Output .= $this->ShowTeam();
-      else if($this->PathItems[0] == 'teams') $Output .= $this->ShowTeams();
-      else if($this->PathItems[0] == 'family') $Output .= $this->ShowFamily();
-      else if($this->PathItems[0] == 'families') $Output .= $this->ShowFamilies();
+    $this->Year = 0;
+    if (count($this->PathItems) > 0)
+    {
+      $Item = $this->PathItems[0];
+      if ($Item == 'sync') $Output .= $this->ShowSync();
+      else if($this->PathItems[0] == 'empty') $Output .= $this->ShowEmpty();
+      else if($Item == 'runner') $Output .= $this->ShowRunner();
+      else if($Item == 'runners') $Output .= $this->ShowRunners();
+      else if($Item == 'team') $Output .= $this->ShowTeam();
+      else if($Item == 'teams') $Output .= $this->ShowTeams();
+      else if($Item == 'family') $Output .= $this->ShowFamily();
+      else if($Item == 'families') $Output .= $this->ShowFamilies();
       else $Output .= $this->ShowMain();
     } else $Output .= $this->ShowMain();

trunk/style.css

@@ -70 +70 @@
 .page-title
 {
-  font-weight: bold; 
+  font-weight: bold;
   text-align: center;
   padding-bottom: 10px;
@@ -77 +77 @@
 .section-title
 {
-  font-weight: normal; 
+  font-weight: normal;
   text-align: center;
 }
+
+.year-list
+{
+  text-align: center;
+  padding-bottom: 10px;
+}