melabidi/alrahma_sunday_school
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix is_active student flag and apply it in all pages
Deploy to Shared Hosting / Shared hosting deploy (push) Failing after 48s
Details
Tests / PHPUnit (push) Successful in 1m17s
Details

Browse Source
This commit is contained in:
root
2026-08-20 12:59:59 -04:00
parent 0a31aa1393
commit bfa343b69f
57 changed files with 820 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Views/admin/certificates/audit_log.php
+4 -1
View File
@@ -77,7 +77,10 @@
<?php foreach ($records as $r): ?>
<tr>
<td><code><?= esc($r['certificate_number']) ?></code></td>
<td><?= esc($r['student_name']) ?></td>
<td>
<?= esc($r['student_name']) ?>
<?= student_enrollment_status_button($r, $schoolYear ?? null) ?>
</td>
<td><?= esc($r['grade'] ?? '—') ?></td>
<td><?= $r['cert_date'] ? esc(date('m/d/Y', strtotime($r['cert_date']))) : '—' ?></td>
<td><?= esc($r['school_year'] ?? '—') ?></td>
app/Views/admin/certificates/index.php
+5 -2
View File
@@ -245,7 +245,10 @@ $decisionBadge = [
<?= $isPass ? '' : 'disabled' ?>>
</td>
<td><?= esc($s['firstname']) ?></td>
<td>
<?= esc($s['firstname']) ?>
<?= student_enrollment_status_button($s, $schoolYear ?? null) ?>
</td>
<td><?= esc($s['lastname']) ?></td>
<td class="text-center fw-semibold">
@@ -624,4 +627,4 @@ window.showCertificatePdf=function(url,fn){
});
})();
</script>
<?= $this->endSection() ?>
<?= $this->endSection() ?>
app/Views/admin/competition_winners/scores.php
+4 -1
View File
@@ -82,7 +82,10 @@
?>
<tr>
<td><?= esc($schoolId ?: $studentId) ?></td>
<td><?= esc($name !== '' ? $name : ('Student #' . $studentId)) ?></td>
<td>
<?= esc($name !== '' ? $name : ('Student #' . $studentId)) ?>
<?= student_enrollment_status_button($s, $schoolYear ?? null) ?>
</td>
<td data-order="<?= esc($val) ?>">
<input class="form-control form-control-sm"
name="scores[<?= esc($studentId) ?>]"
app/Views/admin/competition_winners/winners.php
+4 -1
View File
@@ -84,7 +84,10 @@
<tr class="class-color-<?= esc((string) $colorIndex) ?>">
<td><?= esc($classLabel) ?></td>
<td><?= esc($row['school_id'] ?? $row['student_id'] ?? '-') ?></td>
<td><?= esc($studentLabel) ?></td>
<td>
<?= esc($studentLabel) ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($photoConsentLabel) ?></td>
<td><?= esc($row['rank'] ?? '-') ?></td>
<td><?= esc($scoreLabel) ?></td>
app/Views/admin/student_score_card.php
+4 -1
View File
@@ -78,7 +78,10 @@
<?php foreach ($students as $s): ?>
<tr>
<td><?= esc($s['school_id'] ?? '') ?></td>
<td><?= esc(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? '')) ?></td>
<td>
<?= esc(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? '')) ?>
<?= student_enrollment_status_button($s, $schoolYear ?? null) ?>
</td>
<td>
<?php if ((int)($s['is_active'] ?? 0) === 1): ?>
<span class="badge text-bg-success">Active</span>
app/Views/administrator/administratordashboard.php
+8 -2
View File
@@ -237,7 +237,10 @@
<tr>
<td><?= $i + 1 ?></td>
<td><?= esc($s['school_id']) ?></td>
<td><?= esc(trim(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? ''))) ?></td>
<td>
<?= esc(trim(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? ''))) ?>
<?= student_enrollment_status_button($s, $schoolYear ?? null) ?>
</td>
<td><?= esc($s['gender'] ?? '') ?></td>
<td><?= esc($s['dob'] ?? '') ?></td>
<td><?= esc($s['rfid_tag'] ?? '') ?></td>
@@ -375,7 +378,10 @@
<tr>
<td><?= $i + 1 ?></td>
<td><?= esc($s['school_id'] ?? '') ?></td>
<td><?= esc(trim(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? ''))) ?></td>
<td>
<?= esc(trim(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? ''))) ?>
<?= student_enrollment_status_button($s, $schoolYear ?? null) ?>
</td>
<td><?= esc($s['dob'] ?? '') ?></td>
</tr>
<?php endforeach; ?>
app/Views/administrator/class_assignment.php
+2
View File
@@ -72,8 +72,10 @@
<a href="#" class="text-decoration-none" data-family-student-id="<?= $sid ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $selectedYear ?? $schoolYear ?? null) ?>
<?php else: ?>
<?= esc($student['firstname']) ?>
<?= student_enrollment_status_button($student, $selectedYear ?? $schoolYear ?? null) ?>
<?php endif; ?>
</td>
<td>
app/Views/administrator/daily_attendance.php
+80 -25
View File
@@ -148,6 +148,37 @@
</style>
<?= $this->endSection() ?>
<?php
$semesterOptions = ['Fall', 'Spring'];
$selectedSemester = trim((string)($semester ?? ''));
if ($selectedSemester !== '' && !in_array($selectedSemester, $semesterOptions, true)) {
$semesterOptions[] = $selectedSemester;
}
$selectedSchoolYear = trim((string)($schoolYear ?? ''));
$selectedClassId = (int)($_GET['class_id'] ?? 0);
?>
<form id="attendanceTermFilter" method="get" action="<?= site_url('administrator/daily_attendance') ?>" class="row g-2 justify-content-center align-items-end mb-3">
<input type="hidden" id="attendanceClassIdFilter" name="class_id" value="<?= $selectedClassId > 0 ? $selectedClassId : '' ?>">
<div class="col-12 col-sm-5 col-md-3 col-lg-2">
<label for="attendanceSemesterFilter" class="form-label mb-1">Semester</label>
<select id="attendanceSemesterFilter" name="semester" class="form-select" onchange="this.form.submit()">
<?php foreach ($semesterOptions as $option): ?>
<option value="<?= esc($option) ?>" <?= $option === $selectedSemester ? 'selected' : '' ?>>
<?= esc($option) ?>
</option>
<?php endforeach; ?>
</select>
</div>
<div class="col-12 col-sm-5 col-md-3 col-lg-2">
<label for="attendanceSchoolYearFilter" class="form-label mb-1">School Year</label>
<input id="attendanceSchoolYearFilter" type="text" name="school_year" class="form-control" value="<?= esc($selectedSchoolYear) ?>" placeholder="YYYY-YYYY">
</div>
<div class="col-auto">
<button type="submit" class="btn btn-primary">Apply</button>
</div>
</form>
<!-- ===================== Global Student Search ===================== -->
<div class="row g-2 justify-content-center mb-3">
<div class="col-12 col-md-8 col-lg-6">
@@ -358,8 +389,11 @@
$studentsCountByClassId[$cid] = count($uniq);
}
// Default active tab = first in sorted order (can still be overridden by ?class_id)
$defaultId = $sortedClassIds[0] ?? null;
// Default active tab = first in sorted order unless ?class_id selects a visible grade.
$requestedClassId = (int)($_GET['class_id'] ?? 0);
$defaultId = ($requestedClassId > 0 && in_array($requestedClassId, $sortedClassIds, true))
? $requestedClassId
: ($sortedClassIds[0] ?? null);
// =====================================================================
// NEW UTILITIES (dates pivot logic) — includes "today if Sunday, else next Sunday" column
@@ -716,18 +750,20 @@
$tAbsent = $summary ? (int)($summary['total_absence'] ?? 0) : 0;
$schoolId = esc($student['school_id']);
$fullNameRaw = trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''));
$fullName = esc($fullNameRaw);
$fullNameAttr = esc(strtolower($fullNameRaw));
?>
<tr
data-student-id="<?= (int)$sid ?>"
data-school-id="<?= $schoolId ?>"
data-student-name="<?= $fullNameAttr ?>"
data-student-name-display="<?= esc($fullNameRaw) ?>"
data-class-id="<?= (int)$cid ?>"
data-grade-label="<?= esc($headerText) ?>">
$schoolId = esc($student['school_id']);
$fullNameRaw = trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''));
$fullName = esc($fullNameRaw);
$fullNameAttr = esc(strtolower($fullNameRaw));
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>"
data-student-id="<?= (int)$sid ?>"
data-student-editable="<?= $rowLocked ? '0' : '1' ?>"
data-school-id="<?= $schoolId ?>"
data-student-name="<?= $fullNameAttr ?>"
data-student-name-display="<?= esc($fullNameRaw) ?>"
data-class-id="<?= (int)$cid ?>"
data-grade-label="<?= esc($headerText) ?>">
<td class="school-id-col" style="min-width: <?= (int)$minIdCh ?>ch;"><?= $schoolId ?></td>
<td class="student-name-col" style="min-width: <?= (int)$minNameCh ?>ch;">
<a
@@ -737,6 +773,7 @@
title="Open family card">
<?= $fullName ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<?php foreach ($dateCols as $dcol): ?>
@@ -757,12 +794,13 @@
<td class="text-center date-col" style="min-width:160px;">
<select
class="form-select form-select-sm day-select"
data-class-id="<?= (int)$cid ?>"
data-class-section-id="<?= esc($sectionKey) ?>"
data-student-id="<?= (int)$sid ?>"
data-school-id="<?= esc($student['school_id']) ?>"
data-date="<?= esc($dcol) ?>"
aria-label="Attendance on <?= esc($dLabel) ?>">
data-class-id="<?= (int)$cid ?>"
data-class-section-id="<?= esc($sectionKey) ?>"
data-student-id="<?= (int)$sid ?>"
data-school-id="<?= esc($student['school_id']) ?>"
data-date="<?= esc($dcol) ?>"
<?= $rowLocked ? 'disabled aria-disabled="true"' : '' ?>
aria-label="Attendance on <?= esc($dLabel) ?>">
<?php foreach ($optionDefs as $key => $def): ?>
<option value="<?= $key ?>" <?= $key === $val ? 'selected' : '' ?>>
<?= esc($def['label']) ?>
@@ -865,6 +903,15 @@ $attendanceSaveUrlIndex = '/index.php/' . $savePath; // index.php fallbac
const TERM_SCHOOL_YEAR = <?= json_encode($schoolYear ?? '') ?>;
const TERM_SEMESTER = <?= json_encode($semester ?? '') ?>;
document.querySelectorAll('#attendanceTabs [data-class-id]').forEach((tab) => {
tab.addEventListener('shown.bs.tab', () => {
const classIdInput = document.getElementById('attendanceClassIdFilter');
if (classIdInput) {
classIdInput.value = tab.getAttribute('data-class-id') || '';
}
});
});
<?php
$___adminName = isset($currentAdminName) && $currentAdminName !== ''
? (string)$currentAdminName
@@ -1095,8 +1142,15 @@ $attendanceSaveUrlIndex = '/index.php/' . $savePath; // index.php fallbac
},
};
async function postAttendanceChange(selEl) {
const v = selEl.value;
async function postAttendanceChange(selEl) {
if (selEl.disabled || selEl.closest('tr')?.dataset.studentEditable === '0') {
return {
ok: true,
skipped: true
};
}
const v = selEl.value;
if (v === 'none') return {
ok: true,
skipped: true
@@ -1232,9 +1286,10 @@ $attendanceSaveUrlIndex = '/index.php/' . $savePath; // index.php fallbac
badge.textContent = meta.short;
}
document.addEventListener('change', async (e) => {
const sel = e.target.closest('select.day-select');
if (!sel) return;
document.addEventListener('change', async (e) => {
const sel = e.target.closest('select.day-select');
if (!sel) return;
if (sel.disabled || sel.closest('tr')?.dataset.studentEditable === '0') return;
const tr = sel.closest('tr');
const prev = sel.getAttribute('data-prev') || sel.value;
app/Views/administrator/daily_attendance_analysis.php
+4 -1
View File
@@ -441,7 +441,10 @@
<?php else: ?>
<?php foreach ($studentIssueRows as $row): ?>
<tr>
<td><?= esc($row['name']) ?></td>
<td>
<?= esc($row['name']) ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($row['section']) ?></td>
<td class="text-end"><?= (int)$row['absent'] ?></td>
<td class="text-end"><?= (int)$row['late'] ?></td>
app/Views/administrator/emergency_contact/index.php
+1 -1
View File
@@ -25,7 +25,7 @@
$sid = (int)($s['id'] ?? $s['student_id'] ?? 0);
$label = esc(($s['firstname'] ?? '') . ' ' . ($s['lastname'] ?? ''));
if ($sid > 0) {
return '<a href="#" class="text-decoration-none" data-family-student-id="' . $sid . '">' . $label . '</a>';
return '<a href="#" class="text-decoration-none" data-family-student-id="' . $sid . '">' . $label . '</a>' . student_enrollment_status_button(['student_id' => $sid]);
}
return $label;
}, $group['students']);
app/Views/administrator/enrollment_admin_dashboard.php
+14 -3
View File
@@ -326,7 +326,10 @@ $reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes :
$priorityClass = strtolower($priorityValue) === 'high' ? 'bg-danger' : 'bg-secondary';
?>
<tr>
<td><?= esc($flag['student_name'] ?? '') ?></td>
<td>
<?= esc($flag['student_name'] ?? '') ?>
<?= student_enrollment_status_button($flag, $schoolYear ?? null) ?>
</td>
<td><?= esc($flag['school_id'] ?? '') ?></td>
<td><span class="badge bg-secondary"><?= esc(enrollment_admin_flag_label($flagTypeValue)) ?></span></td>
<td><span class="badge <?= esc($priorityClass) ?>"><?= esc(enrollment_admin_priority_label($priorityValue)) ?></span></td>
@@ -427,7 +430,10 @@ $reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes :
};
?>
<tr>
<td><?= esc($row['student_name'] ?? '') ?></td>
<td>
<?= esc($row['student_name'] ?? '') ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($row['school_id'] ?? '') ?></td>
<td><span class="badge <?= esc($statusClass) ?>"><?= esc($statusValue) ?></span></td>
<td><?= esc($decisionValue !== '' ? ucwords(str_replace('_', ' ', $decisionValue)) : 'Pending') ?></td>
@@ -539,6 +545,7 @@ $reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes :
</td>
<td>
<?= esc($studentPreview['student_name'] ?? '') ?>
<?= student_enrollment_status_button($studentPreview, $schoolYear ?? null) ?>
<div class="small text-muted"><?= esc($studentPreview['school_id'] ?? '') ?></div>
</td>
<td><span class="badge <?= $canEnroll ? 'bg-success' : 'bg-warning text-dark' ?>"><?= esc(enrollment_admin_decision_label($decision)) ?></span></td>
@@ -648,6 +655,7 @@ $reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes :
<tr>
<td>
<?= esc($exception['student_name'] ?? '') ?>
<?= student_enrollment_status_button($exception, $schoolYear ?? null) ?>
<div class="small text-muted"><?= esc($exception['school_id'] ?? '') ?></div>
</td>
<td><?= esc($exception['parent_name'] ?? '') ?></td>
@@ -817,7 +825,10 @@ $reasonCodes = is_array($exceptionReasonCodes ?? null) ? $exceptionReasonCodes :
<?php foreach ($auditRows as $row): ?>
<tr>
<td><?= esc(!empty($row['created_at']) ? local_datetime($row['created_at'], 'm-d-Y H:i') : '') ?></td>
<td><?= esc($row['student_name'] ?? '') ?></td>
<td>
<?= esc($row['student_name'] ?? '') ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc(enrollment_admin_audit_action_label((string) ($row['action'] ?? ''))) ?></td>
<td><?= esc($row['performed_by_name'] ?? '') ?></td>
<td><?= esc($row['reason'] ?? '') ?></td>
app/Views/administrator/events/event_charges.php
+1
View File
@@ -348,6 +348,7 @@
<td data-sort-value="<?= esc(strtolower($parentColumnName)) ?>"><?= esc($parentColumnName) ?></td>
<td data-sort-value="<?= esc(strtolower($displayName)) ?>">
<?= esc($displayName) ?>
<?= student_enrollment_status_button(['student_id' => $charge['student_id'] ?? 0, 'enrollment_status' => $charge['enrollment_status'] ?? ''], $schoolYear ?? null) ?>
<?php if ($externalNote): ?>
<small class="text-muted d-block"><?= esc($externalNote) ?></small>
<?php endif; ?>
app/Views/administrator/financial_aid_review.php
+4 -1
View File
@@ -19,7 +19,10 @@
<div><strong>Students</strong></div>
<ul>
<?php foreach (($students ?? []) as $student): ?>
<li><?= esc(trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''))) ?></li>
<li>
<?= esc(trim(($student['firstname'] ?? '') . ' ' . ($student['lastname'] ?? ''))) ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</li>
<?php endforeach; ?>
</ul>
</div>
app/Views/administrator/grading_management.php
+4 -1
View File
@@ -48,7 +48,10 @@
<tbody>
<?php foreach ($studentsBySection[$sectionId] as $student): ?>
<tr>
<td><?= esc($student['firstname'] . ' ' . $student['lastname']) ?></td>
<td>
<?= esc($student['firstname'] . ' ' . $student['lastname']) ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= esc($student['school_id']) ?></td>
<td>
<?php
app/Views/administrator/late_slip_logs.php
+4 -1
View File
@@ -63,7 +63,10 @@
<tr>
<td><?= (int)($r['id'] ?? 0) ?></td>
<td><?= esc(!empty($r['printed_at']) ? local_datetime($r['printed_at'], 'm-d-Y H:i') : '') ?></td>
<td><?= esc($r['student_name'] ?? '') ?></td>
<td>
<?= esc($r['student_name'] ?? '') ?>
<?= student_enrollment_status_button($r, $schoolYear ?? null) ?>
</td>
<td><?= esc($r['grade'] ?? '') ?></td>
<td><?= esc(!empty($r['slip_date']) ? local_date($r['slip_date'], 'm-d-Y') : '') ?></td>
<td><?= esc($r['time_in'] ?? '') ?></td>
app/Views/administrator/search_results.php
+4 -1
View File
@@ -65,7 +65,10 @@
<?php foreach ($results['students'] as $student): ?>
<tr>
<td><?= esc($student['school_id'] ?? 'N/A') ?></td>
<td><?= esc($student['firstname'] ?? 'N/A') ?></td>
<td>
<?= esc($student['firstname'] ?? 'N/A') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= esc($student['lastname'] ?? 'N/A') ?></td>
<td><?= esc($student['dob'] ?? 'N/A') ?></td>
</tr>
app/Views/administrator/student_class_assignment.php
+1
View File
@@ -71,6 +71,7 @@
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
<?= esc($student['name']) ?>
</a>
<?= student_enrollment_status_button($student, $selectedYear ?? $schoolYear ?? null) ?>
</td>
<td><?= esc($student['age']) ?></td>
<td><?= esc($student['registration_grade']) ?></td>
app/Views/administrator/student_profiles.php
+1
View File
@@ -156,6 +156,7 @@ $selectedYear = trim((string)($selectedYear ?? ''));
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['id'] ?? 0) ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $selectedYear) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['id'] ?? 0) ?>">
app/Views/administrator/tuition_forecast.php
+4 -1
View File
@@ -202,7 +202,10 @@ $warningText = static function (array $warnings): string {
<tbody>
<?php foreach (($family['student_details'] ?? []) as $detail): ?>
<tr>
<td><?= esc($detail['student_name'] ?? '') ?></td>
<td>
<?= esc($detail['student_name'] ?? '') ?>
<?= student_enrollment_status_button($detail, $schoolYear ?? null) ?>
</td>
<td><?= esc($detail['grade_level'] ?? '') ?></td>
<td><?= !empty($detail['billable']) ? 'Yes' : 'No' ?></td>
<td><?= esc((string) ($detail['excluded_reason'] ?? '')) ?></td>
app/Views/attendance/attendance_tracking.php
+4 -1
View File
@@ -102,7 +102,10 @@
<tbody>
<?php foreach ($students as $student): ?>
<tr>
<td><?= $student['name'] ?></td>
<td>
<?= esc($student['name'] ?? '') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= $student['total_absences'] ?></td>
<td>
<?= $student['last_absence'] ? local_date($student['last_absence']['date'], 'm-d-Y') : 'N/A' ?>
app/Views/attendance/early_dismissals.php
+4 -1
View File
@@ -117,7 +117,10 @@
<tbody>
<?php foreach ($rows as $r): ?>
<tr>
<td><?= esc(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? '')) ?></td>
<td>
<?= esc(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? '')) ?>
<?= student_enrollment_status_button($r, $schoolYear ?? null) ?>
</td>
<td><?= esc($r['class_section_name'] ?? '—') ?></td>
<td><?= !empty($r['dismiss_time']) ? esc(substr($r['dismiss_time'], 0, 5)) : '—' ?></td>
<td style="max-width: 420px; white-space: normal;"><?= esc($r['reason'] ?? '') ?></td>
app/Views/attendance/parent_reports.php
+4 -1
View File
@@ -54,7 +54,10 @@
<?php foreach ($rows as $r): ?>
<tr>
<td><?= esc(!empty($r['report_date']) ? local_date($r['report_date'], 'm-d-Y') : '') ?></td>
<td><?= esc(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? '')) ?></td>
<td>
<?= esc(($r['firstname'] ?? '') . ' ' . ($r['lastname'] ?? '')) ?>
<?= student_enrollment_status_button($r, $schoolYear ?? null) ?>
</td>
<td><?= esc($r['class_section_name'] ?? '—') ?></td>
<td class="text-capitalize"><?= esc(str_replace('_',' ', $r['type'])) ?></td>
<td>
app/Views/attendance/violations_notified.php
+1
View File
@@ -119,6 +119,7 @@ $show_actions = false; // notified page hides actions by design
title="Open Family Card">
<?= esc($studName) ?>
</a>
<?= student_enrollment_status_button(['student_id' => $studId, 'enrollment_status' => $st['enrollment_status'] ?? ''], $schoolYear ?? null) ?>
</td>
<td><?= esc($className) ?></td>
<td data-order="<?= $incidentYmd !== '' ? esc($incidentYmd) : '' ?>">
app/Views/attendance/violations_pending.php
+1
View File
@@ -139,6 +139,7 @@ $show_actions = true; // pending page shows actions
title="Open Family Card">
<?= esc($studName) ?>
</a>
<?= student_enrollment_status_button(['student_id' => $studId, 'enrollment_status' => $st['enrollment_status'] ?? ''], $schoolYear ?? null) ?>
</td>
<td><?= esc($grade) ?></td>
<td><span class="<?= esc($badgeCls) ?>" style="<?= $badgeCss ?>"><?= esc($viTitle) ?></span></td>
app/Views/grading/all_decisions.php
+10 -5
View File
@@ -230,13 +230,18 @@
if ($yearVal !== null && $yearVal < 60) {
$rowClass = $yearVal < 50 ? 'grade-red' : 'grade-orange';
}
$badge = $decisionBadge[$decision] ?? null;
[$srcCls, $srcLabel] = $sourceBadge[$source] ?? ['bg-light text-muted', $source];
$studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
$fmt = fn($v) => is_numeric($v) ? number_format((float)$v, 2) : '—';
$badge = $decisionBadge[$decision] ?? null;
[$srcCls, $srcLabel] = $sourceBadge[$source] ?? ['bg-light text-muted', $source];
$studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
$rowLocked = student_is_non_active_for_editing($row, $schoolYear ?? null);
$rowClass = trim($rowClass . ' ' . ($rowLocked ? 'table-secondary text-muted' : ''));
$fmt = fn($v) => is_numeric($v) ? number_format((float)$v, 2) : '—';
?>
<tr class="<?= esc($rowClass) ?>">
<td><?= esc($studentName ?: 'N/A') ?></td>
<td>
<?= esc($studentName ?: 'N/A') ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($row['class_section_name'] ?? '—') ?></td>
<td class="text-center"><?= esc($fmt($row['fall_score'] ?? null)) ?></td>
<td class="text-center"><?= esc($fmt($row['spring_score'] ?? null)) ?></td>
app/Views/grading/below_sixty.php
+20 -13
View File
@@ -85,12 +85,17 @@ if (empty($schoolYears) && $schoolYear !== '') {
}
$studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
$studentLabel = $studentName !== '' ? $studentName : 'N/A';
$isClosed = ($row['status'] ?? 'Open') === 'Closed';
?>
$studentLabel = $studentName !== '' ? $studentName : 'N/A';
$isClosed = ($row['status'] ?? 'Open') === 'Closed';
$rowLocked = student_is_non_active_for_editing($row, $schoolYear ?? null);
$rowClass = trim($scoreClass . ' ' . ($rowLocked ? 'table-secondary text-muted' : ''));
?>
<tr class="<?= esc($scoreClass) ?>">
<td><?= esc($studentLabel) ?></td>
<tr class="<?= esc($rowClass) ?>">
<td>
<?= esc($studentLabel) ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($row['class_section_name'] ?? '—') ?></td>
<td class="text-center">
@@ -124,9 +129,10 @@ if (empty($schoolYears) && $schoolYear !== '') {
name="school_year"
value="<?= esc((string)$schoolYear) ?>">
<select name="status"
class="form-select form-select-sm"
style="width:110px;">
<select name="status"
class="form-select form-select-sm"
<?= $rowLocked ? 'disabled aria-disabled="true"' : '' ?>
style="width:110px;">
<option value="Open" <?= ($row['status'] ?? 'Open') === 'Open' ? 'selected' : '' ?>>
Open
</option>
@@ -137,12 +143,13 @@ if (empty($schoolYears) && $schoolYear !== '') {
<input type="text"
name="note"
class="form-control form-control-sm"
style="width:140px;"
placeholder="Note (optional)"
value="<?= esc((string)($row['note'] ?? '')) ?>">
class="form-control form-control-sm"
style="width:140px;"
placeholder="Note (optional)"
<?= $rowLocked ? 'readonly aria-disabled="true"' : '' ?>
value="<?= esc((string)($row['note'] ?? '')) ?>">
<button type="submit" class="btn btn-sm btn-outline-secondary">
<button type="submit" class="btn btn-sm btn-outline-secondary" <?= $rowLocked ? 'disabled' : '' ?>>
Update
</button>
</form>
app/Views/grading/below_sixty_decisions.php
+26 -20
View File
@@ -176,14 +176,20 @@ if (empty($schoolYears) && $schoolYear !== '') {
}
$studentName = trim((string)($row['firstname'] ?? '') . ' ' . (string)($row['lastname'] ?? ''));
$studentLabel = $studentName !== '' ? $studentName : 'N/A';
$currentDecision = (string)($row['decision'] ?? '');
$currentNotes = (string)($row['decision_notes'] ?? '');
$badge = $decisionBadge[$currentDecision] ?? null;
?>
$studentLabel = $studentName !== '' ? $studentName : 'N/A';
$currentDecision = (string)($row['decision'] ?? '');
$currentNotes = (string)($row['decision_notes'] ?? '');
$badge = $decisionBadge[$currentDecision] ?? null;
$rowLocked = student_is_non_active_for_editing($row, $schoolYear ?? null);
$rowClass = trim($rowClass . ' ' . ($rowLocked ? 'table-secondary text-muted' : ''));
$controlsEditable = $isEditable && !$rowLocked;
?>
<tr class="<?= esc($rowClass) ?>">
<td><?= esc($studentLabel) ?></td>
<td>
<?= esc($studentLabel) ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td class="text-center"><?= esc((string)($row['age'] ?? '—')) ?></td>
@@ -219,15 +225,15 @@ if (empty($schoolYears) && $schoolYear !== '') {
value="<?= esc((string)$schoolYear) ?>">
<textarea name="notes"
class="form-control form-control-sm decision-notes"
rows="3"
placeholder="Add comments or rationale…"
<?= $isEditable ? '' : 'readonly' ?>><?= esc($currentNotes) ?></textarea>
class="form-control form-control-sm decision-notes"
rows="3"
placeholder="Add comments or rationale…"
<?= $controlsEditable ? '' : 'readonly aria-disabled="true"' ?>><?= esc($currentNotes) ?></textarea>
<div class="d-flex gap-2 mt-2 align-items-center">
<select name="decision"
class="form-select form-select-sm decision-select flex-grow-1"
<?= $isEditable ? '' : 'disabled' ?>>
<select name="decision"
class="form-select form-select-sm decision-select flex-grow-1"
<?= $controlsEditable ? '' : 'disabled aria-disabled="true"' ?>>
<?php foreach ($decisionOptions as $val => $label): ?>
<option value="<?= esc($val) ?>" <?= $currentDecision === $val ? 'selected' : '' ?>>
<?= esc($label) ?>
@@ -235,9 +241,9 @@ if (empty($schoolYears) && $schoolYear !== '') {
<?php endforeach; ?>
</select>
<button type="submit"
class="btn btn-sm btn-primary"
<?= $isEditable ? '' : 'disabled' ?>>
<button type="submit"
class="btn btn-sm btn-primary"
<?= $controlsEditable ? '' : 'disabled' ?>>
Save
</button>
</div>
@@ -252,10 +258,10 @@ if (empty($schoolYears) && $schoolYear !== '') {
<button type="button"
class="btn btn-sm btn-outline-primary btn-send-email"
data-student-id="<?= (int)($row['student_id'] ?? 0) ?>"
data-semester="year"
data-school-year="<?= esc((string)$schoolYear) ?>"
<?= $isEditable ? '' : 'disabled' ?>>
data-student-id="<?= (int)($row['student_id'] ?? 0) ?>"
data-semester="year"
data-school-year="<?= esc((string)$schoolYear) ?>"
<?= $controlsEditable ? '' : 'disabled' ?>>
Send Email
</button>
<?php else: ?>
app/Views/grading/comments.php
+28 -20
View File
@@ -78,16 +78,22 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
</tr>
</thead>
<tbody>
<?php $rowNum = 1; ?>
<?php foreach ($students as $student): ?>
<?php $studentId = $student['student_id']; ?>
<tr>
<?php $rowNum = 1; ?>
<?php foreach ($students as $student): ?>
<?php
$studentId = $student['student_id'];
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
$rowButtonLockAttr = ($scoresLocked || $rowLocked) ? 'disabled' : '';
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $rowNum++ ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
<?= esc($student['firstname']) ?> <?= esc($student['lastname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<!-- PTAP Comment and Review -->
@@ -102,7 +108,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
data-first-name="<?= esc($student['firstname']) ?>"
minlength="100"
maxlength="350"
placeholder="Enter PTAP comment" <?= $lockAttr ?>><?= esc($comments[$studentId]['ptap']['comment'] ?? '') ?></textarea>
placeholder="Enter PTAP comment" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['ptap']['comment'] ?? '') ?></textarea>
</td>
<td class="ptap-review-cell">
<div class="d-flex gap-2 align-items-start">
@@ -111,13 +117,13 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
name="reviews[<?= $studentId ?>][ptap]"
rows="2"
class="form-control review-field"
placeholder="Enter PTAP review" <?= $lockAttr ?>><?= esc($comments[$studentId]['ptap']['comment_review'] ?? '') ?></textarea>
placeholder="Enter PTAP review" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['ptap']['comment_review'] ?? '') ?></textarea>
<div class="d-flex flex-column gap-1 align-items-stretch">
<button
type="button"
class="btn btn-outline-secondary btn-sm copy-ptap-btn"
data-copy-source="#<?= esc($ptapCommentId) ?>"
data-copy-target="#<?= esc($ptapReviewId) ?>" <?= $lockAttr ?>>
data-copy-target="#<?= esc($ptapReviewId) ?>" <?= $rowButtonLockAttr ?>>
Paste
</button>
<div class="small text-muted proofread-status" data-status-for="<?= esc($ptapReviewId) ?>"></div>
@@ -144,7 +150,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
data-first-name="<?= esc($student['firstname']) ?>"
minlength="100"
maxlength="350"
placeholder="Enter Midterm comment" <?= $lockAttr ?>><?= esc($comments[$studentId]['midterm']['comment'] ?? '') ?></textarea>
placeholder="Enter Midterm comment" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['midterm']['comment'] ?? '') ?></textarea>
</td>
<td>
<div class="d-flex gap-2 align-items-start">
@@ -156,13 +162,13 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
data-first-name="<?= esc($student['firstname']) ?>"
minlength="100"
maxlength="350"
placeholder="Enter Midterm review" <?= $lockAttr ?>><?= esc($comments[$studentId]['midterm']['comment_review'] ?? '') ?></textarea>
placeholder="Enter Midterm review" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['midterm']['comment_review'] ?? '') ?></textarea>
<div class="d-flex flex-column gap-1 align-items-stretch">
<button
type="button"
class="btn btn-outline-secondary btn-sm copy-midterm-btn"
data-copy-source="#<?= esc($midCommentId) ?>"
data-copy-target="#<?= esc($midReviewId) ?>" <?= $lockAttr ?>>
data-copy-target="#<?= esc($midReviewId) ?>" <?= $rowButtonLockAttr ?>>
Paste
</button>
<div class="small text-muted proofread-status" data-status-for="<?= esc($midReviewId) ?>"></div>
@@ -187,7 +193,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
data-first-name="<?= esc($student['firstname']) ?>"
minlength="100"
maxlength="350"
placeholder="Enter Final comment" <?= $lockAttr ?>><?= esc($comments[$studentId]['final']['comment'] ?? '') ?></textarea>
placeholder="Enter Final comment" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['final']['comment'] ?? '') ?></textarea>
</td>
<td>
<div class="d-flex gap-2 align-items-start">
@@ -196,13 +202,13 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
name="reviews[<?= $studentId ?>][final]"
rows="2"
class="form-control review-field"
placeholder="Enter Final review" <?= $lockAttr ?>><?= esc($comments[$studentId]['final']['comment_review'] ?? '') ?></textarea>
placeholder="Enter Final review" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['final']['comment_review'] ?? '') ?></textarea>
<div class="d-flex flex-column gap-1 align-items-stretch">
<button
type="button"
class="btn btn-outline-secondary btn-sm copy-final-btn"
data-copy-source="#<?= esc($finalCommentId) ?>"
data-copy-target="#<?= esc($finalReviewId) ?>" <?= $lockAttr ?>>
data-copy-target="#<?= esc($finalReviewId) ?>" <?= $rowButtonLockAttr ?>>
Paste
</button>
<div class="small text-muted proofread-status" data-status-for="<?= esc($finalReviewId) ?>"></div>
@@ -225,7 +231,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
data-first-name="<?= esc($student['firstname']) ?>"
minlength="100"
maxlength="350"
placeholder="Enter Attendance comment" <?= $lockAttr ?>><?= esc($comments[$studentId]['attendance']['comment'] ?? '') ?></textarea>
placeholder="Enter Attendance comment" <?= $rowLockAttr ?>><?= esc($comments[$studentId]['attendance']['comment'] ?? '') ?></textarea>
</td>
</tr>
<?php endforeach; ?>
@@ -377,7 +383,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
};
const shouldAutoSave = function(field, value) {
if (field.disabled) return false;
if (field.disabled || field.readOnly) return false;
const lastSaved = field.getAttribute('data-last-saved') || '';
if (value === lastSaved) return false;
const parsed = parseFieldName(field.name || '');
@@ -434,8 +440,9 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
form.addEventListener('submit', function(event) {
syncCsrfToken();
const errors = [];
form.querySelectorAll('textarea[data-first-name]').forEach(field => {
const value = field.value.trim();
form.querySelectorAll('textarea[data-first-name]').forEach(field => {
if (field.disabled || field.readOnly) return;
const value = field.value.trim();
if (value === '') return;
const min = 100;
@@ -472,9 +479,10 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
const wireCopyButtons = (selector) => {
document.querySelectorAll(selector).forEach(button => {
button.addEventListener('click', function() {
const source = document.querySelector(this.dataset.copySource || '');
const target = document.querySelector(this.dataset.copyTarget || '');
if (!source || !target) return;
const source = document.querySelector(this.dataset.copySource || '');
const target = document.querySelector(this.dataset.copyTarget || '');
if (!source || !target) return;
if (target.disabled || target.readOnly) return;
target.value = source.value;
target.style.height = 'auto';
target.style.height = (target.scrollHeight) + 'px';
app/Views/grading/final.php
+9 -4
View File
@@ -88,15 +88,20 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
</tr>
</thead>
<tbody>
<?php foreach ($students as $index => $student): ?>
<tr>
<tbody>
<?php foreach ($students as $index => $student): ?>
<?php
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $index + 1 ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
@@ -106,7 +111,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<td>
<input type="number" name="final_score[<?= esc($student['student_id']) ?>][score]"
value="<?= esc($student['score'] ?? '') ?>" class="form-control text-center" min="0" max="100" step="0.01"
placeholder="Enter score (optional)" <?= $lockAttr ?>>
placeholder="Enter score (optional)" <?= $rowLockAttr ?>>
</td>
</tr>
<?php endforeach; ?>
app/Views/grading/grading_main.php
+6 -3
View File
@@ -357,9 +357,10 @@
<th>Semester Score</th>
</tr>
</thead>
<tbody>
<?php foreach ($students as $student): ?>
<tr>
<tbody>
<?php foreach ($students as $student): ?>
<?php $rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null); ?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= esc($student['school_id'] ?? 'N/A') ?></td>
<td>
<?php $sid = (int)($student['id'] ?? 0); ?>
@@ -367,8 +368,10 @@
<a href="#" class="text-decoration-none" data-family-student-id="<?= $sid ?>">
<?= esc($student['firstname'] ?? 'N/A') ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
<?php else: ?>
<?= esc($student['firstname'] ?? 'N/A') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
<?php endif; ?>
</td>
<td>
app/Views/grading/homework.php
+5 -2
View File
@@ -55,14 +55,17 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<?php
$studentId = $student['id'];
$scores = $homeworkScores[$studentId]['scores'] ?? [];
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $row++ ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
@@ -78,7 +81,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
name="scores[<?= $studentId ?>][<?= $index ?>]"
value="<?= esc(is_array($scoreValue) ? '' : $scoreValue) ?>"
class="form-control text-center"
min="0" max="100" step="0.01" <?= $lockAttr ?>>
min="0" max="100" step="0.01" <?= $rowLockAttr ?>>
</td>
<?php endforeach; ?>
</tr>
app/Views/grading/midterm.php
+9 -4
View File
@@ -45,15 +45,20 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
</tr>
</thead>
<tbody>
<?php foreach ($students as $index => $student): ?>
<tr>
<tbody>
<?php foreach ($students as $index => $student): ?>
<?php
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $index + 1 ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
@@ -63,7 +68,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<td>
<input type="number" name="final_score[<?= esc($student['student_id']) ?>][score]"
value="<?= esc($student['score'] ?? '') ?>" class="form-control text-center" min="0" max="100" step="0.01"
placeholder="Enter score (optional)" <?= $lockAttr ?>>
placeholder="Enter score (optional)" <?= $rowLockAttr ?>>
</td>
</tr>
<?php endforeach; ?>
app/Views/grading/participation.php
+9 -4
View File
@@ -45,15 +45,20 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
</tr>
</thead>
<tbody>
<?php foreach ($students as $index => $student): ?>
<tr>
<tbody>
<?php foreach ($students as $index => $student): ?>
<?php
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $index + 1 ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['student_id'] ?? 0) ?>">
@@ -63,7 +68,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<td>
<input type="number" name="final_score[<?= esc($student['student_id']) ?>][score]"
value="<?= esc($student['score'] ?? '') ?>" class="form-control text-center" min="0" max="100" step="0.01"
placeholder="Enter score (optional)" <?= $lockAttr ?>>
placeholder="Enter score (optional)" <?= $rowLockAttr ?>>
</td>
</tr>
<?php endforeach; ?>
app/Views/grading/placement.php
+14 -9
View File
@@ -53,13 +53,17 @@
</thead>
<tbody>
<?php foreach ($students as $student): ?>
<?php
$sid = (int) ($student['student_id'] ?? 0);
$current = (string) ($levels[$sid] ?? '');
?>
<tr>
<?php
$sid = (int) ($student['student_id'] ?? 0);
$current = (string) ($levels[$sid] ?? '');
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= esc($student['school_id'] ?? '') ?></td>
<td><?= esc($student['firstname'] ?? '') ?></td>
<td>
<?= esc($student['firstname'] ?? '') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= esc($student['lastname'] ?? '') ?></td>
<td>
<input type="number"
@@ -67,9 +71,10 @@
class="form-control form-control-sm"
min="0"
max="100"
step="1"
value="<?= esc($current) ?>"
placeholder="0-100">
step="1"
value="<?= esc($current) ?>"
<?= $rowLocked ? 'readonly aria-disabled="true"' : '' ?>
placeholder="0-100">
</td>
</tr>
<?php endforeach; ?>
app/Views/grading/placement_batch.php
+15 -10
View File
@@ -53,14 +53,18 @@
<?php
$sid = (int) ($student['student_id'] ?? 0);
$scoreRow = $scores[$sid] ?? null;
$current = $scoreRow ? (string) ($scoreRow['score'] ?? '') : '';
$sectionName = (string) ($student['class_section_name'] ?? '');
$className = (string) ($student['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
?>
<tr>
$current = $scoreRow ? (string) ($scoreRow['score'] ?? '') : '';
$sectionName = (string) ($student['class_section_name'] ?? '');
$className = (string) ($student['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= esc($student['school_id'] ?? '') ?></td>
<td><?= esc($student['firstname'] ?? '') ?></td>
<td>
<?= esc($student['firstname'] ?? '') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= esc($student['lastname'] ?? '') ?></td>
<td><?= esc($sectionLabel ?: '—') ?></td>
<td>
@@ -69,9 +73,10 @@
class="form-control form-control-sm"
min="0"
max="100"
step="1"
value="<?= esc($current) ?>"
placeholder="0-100">
step="1"
value="<?= esc($current) ?>"
<?= $rowLocked ? 'readonly aria-disabled="true"' : '' ?>
placeholder="0-100">
</td>
</tr>
<?php endforeach; ?>
app/Views/grading/placement_index.php
+24 -15
View File
@@ -61,13 +61,17 @@
<?php foreach ($students as $student): ?>
<?php
$sid = (int) ($student['student_id'] ?? 0);
$sectionName = (string) ($student['class_section_name'] ?? '');
$className = (string) ($student['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
?>
<tr>
$sectionName = (string) ($student['class_section_name'] ?? '');
$className = (string) ($student['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= esc($student['school_id'] ?? '') ?></td>
<td><?= esc($student['firstname'] ?? '') ?></td>
<td>
<?= esc($student['firstname'] ?? '') ?>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td><?= esc($student['lastname'] ?? '') ?></td>
<td><?= esc($sectionLabel ?: '—') ?></td>
<td>
@@ -76,9 +80,10 @@
class="form-control form-control-sm"
min="0"
max="100"
step="1"
value=""
placeholder="0-100">
step="1"
value=""
<?= $rowLocked ? 'readonly aria-disabled="true"' : '' ?>
placeholder="0-100">
</td>
</tr>
<?php endforeach; ?>
@@ -154,13 +159,17 @@
<tbody>
<?php foreach ($detailRows as $row): ?>
<?php
$sectionName = (string) ($row['class_section_name'] ?? '');
$className = (string) ($row['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
?>
<tr>
$sectionName = (string) ($row['class_section_name'] ?? '');
$className = (string) ($row['class_name'] ?? '');
$sectionLabel = $className !== '' ? ($className . ' — ' . $sectionName) : $sectionName;
$rowLocked = student_is_non_active_for_editing($row, $schoolYear ?? null);
?>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= esc($row['school_id'] ?? '') ?></td>
<td><?= esc($row['firstname'] ?? '') ?></td>
<td>
<?= esc($row['firstname'] ?? '') ?>
<?= student_enrollment_status_button($row, $schoolYear ?? null) ?>
</td>
<td><?= esc($row['lastname'] ?? '') ?></td>
<td><?= esc($sectionLabel ?: '—') ?></td>
<td><?= esc($row['score'] ?? '') ?></td>
app/Views/grading/project.php
+5 -2
View File
@@ -56,14 +56,17 @@
<?php
$studentId = $student['id'];
$scores = $projectScores[$studentId]['scores'] ?? [];
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $row++ ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
@@ -79,7 +82,7 @@
name="scores[<?= $studentId ?>][<?= $index ?>]"
value="<?= esc(is_array($scoreValue) ? '' : $scoreValue) ?>"
class="form-control text-center"
min="0" max="100" step="0.01" <?= $lockAttr ?>>
min="0" max="100" step="0.01" <?= $rowLockAttr ?>>
</td>
<?php endforeach; ?>
</tr>
app/Views/grading/quiz.php
+5 -2
View File
@@ -56,14 +56,17 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<?php
$studentId = $student['id'];
$scores = $quizScores[$studentId]['scores'] ?? [];
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
?>
<tr>
<tr class="<?= $rowLocked ? 'table-secondary text-muted' : '' ?>">
<td><?= $row++ ?></td>
<td><?= esc($student['school_id']) ?></td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
<?= esc($student['firstname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</td>
<td>
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)$studentId ?>">
@@ -79,7 +82,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
name="scores[<?= $studentId ?>][<?= $index ?>]"
value="<?= esc(is_array($scoreValue) ? '' : $scoreValue) ?>"
class="form-control text-center"
min="0" max="100" step="0.01" <?= $lockAttr ?>>
min="0" max="100" step="0.01" <?= $rowLockAttr ?>>
</td>
<?php endforeach; ?>
</tr>
app/Views/grading/test.php
+9 -5
View File
@@ -41,6 +41,9 @@ switch ($viewFile) {
$scoresLocked = !empty($scoresLocked);
$lockAttr = $scoresLocked ? 'disabled' : '';
$rowLocked = student_is_non_active_for_editing($student, $schoolYear ?? null);
$rowLockAttr = $scoresLocked ? $lockAttr : ($rowLocked ? 'readonly aria-disabled="true"' : '');
$rowButtonLockAttr = ($scoresLocked || $rowLocked) ? 'disabled' : '';
?>
<?= $this->extend('layout/management_layout') ?>
@@ -51,6 +54,7 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<a href="#" class="text-decoration-none" data-family-student-id="<?= (int)($student['id'] ?? 0) ?>">
<?= esc($student['firstname'] . ' ' . $student['lastname']) ?>
</a>
<?= student_enrollment_status_button($student, $schoolYear ?? null) ?>
</h2>
<?php if ($scoresLocked): ?>
<div class="alert alert-warning text-center">
@@ -79,10 +83,10 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<td><?= $index + 1 ?></td>
<td>
<input type="hidden" name="score_ids[]" value="<?= $row['id'] ?>">
<input type="number" class="form-control" name="scores[]" value="<?= $row['score'] ?>" <?= $lockAttr ?>>
<input type="number" class="form-control" name="scores[]" value="<?= $row['score'] ?>" <?= $rowLockAttr ?>>
</td>
<td>
<textarea class="form-control" name="comments[]" <?= $lockAttr ?>><?= esc($row['comment'] ?? '') ?></textarea>
<textarea class="form-control" name="comments[]" <?= $rowLockAttr ?>><?= esc($row['comment'] ?? '') ?></textarea>
</td>
</tr>
<?php endforeach; ?>
@@ -91,17 +95,17 @@ $lockAttr = $scoresLocked ? 'disabled' : '';
<?php elseif (in_array($type, ['midterm', 'final', 'test'])): ?>
<div class="form-group">
<label>Score</label>
<input type="number" class="form-control" name="score" value="<?= $scores[0]['score'] ?? '' ?>" <?= $lockAttr ?>>
<input type="number" class="form-control" name="score" value="<?= $scores[0]['score'] ?? '' ?>" <?= $rowLockAttr ?>>
</div>
<?php elseif ($type === 'comments'): ?>
<div class="form-group">
<label>General Comment</label>
<textarea class="form-control" name="comment" rows="5" <?= $lockAttr ?>><?= $scores[0]['comment'] ?? '' ?></textarea>
<textarea class="form-control" name="comment" rows="5" <?= $rowLockAttr ?>><?= $scores[0]['comment'] ?? '' ?></textarea>
</div>
<?php endif; ?>
<div class="form-group text-center mt-3">
<button type="submit" class="btn btn-primary" <?= $lockAttr ?>>Save Changes</button>
<button type="submit" class="btn btn-primary" <?= $rowButtonLockAttr ?>>Save Changes</button>
</div>
</form>
<div class="text-center mt-4">