+section('content') ?>
+ 'Assign a class',
+ 'PENDING_MAKE_UP_EXAM_PROMOTION' => 'Makeup exam result',
+ 'AGE_EXCEPTION_REQUIRED' => 'Age exception',
+ 'LATE_REGISTRATION_EXCEPTION' => 'Late registration',
+ 'FINANCIAL_REVIEW_REQUIRED' => 'Finance review',
+ 'CLASS_CAPACITY_EXCEPTION_REQUIRED' => 'Class capacity',
+ 'DEFERRED_DELIBERATION' => 'Missing decision',
+ 'RESTRICTED_ADMINISTRATIVE_REVIEW' => 'Restricted review',
+ 'WITHDRAWAL_REVIEW_REQUIRED' => 'Withdrawal review',
+ 'COMPLETION_OR_EXIT_PROCESS_REQUIRED' => 'Exit / completion',
+ 'ADULT_STUDENT_ACTION_REQUIRED' => 'Adult student',
+ 'SIBLING_LAST_NAME_MISMATCH' => 'Sibling last names',
+ default => $type !== '' ? ucwords(strtolower(str_replace('_', ' ', $type))) : 'Unknown',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_placement_label')) {
+ function enrollment_admin_placement_label(string $status): string
+ {
+ return match ($status) {
+ 'automatic_distribution_pending' => 'Awaiting class assignment',
+ 'manual_class_required' => 'Needs a class assigned',
+ 'temporary_manual_class_required' => 'Needs a temporary class',
+ 'same_class_assigned' => 'Same class assigned',
+ 'temporary_same_grade' => 'Temporary same grade',
+ 'exit_required' => 'Exit / completion',
+ 'not_created' => 'Not created',
+ default => $status !== '' ? ucwords(str_replace('_', ' ', $status)) : 'Pending',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_rule_label')) {
+ function enrollment_admin_rule_label(string $code): string
+ {
+ return match ($code) {
+ 'STUDENT_NOT_LINKED' => 'Student is not linked to this parent',
+ 'SOURCE_YEAR_NOT_FOUND' => 'Student was not in the previous year',
+ 'TARGET_YEAR_NOT_FOUND' => 'School year was not found',
+ 'ALREADY_ENROLLED' => 'Already enrolled',
+ 'SIBLING_LAST_NAME_MISMATCH' => 'Sibling last names do not match',
+ 'OUTSTANDING_BALANCE_BLOCKED' => 'Previous-year balance must be paid',
+ 'FINANCE_APPROVAL_REQUIRED' => 'Finance approval required',
+ 'AGE_RULE_BLOCKED' => 'Age rule not met',
+ 'REGISTRATION_CLOSED' => 'Registration is closed',
+ 'REGISTRATION_NOT_OPEN' => 'Registration is not open yet',
+ 'ADULT_STUDENT_PARENT_BLOCKED' => 'Adult student cannot be enrolled by a parent',
+ 'EXIT_REQUIRED' => 'Exit / completion required',
+ 'EXPELLED' => 'Expelled — administrative review',
+ 'WITHDRAWN' => 'Withdrawn — review required',
+ 'NO_FINAL_DECISION' => 'No final academic decision',
+ 'UNRECOGNIZED_DECISION' => 'Unrecognized academic decision',
+ 'DEFERRED_DECISION' => 'Deferred academic decision',
+ 'REVIEW_REQUIRED' => 'Staff review required',
+ 'LAST_NAME_EXCEPTION_CARRIED_FORWARD' => 'Last-name exception carried forward',
+ 'PASSED' => 'Passed',
+ 'REPEAT_CLASS' => 'Repeat class',
+ 'MAKE_UP_EXAM' => 'Makeup exam',
+ default => enrollment_admin_flag_label($code),
+ };
+ }
+}
+if (!function_exists('enrollment_admin_decision_label')) {
+ function enrollment_admin_decision_label(string $decision): string
+ {
+ return match ($decision) {
+ 'ELIGIBLE' => 'Can enroll',
+ 'ELIGIBLE_WITH_WARNING' => 'Can enroll, with follow-up',
+ 'INELIGIBLE' => 'Cannot enroll',
+ 'REVIEW_REQUIRED' => 'Needs staff review',
+ 'EXCEPTION_ELIGIBLE' => 'Can enroll with exception',
+ 'ALREADY_ENROLLED' => 'Already enrolled',
+ default => $decision !== '' ? ucwords(strtolower(str_replace('_', ' ', $decision))) : 'Pending',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_priority_label')) {
+ function enrollment_admin_priority_label(string $priority): string
+ {
+ return match (strtolower($priority)) {
+ 'high' => 'High',
+ 'low' => 'Low',
+ default => 'Normal',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_exception_status_label')) {
+ function enrollment_admin_exception_status_label(string $status): string
+ {
+ return match ($status) {
+ 'active' => 'Active',
+ 'used' => 'Used',
+ 'revoked' => 'Revoked',
+ 'expired' => 'Expired',
+ default => $status !== '' ? ucfirst($status) : 'Unknown',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_audit_action_label')) {
+ function enrollment_admin_audit_action_label(string $action): string
+ {
+ return match ($action) {
+ 'flag_resolved' => 'Closed a work item',
+ 'manual_class_assignment' => 'Assigned a class',
+ 'make_up_exam_promotion_completed' => 'Recorded a passing makeup exam',
+ 'make_up_exam_no_promotion_required' => 'Recorded a failed makeup exam',
+ 'enrollment_exception_created' => 'Granted an exception',
+ 'enrollment_exception_revoked' => 'Revoked an exception',
+ 'initial_transition_applied' => 'Applied year transition',
+ 'transition_evaluation_blocked' => 'Transition blocked',
+ default => $action !== '' ? ucwords(str_replace('_', ' ', $action)) : '',
+ };
+ }
+}
+if (!function_exists('enrollment_admin_reason_label')) {
+ function enrollment_admin_reason_label(string $code, array $reasonCodes): string
+ {
+ if (isset($reasonCodes[$code]) && is_string($reasonCodes[$code]) && $reasonCodes[$code] !== '') {
+ return $reasonCodes[$code];
+ }
+
+ return enrollment_admin_rule_label($code);
+ }
+}
+
+$selectedParentId = (int) ($exceptionSelectedParentId ?? 0);
+$preview = $exceptionPreview ?? null;
+$nonOverridableCodes = ['STUDENT_NOT_LINKED', 'SOURCE_YEAR_NOT_FOUND', 'TARGET_YEAR_NOT_FOUND', 'ALREADY_ENROLLED'];
+$previewStudents = is_array($preview['students'] ?? null) ? $preview['students'] : [];
+$hasGrantableStudent = false;
+$openFlagCount = (int) ($openFlagCount ?? 0);
+$followupCount = count($enrollmentFollowups ?? []);
+$activeExceptionCount = 0;
+foreach (($activeExceptions ?? []) as $exceptionRow) {
+ if (($exceptionRow['status'] ?? '') === 'active') {
+ $activeExceptionCount++;
+ }
+}
+$emailExampleCount = count($emailExamples ?? []);
+$launchReady = empty($launchState['missing']);
+$launchApproved = !empty($launchState['approved']);
+$defaultTab = 'work';
+$emailStepLabel = $launchApproved ? 'Ready' : ($launchReady ? 'Review' : 'Blocked');
+$reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes : [];
+?>
+
+
+
Enrollment Administration
-
Review school-year transition flags, exceptions, and placement follow-up.
+
Work these steps in order: clear today's queue, grant any family exceptions, then send parent emails.
+
getFlashdata('success')): ?>
@@ -16,321 +227,683 @@
getFlashdata('error')) ?>
-
-
-
-
Registration Email Launch
-
-
Approved at
-
-
Missing:
-
-
Configuration is ready for launch approval.
-
+
+
+
+ 1. Work queue
+
+
+
+
+ 2. Follow-up
+
+
+
+
+ 3. Parent emails
+
+
+
+ History
+
+
+
+
+
+
+
+
Today's work queue
+
Start here. These are students who currently cannot complete re-enrollment, plus makeup and class follow-ups.
+
-
-
-
Preview Email
-
-
-
+
+
+
+
+
Showing closed items. Switch Status back to Open to see today's queue.
+
+
+
+
-
-
Decision Email Examples
-
-
-
-
- Parent
- Recipient
- Students
- Subject
- Delivery
- Example
-
-
-
-
-
- 'bg-success',
- 'failed' => 'bg-danger',
- 'generated' => 'bg-info text-dark',
- default => 'bg-secondary',
- };
- ?>
+
+
Enrollments still waiting on staff
+
These students already have an enrollment record. If a class or exception is needed, handle it in Work queue.
+
+
-
+
+
+
+
+ 'bg-warning text-dark',
+ 'waitlist' => 'bg-info text-dark',
+ 'denied' => 'bg-danger',
+ default => 'bg-secondary',
+ };
+ ?>
+
+
+
+ Exception
+
+ (bool) preg_match('/^[A-Z0-9_]+$/', $part))) === count($reasonParts);
+ ?>
+
+
+
+
+
+
+
+
+
-
+
+
Family exception tools
+
Use the lookup to grant a family exception after reviewing the matching work queue item. Saved exceptions stay here for audit and revocation.
-
Enrollment Follow-up
-
-
-
-
- Student
- School ID
- Enrollment Status
- Decision
- Placement
- Class
- Exception / Reason
- Updated
-
-
-
-
-
- 'bg-warning text-dark',
- 'waitlist' => 'bg-info text-dark',
- 'denied' => 'bg-danger',
- default => 'bg-secondary',
- };
- ?>
-
-
-
- Exception
-
-
-
-
-
-
-
- No enrollment records need follow-up for this school year.
-
-
-
-
-
+
+
+
+
Look up a family
+
+
You do not have permission to manage enrollment exceptions.
+
+
-
Enrollment Flags
-
-
-
-
- Student
- School ID
- Flag Type
- Priority
- Details
- Assigned
- Created
- Action
-
-
-
-
-
-
-
-
-
- $value): ?>
- :
-
-
- No details
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+ Select a parent to see their students and whether they can enroll.
-
-
-
-
-
- No formal enrollment flags found. Check Enrollment Follow-up above for status-based items.
-
-
-
-
-
+
+
+
-
Recent Enrollment Audit
-
-
-
-
- When
- Student
- Action
- Administrator
- Reason
-
-
-
-
-
+
+
+
Saved exceptions
+
+
You do not have permission to view enrollment exceptions.
+
+
+
+
+
+
+
+
Launch parent emails
+
Preview one email, approve the launch, then send. Do this after the work queue and exceptions are in good shape.
+
+
+
Finish this setup before you can approve or send: .
+
+
+
+
+
1
+
+
Preview a sample email
+
Open one parent email and confirm the wording, dates, and fees look right.
+
+
Preview sample
+
+
No parent with linked students is available for a sample preview.
+
+
+
+
+
2
+
+
Approve the launch
+
+
Approved .
+
+
Approve only after the year dates and fees are correct.
+
+
+
+
+
+
3
+
+
Send real emails
+
This emails parents for . Use resend only if you need to send again.
+
+
+
+
+
+
Email examples ()
+
+
+
+
+
+
+ 'bg-success',
+ 'failed' => 'bg-danger',
+ 'generated' => 'bg-info text-dark',
+ default => 'bg-secondary',
+ };
+ $deliveryLabel = match ($deliveryStatus) {
+ 'sent' => 'Sent',
+ 'failed' => 'Failed',
+ 'generated' => 'Generated',
+ 'not sent' => 'Not sent',
+ default => ucwords(str_replace('_', ' ', $deliveryStatus)),
+ };
+ ?>
+
+
+
+
+
+
+
+
+
+ View example
+
+
+
+
+
+
+
+
+
+
+
History
+
A record of enrollment decisions and exception actions for this school year.
+
+
+
+
-
+endSection() ?>
+
+section('scripts') ?>
+
endSection() ?>
diff --git a/app/Views/administrator/financial_aid_queue.php b/app/Views/administrator/financial_aid_queue.php
new file mode 100644
index 0000000..c6fd7c0
--- /dev/null
+++ b/app/Views/administrator/financial_aid_queue.php
@@ -0,0 +1,54 @@
+extend('layout/management_layout') ?>
+section('content') ?>
+
+
Financial Aid Requests
+ getFlashdata('success')): ?>
+
getFlashdata('success')) ?>
+
+ getFlashdata('error')): ?>
+
getFlashdata('error')) ?>
+
+
+
+
+
+
+
+
+ ID
+ Parent
+ Year
+ Status
+ Requested
+ Submitted
+
+
+
+
+
+
+ Review
+
+
+ No financial aid requests found.
+
+
+
+endSection() ?>
diff --git a/app/Views/administrator/financial_aid_review.php b/app/Views/administrator/financial_aid_review.php
new file mode 100644
index 0000000..00179d1
--- /dev/null
+++ b/app/Views/administrator/financial_aid_review.php
@@ -0,0 +1,52 @@
+extend('layout/management_layout') ?>
+section('content') ?>
+
+
← Back to queue
+
Review Financial Aid Request #
+
+ getFlashdata('error')): ?>
+
getFlashdata('error')) ?>
+
+
+
+
Parent:
+
School year:
+
Status:
+
Household size:
+
Requested amount:
+
Need statement
+
+
Students
+
+
+
+
+
+
+
+endSection() ?>
diff --git a/app/Views/administrator/sections_auto_distribute.php b/app/Views/administrator/sections_auto_distribute.php
index df05c04..6be1da5 100644
--- a/app/Views/administrator/sections_auto_distribute.php
+++ b/app/Views/administrator/sections_auto_distribute.php
@@ -152,17 +152,17 @@
- Number of Sections
+ Max Number of Sections
- Minimum Students
+ Min Students Per Section
-
+
Refresh Totals
Generate All
@@ -217,6 +217,13 @@
+
+ Total
+ 0
+
+
@@ -247,6 +254,7 @@
}, $classes ?? [])), JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT) ?>;
const tblBody = document.getElementById('tblBody');
+ const allStudentsTotal = document.getElementById('allStudentsTotal');
const sectionCountInput = document.getElementById('sectionCount');
const minInput = document.getElementById('minStudents');
const maxInput = document.getElementById('maxStudents');
@@ -352,6 +360,20 @@
});
});
+ if (!resolvedClassId && selectedClassId > 0) {
+ const firstSection = (sectionsByClassId[String(selectedClassId)] || [])[0] || null;
+ if (firstSection) {
+ select.value = String(firstSection.id);
+ resolvedClassId = selectedClassId;
+ } else {
+ const baseClass = baseClasses.find(c => c.class_id === selectedClassId) || null;
+ if (baseClass) {
+ select.value = String(baseClass.class_section_id);
+ resolvedClassId = selectedClassId;
+ }
+ }
+ }
+
const selectedOption = select.options[select.selectedIndex] || null;
if (!resolvedClassId && selectedOption) {
resolvedClassId = parseInt(selectedOption.dataset.classId || '0', 10);
@@ -380,8 +402,10 @@
function buildInitialTable(rows) {
tblBody.innerHTML = '';
rowIndexByClassId = {};
+ let allTotal = 0;
rows.forEach(function(r){
+ allTotal += parseInt(r.total || '0', 10) || 0;
const tr = document.createElement('tr');
tr.dataset.classId = r.class_id;
tr.dataset.classSectionId = r.class_section_id;
@@ -417,13 +441,16 @@
renderSectionsForRow(r.class_section_id, r.sections, r.students || []);
}
});
+ if (allStudentsTotal) {
+ allStudentsTotal.textContent = String(allTotal);
+ }
applyStudentSearch();
}
function runDistribution(baseSectionId, baseName) {
const sectionCount = parseInt(sectionCountInput.value || '0', 10);
const minStudents = parseInt(minInput.value || '0', 10);
- const maxStudents = parseInt(maxInput.value || '0', 10);
+ const maxStudents = parseInt((maxInput && maxInput.value) || '0', 10);
if (!sectionCount || sectionCount <= 0 || !minStudents || minStudents <= 0) {
msgEl.textContent = 'Enter number of sections and minimum students first.';
return;
@@ -611,6 +638,7 @@
student_name: assignment.student_name || 'Student',
age_at_reference: assignment.age_at_reference ?? null,
gender: assignment.gender || '',
+ previous_final_score: assignment.previous_final_score ?? null,
last_year_class_section: assignment.last_year_class_section || '',
class_id: parseInt(assignment.class_id || section.class_id || '0', 10),
class_section_id: parseInt(assignment.class_section_id || section.class_section_id || '0', 10),
@@ -623,6 +651,27 @@
return out;
}
+ function assignmentStats(assignments) {
+ const stats = { male: 0, female: 0, scoreTotal: 0, scoreCount: 0 };
+ (Array.isArray(assignments) ? assignments : []).forEach(function(assignment){
+ const gender = String(assignment.gender || '').trim().toLowerCase();
+ if (gender === 'female' || gender === 'f') {
+ stats.female++;
+ } else if (gender === 'male' || gender === 'm') {
+ stats.male++;
+ }
+
+ const score = Number(assignment.previous_final_score);
+ if (Number.isFinite(score)) {
+ stats.scoreTotal += score;
+ stats.scoreCount++;
+ }
+ });
+
+ stats.averageScore = stats.scoreCount ? stats.scoreTotal / stats.scoreCount : null;
+ return stats;
+ }
+
function renderClassRoster(tr, assignments) {
const wrap = document.createElement('div');
wrap.className = 'distribution-class-roster';
@@ -641,6 +690,23 @@
title.appendChild(count);
wrap.appendChild(title);
+ const stats = assignmentStats(assignments);
+ const meta = document.createElement('div');
+ meta.className = 'distribution-meta';
+ if (stats.averageScore !== null) {
+ const avg = document.createElement('span');
+ avg.className = 'badge text-bg-light';
+ avg.textContent = 'Avg ' + stats.averageScore.toFixed(2);
+ meta.appendChild(avg);
+ }
+ if (stats.male || stats.female) {
+ const gender = document.createElement('span');
+ gender.className = 'badge text-bg-light';
+ gender.textContent = 'M ' + stats.male + ' / F ' + stats.female;
+ meta.appendChild(gender);
+ }
+ if (meta.children.length) wrap.appendChild(meta);
+
if (!assignments.length) {
const empty = document.createElement('div');
empty.className = 'distribution-empty';
diff --git a/app/Views/administrator/tuition_forecast.php b/app/Views/administrator/tuition_forecast.php
index b4db8bd..ce74acf 100644
--- a/app/Views/administrator/tuition_forecast.php
+++ b/app/Views/administrator/tuition_forecast.php
@@ -30,7 +30,6 @@ $warningText = static function (array $warnings): string {
'include_event_only' => !empty($filters['include_event_only']) ? '1' : '0',
'include_paid_invoices' => !empty($filters['include_paid_invoices']) ? '1' : '0',
'unit_price' => $filters['unit_price'] ?? '',
- 'youth_unit_price' => $filters['youth_unit_price'] ?? '',
]);
?>
@@ -71,7 +70,7 @@ $warningText = static function (array $warnings): string {
- Grades Unit Price
+ Base Tuition
-
- Youth Unit Price
-