Changeset 4 for trunk

Timestamp:

Sep 8, 2016, 11:14:39 PM (8 years ago)

Author:

chronos

Message:

• Fixed: PassengerCount table column usage.
• Fixed: Google map with empty waypoints.

Location:

trunk/Modules

Files:

• Map/Map.php (modified) (1 diff)
• Ride/Ride.php (modified) (5 diffs)

trunk/Modules/Map/Map.php

@@ -142 +142 @@
     array_shift($WayPoints);
     array_pop($WayPoints);
+    if(count($WayPoints) > 0)
+      $WaypointsQuery = '&waypoints='.implode('|', $WayPoints);
+      else $WaypointsQuery = '';
 
     $Output = '<iframe width="'.$this->Width.'" height="'.$this->Height.'" frameborder="0" scrolling="no" '.
       'marginheight="0" marginwidth="0" src="'.'https://www.google.com/maps/embed/v1/directions'.
-      '?key='.$this->Key.'&origin='.$this->Path[0].'&waypoints='.implode('|', $WayPoints).
+      '?key='.$this->Key.'&origin='.$this->Path[0].$WaypointsQuery.
       '&destination='.$this->Path[count($this->Path) - 1].''.
       '" style="border: 1px solid black"></iframe>';

trunk/Modules/Ride/Ride.php

@@ -70 +70 @@
   `Sequence` int(11) NOT NULL,
   `Price` int(11) NOT NULL,
-  `PassengerCount` int(11) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `Ride` (`Ride`)
@@ -83 +82 @@
   `RideStopFrom` int(11) NOT NULL,
   `RideStopTo` int(11) NOT NULL,
+  `PassengerCount` int(11) NOT NULL,
   PRIMARY KEY (`Id`),
   KEY `User` (`User`),
@@ -130 +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('/nabídnout/').'">Nabídnout jízdu</a>';
+      '<a href="'.$this->System->Link('/nova-jizda/').'">Nabídnout jízdu</a>';
     return($Output);
   }
@@ -343 +343 @@
         '<tr><td>&nbsp;</td></tr>';
     }
-    $Output .= '</table';
+    $Output .= '</table>';
 
     return($Output);
@@ -465 +465 @@
             'Price' => $TrackItem['Price'],
             'Sequence' => $Index,
+            'PassengerCount' => 0,
           ));
         }