Display holidays from JSON feed

src/appointment_feed.php

@@ -11,7 +11,7 @@ function computeEndTime(&$data){
 }
 
 
-function renameArray($data){
+function formatArray($data){
     computeEndTime($data);
     $events = array();
     foreach($data as $row){
@@ -36,7 +36,7 @@ function fetchDatabase(){
 
 
 $result = fetchDatabase();
-$events = renameArray($result);
+$events = formatArray($result);
 echo json_encode($events);
 
 ?>

src/appointment_management.php

@@ -22,7 +22,7 @@ function listEvents($pdo){
 function listHolidays($pdo){
     $doctor = fetchDoctor($pdo);
     $holidays = fetchDoctorHolidays($pdo, $doctor);
-    return json_encode($holidays);
+    return $holidays;
 }
 
 

src/calendar.js

@@ -10,10 +10,12 @@
             right: 'month,agendaWeek,agendaDay'
         },
 
-        events: "appointment_feed.php" + queryString,
+        eventSources: [
+            "appointment_feed.php" + queryString,
+            "holiday_feed.php" + queryString
+        ],
 
         selectable: true,
-
         selectHelper: true,
 
         select: function(start, end) {

src/database.php

@@ -395,7 +395,9 @@ function fetchCalendarSettings($pdo, $doctor)
 
 function fetchDoctorHolidays($pdo, $doctor)
 {
-    $query = "SELECT * FROM festivo WHERE medico IS NULL OR medico=?";
+    $query = "SELECT festivo.id, fecha_festivo, tipo_festivo, medico, nombre FROM festivo
+    INNER JOIN usuario ON festivo.medico = usuario.id;
+    WHERE medico IS NULL OR medico=?";
     $result = $pdo->prepare($query);
     $result->execute([$doctor]);
     $data = $result->fetchAll(PDO::FETCH_ASSOC);

src/holiday_feed.php

@@ -0,0 +1,34 @@
+<?php
+
+include 'appointment_management.php';
+
+function formatArray($data){
+    $events = array();
+    foreach($data as $row){
+        $events[] = array(
+            "id"   => $row["id"],
+            "title"   => "Festivo",
+            "start"   => $row["fecha_festivo"],
+            "description" => $row["tipo_festivo"],
+            "doctor" => $row["nombre"],
+            "groupId" => "holidays",
+            "rendering" => "background",
+            "color" => "#ffa6a3",
+        );
+    }
+    return $events;
+}
+
+function fetchDatabase(){
+    $pdo = connectDatabase();
+    $data = listHolidays($pdo);
+    closeDatabase($pdo);
+    return $data;
+}
+
+
+$result = fetchDatabase();
+$events = formatArray($result);
+echo json_encode($events);
+
+?>