Changeset 5 for trunk

Timestamp:

Sep 9, 2016, 10:17:39 PM (8 years ago)

Author:

chronos

Message:

• Added: Show driver age.

Location:

trunk/Modules

Files:

• Ride/Ride.php (modified) (7 diffs)
• User/User.php (modified) (1 diff)
• User/UserModel.php (modified) (1 diff)

trunk/Modules/Ride/Ride.php

@@ -19 +19 @@
     $this->System->RegisterPage('nova-jizda', 'PageNewRide');
     $this->System->RegisterPage('jizda', 'PageRideDetail');
+    $this->System->RegisterPage('jizdy', 'PageRideList');
     $this->System->RegisterPageBarItem('TopLeft', 'Logo', array($this, 'ShowLogo'));
   }
@@ -129 +130 @@
   {
     $Output = '<img src="" width="200" height="50" alt="Logo"/> '.
-      '<a href="'.$this->System->Link('/hledat/').'">Hledat jízdu</a> nebo '.
+      '<a href="'.$this->System->Link('/jizdy/').'">Hledat jízdu</a> nebo '.
       '<a href="'.$this->System->Link('/nova-jizda/').'">Nabídnout jízdu</a>';
     return($Output);
@@ -228 +229 @@
     }
 
-    $Output .= '<tr><th>Zastávka / Čas</th><th>Řidič</th>';
+    $Output .= '<tr><th>Zastávka / Čas</th><th style="width: 80px">Řidič</th>';
     for ($I = 0; $I < $DbRow['SeatCount']; $I++)
-      $Output .= '<th>Cestující</th>';
+      $Output .= '<th style="width: 80px">Cestující</th>';
     $Output .= '</tr>';
     foreach($Track as $Index => $TrackItem)
@@ -288 +289 @@
     if(array_key_exists('to', $_GET)) $PlaceTo = $_GET['to'];
       else $PlaceTo = '';
-     $Output = '<table style="width: 100%"><tr><td>'.
-     '<form style="display: inline;" method="get" action="'.$this->System->Link('/').'">'.
+    if(array_key_exists('time', $_GET)) $Time = $_GET['time'];
+      else $Time = '';
+    $Output = '<table style="width: 100%; margin-top: 100px; margin-bottom: 100px;"><tr><td style="text-align: center">'.
+      '<div><h3>Vyhledat jízdu</h3>'.
+      '<form style="display: inline;" method="get" action="'.$this->System->Link('/jizdy/').'">'.
       'Odkud: <input type="text" name="from" value="'.$PlaceFrom.'"/> '.
       'Kam: <input type="text" name="to" value="'.$PlaceTo.'"/> '.
+      'Čas: <input type="text" name="time" value="'.$Time.'"/> '.
       '<input type="submit" value="Hledat"/>'.
-      '</form></td><td><a href="'.$this->System->Link('/nova-jizda/').'">Nová jízda</a></td></tr></table>';
+      '</form></div></td></tr></table>';
+    return($Output);
+  }
+}
+
+class PageRideList extends Page
+{
+  function Show()
+  {
+    if(array_key_exists('from', $_GET)) $PlaceFrom = $_GET['from'];
+      else $PlaceFrom = '';
+    if(array_key_exists('to', $_GET)) $PlaceTo = $_GET['to'];
+      else $PlaceTo = '';
+    if(array_key_exists('time', $_GET)) $Time = $_GET['time'];
+      else $Time = '';
+    $Output = '<table style="width: 100%"><tr><td style="text-align: center;">'.
+      '<form style="display: inline;" method="get" action="'.$this->System->Link('/').'">'.
+      'Odkud: <input type="text" name="from" value="'.$PlaceFrom.'"/> '.
+      'Kam: <input type="text" name="to" value="'.$PlaceTo.'"/> '.
+      'Čas: <input type="text" name="time" value="'.$Time.'"/> '.
+      '<input type="submit" value="Hledat"/>'.
+      '</form></td></tr></table>';
     if (array_key_exists('from', $_GET) and array_key_exists('to', $_GET)) {
       $Output .= $this->ShowRides($_GET['from'], $_GET['to']);
@@ -304 +330 @@
     $Output = '<h3>Jízdy:</h3>';
     $Output .= '<table>';
-    $Query = 'SELECT Ride.Id, Ride.SeatCount, (SELECT Name FROM User WHERE User.Id=Ride.Driver) AS DriverName, '.
+    $Query = 'SELECT Ride.Id, Ride.SeatCount, User.Name AS DriverName, User.BirthDate, '.
       'CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS CarName ';
     if((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
@@ -317 +343 @@
       'LEFT JOIN Car ON Car.Id = Ride.Car '.
       'LEFT JOIN CarModel ON CarModel.Id = Car.Model '.
-      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer ';
+      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
+      'LEFT JOIN User ON User.Id=Ride.Driver ';
     if((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
       $Query .= 'JOIN RideStop AS RideStopFrom ON (RideStopFrom.Ride = Ride.Id) AND (RideStopFrom.Place LIKE "%'.$PlaceFrom.'%") '.
@@ -335 +362 @@
       }
 
-      $Output .= '<tr><td>Řidič:</td><td>'.$DbRow['DriverName'].'</td>'.
+      if ($DbRow['BirthDate'] != '') $Age = ' ('.round((time() - MysqlDateToTime($DbRow['BirthDate'])) / (3600*24*364.25)).' let)';
+        else $Age = '';
+      $Output .= '<tr><td>Řidič:</td><td>'.$DbRow['DriverName'].$Age.'</td>'.
         '<td colspan="4"><a href="'.$this->System->Link('/jizda/?id='.$DbRow['Id'].'&from='.$PlaceFrom.'&to='.$PlaceTo).'">Ukázat</a></td></tr>'.
         '<tr><td>Trasa:</td><td>'.implode(' → ', $Stops).'</td></tr>'.

trunk/Modules/User/User.php

@@ -30 +30 @@
       '`Salt` varchar(255) NOT NULL,'.
       '`Email` varchar(128) NOT NULL DEFAULT "",'.
+      '`BirthDate` date NULL,'.
       '`LastIpAddress` varchar(16) NOT NULL DEFAULT "",'.
       '`LastLoginTime` datetime NULL,'.

trunk/Modules/User/UserModel.php

@@ -174 +174 @@
 
             $Result = USER_REGISTRATED;
-            $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
+            if(array_key_exists('Log', $this->System->ModuleManager->Modules))
+              $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
           }
         }