Changeset 41 for trunk

Timestamp:

Sep 14, 2020, 12:22:36 PM (4 years ago)

Author:

chronos

Message:

• Modified: Translate prefix multipliers.
• Modified: Improve length, duration and speed calculation in detailed and daily tables.
• Added: Allow to define lap length na money per Km for each year.

Location:

trunk

Files:

• Locale/cs.php (modified) (1 diff)
• Packages/Common/PrefixMultiplier.php (modified) (3 diffs)
• SQL/Upgrade.txt (modified) (1 diff)
• index.php (modified) (13 diffs)

trunk/Locale/cs.php

@@ -50 +50 @@
         'Search' => 'Hledat',
         'hour' => 'hodinu',
+        'yoctosecond' => 'yoctosekund',
+        'zeptosecond' => 'zeptosekund',
+        'attosecond' => 'attosekund',
+        'femtosecond' => 'femtosekund',
+        'pikosecond' => 'pikosekund',
+        'nanosecond' => 'nanosekund',
+        'microsecond' => 'mikrosekund',
+        'millisecond' => 'milisekund',
+        'second' => 'sekund',
+        'minutes' => 'minut',
+        'minute' => 'minuta',
+        'hours' => 'hodin',
+        'hour' => 'hodina',
+        'days' => 'dnů',
+        'day' => 'den',
+        'weeks' => 'týdnů',
+        'week' => 'týden',
+        'months' => 'měsíců',
+        'month' => 'měsíc',
+        'years' => 'roků',
+        'year' => 'rok',
+        'decades' => 'desetiletí',
+        'decade' => 'desetiletí',
+        'centuries' => 'století',
+        'century' => 'století',
+        'millennia' => 'tisíciletí',
+        'millennium' => 'tisíciletí',
       ),
       'URL' => array(

trunk/Packages/Common/PrefixMultiplier.php

@@ -1 +1 @@
 <?php
 
+function InitPrefixMultipliers()
+{
+  global $PrefixMultipliers;
 $PrefixMultipliers = array
 (
@@ -48 +51 @@
     'Definition' => array
     (
-      array('ys', 'yoctosecond', pow(10, -24)),
-      array('zs', 'zeptosecond', pow(10, -21)),
-      array('as', 'attosecond', pow(10, -18)),
-      array('fs', 'femtosecond', pow(10, -15)),
-      array('ps', 'pikosecond', pow(10, -12)),
-      array('ns', 'nanosecond', pow(10, -9)),
-      array('us', 'mikrosecond', pow(10, -6)),
-      array('ms', 'milisecond', pow(10, -3)),
-      array('s', 'second', 1),
-      array('minutes', 'minute', 60),
-      array('hours', 'hour', 60 * 60) ,
-      array('days', 'day', 24 * 60 * 60),
-      array('weeks', 'week', 7 * 24 * 60 * 60),
-      array('months', 'month', 30 * 24 * 60 * 60),
-      array('years', 'year', 364 * 24 * 60 * 60),
-      array('desitiletí', 'desetiletí', 10 * 364 * 24 * 60 * 60),
-      array('staletí', 'staletí', 100 * 364 * 24 * 60 * 60),
-      array('tisíciletí', 'tisiciletí', 10000 * 364 * 24 * 60 * 60),
+      array('ys', T('yoctosecond'), pow(10, -24)),
+      array('zs', T('zeptosecond'), pow(10, -21)),
+      array('as', T('attosecond'), pow(10, -18)),
+      array('fs', T('femtosecond'), pow(10, -15)),
+      array('ps', T('pikosecond'), pow(10, -12)),
+      array('ns', T('nanosecond'), pow(10, -9)),
+      array('us', T('microsecond'), pow(10, -6)),
+      array('ms', T('millisecond'), pow(10, -3)),
+      array('s', T('second'), 1),
+      array(T('minutes'), T('minute'), 60),
+      array(T('hours'), T('hour'), 60 * 60) ,
+      array(T('days'), T('day'), 24 * 60 * 60),
+      array(T('weeks'), T('week'), 7 * 24 * 60 * 60),
+      array(T('months'), T('month'), 30 * 24 * 60 * 60),
+      array(T('years'), T('year'), 364 * 24 * 60 * 60),
+      array(T('decades'), T('decade'), 10 * 364 * 24 * 60 * 60),
+      array(T('centuries'), T('century'), 100 * 364 * 24 * 60 * 60),
+      array(T('millennia'), T('millennium'), 10000 * 364 * 24 * 60 * 60),
     ),
   ),
 );
+}
 
 class PrefixMultiplier
@@ -117 +121 @@
   }
 }
+
+InitPrefixMultipliers();

trunk/SQL/Upgrade.txt

@@ -15 +15 @@
   MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=6;
 
+-- 41
+
+CREATE TABLE `Year` (
+  `Id` int(11) NOT NULL,
+  `Year` int(11) NOT NULL,
+  `MoneyKm` int(11) NOT NULL,
+  `LapLength` DECIMAL(10,1) NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ALTER TABLE `Year` ADD PRIMARY KEY (`Id`);
+
+ALTER TABLE `Year`
+  MODIFY `Id` int(11) NOT NULL AUTO_INCREMENT;
+COMMIT;
+
+INSERT INTO `Year` (`Id`, `Year`, `MoneyKm`, `LapLength`) VALUES
+(1, 2018, 30, '1.5'),
+(2, 2019, 30, '1.5'),
+(3, 2020, 10, '0.0');

trunk/index.php

@@ -6 +6 @@
 include_once('Run.php');
 include_once('Packages/Common/Base.php');
+include_once('Packages/Common/Locale.php');
 include_once('Packages/Common/PrefixMultiplier.php');
-include_once('Packages/Common/Locale.php');
 
 session_start();
@@ -29 +29 @@
   var $LinkLocaleExceptions;
   var $Title;
+  var $LapLength;
+  var $MoneyKm;
+  var $MaxRunnerSpeed;
+  var $MinRunnerSpeed;
 
   function __construct()
@@ -36 +40 @@
     $this->LinkLocaleExceptions = array();
     $this->Title = '';
+    $this->LapLength = 0; // km
+    $this->MoneyKm = 0; // Kč
+    $this->MaxRunnerSpeed = 20; // km/hour
+    $this->MinRunnerSpeed = 2; // km/hour
   }
 
@@ -468 +476 @@
     $Output .= '<div class="page-title">'.$Title.' '.$DbRow['Name'].'</div>';
     $Output .= '<div class="section-title">'.$this->ItemsYearList('/'.$UrlDir.'/', $TeamId, 'Team', 'Name="'.$DbRow['Name'].'"').'</div>';
+    $this->LoadYearParameters($DbRow['Year']);
     $Output .= '<div class="section-title">'.
       T('Runners').': '.$DbRow['RunnerCount'].', '.
@@ -546 +555 @@
     $Output .= '<table class="WideTable">';
     $Output .= $Order['Output'];
+    $TableStat = $Table.'Stat';
     $DbResult = $this->Database->query('SELECT *'.
-      ', (SELECT TIME_TO_SEC(TIMEDIFF('.$Table.'Stat.Time, B.Time)) FROM '.$Table.'Stat AS B WHERE (B.Time < '.$Table.'Stat.Time) AND (B.'.$Table.' = '.$Table.'Stat.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Duration'.
-      ', (SELECT '.$Table.'Stat.Distance - B.Distance FROM '.$Table.'Stat AS B WHERE (B.Time < '.$Table.'Stat.Time) AND (B.'.$Table.' = '.$Table.'Stat.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Length'.
+      ', (SELECT '.$TableStat.'.Distance - B.Distance FROM '.$TableStat.' AS B WHERE (B.Time < '.$TableStat.'.Time) AND (B.'.$Table.' = '.$TableStat.'.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Length'.
+      ', (SELECT TIME_TO_SEC(TIMEDIFF('.$TableStat.'.Time, B.Time)) FROM '.$TableStat.' AS B WHERE (B.Time < '.$TableStat.'.Time) AND (B.'.$Table.' = '.$TableStat.'.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Duration'.
       ', NULL AS Speed'.
-      ' FROM '.$Table.'Stat'.
+      ' FROM '.$TableStat.
       ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
     while ($Item = $DbResult->fetch_assoc())
@@ -559 +569 @@
         '<td>'.$Item['Money'].'</td>'.
         '<td>'.$Item['Rank'].'</td>';
-      if ($Item['Duration'] != null) $Output .= '<td>'.$PrefixMultiplier->Add($Item['Duration'], '', 4, 'Time').'</td>';
+      if (($Item['Duration'] != null) and ($Item['Duration'] < $Item['Length'] / $this->MinRunnerSpeed * 3600)) $Output .= '<td>'.$PrefixMultiplier->Add($Item['Duration'], '', 4, 'Time').'</td>';
         else $Output .= '<td>&nbsp;</td>';
       $Output .= '<td>'.$Item['Length'].'</td>';
-      if ($Item['Duration'] > 0) $Output .= '<td>'.$PrefixMultiplier->Add($Item['Length'] / $Item['Duration'] * 3600, '', 4, 'Decimal').'</td>';
+      $Speed = $Item['Length'] / $Item['Duration'] * 3600;
+      if (($Item['Duration'] > 0) and ($Item['Duration'] < $Item['Length'] * 3600 / $this->MinRunnerSpeed))
+        $Output .= '<td>'.$PrefixMultiplier->Add($Speed, '', 4, 'Decimal').'</td>';
         else $Output .= '<td>&nbsp;</td>';
       $Output .= '</tr>';
@@ -577 +589 @@
     $Where = '1';
 
-    $DailyTableMaxId = 'SELECT * FROM (SELECT MAX(Id) AS MaxId FROM `'.$Table.'Stat` AS T1 WHERE T1.'.$Table.'='.$Id.' GROUP BY DATE(Time)) AS T2 LEFT JOIN '.$Table.'Stat AS T3 ON T3.Id=T2.MaxId';
-    $DailyTableMinId = 'SELECT * FROM (SELECT MIN(Id) AS MinId FROM `'.$Table.'Stat` AS T1 WHERE T1.'.$Table.'='.$Id.' GROUP BY DATE(Time)) AS T2 LEFT JOIN '.$Table.'Stat AS T3 ON T3.Id=T2.MinId';
+    $TableStat = $Table.'Stat';
+    $DailyTableMaxId = 'SELECT * FROM (SELECT MAX(Id) AS MaxId FROM '.$TableStat.' AS T1 WHERE T1.'.$Table.'='.$Id.' GROUP BY DATE(Time)) AS T2 LEFT JOIN '.$TableStat.' AS T3 ON T3.Id=T2.MaxId';
+    $DailyTableMinId = 'SELECT * FROM (SELECT MIN(Id) AS MinId FROM '.$TableStat.' AS T1 WHERE T1.'.$Table.'='.$Id.' GROUP BY DATE(Time)) AS T2 LEFT JOIN '.$TableStat.' AS T3 ON T3.Id=T2.MinId';
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$DailyTableMaxId.') AS B');
     $DbRow = $DbResult->fetch_row();
@@ -598 +611 @@
     $Output .= '<table class="WideTable">';
     $Output .= $Order['Output'];
-    $DbResult = $this->Database->query('SELECT * '.
-      ', (SELECT T4.Distance - B.Distance + 1.5 FROM ('.$DailyTableMinId.') AS B WHERE (DATE(B.Time) = DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Length'.
-      ', (SELECT TIME_TO_SEC(TIMEDIFF(T4.Time, B.Time)) / (Length - 1.5) * Length FROM ('.$DailyTableMinId.') AS B WHERE (DATE(B.Time) = DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Duration'.
-      ', NULL AS Speed'.
-      ' FROM ('.$DailyTableMaxId.') AS T4'.
-      ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
+
+    if ($this->LapLength == 0)
+    {
+      $DbResult = $this->Database->query('SELECT * '.
+        ', COALESCE((SELECT T4.Distance - B.Distance FROM ('.$DailyTableMaxId.') AS B WHERE (DATE(B.Time) < DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.') ORDER BY B.Time DESC LIMIT 1), T4.Distance) AS Length'.
+        ', NULL AS Duration'.
+        ', NULL AS Speed'.
+        ' FROM ('.$DailyTableMaxId.') AS T4'.
+        ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
+    } else
+    {
+      $DbResult = $this->Database->query('SELECT * '.
+        ', COALESCE((SELECT T4.Distance - B.Distance FROM ('.$DailyTableMaxId.') AS B WHERE (DATE(B.Time) < DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.') ORDER BY B.Time DESC LIMIT 1), T4.Distance) AS Length'.
+        //', (SELECT COUNT(*) * '.$this->LapLength.' FROM '.$TableStat.' AS B WHERE (DATE(B.Time) = DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.')) AS LapLength'.
+        ', (SELECT TIME_TO_SEC(TIMEDIFF(T4.Time, B.Time)) / (Length - '.$this->LapLength.') * Length FROM ('.$DailyTableMinId.') AS B WHERE (DATE(B.Time) = DATE(T4.Time)) AND (B.'.$Table.' = T4.'.$Table.') ORDER BY B.Time DESC LIMIT 1) AS Duration'.
+        ', NULL AS Speed'.
+        ' FROM ('.$DailyTableMaxId.') AS T4'.
+        ' WHERE '.$Where.$Order['SQL'].$PageList['SQLLimit']);
+    }
     while ($Item = $DbResult->fetch_assoc())
     {
@@ -700 +726 @@
     if (!is_numeric($RunnerId)) die(T('Runner id needs to be numeric'));
 
-    $DbResult = $this->Database->query('SELECT Runner.Name, Team.Name AS TeamName, Team.Id AS TeamId FROM Runner LEFT JOIN Team ON Team.Id=Runner.Team WHERE Runner.Id='.$RunnerId);
+    $DbResult = $this->Database->query('SELECT Runner.Name, Team.Name AS TeamName, Team.Id AS TeamId, Team.Year FROM Runner LEFT JOIN Team ON Team.Id=Runner.Team WHERE Runner.Id='.$RunnerId);
     $DbRow = $DbResult->fetch_assoc();
     $this->Title = T('Runner').' '.$DbRow['Name'].' - '.$this->Title;
@@ -707 +733 @@
       $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>';
+    $this->LoadYearParameters($DbRow['Year']);
 
     $Output .= $this->ShowDetailed('Runner', $RunnerId);
@@ -732 +759 @@
     }
     if ($Year == 0) $Year = $this->GetLatestYear();
+    $this->LoadYearParameters($Year);
     return $Year;
   }
@@ -876 +904 @@
   }
 
+  function LoadYearParameters($Year)
+  {
+    $DbResult = $this->Database->query('SELECT * FROM `Year` WHERE `Year`.`Year`='.$Year);
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $this->LapLength = $DbRow['LapLength'];
+      $this->MoneyKm = $DbRow['MoneyKm'];
+    }
+  }
+
   function Run()
   {
@@ -917 +956 @@
       $this->LocaleManager->LoadLocale($this->LocaleManager->LangCode);
     }
+    InitPrefixMultipliers();
 
     if (GetRemoteAddress() != '')