Changeset 3 for trunk

Timestamp:

Sep 8, 2016, 11:03:23 PM (8 years ago)

Author:

chronos

Message:

• Added: Calculare available seats for passenger registration.
• Added: Show table of passengers for a ride.

Location:

trunk

Files:

• .htaccess (modified) (1 diff)
• Application/Core.php (modified) (3 diffs)
• Application/View.php (modified) (2 diffs)
• Modules/Ride/Ride.php (modified) (11 diffs)

trunk/.htaccess

@@ -7 +7 @@
 RewriteCond  %{REQUEST_FILENAME}  !-f
 RewriteCond  %{REQUEST_FILENAME}  !-d
-RewriteRule   ^(.*)$ %{CONTEXT_PREFIX}/index.php?$1
+RewriteRule   ^(.*)$ %{CONTEXT_PREFIX}index.php?$1
 
 #ErrorDocument 403 "index.php?page=403"

trunk/Application/Core.php

@@ -30 +30 @@
     $this->ShowPage = true;
     $this->BaseURL = $_SERVER['SCRIPT_NAME'];
-    if(substr($this->BaseURL, -10, 10) == '/index.php')
-      $this->BaseURL = substr($this->BaseURL, 0, -10);
+    $BaseScriptName = '/index.php';
+    if(substr($this->BaseURL, -strlen($BaseScriptName), strlen($BaseScriptName)) == $BaseScriptName)
+      $this->BaseURL = substr($this->BaseURL, 0, -strlen($BaseScriptName));
     $this->FormManager = new FormManager($this->Database);
   }
@@ -62 +63 @@
 
     $this->RegisterPageBar('Top');
+    $this->RegisterPageBar('TopLeft');
 
     // Register and start existing modules
@@ -164 +166 @@
   {
     Header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
-    return('<h3 align="center">'.T('Required page not found'));
+    return('<h3 align="center">'.T('Required page not found').'</h3>');
   }
 }

trunk/Application/View.php

@@ -35 +35 @@
   {
     $Output = '<div>';
+    $Output .= '<div class="MenuItem">';
+    $Bar = '';
+    foreach($this->System->Bars['TopLeft'] as $BarItem)
+      $Bar .= call_user_func($BarItem);
+      if(trim($Bar) != '') $Output .= $Bar;
+      else $Output .= '&nbsp;';
+    $Output .= '</div><div class="MenuItem2">';
     $Bar = '';
     foreach($this->System->Bars['Top'] as $BarItem)
@@ -40 +47 @@
       if(trim($Bar) != '') $Output .= $Bar;
       else $Output .= '&nbsp;';
-    $Output .= '</div>';
+    $Output .= '</div></div>';
     return($Output);
   }

trunk/Modules/Ride/Ride.php

@@ -19 +19 @@
     $this->System->RegisterPage('nova-jizda', 'PageNewRide');
     $this->System->RegisterPage('jizda', 'PageRideDetail');
+    $this->System->RegisterPageBarItem('TopLeft', 'Logo', array($this, 'ShowLogo'));
   }
 
@@ -69 +70 @@
   `Sequence` int(11) NOT NULL,
   `Price` int(11) NOT NULL,
+  `PassengerCount` int(11) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `Ride` (`Ride`)
@@ -123 +125 @@
 
   }
+
+  function ShowLogo()
+  {
+    $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('/nabídnout/').'">Nabídnout jízdu</a>';
+    return($Output);
+  }
+
+  function UpdatePassengerCount($RideId)
+  {
+    $DbResult = $this->System->Database->select('RideStop', 'COUNT(*) AS RideStopCount', 'Ride='.$RideId);
+    $DbRow = $DbResult->fetch_assoc();
+
+    $Stops = array_fill(0, $DbRow['RideStopCount'], 0);
+    $this->System->Database->update('RideStop', 'Ride='.$RideId, array('PassengerCount' => 0));
+    $DbResult = $this->System->Database->query('SELECT PassengerRideStopFrom.Sequence AS SequenceFrom, '.
+        'PassengerRideStopTo.Sequence AS SequenceTo, Passenger.SeatCount FROM Passenger '.
+        'LEFT JOIN RideStop AS PassengerRideStopFrom ON PassengerRideStopFrom.Id=Passenger.RideStopFrom '.
+        'LEFT JOIN RideStop AS PassengerRideStopTo ON PassengerRideStopTo.Id=Passenger.RideStopTo '.
+        'WHERE Passenger.Ride='.$RideId);
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      for($I = $DbRow['SequenceFrom'] + 1; $I <= $DbRow['SequenceTo']; $I++)
+      {
+        $Stops[$I] = $Stops[$I] + $DbRow['SeatCount'];
+      }
+    }
+    foreach($Stops as $Index => $Stop)
+    {
+      $this->System->Database->update('RideStop', 'Ride='.$RideId.' AND Sequence='.$Index, array('PassengerCount' => $Stop));
+    }
+  }
 }
+
 class PageRideDetail extends Page
 {
   function ShowDetail()
   {
+    $RideId = $_GET['id'];
     $DbResult = $this->Database->query('SELECT Ride.Details, Ride.Id, Ride.SeatCount, '.
       'RideStopFrom.Id AS RideStopFromId, RideStopTo.Id AS RideStopToId, '.
@@ -137 +174 @@
       'LEFT JOIN CarModel ON CarModel.Id = Car.Model '.
       'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
-      'WHERE Ride.Id='.$_GET['id']);
+      'WHERE Ride.Id='.$RideId);
     $DbRow = $DbResult->fetch_assoc();
     $Track = array();
@@ -157 +194 @@
     $Output .= '<form action="?step=2" method="post">'.
       'Počet míst: <input type="text" name="seats" value="1"/>'.
-      '<input type="hidden" name="id" value="'.$_GET['id'].'"/>'.
+      '<input type="hidden" name="id" value="'.$RideId.'"/>'.
       '<input type="hidden" name="fromid" value="'.$DbRow['RideStopFromId'].'"/>'.
       '<input type="hidden" name="toid" value="'.$DbRow['RideStopToId'].'"/>'.
@@ -166 +203 @@
       '<table class="WideTable">';
 
-/*    $DbResult2 = $this->Database->query('SELECT * FROM RideStop WHERE Ride='.$DbRow['Id'].' ORDER BY Sequence');
-    while($DbRow2 = $DbResult2->fetch_assoc())
-    {
-      $Track[] = $DbRow2;
-      $Stops[] = $DbRow2['Place'];
-    }
-  */
+    // Load passengers table
+    $Table = array_fill(0, count($Track), array_fill(0, $DbRow['SeatCount'], NULL));
+    $Passengers = array();
+    $DbResult = $this->System->Database->query('SELECT User.Name AS UserName, PassengerRideStopFrom.Sequence AS SequenceFrom, '.
+      'PassengerRideStopTo.Sequence AS SequenceTo FROM Passenger '.
+      'LEFT JOIN RideStop AS PassengerRideStopFrom ON PassengerRideStopFrom.Id=Passenger.RideStopFrom '.
+      'LEFT JOIN RideStop AS PassengerRideStopTo ON PassengerRideStopTo.Id=Passenger.RideStopTo '.
+      'LEFT JOIN User ON User.Id=Passenger.User '.
+      'WHERE Passenger.Ride='.$RideId);
+    while($Passenger = $DbResult->fetch_assoc())
+    {
+      $Passengers[] = $Passenger;
+      $Seat = 0;
+      do {
+        $Check = true;
+        for($I = $Passenger['SequenceFrom']; $I < $Passenger['SequenceTo']; $I++)
+        {
+          if($Table[$I][$Seat] != 0) $Check = false;
+        }
+        if (!$Check) $Seat++;
+      } while(!$Check);
+      for($I = $Passenger['SequenceFrom']; $I < $Passenger['SequenceTo']; $I++)
+        $Table[$I][$Seat] = count($Passengers) - 1;
+    }
+
+    $Output .= '<tr><th>Zastávka / Čas</th><th>Řidič</th>';
+    for ($I = 0; $I < $DbRow['SeatCount']; $I++)
+      $Output .= '<th>Cestující</th>';
+    $Output .= '</tr>';
     foreach($Track as $Index => $TrackItem)
     {
-      $Output .= '<tr><td>'.$TrackItem['Place'].'<br/>'.$TrackItem['Time'].'</td>';
+      $Output .= '<tr><td style="height: 100px">'.$TrackItem['Place'].'<br/>'.$TrackItem['Time'].'</td>';
+      if($Index == 0) $Output .= '<td rowspan="'.count($Track).'">Řidič</td>';
       for ($I = 0; $I < $DbRow['SeatCount']; $I++)
       {
-        $Output .= '<td>'.'s'.'</td>';
+        if (!is_null($Table[$Index][$I])) {
+          $Passenger = $Passengers[$Table[$Index][$I]];
+          if ($Index == $Passenger['SequenceFrom'])
+          $Output .= '<td rowspan="'.($Passenger['SequenceTo'] - $Passenger['SequenceFrom']).'">'.$Passenger['UserName'].'</td>';
+        } else {
+          // Show unused space
+          if(($Index == 0) or ((($Index - 1) >= 0) and (!is_null($Table[$Index - 1][$I]))))
+          {
+            $J = 1;
+            while((($Index + $J) < count($Table)) and is_null($Table[$Index + $J][$I])) $J++;
+            $Output .= '<td rowspan="'.$J.'">&nbsp;</td>';
+          }
+        }
       }
       $Output .= '</tr>';
@@ -200 +272 @@
           'RideStopTo' => $_POST['toid'],
         ));
+        $this->System->ModuleManager->Modules['Ride']->UpdatePassengerCount($_POST['id']);
         $Output = 'Rezervace dokončena';
       }
@@ -223 +296 @@
     if (array_key_exists('from', $_GET) and array_key_exists('to', $_GET)) {
       $Output .= $this->ShowRides($_GET['from'], $_GET['to']);
-    }
+    } else $Output .= $this->ShowRides('', '');
     return($Output);
   }
@@ -231 +304 @@
     $Output = '<h3>Jízdy:</h3>';
     $Output .= '<table>';
-    if((trim($PlaceFrom) == '') or (trim($PlaceTo == ''))) return "Zadejte odkud kam.";
-    $DbResult = $this->Database->query('SELECT Ride.Id, Ride.SeatCount, (SELECT Name FROM User WHERE User.Id=Ride.Driver) AS DriverName, '.
-      'CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS CarName FROM Ride '.
-      'JOIN RideStop AS RideStopFrom ON (RideStopFrom.Ride = Ride.Id) AND (RideStopFrom.Place LIKE "%'.$PlaceFrom.'%") '.
-      'JOIN RideStop AS RideStopTo ON (RideStopTo.Ride = Ride.Id) AND (RideStopTo.Place LIKE "%'.$PlaceTo.'%") '.
+    $Query = 'SELECT Ride.Id, Ride.SeatCount, (SELECT Name FROM User WHERE User.Id=Ride.Driver) AS DriverName, '.
+      'CONCAT(CarManufacturer.Name, " ", CarModel.Name) AS CarName ';
+    if((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
+      $Query .= ', (SELECT COALESCE(MAX(RideStop.PassengerCount), 0) FROM RideStop '.
+      'WHERE (RideStop.Ride=Ride.Id) AND (RideStop.Sequence > RideStopFrom.Sequence) AND '.
+      '(RideStop.Sequence <= RideStopTo.Sequence)) AS PassengerCount ';
+    else
+      $Query .= ', (SELECT COALESCE(MAX(RideStop.PassengerCount), 0) FROM RideStop '.
+       'WHERE (RideStop.Ride=Ride.Id)) AS PassengerCount ';
+
+    $Query .= 'FROM Ride '.
       'LEFT JOIN Car ON Car.Id = Ride.Car '.
       'LEFT JOIN CarModel ON CarModel.Id = Car.Model '.
-      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer '.
-      'WHERE RideStopFrom.Sequence < RideStopTo.Sequence '.
-      'LIMIT 10');
+      'LEFT JOIN CarManufacturer ON CarManufacturer.Id = CarModel.Manufacturer ';
+    if((trim($PlaceFrom) != '') and (trim($PlaceTo != '')))
+      $Query .= 'JOIN RideStop AS RideStopFrom ON (RideStopFrom.Ride = Ride.Id) AND (RideStopFrom.Place LIKE "%'.$PlaceFrom.'%") '.
+        'JOIN RideStop AS RideStopTo ON (RideStopTo.Ride = Ride.Id) AND (RideStopTo.Place LIKE "%'.$PlaceTo.'%") '.
+        'WHERE (RideStopFrom.Sequence < RideStopTo.Sequence)';
+    $Query .= 'LIMIT 10';
+    $DbResult = $this->Database->query($Query);
     while($DbRow = $DbResult->fetch_assoc())
     {
@@ -251 +334 @@
         $Price += $DbRow2['Price'];
       }
-      $AvailSpace = $DbRow['SeatCount'];
-      $DbResult2 = $this->Database->query('SELECT * FROM Passenger WHERE Ride='.$DbRow['Id']);
-      while($DbRow2 = $DbResult2->fetch_assoc())
-      {
-        $AvailSpace -= $DbRow2['SeatCount'];
-      }
 
       $Output .= '<tr><td>Řidič:</td><td>'.$DbRow['DriverName'].'</td>'.
-        '<td colspan="4"><a href="'.$this->System->Link('/jizda/?id='.$DbRow['Id'].'&from='.$_GET['from'].'&to='.$_GET['to']).'">Ukázat</a></td></tr>'.
+        '<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>'.
         '<tr><td>Cena:</td><td>'.$Price.' Kč</td></tr>'.
-        '<tr><td>Volných míst:</td><td>'.$AvailSpace.'</td></tr>'.
-        '<tr><td>Auto:</td><td>'.$DbRow['CarName'].'</td></tr>';
+        '<tr><td>Volných míst:</td><td>'.($DbRow['SeatCount'] - $DbRow['PassengerCount']).'</td></tr>'.
+        '<tr><td>Auto:</td><td>'.$DbRow['CarName'].'</td></tr>'.
+        '<tr><td>&nbsp;</td></tr>';
     }
     $Output .= '</table';
@@ -331 +409 @@
         $Map->Width = 400;
         $Map->Height = 300;
-        $Map->Path = array($_GET['from'], 'Pardubice', $_GET['to']);
-        $Map->Path = array('Praha', 'Brno', 'Zlín', 'Vsetín');
+        $Map->Path = array($_GET['from'], $_GET['to']);
+        //$Map->Path = array('Praha', 'Brno', 'Zlín', 'Vsetín');
         $Track = $Map->Route();
         $Output .= '<h3>Trasa</h3>';