Subject CRUD

public/userarea/scadenzario/print.php

@@ -5,10 +5,13 @@ $pdo = $db->getConnection();
 
 $sql = "
     SELECT d.*,
+        s.name AS subject_name,
+        s.color AS subject_color,
         GROUP_CONCAT(DISTINCT CONCAT(e.first_name, ' ', e.last_name) ORDER BY e.first_name SEPARATOR ', ') as responsabili,
         GROUP_CONCAT(DISTINCT e.department ORDER BY e.department SEPARATOR ', ') as reparti_persone,
         d.departments as reparti_assegnati
     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
 ";
@@ -171,8 +174,8 @@ if ($checkFrom || $checkTo) {
                 if (!empty($row['reparti_persone'])) $allDepts = array_merge($allDepts, array_map('trim', explode(',', $row['reparti_persone'])));
                 $reparti = implode(', ', array_unique(array_filter($allDepts)));
             ?>
-            <tr class="<?= $rowClass ?>">
-                <td><strong><?= htmlspecialchars($row['category'] ?? '', ENT_QUOTES, 'UTF-8') ?></strong></td>
+            <tr class="<?= $rowClass ?>"<?= !empty($row['subject_color']) ? ' style="border-left: 4px solid ' . htmlspecialchars($row['subject_color'], ENT_QUOTES, 'UTF-8') . '"' : '' ?>>
+                <td><strong><?= htmlspecialchars($row['subject_name'] ?? '', ENT_QUOTES, 'UTF-8') ?></strong></td>
                 <td><?= htmlspecialchars($row['law_regulation'] ?? '', ENT_QUOTES, 'UTF-8') ?></td>
                 <td><?= htmlspecialchars($row['topic'], ENT_QUOTES, 'UTF-8') ?></td>
                 <td><?= htmlspecialchars($recurrenceLabels[$row['recurrence_type']] ?? $row['recurrence_type'], ENT_QUOTES, 'UTF-8') ?></td>