From b7cf5289e7f8ab67a2b44dad58c1aeec36ed270c Mon Sep 17 00:00:00 2001 From: KenzaTita Date: Mon, 1 Apr 2019 14:44:20 -0400 Subject: [PATCH 1/3] edit Transport --- editAppointmentView.php | 2 ++ newAppointmentView.php | 1 + 2 files changed, 3 insertions(+) diff --git a/editAppointmentView.php b/editAppointmentView.php index a2106f7..cb5e142 100644 --- a/editAppointmentView.php +++ b/editAppointmentView.php @@ -43,6 +43,8 @@ Arrivee:
Itineraire:
FrequenceHoraire:
+ Itineraire:
+ FrequenceHoraire:
diff --git a/newAppointmentView.php b/newAppointmentView.php index 44dfc29..c260211 100644 --- a/newAppointmentView.php +++ b/newAppointmentView.php @@ -25,6 +25,7 @@ Arrivee:
Itineraire:
FreqHoraire:
+ FreqHoraire:
From 2f3607c1c64ff97acd72e36cc54b2238e93f28e7 Mon Sep 17 00:00:00 2001 From: KenzaTita Date: Mon, 1 Apr 2019 15:57:10 -0400 Subject: [PATCH 2/3] modification nom fichier --- doDeletePatient.php => doDeleteResidence.php | 2 +- doDeleteAppointment.php => doDeleteServiceTransport.php | 2 +- doEditPatient.php | 1 - doEditAppointment.php => doEditServiceTransport.php | 2 +- doNewAppointment.php => doNewServiceTransport.php | 2 +- editAppointmentView.php => editServiceTransportView.php | 9 ++------- inc/prelude.php | 2 +- index.php | 2 +- newAppointmentView.php => newServiceTransportView.php | 3 +-- appointments.php => servicetransport.php | 8 ++++---- 10 files changed, 13 insertions(+), 20 deletions(-) rename doDeletePatient.php => doDeleteResidence.php (86%) rename doDeleteAppointment.php => doDeleteServiceTransport.php (85%) rename doEditAppointment.php => doEditServiceTransport.php (90%) rename doNewAppointment.php => doNewServiceTransport.php (89%) rename editAppointmentView.php => editServiceTransportView.php (76%) rename newAppointmentView.php => newServiceTransportView.php (85%) rename appointments.php => servicetransport.php (82%) diff --git a/doDeletePatient.php b/doDeleteResidence.php similarity index 86% rename from doDeletePatient.php rename to doDeleteResidence.php index 30c38a1..b2ad603 100644 --- a/doDeletePatient.php +++ b/doDeleteResidence.php @@ -11,5 +11,5 @@ if (!$ret) { setFlash(pg_last_error($db)); } - header("Location: patients.php"); + header("Location: residences.php"); ?> \ No newline at end of file diff --git a/doDeleteAppointment.php b/doDeleteServiceTransport.php similarity index 85% rename from doDeleteAppointment.php rename to doDeleteServiceTransport.php index 7bea13c..c913ec3 100644 --- a/doDeleteAppointment.php +++ b/doDeleteServiceTransport.php @@ -11,5 +11,5 @@ if (!$ret) { setFlash(pg_last_error($db)); } - header("Location: appointments.php"); + header("Location: servicetransport.php"); ?> \ No newline at end of file diff --git a/doEditPatient.php b/doEditPatient.php index 4daf834..c043f54 100644 --- a/doEditPatient.php +++ b/doEditPatient.php @@ -15,7 +15,6 @@ $_POST["telephoneResidence"], $_POST["id"]]); closeDB(); - if (!$ret) { setFlash(pg_last_error($db)); } diff --git a/doEditAppointment.php b/doEditServiceTransport.php similarity index 90% rename from doEditAppointment.php rename to doEditServiceTransport.php index cd4a254..11898f5 100644 --- a/doEditAppointment.php +++ b/doEditServiceTransport.php @@ -20,6 +20,6 @@ setFlash(pg_last_error($db)); } else { - header("Location: appointments.php"); + header("Location: servicetransport.php"); } ?> \ No newline at end of file diff --git a/doNewAppointment.php b/doNewServiceTransport.php similarity index 89% rename from doNewAppointment.php rename to doNewServiceTransport.php index f5af2f9..8cebfe5 100644 --- a/doNewAppointment.php +++ b/doNewServiceTransport.php @@ -15,6 +15,6 @@ setFlash(pg_last_error($db)); } else { - header("Location: appointments.php"); + header("Location: servicetransport.php"); } ?> \ No newline at end of file diff --git a/editAppointmentView.php b/editServiceTransportView.php similarity index 76% rename from editAppointmentView.php rename to editServiceTransportView.php index cb5e142..2159b1b 100644 --- a/editAppointmentView.php +++ b/editServiceTransportView.php @@ -3,13 +3,12 @@ connectDB(); - $sql = "select * from cojoDatabase.Appointment where id = $1"; $sql = "select * from cojoDatabase.ServiceTransport where id = $1"; $ret = pg_query_params($db, $sql, [$_GET["id"]]); closeDB(); if (!$ret) { setFlash("This isn't the serviceTransport you're looking for."); - header("Location: appointments.php"); + header("Location: servicetransport.php"); exit; } ?> @@ -30,19 +29,15 @@
-

COJO PROJECT

-

COJO

-
+
Depart:
Arrivee:
- Itineraire:
- FrequenceHoraire:
Itineraire:
FrequenceHoraire:
diff --git a/inc/prelude.php b/inc/prelude.php index b13b7de..7b6d417 100644 --- a/inc/prelude.php +++ b/inc/prelude.php @@ -10,7 +10,7 @@ function connectDB() { global $db; - $db = pg_connect("host=localhost port=5432 dbname=cojoDatabase user=postgres password=admin"); + $db = pg_connect("host=localhost port=5432 dbname=cojoDatabase user=postgres password=didine"); if (!$db) { echo "Error : Unable to open database\n"; } diff --git a/index.php b/index.php index adc1668..389777a 100644 --- a/index.php +++ b/index.php @@ -17,7 +17,7 @@
Athlètes
Officiels
Résidences
-
Services Transport
+
Services Transport
Épreuves
Employés
Services Médicaux
diff --git a/newAppointmentView.php b/newServiceTransportView.php similarity index 85% rename from newAppointmentView.php rename to newServiceTransportView.php index c260211..75af4bf 100644 --- a/newAppointmentView.php +++ b/newServiceTransportView.php @@ -20,11 +20,10 @@ - + Depart:
Arrivee:
Itineraire:
- FreqHoraire:
FreqHoraire:
diff --git a/appointments.php b/servicetransport.php similarity index 82% rename from appointments.php rename to servicetransport.php index 1213460..eb6b8d9 100644 --- a/appointments.php +++ b/servicetransport.php @@ -20,7 +20,7 @@ - New + New ", $row[$i], ""; } - echo "Read"; + echo "Read"; for ($i = 3; $i < 5; $i++) { echo "", $row[$i], ""; } - editCell("Appointment", $row[0]); - deleteCell("Appointment", $row[0]); + editCell("ServiceTransport", $row[0]); + deleteCell("ServiceTransport", $row[0]); echo ""; } From ba6ac866d69f748c5ccf0c2ba958915def204626 Mon Sep 17 00:00:00 2001 From: KenzaTita Date: Mon, 1 Apr 2019 16:55:30 -0400 Subject: [PATCH 3/3] Update patients.php ne pas prendre en consideration --- patients.php | 1 - 1 file changed, 1 deletion(-) diff --git a/patients.php b/patients.php index 7da2022..6a0bdf5 100644 --- a/patients.php +++ b/patients.php @@ -6,7 +6,6 @@ - COJO OLYMPIC GAMES PROJECT - CSI2532 :: Patients COJO OLYMPIC GAMES PROJECT - CSI2532 :: Residences