ssbg04/TIS_RMS
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(reports): require all mandatory documents across all enrolled school tiers (JHS/SHS) for student compliance

Browse Source
This commit is contained in:
ssbg04 committed 2026-08-18 20:03:45 +08:00
1 parent 255fe61811
commit 171afbd72b
1 file changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/controllers/reportsController.js
+9 -9
View File
@@ -84,9 +84,9 @@ exports.getStats = (req, res) => {
)
WHERE r.is_enabled = 1
AND r.is_mandatory = 1
AND (
(r.category = 'JHS' AND e.grade_level BETWEEN 7 AND 10)
OR (r.category = 'SHS' AND e.grade_level BETWEEN 11 AND 12)
AND r.category IN (
SELECT DISTINCT CASE WHEN grade_level <= 10 THEN 'JHS' ELSE 'SHS' END
FROM enrollments WHERE student_id = s.id
)
${whereSql}
AND NOT EXISTS (
@@ -117,9 +117,9 @@ exports.getStats = (req, res) => {
FROM document_requirements r
WHERE r.is_enabled = 1
AND r.is_mandatory = 1
AND (
(r.category = 'JHS' AND e_latest.grade_level BETWEEN 7 AND 10)
OR (r.category = 'SHS' AND e_latest.grade_level BETWEEN 11 AND 12)
AND r.category IN (
SELECT DISTINCT CASE WHEN grade_level <= 10 THEN 'JHS' ELSE 'SHS' END
FROM enrollments WHERE student_id = s.id
)
AND NOT EXISTS (
SELECT 1 FROM documents d
@@ -134,9 +134,9 @@ exports.getStats = (req, res) => {
FROM document_requirements r
WHERE r.is_enabled = 1
AND r.is_mandatory = 1
AND (
(r.category = 'JHS' AND e_latest.grade_level BETWEEN 7 AND 10)
OR (r.category = 'SHS' AND e_latest.grade_level BETWEEN 11 AND 12)
AND r.category IN (
SELECT DISTINCT CASE WHEN grade_level <= 10 THEN 'JHS' ELSE 'SHS' END
FROM enrollments WHERE student_id = s.id
)
AND NOT EXISTS (
SELECT 1 FROM documents d