From 472714aa2b0df06b11df7445abfcb9f2087eff58 Mon Sep 17 00:00:00 2001
From: ssbg04 <crischarlesgarcia345@gmail.com>
Date: Sun, 30 Aug 2026 10:01:50 +0800
Subject: [PATCH] fix(dashboard): calculate digitalization progress based on
 all mandatory requirements completed

---
 .../src/controllers/dashboardController.js    | 66 +++++++++++++++++--
 .../dashboard/widgets/dashboard_kpis.dart     |  2 +-
 2 files changed, 61 insertions(+), 7 deletions(-)

diff --git a/backend/src/controllers/dashboardController.js b/backend/src/controllers/dashboardController.js
index 3b29156..70cb7f2 100644
--- a/backend/src/controllers/dashboardController.js
+++ b/backend/src/controllers/dashboardController.js
@@ -306,20 +306,46 @@ exports.getKpis = (req, res) => {
                 SELECT COUNT(DISTINCT s.id) as count
                 FROM students s
                 JOIN enrollments e ON s.id = e.student_id
-                JOIN documents d ON d.student_id = s.id AND d.deleted_at IS NULL
                 WHERE e.academic_year_id = ?
                   AND e.section_id IN (SELECT section_id FROM teacher_sections WHERE teacher_id = ?)
                   AND e.grade_level <= 10
+                  AND NOT EXISTS (
+                      SELECT 1
+                      FROM document_requirements dr
+                      WHERE dr.category = 'JHS'
+                        AND dr.is_mandatory = 1
+                        AND dr.is_enabled = 1
+                        AND NOT EXISTS (
+                            SELECT 1 FROM documents d
+                            WHERE d.student_id = s.id
+                              AND d.requirement_id = dr.id
+                              AND d.status = 'Completed'
+                              AND d.deleted_at IS NULL
+                        )
+                  )
             `).get(activeAyId, userId).count;
 
             shsDigitized = db.prepare(`
                 SELECT COUNT(DISTINCT s.id) as count
                 FROM students s
                 JOIN enrollments e ON s.id = e.student_id
-                JOIN documents d ON d.student_id = s.id AND d.deleted_at IS NULL
                 WHERE e.academic_year_id = ?
                   AND e.section_id IN (SELECT section_id FROM teacher_sections WHERE teacher_id = ?)
                   AND e.grade_level > 10
+                  AND NOT EXISTS (
+                      SELECT 1
+                      FROM document_requirements dr
+                      WHERE dr.category = 'SHS'
+                        AND dr.is_mandatory = 1
+                        AND dr.is_enabled = 1
+                        AND NOT EXISTS (
+                            SELECT 1 FROM documents d
+                            WHERE d.student_id = s.id
+                              AND d.requirement_id = dr.id
+                              AND d.status = 'Completed'
+                              AND d.deleted_at IS NULL
+                        )
+                  )
             `).get(activeAyId, userId).count;
 
             // ── 2. Activity by day (Teacher's Activities / Students) ────────────
@@ -569,17 +595,45 @@ exports.getKpis = (req, res) => {
             jhsDigitized = db.prepare(`
                 SELECT COUNT(DISTINCT s.id) as count
                 FROM students s
-                JOIN documents d ON d.student_id = s.id
                 JOIN enrollments e ON s.id = e.student_id
-                WHERE e.academic_year_id = ? AND e.grade_level <= 10 AND d.deleted_at IS NULL
+                WHERE e.academic_year_id = ?
+                  AND e.grade_level <= 10
+                  AND NOT EXISTS (
+                      SELECT 1
+                      FROM document_requirements dr
+                      WHERE dr.category = 'JHS'
+                        AND dr.is_mandatory = 1
+                        AND dr.is_enabled = 1
+                        AND NOT EXISTS (
+                            SELECT 1 FROM documents d
+                            WHERE d.student_id = s.id
+                              AND d.requirement_id = dr.id
+                              AND d.status = 'Completed'
+                              AND d.deleted_at IS NULL
+                        )
+                  )
             `).get(activeAyId).count;
 
             shsDigitized = db.prepare(`
                 SELECT COUNT(DISTINCT s.id) as count
                 FROM students s
-                JOIN documents d ON d.student_id = s.id
                 JOIN enrollments e ON s.id = e.student_id
-                WHERE e.academic_year_id = ? AND e.grade_level > 10 AND d.deleted_at IS NULL
+                WHERE e.academic_year_id = ?
+                  AND e.grade_level > 10
+                  AND NOT EXISTS (
+                      SELECT 1
+                      FROM document_requirements dr
+                      WHERE dr.category = 'SHS'
+                        AND dr.is_mandatory = 1
+                        AND dr.is_enabled = 1
+                        AND NOT EXISTS (
+                            SELECT 1 FROM documents d
+                            WHERE d.student_id = s.id
+                              AND d.requirement_id = dr.id
+                              AND d.status = 'Completed'
+                              AND d.deleted_at IS NULL
+                        )
+                  )
             `).get(activeAyId).count;
 
             // ── 2. Activity by day — last 7 days bar chart ──────────────────
diff --git a/frontend/lib/ui/screens/dashboard/widgets/dashboard_kpis.dart b/frontend/lib/ui/screens/dashboard/widgets/dashboard_kpis.dart
index 8912f98..740c6a2 100644
--- a/frontend/lib/ui/screens/dashboard/widgets/dashboard_kpis.dart
+++ b/frontend/lib/ui/screens/dashboard/widgets/dashboard_kpis.dart
@@ -322,7 +322,7 @@ class _DigitalizationCard extends StatelessWidget {
     return _ChartCard(
       title: 'Digitalization Progress',
       icon: Icons.donut_large_rounded,
-      subtitle: 'Enrolled students with uploaded documents',
+      subtitle: 'Enrolled students with all mandatory requirements completed',
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         children: [