Subject CRUD

public/userarea/scadenzario/ajax/get_calendar_events.php

@@ -13,8 +13,10 @@ try {
     $filterDept = $_GET['department'] ?? '';
     $filterEmployee = $_GET['employee'] ?? '';
 
-    $sql = "SELECT DISTINCT d.id, d.topic, d.category, d.due_date, d.status, d.notification_days, d.departments
+    $sql = "SELECT DISTINCT d.id, d.topic, d.due_date, d.status, d.notification_days, d.departments,
+                   s.name AS subject_name, s.color AS subject_color
             FROM scad_deadlines d
+            LEFT JOIN scad_subjects s ON s.id = d.subject_id
             LEFT JOIN scad_deadline_employee de ON de.deadline_id = d.id
             LEFT JOIN employees e ON e.id = de.employee_id";
 
@@ -73,14 +75,14 @@ try {
         else                    { $color = '#5a8fd8'; }
 
         $title = $d['topic'];
-        if ($d['category']) $title = $d['category'] . ': ' . $title;
+        if (!empty($d['subject_name'])) $title = $d['subject_name'] . ': ' . $title;
 
         $events[] = [
             'id'              => $d['id'],
             'title'           => $title,
             'start'           => $d['due_date'],
             'backgroundColor' => $color,
-            'borderColor'     => $color,
+            'borderColor'     => !empty($d['subject_color']) ? $d['subject_color'] : $color,
             'url'             => 'scadenzario/detail.php?id=' . $d['id'],
         ];
     }