From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Wed, 17 Jan 2018 15:41:44 +0000 (+0100)
Subject: Fixlets to today coding session.
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=0a87f4538a04b4dba4888a6abdb166ba8f465ba4;p=Project_webapp.git

Fixlets to today coding session.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/includes/booking.php b/includes/booking.php
new file mode 100644
index 0000000..e69de29
diff --git a/includes/formbooking.php b/includes/formbooking.php
index 3d55c50..2d47f81 100644
--- a/includes/formbooking.php
+++ b/includes/formbooking.php
@@ -35,6 +35,8 @@ if (!$input_failure && $is_logged_in && !empty($form_nb_place) && !empty($form_c
     if (!empty($nb_booked)) {
         echo "Vous avez de&#769;ja&#768; re&#769;serve&#769; ce vol, vous allez e&#770;tre redirige&#769; vers la liste de vos re&#769;servations dans 2 secondes. <br>";
         redirect("index.php?page=reservations", 2);
+        include('footer.html');
+        exit();
     }
     $sql_pquery = "insert into RESERVATIONS (NumCl, NumVol, Classe, NbPlaces)
                    values (?, ?, ?, ?)";
diff --git a/includes/formsearch.php b/includes/formsearch.php
index 7796f06..e40ab12 100644
--- a/includes/formsearch.php
+++ b/includes/formsearch.php
@@ -90,7 +90,7 @@ if (empty($form_arrival_date)) {
  </select>
  <label> Date -> </label>
  <input type="datetime-local" name="arrival_date" <?php if (isset($form_arrival_date)) echo "value=\"$form_arrival_date\"";?> />
- <input type="submit" value="Valider">
+ <input type="submit" value="Rechercher">
 </form>
 <br>
 
diff --git a/includes/reservations.php b/includes/reservations.php
index f560b9a..15beeac 100644
--- a/includes/reservations.php
+++ b/includes/reservations.php
@@ -10,8 +10,9 @@ if (!$is_logged_in) {
 <h1>Mes re&#769;servations</h1>
 <?php
 $client_id = get_client_id($_SESSION['email']);
-//Add teen minutes to permit to show reservations after the end of the flight
+// Add teen minutes to permit to show reservations after the end of the flight
 $date_now = date('Y-m-d\TH:i', time() + 600);
+$oDateNow = new Datetime($date_now);
 global $connection;
 $sql_pquery = "select RESERVATIONS.NumVol as NumVol, VilleD, DateD, VilleA, DateA, RESERVATIONS.Classe, NbPlaces, round(CoutVol*CoeffPrix*NbPlaces, 2) as Prix
                from RESERVATIONS join VOLS on RESERVATIONS.NumVol = VOLS.NumVol
@@ -41,6 +42,7 @@ if (empty($rows)) {
     echo "    <th>Actions</th>\n";
     echo "  </tr>\n";
     foreach ($rows as $row) {
+        $oDepartureDate = new DateTime($row['DateD']);
         echo "  <tr>\n";
         echo "    <td>" . $row['NumVol'] . "</td>\n";
         echo "    <td>" . $row['VilleD'] . "</td>\n";
@@ -50,15 +52,19 @@ if (empty($rows)) {
         echo "    <td>" . $row['Classe'] . "</td>\n";
         echo "    <td>" . $row['NbPlaces'] . "</td>\n";
         echo "    <td>" . $row['Prix'] . "&euro;</td>\n";
-        echo "    <td>
-                    <form action=\"index.php\" id=\"reservations\" method=\"post\">
-                      <input type=\"hidden\" name=\"form\" value=\"reservations\" />
-                      <input type=\"hidden\" name=\"flight_id\" value=\"" . $row['NumVol'] . "\" />
-                      <input type=\"hidden\" name=\"class_name\" value=\"" . $row['Classe'] . "\" />
-                      <input type=\"submit\" name=\"modify\" value=\"Modifier\">
-                      <input type=\"submit\" name=\"cancel\" value=\"Annuler\">
-                    </form>
-                  </td>\n";
+        if ($oDepartureDate > $oDateNow) {
+            echo "    <td>
+                        <form action=\"index.php\" id=\"reservations\" method=\"post\">
+                          <input type=\"hidden\" name=\"form\" value=\"reservations\" />
+                          <input type=\"hidden\" name=\"flight_id\" value=\"" . $row['NumVol'] . "\" />
+                          <input type=\"hidden\" name=\"class_name\" value=\"" . $row['Classe'] . "\" />
+                          <input type=\"submit\" name=\"modify\" value=\"Modifier\">
+                          <input type=\"submit\" name=\"cancel\" value=\"Annuler\">
+                        </form>
+                      </td>\n";
+        } else {
+            echo "Vol en cours";
+        }
         echo "  </tr>\n";
     }
     echo "</table>";
diff --git a/includes/search.php b/includes/search.php
index 3365090..c7e761f 100644
--- a/includes/search.php
+++ b/includes/search.php
@@ -43,6 +43,6 @@
  </select>
  <label> Date -> </label>
  <input type="datetime-local" name="arrival_date" />
- <input type="submit" value="Valider">
+ <input type="submit" value="Rechercher">
 </form>
 <br>