diff --git a/src/API/requests.php b/src/API/requests.php
index 50d3b3b..90f2464 100644
--- a/src/API/requests.php
+++ b/src/API/requests.php
@@ -128,7 +128,7 @@ $router->DELETE('/api/requests', ["test"], function($test){
$router->GET('/api/rdv-praticient', ["id"], function($id){
global $pdo;
dbRequestRdvPraticien($pdo, $id);
- getAllLieux($pdo);
+ //getAllLieux($pdo);
});
$router->GET('/api/rdv-patient', ["id"], function($id){
diff --git a/src/API/test/database.php b/src/API/test/database.php
index d596c37..cbdca98 100644
--- a/src/API/test/database.php
+++ b/src/API/test/database.php
@@ -49,7 +49,7 @@ function dbRequestRdvPatient($pdo, $id){
INNER JOIN lieu on lieu.l_id = rendez_vous.l_id
WHERE NOW() <= (rdv_date + rdv_time) AND patient.p_id = :id
- ORDER BY rdv_date, rdv_time ASC");
+ ORDER BY rdv_date ASC, rdv_time ASC");
$statement->bindParam(':id', $id);
$statement->execute();
@@ -71,7 +71,7 @@ function getPastRdvByPatient($pdo, $id){
INNER JOIN lieu on lieu.l_id = rendez_vous.l_id
WHERE NOW() > (rdv_date + rdv_time) AND patient.p_id = :id
- ORDER BY rdv_date, rdv_time ASC");
+ ORDER BY rdv_date DESC, rdv_time DESC LIMIT 5");
$statement->bindParam(':id', $id);
$statement->execute();
$result = $statement->fetchAll(PDO::FETCH_ASSOC);
diff --git a/src/js/AJAX/index.js b/src/js/AJAX/index.js
index 184fe79..1f85725 100644
--- a/src/js/AJAX/index.js
+++ b/src/js/AJAX/index.js
@@ -1,6 +1,8 @@
import {attachSearchEventListener} from "./search.js";
import {attachLoginUserDisplayEventListener, attachLoginPraticienDisplayEventListener, attachDisconnectEventListener} from "./login.js";
+import {TokenDecode} from "./lib.js";
import {displayHome, displayHomeTopBar, attachReturnHomeEventListener} from "./home.js";
+
console.log("index.js loaded");
@@ -15,17 +17,40 @@ document.addEventListener("DOMContentLoaded", function() {
//Yanis Part
+document.addEventListener("DOMContentLoaded", function() {
+ ButtonShowRdvPraticient();
+});
+
+function ButtonShowRdvPraticient() {
+ try {
+ console.log("test1");
+ document.getElementById("praticien-calendar").addEventListener("click", function () {
+ console.log("test2");
+ ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + 1, function (data) {
+ console.log("test3");
+ DisplayRDVPraticient(data);
+ });
+ });
+ }
+ catch (e) {
+ //Do nothing
+ //console.error(e);
+ }
+}
+
function DisplayRDVPraticient(rdv){
let count = rdv.length;
- $('#content').empty();
- $('#content').html('
');
+ let content = document.getElementById("content");
+ content.innerHTML = "";
+ content.innerHTML = '
';
if(count === 0){
- $('#content').append('
Vous n\'avez pas de rendez-vous
');
+ content.append('
Vous n\'avez pas de rendez-vous
');
}
else {
for (let i = 0; i < count; i++){
- if (rdv[i].p_mail !== "null")
- $('#content').append('' +
+ console.log(rdv[i]);
+ if (rdv[i].p_mail !== null){
+ content.innerHTML = '' +
'
' +
'');
+ '
' + '
';
+ }
else{
- $('#content').append('' +
+ content.innerHTML = '' +
'
' +
'' +
'
' +
'
Vous n\'avez pas de' + '
' + 'patient pour ce créneau
' +
- '' + '
');
+ '
' + '
';
}
}
}
}
-function ButtonShowRdvPraticient() {
- try {
- document.getElementById("CalendarPraticient").addEventListener("click", function () {
- ajaxRequest('GET', "src/API/requests.php/api/rdv-praticient?id=" + 1, function (data) {
- DisplayRDVPraticient(data);
- });
- });
+
+/*
+function DisplayRDVPatient(rdv){
+ let rdvPatient = rdv[0];
+ let lieux = rdv[1];
+
+ let count = $rdvPatient.length;
+ $('#content').empty();
+ $('#content').html('
Vos rendez-vous à venir
');
+ if(count === 0){
+ $('#content').append('
Bienvenue sur Doct\'ISEN, veuillez prendre un rendez-vous en allant à l\'acceuil et en recherchant un praticient!
');
}
- catch (e) {
- //Do nothing
- //console.error(e);
+ else {
+ for (let i = 0; i < count; i++){
+ if($rdvPatient !== "null")
+ $('#content').append('' +
+ '