From 1ee89ef1f5d3104c87dfd379f10ad4a90b733a28 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Fri, 26 Jun 2020 13:39:30 +0200
Subject: [PATCH] Hide appointment creation form on page load

---
 src/appointment.php            |  2 +-
 src/appointment_management.php | 11 ++++-------
 src/calendar.js                |  2 +-
 src/database.php               |  5 +++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/appointment.php b/src/appointment.php
index 74316f3..6d89b0c 100644
--- a/src/appointment.php
+++ b/src/appointment.php
@@ -38,7 +38,7 @@
         </div>
     <?php endif; ?>
     <?php closeDatabase($pdo); ?>
-        <div id="dialog-form" title="Añadir cita">
+        <div id="dialog-form" title="Añadir cita" style="display:none;">
             <form>
                 <div class="input-group">
                     <label for="hora">Hora</label>
diff --git a/src/appointment_management.php b/src/appointment_management.php
index 83739ad..da96e34 100644
--- a/src/appointment_management.php
+++ b/src/appointment_management.php
@@ -18,7 +18,7 @@ function listEvents(){
     $doctor = fetchDoctor($pdo);
     $events = fetchCalendarEvents($pdo, $doctor);
     closeDatabase($pdo);
-    return json_encode($events);
+    echo json_encode($events);
 }
 
 
@@ -27,12 +27,9 @@ function listHolidays(){
     $doctor = fetchDoctor($pdo);
     $holidays = fetchDoctorHolidays($pdo, $doctor);
     closeDatabase($pdo);
-    return json_encode($holidays);
+    echo json_encode($holidays);
 }
 
 
-if (isset($_GET["list"])) {
-    listEvents();
-    listHolidays();
-    header('location: appointment.php');
-}
+listEvents();
+listHolidays();
diff --git a/src/calendar.js b/src/calendar.js
index afd728b..1d83116 100644
--- a/src/calendar.js
+++ b/src/calendar.js
@@ -24,7 +24,7 @@
    },
 
 
-   events: "appointment_management.php?list=1",
+   events: "http://localhost:8000/appointment_management.php",
 
 
     eventRender: function(event, element, view) {
diff --git a/src/database.php b/src/database.php
index 689fd80..043801f 100644
--- a/src/database.php
+++ b/src/database.php
@@ -60,7 +60,7 @@ function deletePatient($pdo, string $id)
 
 function createHoliday($pdo, $data)
 {
-    if (empty($data["medico"])) {
+    if (!empty($data["medico"])) {
         $query = "INSERT INTO festivo (fecha_festivo, tipo_festivo, medico) VALUES (?,?,?)";
         $pdo->prepare($query)->execute([$data["fecha_festivo"], $data["tipo_festivo"], $data["medico"]]);
     } else {
@@ -189,7 +189,8 @@ function fetchRegions($pdo)
 
 function fetchHolidays($pdo)
 {
-    $query = "SELECT * FROM festivo";
+    $query = "SELECT festivo.id, festivo.fecha_festivo, festivo.tipo_festivo, usuario.nombre
+    FROM festivo LEFT JOIN usuario ON festivo.medico = usuario.id";
     $result = $pdo->prepare($query);
     $result->execute();
     $data = $result->fetchAll();