X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=includes%2Freservations.php;h=9458dc77e98f76eb96f245db05d8c950aa701584;hb=HEAD;hp=f560b9a1dd776ce60f4d14cf8aa4f947704062be;hpb=a2f7a7290d0b54650c249a0bf59e66d8d7691135;p=Project_webapp.git

diff --git a/includes/reservations.php b/includes/reservations.php
index f560b9a..9458dc7 100644
--- a/includes/reservations.php
+++ b/includes/reservations.php
@@ -2,6 +2,7 @@
 global $is_logged_in;
 if (!$is_logged_in) {
     echo "Please login first. <br>";
+    $_SESSION['login_referer'] = $_SERVER['HTTP_REFERER'];
     redirect("index.php?page=login", 2);
     include('footer.html');
     exit();
@@ -10,22 +11,22 @@ 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
-               join DEFCLASSES on DEFCLASSES.NumVol = VOLS.NumVol and RESERVATIONS.Classe = DEFCLASSES.Classe
+               join DEFCLASSES on DEFCLASSES.NumVol = RESERVATIONS.NumVol and DEFCLASSES.NumVol = VOLS.NumVol and DEFCLASSES.Classe = RESERVATIONS.Classe
        		   where NumCl = ? and DateD > ?
                order by DateD, NumVol, Prix";
 $connection->prepare_query($sql_pquery);
 $connection->prepared_query_bind_param("is", array($client_id, $date_now));
 $connection->run_prepared_query();
 $connection->get_pquery_result();
-$rows = $connection->get_result_array();
+$reservations = $connection->get_result_array();
 $connection->close_prepared_query();
-//var_dump($rows);
-if (empty($rows)) {
+if (empty($reservations)) {
     echo "Aucune(s) re&#769;servation(s) en cours pour le moment. <br>";
 } else {
     echo "<table id=\"reservations\">\n";
@@ -40,27 +41,32 @@ if (empty($rows)) {
     echo "    <th>Prix</th>\n";
     echo "    <th>Actions</th>\n";
     echo "  </tr>\n";
-    foreach ($rows as $row) {
+    foreach ($reservations as $reservation) {
+        $oDepartureDate = new DateTime($reservation['DateD']);
         echo "  <tr>\n";
-        echo "    <td>" . $row['NumVol'] . "</td>\n";
-        echo "    <td>" . $row['VilleD'] . "</td>\n";
-        echo "    <td>" . $row['DateD'] . "</td>\n";
-        echo "    <td>" . $row['VilleA'] . "</td>\n";
-        echo "    <td>" . $row['DateA'] . "</td>\n";
-        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";
+        echo "    <td>" . $reservation['NumVol'] . "</td>\n";
+        echo "    <td>" . $reservation['VilleD'] . "</td>\n";
+        echo "    <td>" . $reservation['DateD'] . "</td>\n";
+        echo "    <td>" . $reservation['VilleA'] . "</td>\n";
+        echo "    <td>" . $reservation['DateA'] . "</td>\n";
+        echo "    <td>" . $reservation['Classe'] . "</td>\n";
+        echo "    <td>" . $reservation['NbPlaces'] . "</td>\n";
+        echo "    <td>" . $reservation['Prix'] . "&euro;</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=\"" . $reservation['NumVol'] . "\" />
+                          <input type=\"hidden\" name=\"class_name\" value=\"" . $reservation['Classe'] . "\" />
+                          <input type=\"button\" name=\"modify\" value=\"Modifier\" onClick=\"location.href='index.php?page=modify&flight_id=" . $reservation['NumVol'] . "&class_name=" . $reservation['Classe'] . "';\">
+                          <input type=\"button\" name=\"cancel\" value=\"Annuler\" onClick=\"ConfirmCancelFlight()\">
+                        </form>
+                      </td>\n";
+        } else {
+            echo "Vol en cours\n";
+        }
         echo "  </tr>\n";
     }
-    echo "</table>";
+    echo "</table>\n";
 }
 ?>