From 261b5a79acfa9374318786950204badd99f7b554 Mon Sep 17 00:00:00 2001 From: sinbad Date: Tue, 21 May 2024 16:46:32 +0200 Subject: [PATCH 1/3] Putain d'addEventListener --- src/API/requests.php | 9 ++--- src/API/test/database.php | 33 ++++-------------- src/js/AJAX/rdv-patient.js | 2 +- src/js/AJAX/rdv-praticien.js | 67 ++++++++++++++++++++++++++++++------ 4 files changed, 65 insertions(+), 46 deletions(-) diff --git a/src/API/requests.php b/src/API/requests.php index 52079a8..144d77a 100644 --- a/src/API/requests.php +++ b/src/API/requests.php @@ -135,14 +135,9 @@ $router->GET('/api/past-rdv-patient', ["id"], function($id){ getPastRdvByPatient($pdo, $id); }); -$router->DELETE('/api/delete-empty', ["id"], function($id){ +$router->DELETE('/api/cancel-empty-rdv', ["id"], function($id){ global $pdo; - DeleteEmptyRdv($pdo, $id); -}); - -$router->DELETE('/api/cancel-rdv', ["id"], function($id){ - global $pdo; - CancelRDV($pdo, $id); + CancelEmptyRDV($pdo, $id); }); $router->POST('/api/create-rdv', ["medID", "date", "time", "lieu"], function($medID, $date, $time, $lieu){ diff --git a/src/API/test/database.php b/src/API/test/database.php index 75fd92e..74f9dfd 100644 --- a/src/API/test/database.php +++ b/src/API/test/database.php @@ -1,22 +1,6 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - } - catch (PDOException $exception) - { - error_log('Connection error: '.$exception->getMessage()); - return false; - } - return $db; -}*/ - - function dbRequestRdvPraticien($pdo, $id){ $statement = $pdo->prepare("SELECT rdv_date, rdv_time, concat(p_name,' ', p_surname) as patient, p_mail, p_phone FROM rendez_vous @@ -129,19 +113,14 @@ function CreateRDV($pdo, $medID, $date, $time, $lieu){ } } -function DeleteEmptyRdv($pdo, $id) -{ - $statement = $pdo->prepare("SELECT p_id FROM rendez_vous WHERE rdv_id = :id"); +function CancelEmptyRDV($pdo, $id){ + $statement = $pdo->prepare("DELETE FROM propose WHERE rdv_id = :id"); $statement->bindParam(':id', $id); $statement->execute(); - $result = $statement->fetch(PDO::FETCH_ASSOC); - if ($result['p_id'] == null) { - $statement = $pdo->prepare("DELETE FROM rendez_vous WHERE rdv_id = :id"); - $statement->bindParam(':id', $id); - $statement->execute(); - Response::HTTP200(["Success" => "RDV deleted"]); - } - Response::HTTP403(["Forbidden" => "This RDV is not empty"]); + $statement = $pdo->prepare("DELETE FROM rendez_vous WHERE rdv_id = :id"); + $statement->bindParam(':id', $id); + $statement->execute(); + Response::HTTP200(["Success" => "RDV deleted"]); } function CancelRDVFromPatient($pdo, $id){ diff --git a/src/js/AJAX/rdv-patient.js b/src/js/AJAX/rdv-patient.js index e01e3e4..e0c42b0 100644 --- a/src/js/AJAX/rdv-patient.js +++ b/src/js/AJAX/rdv-patient.js @@ -133,8 +133,8 @@ function DisplayPastRDVPatient(past_rdv, rdv) { document.getElementById("retake-rdv-" + i + "-" + rdv[i].m_id).addEventListener("click", function () { attachEventListener(i, rdv[i].m_id); }); - } } + } } diff --git a/src/js/AJAX/rdv-praticien.js b/src/js/AJAX/rdv-praticien.js index bfff1fc..f9ed30f 100644 --- a/src/js/AJAX/rdv-praticien.js +++ b/src/js/AJAX/rdv-praticien.js @@ -1,4 +1,5 @@ import {TokenDecode} from "./lib.js"; +import {attachReturnHomeEventListener} from "./home.js"; function ButtonShowRdvPraticient() { try { @@ -6,6 +7,7 @@ function ButtonShowRdvPraticient() { let user = TokenDecode(sessionStorage.getItem("token")); ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + user.id, function (data) { DisplayRDVPraticient(data); + attachReturnHomeEventListener(); console.log(data); }); }); @@ -16,27 +18,60 @@ function ButtonShowRdvPraticient() { } } +function attachCancelEventListener(rdv_id, i) { + const idBtn = "cancel_button" + i; + const Btn = document.getElementById(idBtn); + if(Btn !== null){ + console.log("je suis là"); + console.log(Btn); + Btn.addEventListener("click", function (event) { + console.log("hello"); + let data = 'rdv_id=' + rdv_id; + console.log(data); + /* + ajaxRequest('DELETE', "src/API/requests.php/api/cancel-rdv", function (data) { + console.log(data); + ButtonShowRdvPraticient(); + attachReturnHomeEventListener(); + ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + user.id, function (data) { + DisplayRDVPraticient(data); + console.log(data); + }); + }, data);*/ + }); + } + else{ + console.log("je suis pas là") + } +} + + function DisplayRDVPraticient(rdv){ let count = rdv.length; let content = document.getElementById("content"); content.innerHTML = ""; - content.innerHTML = '
'; + let h100 = document.createElement("div"); + h100.classList.add("h-100"); + let container = document.createElement("div"); + container.classList.add("d-flex", "flex-row", "flex-wrap", "my-5", "mx-5", "gap-5", "justify-content-center", "text-center"); if(count === 0){ - content.innerHTML += '
' + + container.innerHTML += '
' + '
' + '
' + '

' + '
' + '
' + '
' + - '
Vous n\'avez pas de rendez-vous de planifié
' + + '
Vous n\'avez pas de créneaux de planifié
' + '
' + '
'; } else { for (let i = 0; i < count; i++) { console.log(rdv[i]); + + let card = document.createElement("div"); + card.classList.add("card", "rounded-4", "mx-2", "pointer"); if (rdv[i].p_mail !== null) { - content.innerHTML += '
' + - '
' + + card.innerHTML += '
' + '
' + '

' + rdv[i].rdv_date + '

' + '

' + rdv[i].rdv_time + '

' + @@ -48,18 +83,26 @@ function DisplayRDVPraticient(rdv){ '' + '0' + rdv[i].p_phone + '' + '
' + '
'; } else { - content.innerHTML += '
' + - '
' + + card.innerHTML += '
' + '
' + '

' + rdv[i].rdv_date + '

' + '

' + rdv[i].rdv_time + '

' + '
' + '
' + '
' + '
Vous n\'avez pas de' + '
' + 'patient pour ce créneau
' + + '' + '
' + '
'; } + container.appendChild(card); } + } + h100.appendChild(container); + content.appendChild(h100); + for (let i = 0; i < count; i++) { + attachCancelEventListener(rdv[i].rdv_id, i); + } + content.innerHTML += '
'; ShowAddRDV(); } @@ -107,11 +150,13 @@ function DisplayAddRDV(lieux) { ajaxRequest('POST', "src/API/requests.php/api/create-rdv", function (data) { console.log(data); ButtonShowRdvPraticient(); + attachReturnHomeEventListener(); + ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + user.id, function (data) { + DisplayRDVPraticient(data); + console.log(data); + }); }, data); - ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + user.id, function (data) { - DisplayRDVPraticient(data); - console.log(data); - }); + }); } From 8f665a4779616de31eb44791d95044ebb918e605 Mon Sep 17 00:00:00 2001 From: sinbad Date: Tue, 21 May 2024 17:40:12 +0200 Subject: [PATCH 2/3] Putain d'addEventListener V2 --- src/js/AJAX/home.js | 4 ++-- src/js/AJAX/rdv-praticien.js | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/js/AJAX/home.js b/src/js/AJAX/home.js index b3a9fad..d58029c 100644 --- a/src/js/AJAX/home.js +++ b/src/js/AJAX/home.js @@ -59,11 +59,11 @@ function displayHomeTopBar() { topbar.innerHTML = `
-

+

Doct'ISEN

-
+
avatar ' + '
' + '
' + '
Vous n\'avez pas de' + '
' + 'patient pour ce créneau
' + - '' + + '' + '
' + '
'; } container.appendChild(card); From 6f7d6b7e828c891e325dc0713cfb0e5ab88f90ee Mon Sep 17 00:00:00 2001 From: sinbad Date: Tue, 21 May 2024 17:46:45 +0200 Subject: [PATCH 3/3] Fix --- src/API/test/request.php | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 src/API/test/request.php diff --git a/src/API/test/request.php b/src/API/test/request.php deleted file mode 100644 index 11aedc2..0000000 --- a/src/API/test/request.php +++ /dev/null @@ -1,26 +0,0 @@ -