merge prod to main
This commit is contained in:
root
Regular → Executable
+6
-6
@@ -212,42 +212,42 @@
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-1.jpg"
|
||||
src="assets/images/classes-1.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-2.jpg"
|
||||
src="assets/images/classes-2.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-3.jpg"
|
||||
src="assets/images/classes-3.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-4.jpg"
|
||||
src="assets/images/classes-4.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-5.jpg"
|
||||
src="assets/images/classes-5.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img
|
||||
class="img-fluid rounded bg-light p-1"
|
||||
src=""assets/images/classes-6.jpg"
|
||||
src="assets/images/classes-6.jpg"
|
||||
alt=""
|
||||
/>
|
||||
</div>
|
||||
|
||||
Regular → Executable
+7
-7
@@ -170,22 +170,22 @@
|
||||
<h3 class="text-white mb-4">Photo Gallery</h3>
|
||||
<div class="row g-2 pt-2">
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -236,4 +236,4 @@
|
||||
<script src="<?= base_url('js/main.js') ?>"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
+189
-71
@@ -1,8 +1,21 @@
|
||||
<?= $this->extend('layout/management_layout') ?>
|
||||
<?= $this->section('content') ?>
|
||||
<style>
|
||||
#adminProgressTable thead th {
|
||||
.admin-progress-table thead th {
|
||||
position: static !important;
|
||||
top: auto !important;
|
||||
z-index: auto !important;
|
||||
background: #f8f9fa;
|
||||
white-space: nowrap;
|
||||
line-height: 1.2;
|
||||
padding-top: .75rem;
|
||||
padding-bottom: .75rem;
|
||||
}
|
||||
.admin-progress-table td {
|
||||
vertical-align: top;
|
||||
}
|
||||
.bg-orange {
|
||||
background-color: #fd7e14 !important;
|
||||
}
|
||||
</style>
|
||||
<div class="container py-4">
|
||||
@@ -12,6 +25,23 @@
|
||||
<h3 class="mb-0">Class Progress Reports</h3>
|
||||
<div class="text-muted">Filter by week, class, and status</div>
|
||||
</div>
|
||||
<div>
|
||||
<?php
|
||||
$lowProgressSectionIds = $lowProgressSectionIds ?? [];
|
||||
$lowProgressQuery = implode(',', $lowProgressSectionIds);
|
||||
$lowProgressUrl = base_url('administrator/teacher-submissions');
|
||||
if ($lowProgressQuery !== '') {
|
||||
$lowProgressUrl .= '?low_progress_sections=' . rawurlencode($lowProgressQuery);
|
||||
}
|
||||
?>
|
||||
<a
|
||||
class="btn btn-sm btn-outline-warning <?= empty($lowProgressSectionIds) ? 'disabled' : '' ?>"
|
||||
href="<?= esc($lowProgressUrl) ?>"
|
||||
<?= empty($lowProgressSectionIds) ? 'tabindex="-1" aria-disabled="true"' : '' ?>
|
||||
>
|
||||
Teachers < 50%
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -56,79 +86,167 @@
|
||||
</form>
|
||||
|
||||
<div class="card shadow-sm mt-5">
|
||||
<div class="card-body pt-4 px-0">
|
||||
<div class="table-responsive px-4" style="margin-top: 1.5rem;">
|
||||
<table id="adminProgressTable" class="table table-hover align-middle mb-0">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Week</th>
|
||||
<th>Subjects</th>
|
||||
<th>Teacher</th>
|
||||
<th class="text-end">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<div class="card-body pt-4">
|
||||
<?php
|
||||
$reportGroupsBySection = $reportGroupsBySection ?? [];
|
||||
$subjectSections = $subjectSections ?? [];
|
||||
$classSections = $classSections ?? [];
|
||||
$sectionStats = $sectionStats ?? [];
|
||||
$sectionSubjectCounts = $sectionSubjectCounts ?? [];
|
||||
$expectedDays = (int) ($expectedDays ?? 0);
|
||||
?>
|
||||
<?php if (empty($classSections)): ?>
|
||||
<div class="text-center text-muted py-4">No class sections found.</div>
|
||||
<?php else: ?>
|
||||
<div class="accordion" id="adminProgressAccordion">
|
||||
<?php foreach ($classSections as $index => $cs): ?>
|
||||
<?php
|
||||
$reportGroups = $reportGroups ?? [];
|
||||
$subjectSections = $subjectSections ?? [];
|
||||
$sectionId = (int) ($cs['class_section_id'] ?? 0);
|
||||
$sectionName = $cs['class_section_name'] ?? 'Unknown Section';
|
||||
$sectionGroups = $reportGroupsBySection[$sectionId] ?? [];
|
||||
$hasReports = ! empty($sectionGroups);
|
||||
$collapseId = 'progress-section-' . $sectionId;
|
||||
$headingId = 'progress-heading-' . $sectionId;
|
||||
$stat = $sectionStats[$sectionId] ?? null;
|
||||
$subjectCount = (int) ($sectionSubjectCounts[$sectionId] ?? 0);
|
||||
if (! $stat) {
|
||||
if ($expectedDays === 0) {
|
||||
$stat = [
|
||||
'submitted' => 0,
|
||||
'expected' => 0,
|
||||
'percent' => 0,
|
||||
'badgeClass' => 'bg-secondary',
|
||||
'labelClass' => 'text-muted',
|
||||
];
|
||||
} else {
|
||||
$stat = [
|
||||
'submitted' => 0,
|
||||
'expected' => $expectedDays,
|
||||
'percent' => 0,
|
||||
'badgeClass' => 'bg-danger',
|
||||
'labelClass' => 'text-danger',
|
||||
];
|
||||
}
|
||||
}
|
||||
$percentLabel = $expectedDays > 0 ? number_format((float) $stat['percent'], 1) . '%' : 'N/A';
|
||||
$submissionLabel = $expectedDays > 0
|
||||
? ('Submitted: ' . (int) $stat['submitted'] . ' / ' . (int) $expectedDays . ' (' . $percentLabel . ')')
|
||||
: 'Submitted: N/A';
|
||||
$subjectLabel = 'Units: ' . $subjectCount;
|
||||
?>
|
||||
<?php if (empty($reportGroups)): ?>
|
||||
<tr><td colspan="4" class="text-center text-muted py-4">No reports found.</td></tr>
|
||||
<?php else: ?>
|
||||
<?php foreach ($reportGroups as $group): ?>
|
||||
<?php
|
||||
$weekLabel = $group['week_start'] ? date('M d, Y', strtotime($group['week_start'])) : '-';
|
||||
if (!empty($group['week_end'])) {
|
||||
$weekLabel .= ' – ' . date('M d, Y', strtotime($group['week_end']));
|
||||
}
|
||||
$reports = $group['reports'] ?? [];
|
||||
$teacherName = '';
|
||||
foreach ($reports as $report) {
|
||||
if (!empty($report['teacher_name'])) {
|
||||
$teacherName = $report['teacher_name'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
$exampleId = $reports ? reset($reports)['id'] : null;
|
||||
?>
|
||||
<tr>
|
||||
<td>
|
||||
<div class="fw-semibold"><?= esc($weekLabel) ?></div>
|
||||
<?php if (!empty($group['class_section_name'])): ?>
|
||||
<div class="text-muted small">Class: <?= esc($group['class_section_name']) ?></div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<div class="d-flex flex-column gap-2">
|
||||
<?php foreach ($subjectSections as $slug => $section): ?>
|
||||
<?php
|
||||
$subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
|
||||
$report = $reports[$subjectName] ?? null;
|
||||
$statusTag = $report ? ($report['status_label'] ?? 'Unknown') : 'No entry';
|
||||
$badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
|
||||
?>
|
||||
<div class="border rounded-3 p-2">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
|
||||
<span class="badge <?= $badgeClass ?>"><?= esc($statusTag) ?></span>
|
||||
</div>
|
||||
<div class="small text-muted"><?= $report ? esc($report['unit_title'] ?: '-') : 'No submission' ?></div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<div class="accordion-item mb-2">
|
||||
<h2 class="accordion-header" id="<?= esc($headingId) ?>">
|
||||
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
|
||||
<?= esc($sectionName) ?>
|
||||
<span class="badge <?= esc($stat['badgeClass']) ?> ms-2"><?= esc($submissionLabel) ?></span>
|
||||
<span class="badge bg-info text-dark ms-2"><?= esc($subjectLabel) ?></span>
|
||||
<?php if ($hasReports): ?>
|
||||
<span class="badge bg-secondary ms-2"><?= count($sectionGroups) ?> weeks</span>
|
||||
<?php endif; ?>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="<?= esc($headingId) ?>" data-bs-parent="#adminProgressAccordion">
|
||||
<div class="accordion-body">
|
||||
<?php if (! $hasReports): ?>
|
||||
<div class="text-muted">No reports found for this section.</div>
|
||||
<?php else: ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover align-middle mb-0 admin-progress-table no-mgmt-sticky" data-no-mgmt-sticky>
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Week</th>
|
||||
<th>Subjects</th>
|
||||
<th>Teacher</th>
|
||||
<th class="text-end">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($sectionGroups as $group): ?>
|
||||
<?php
|
||||
$weekLabel = $group['week_start'] ? date('M d, Y', strtotime($group['week_start'])) : '-';
|
||||
if (! empty($group['week_end'])) {
|
||||
$weekLabel .= ' – ' . date('M d, Y', strtotime($group['week_end']));
|
||||
}
|
||||
$reports = $group['reports'] ?? [];
|
||||
$teacherCounts = [];
|
||||
$teacherLatest = [];
|
||||
foreach ($reports as $report) {
|
||||
$name = trim((string) ($report['teacher_name'] ?? ''));
|
||||
if ($name === '') {
|
||||
continue;
|
||||
}
|
||||
$teacherCounts[$name] = ($teacherCounts[$name] ?? 0) + 1;
|
||||
$stamp = (string) ($report['updated_at'] ?? $report['created_at'] ?? '');
|
||||
if ($stamp !== '' && (!isset($teacherLatest[$name]) || $stamp > $teacherLatest[$name])) {
|
||||
$teacherLatest[$name] = $stamp;
|
||||
}
|
||||
}
|
||||
$teacherLabel = '-';
|
||||
if (!empty($teacherCounts)) {
|
||||
$bestName = '';
|
||||
$bestCount = -1;
|
||||
$bestStamp = '';
|
||||
foreach ($teacherCounts as $name => $count) {
|
||||
$stamp = $teacherLatest[$name] ?? '';
|
||||
if ($count > $bestCount || ($count === $bestCount && $stamp > $bestStamp)) {
|
||||
$bestName = $name;
|
||||
$bestCount = $count;
|
||||
$bestStamp = $stamp;
|
||||
}
|
||||
}
|
||||
$teacherLabel = $bestName ?: '-';
|
||||
}
|
||||
$exampleId = $reports ? reset($reports)['id'] : null;
|
||||
?>
|
||||
<tr>
|
||||
<td><div class="fw-semibold"><?= esc($weekLabel) ?></div></td>
|
||||
<td>
|
||||
<div class="d-flex flex-column gap-2">
|
||||
<?php foreach ($subjectSections as $slug => $section): ?>
|
||||
<?php
|
||||
$subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
|
||||
$report = $reports[$subjectName] ?? null;
|
||||
$statusTag = $report ? ($report['status_label'] ?? 'Unknown') : 'No entry';
|
||||
$badgeClass = $report ? 'bg-secondary' : 'bg-light text-muted';
|
||||
?>
|
||||
<div class="border rounded-3 p-2">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
<strong class="small mb-0"><?= esc($section['label'] ?? $subjectName) ?></strong>
|
||||
<span class="badge <?= $badgeClass ?>"><?= esc($statusTag) ?></span>
|
||||
</div>
|
||||
<div class="small">
|
||||
<?php if ($report): ?>
|
||||
<?= view('admin/partials/class_progress_unit_display', [
|
||||
'unitTitle' => (string) ($report['unit_title'] ?? ''),
|
||||
'isQuran' => ($subjectName === 'Quran/Arabic'),
|
||||
'compact' => true,
|
||||
]) ?>
|
||||
<?php else: ?>
|
||||
<span class="text-muted">No submission</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
</td>
|
||||
<td><?= esc($teacherLabel) ?></td>
|
||||
<td class="text-end">
|
||||
<?php if ($exampleId): ?>
|
||||
<a class="btn btn-sm btn-outline-primary" href="<?= base_url('admin/progress/view/' . $exampleId) ?>">View</a>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
<td><?= esc($teacherName ?: '-') ?></td>
|
||||
<td class="text-end">
|
||||
<?php if ($exampleId): ?>
|
||||
<a class="btn btn-sm btn-outline-primary" href="<?= base_url('admin/progress/view/' . $exampleId) ?>">View</a>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Regular → Executable
+7
-2
@@ -39,7 +39,6 @@
|
||||
<?php
|
||||
$subjectName = $section['db_subject'] ?? $section['label'] ?? $slug;
|
||||
$isQuran = $subjectName === 'Quran/Arabic';
|
||||
$unitLabel = $isQuran ? 'Surah / Custom Arabic' : 'Unit / Chapter';
|
||||
$homeworkLabel = $isQuran ? 'Arabic Practice / Homework' : 'Assigned Homework';
|
||||
$report = $reportsBySubject[$subjectName] ?? null;
|
||||
?>
|
||||
@@ -51,7 +50,13 @@
|
||||
<?php if (! $report): ?>
|
||||
<div class="text-muted">No entry submitted for this subject this week.</div>
|
||||
<?php else: ?>
|
||||
<div class="mb-2"><strong><?= $unitLabel ?>:</strong> <?= esc($report['unit_title'] ?: '-') ?></div>
|
||||
<div class="mb-2">
|
||||
<?= view('admin/partials/class_progress_unit_display', [
|
||||
'unitTitle' => (string) ($report['unit_title'] ?? ''),
|
||||
'isQuran' => $isQuran,
|
||||
'compact' => false,
|
||||
]) ?>
|
||||
</div>
|
||||
<?php if (!empty($report['materials'])): ?>
|
||||
<div class="mb-2"><strong>Materials:</strong> <?= esc($report['materials']) ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
@@ -0,0 +1,48 @@
|
||||
<?php
|
||||
/**
|
||||
* Renders class progress unit_title with explicit curriculum vs custom subject lines.
|
||||
*
|
||||
* @var string $unitTitle
|
||||
* @var bool $isQuran
|
||||
* @var bool $compact If true, tighter layout for the list accordion.
|
||||
*/
|
||||
|
||||
use App\Controllers\ClassProgressController;
|
||||
|
||||
$unitTitle = trim((string) ($unitTitle ?? ''));
|
||||
$compact = ! empty($compact);
|
||||
$isQuran = ! empty($isQuran);
|
||||
|
||||
$split = ClassProgressController::splitUnitTitleForDisplay($unitTitle);
|
||||
$curriculumLines = $split['curriculum'];
|
||||
$customTopics = $split['custom'];
|
||||
|
||||
$labelCurriculum = $isQuran ? 'Surah / curriculum' : 'Unit / chapter';
|
||||
$labelCustom = $isQuran ? 'Custom Surah / Arabic' : 'Custom subject(s)';
|
||||
?>
|
||||
|
||||
<?php if ($unitTitle === ''): ?>
|
||||
<span class="text-muted">-</span>
|
||||
<?php elseif ($compact): ?>
|
||||
<?php if (! empty($customTopics)): ?>
|
||||
<div class="small">
|
||||
<span class="badge text-bg-info me-1"><?= $isQuran ? 'Custom' : 'Custom subject' ?></span><?= esc(implode(', ', $customTopics)) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if (! empty($curriculumLines)): ?>
|
||||
<div class="small <?= ! empty($customTopics) ? 'text-muted mt-1' : 'text-muted' ?>"><?= esc(implode(' · ', $curriculumLines)) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php if (empty($customTopics) && empty($curriculumLines)): ?>
|
||||
<div class="small text-muted"><?= esc($unitTitle) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<?php if (! empty($curriculumLines)): ?>
|
||||
<div class="mb-2"><strong><?= esc($labelCurriculum) ?>:</strong> <?= esc(implode(' ; ', $curriculumLines)) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php if (! empty($customTopics)): ?>
|
||||
<div class="mb-2"><strong><?= esc($labelCustom) ?>:</strong> <?= esc(implode(' ; ', $customTopics)) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php if (empty($curriculumLines) && empty($customTopics)): ?>
|
||||
<div class="mb-2"><strong><?= esc($labelCurriculum) ?>:</strong> <?= esc($unitTitle) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+6
-15
@@ -517,37 +517,28 @@
|
||||
<section class="mb-5">
|
||||
<h2 class="mb-4 text-center">Statistics</h2>
|
||||
<div class="stats-row">
|
||||
<!-- Students -->
|
||||
<div class="stat-circle circle-primary">
|
||||
<div class="stat-icon"><i class="bi bi-people-fill"></i></div>
|
||||
<div class="stat-icon"><i class="fas fa-user-graduate"></i></div>
|
||||
<div class="stat-value" data-stat="students">—</div>
|
||||
<div class="stat-title">Students</div>
|
||||
</div>
|
||||
|
||||
<!-- Teachers -->
|
||||
<div class="stat-circle circle-info">
|
||||
<div class="stat-icon"><i class="bi bi-person-video2"></i></div>
|
||||
<div class="stat-icon"><i class="fas fa-chalkboard-teacher"></i></div>
|
||||
<div class="stat-value" data-stat="teachers">—</div>
|
||||
<div class="stat-title">Teachers</div>
|
||||
</div>
|
||||
|
||||
<!-- Teacher Assistants -->
|
||||
<div class="stat-circle circle-success">
|
||||
<div class="stat-icon"><i class="bi bi-person-badge-fill"></i></div>
|
||||
<div class="stat-icon"><i class="fas fa-user-cog"></i></div>
|
||||
<div class="stat-value" data-stat="teacherAssistants">—</div>
|
||||
<div class="stat-title">Teachers' Assistants</div>
|
||||
<div class="stat-title">TAs</div>
|
||||
</div>
|
||||
|
||||
<!-- Admins -->
|
||||
<div class="stat-circle circle-warning">
|
||||
<div class="stat-icon"><i class="bi bi-shield-lock-fill"></i></div>
|
||||
<div class="stat-icon"><i class="fas fa-user-shield"></i></div>
|
||||
<div class="stat-value" data-stat="admins">—</div>
|
||||
<div class="stat-title">Admins</div>
|
||||
</div>
|
||||
|
||||
<!-- Parents -->
|
||||
<div class="stat-circle circle-light">
|
||||
<div class="stat-icon"><i class="bi bi-people"></i></div>
|
||||
<div class="stat-icon"><i class="fas fa-users"></i></div>
|
||||
<div class="stat-value" data-stat="parents">—</div>
|
||||
<div class="stat-title">Parents</div>
|
||||
</div>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+11
-1
@@ -696,7 +696,17 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($studentsBySection[$sectionKey] as $student): ?>
|
||||
<?php
|
||||
$uniqueStudents = [];
|
||||
foreach ($studentsBySection[$sectionKey] as $student) {
|
||||
$sid = (int)($student['id'] ?? 0);
|
||||
if ($sid <= 0 || isset($uniqueStudents[$sid])) {
|
||||
continue;
|
||||
}
|
||||
$uniqueStudents[$sid] = $student;
|
||||
}
|
||||
?>
|
||||
<?php foreach ($uniqueStudents as $student): ?>
|
||||
<?php
|
||||
$sid = (int)$student['id'];
|
||||
$entryMap = $recAt($__attendanceData[$sectionKey][$sid] ?? []);
|
||||
|
||||
Regular → Executable
+102
-1
@@ -71,9 +71,20 @@
|
||||
max-height: none;
|
||||
overflow: visible;
|
||||
}
|
||||
.attn-pie-wrap {
|
||||
width: 320px;
|
||||
height: 320px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
@media (max-width: 1200px) {
|
||||
.attn-analysis-half { grid-column: span 12; }
|
||||
}
|
||||
@media (max-width: 576px) {
|
||||
.attn-pie-wrap {
|
||||
width: 180px;
|
||||
height: 180px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
@@ -239,6 +250,54 @@
|
||||
$analysisSectionTotals[] = (int)($s['total_students'] ?? 0);
|
||||
}
|
||||
|
||||
// ---- Student absences/late list ----
|
||||
$sectionLabelByKey = [];
|
||||
foreach ($grades as $classId => $sections) {
|
||||
foreach ($sections as $section) {
|
||||
$sectionKey = (string)($section['class_section_id'] ?? ($section['id'] ?? ''));
|
||||
if ($sectionKey === '') continue;
|
||||
$secNameRaw = trim((string)($section['class_section_name'] ?? ''));
|
||||
$sectionLabelByKey[$sectionKey] = $secNameRaw !== '' ? $secNameRaw : ('Section ' . $sectionKey);
|
||||
}
|
||||
}
|
||||
|
||||
$studentIssueRows = [];
|
||||
foreach ($studentsBySection as $sectionKey => $students) {
|
||||
foreach ($students as $stu) {
|
||||
$sid = (int)($stu['id'] ?? 0);
|
||||
if ($sid <= 0) continue;
|
||||
$entries = $attendanceData[$sectionKey][$sid] ?? [];
|
||||
if (!is_array($entries)) continue;
|
||||
$abs = 0;
|
||||
$late = 0;
|
||||
foreach ($entries as $e) {
|
||||
$d = substr((string)($e['date'] ?? ''), 0, 10);
|
||||
if ($d === '') continue;
|
||||
if ($filterStart !== '' && $d < $filterStart) continue;
|
||||
if ($filterEnd !== '' && $d > $filterEnd) continue;
|
||||
$st = strtolower(trim((string)($e['status'] ?? '')));
|
||||
if ($st === 'absent') {
|
||||
$abs++;
|
||||
} elseif ($st === 'late') {
|
||||
$late++;
|
||||
}
|
||||
}
|
||||
if (($abs + $late) <= 0) continue;
|
||||
$studentIssueRows[] = [
|
||||
'name' => trim((string)($stu['firstname'] ?? '') . ' ' . (string)($stu['lastname'] ?? '')),
|
||||
'section' => $sectionLabelByKey[(string)$sectionKey] ?? ('Section ' . $sectionKey),
|
||||
'absent' => $abs,
|
||||
'late' => $late,
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
usort($studentIssueRows, static function ($a, $b) {
|
||||
$sec = strcmp($a['section'], $b['section']);
|
||||
if ($sec !== 0) return $sec;
|
||||
return strcmp($a['name'], $b['name']);
|
||||
});
|
||||
|
||||
$totalDaysForPercent = 0;
|
||||
if ($filterStart === '' && $filterEnd === '' && !empty($totalPassedDays)) {
|
||||
$totalDaysForPercent = (int)$totalPassedDays;
|
||||
@@ -291,7 +350,9 @@
|
||||
<div class="attn-analysis-grid">
|
||||
<div class="attn-analysis-card attn-analysis-half">
|
||||
<h6>Overall Distribution</h6>
|
||||
<canvas id="attnPieChart" height="50" aria-label="Overall attendance pie chart"></canvas>
|
||||
<div class="attn-pie-wrap">
|
||||
<canvas id="attnPieChart" aria-label="Overall attendance pie chart"></canvas>
|
||||
</div>
|
||||
<table class="attn-analysis-table mt-3 no-mgmt-sticky" data-no-mgmt-sticky>
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -360,6 +421,37 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="attn-analysis-card attn-analysis-wide">
|
||||
<h6>Students With Absences / Late</h6>
|
||||
<div class="attn-analysis-scroll">
|
||||
<table id="studentIssueTable" class="attn-analysis-table no-mgmt-sticky" data-no-mgmt-sticky>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Student Name</th>
|
||||
<th>Class Section</th>
|
||||
<th class="text-end">Nbr of ABS</th>
|
||||
<th class="text-end">Nbr of LATE</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php if (empty($studentIssueRows)): ?>
|
||||
<tr>
|
||||
<td colspan="4" class="text-center text-muted">No absences or late records in the selected range.</td>
|
||||
</tr>
|
||||
<?php else: ?>
|
||||
<?php foreach ($studentIssueRows as $row): ?>
|
||||
<tr>
|
||||
<td><?= esc($row['name']) ?></td>
|
||||
<td><?= esc($row['section']) ?></td>
|
||||
<td class="text-end"><?= (int)$row['absent'] ?></td>
|
||||
<td class="text-end"><?= (int)$row['late'] ?></td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -415,6 +507,8 @@
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
maintainAspectRatio: false,
|
||||
plugins: {
|
||||
tooltip: {
|
||||
callbacks: {
|
||||
@@ -465,6 +559,13 @@
|
||||
info: false,
|
||||
order: [[0, 'asc']]
|
||||
});
|
||||
$('#studentIssueTable').DataTable({
|
||||
paging: true,
|
||||
searching: true,
|
||||
info: true,
|
||||
order: [[1, 'asc'], [0, 'asc']],
|
||||
pageLength: 25
|
||||
});
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+87
-2
@@ -4,6 +4,11 @@
|
||||
<div class="container mt-4">
|
||||
<h2>Create Event</h2>
|
||||
|
||||
<?php
|
||||
$defaultCategories = ['Fun Event-1', 'Fun Event-2', 'Fun Event-3'];
|
||||
$existingCategories = array_map('strval', $categories ?? []);
|
||||
$allCategories = array_unique(array_merge($defaultCategories, $existingCategories));
|
||||
?>
|
||||
<form method="post" action="<?= site_url('administrator/events/create') ?>" enctype="multipart/form-data">
|
||||
<?= csrf_field() ?>
|
||||
<div class="mb-3">
|
||||
@@ -15,7 +20,7 @@
|
||||
<label class="form-label">Category</label>
|
||||
<select name="event_category" class="form-control" required>
|
||||
<option value="" selected disabled>Select category</option>
|
||||
<?php foreach (($categories ?? []) as $category): ?>
|
||||
<?php foreach ($allCategories as $category): ?>
|
||||
<option value="<?= esc($category) ?>"><?= esc(ucwords($category)) ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
@@ -23,7 +28,7 @@
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Description</label>
|
||||
<textarea name="description" class="form-control"></textarea>
|
||||
<textarea id="event_description" name="description" class="form-control"></textarea>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
@@ -51,9 +56,89 @@
|
||||
<input type="text" name="school_year" class="form-control" required>
|
||||
</div>
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">School Calendar</div>
|
||||
<div class="card-body">
|
||||
<div class="form-check mb-2">
|
||||
<input class="form-check-input" type="checkbox" id="add_to_calendar" name="add_to_calendar" value="1">
|
||||
<label class="form-check-label" for="add_to_calendar">
|
||||
Add this event to the school calendar
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div id="calendar_recipients" class="ms-3" style="display:none;">
|
||||
<div class="mb-2 fw-semibold">Visible On Calendars</div>
|
||||
<div class="d-flex flex-wrap gap-3">
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_parent" value="1" checked>
|
||||
Parents
|
||||
</label>
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_teacher" value="1" checked>
|
||||
Teachers
|
||||
</label>
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_admin" value="1" checked>
|
||||
Admins
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-text">If none are selected, the event is visible to everyone.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">Parent Email Broadcast</div>
|
||||
<div class="card-body">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" id="send_email_parent" name="send_email_parent" value="1">
|
||||
<label class="form-check-label" for="send_email_parent">
|
||||
Send one event email to all parents and add all parent emails in CC
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-text">The email is sent once. The school sender address stays in To, and all parent emails are placed in CC.</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-success">Create Event</button>
|
||||
<a href="<?= site_url('administrator/events') ?>" class="btn btn-secondary">Cancel</a>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
<?= $this->section('scripts') ?>
|
||||
<script src="<?= base_url('assets/tinymce/tinymce.min.js') ?>"></script>
|
||||
<script>
|
||||
(function () {
|
||||
const toggle = document.getElementById('add_to_calendar');
|
||||
const recipients = document.getElementById('calendar_recipients');
|
||||
const description = document.getElementById('event_description');
|
||||
|
||||
if (toggle && recipients) {
|
||||
function sync() {
|
||||
recipients.style.display = toggle.checked ? '' : 'none';
|
||||
}
|
||||
toggle.addEventListener('change', sync);
|
||||
sync();
|
||||
}
|
||||
|
||||
if (description && window.tinymce) {
|
||||
tinymce.init({
|
||||
selector: '#event_description',
|
||||
base_url: '<?= base_url('assets/tinymce') ?>',
|
||||
suffix: '.min',
|
||||
license_key: 'gpl',
|
||||
height: 320,
|
||||
menubar: true,
|
||||
branding: false,
|
||||
promotion: false,
|
||||
plugins: 'advlist autolink lists link charmap preview anchor searchreplace visualblocks code fullscreen insertdatetime table help wordcount',
|
||||
toolbar: 'undo redo | blocks | bold italic underline strikethrough forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link table | removeformat | preview code',
|
||||
convert_urls: false,
|
||||
content_style: 'body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; }'
|
||||
});
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
Regular → Executable
+89
-3
@@ -4,6 +4,12 @@
|
||||
<div class="container mt-4">
|
||||
<h2>Edit Event</h2>
|
||||
|
||||
<?php
|
||||
$defaultCategories = ['Fun Event-1', 'Fun Event-2', 'Fun Event-3'];
|
||||
$existingCategories = array_map('strval', $categories ?? []);
|
||||
$allCategories = array_unique(array_merge($defaultCategories, $existingCategories));
|
||||
?>
|
||||
|
||||
<?php if (session()->getFlashdata('error')): ?>
|
||||
<div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
|
||||
<?php endif; ?>
|
||||
@@ -23,7 +29,7 @@
|
||||
<label class="form-label">Category</label>
|
||||
<select name="event_category" class="form-control" required>
|
||||
<option value="" disabled <?= empty($event['event_category']) ? 'selected' : '' ?>>Select category</option>
|
||||
<?php foreach (($categories ?? []) as $category): ?>
|
||||
<?php foreach ($allCategories as $category): ?>
|
||||
<option value="<?= esc($category) ?>" <?= (string)($event['event_category'] ?? '') === (string)$category ? 'selected' : '' ?>>
|
||||
<?= esc(ucwords($category)) ?>
|
||||
</option>
|
||||
@@ -33,7 +39,7 @@
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Description</label>
|
||||
<textarea name="description" class="form-control"><?= esc($event['description']) ?></textarea>
|
||||
<textarea id="event_description" name="description" class="form-control"><?= esc($event['description']) ?></textarea>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
@@ -44,7 +50,7 @@
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Current Flyer</label><br>
|
||||
<?php if ($event['flyer']): ?>
|
||||
<img src="<?= base_url('writable/uploads/' . $event['flyer']) ?>" width="150" class="mb-2">
|
||||
<img src="<?= base_url('uploads/' . ltrim((string) $event['flyer'], '/')) ?>" width="150" class="mb-2">
|
||||
<?php else: ?>
|
||||
<div class="text-muted">No flyer uploaded.</div>
|
||||
<?php endif; ?>
|
||||
@@ -70,9 +76,89 @@
|
||||
<input type="text" name="school_year" class="form-control" value="<?= esc($event['school_year']) ?>" required>
|
||||
</div>
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">School Calendar</div>
|
||||
<div class="card-body">
|
||||
<div class="form-check mb-2">
|
||||
<input class="form-check-input" type="checkbox" id="add_to_calendar" name="add_to_calendar" value="1">
|
||||
<label class="form-check-label" for="add_to_calendar">
|
||||
Add this event to the school calendar
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div id="calendar_recipients" class="ms-3" style="display:none;">
|
||||
<div class="mb-2 fw-semibold">Visible On Calendars</div>
|
||||
<div class="d-flex flex-wrap gap-3">
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_parent" value="1" checked>
|
||||
Parents
|
||||
</label>
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_teacher" value="1" checked>
|
||||
Teachers
|
||||
</label>
|
||||
<label class="form-check-label">
|
||||
<input class="form-check-input me-1" type="checkbox" name="notify_admin" value="1" checked>
|
||||
Admins
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-text">If none are selected, the event is visible to everyone.</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card mb-3">
|
||||
<div class="card-header">Parent Email Broadcast</div>
|
||||
<div class="card-body">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" id="send_email_parent" name="send_email_parent" value="1">
|
||||
<label class="form-check-label" for="send_email_parent">
|
||||
Send one event email to all parents and add all parent emails in CC
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-text">Use this when you want to rebroadcast the updated event to all parents in a single email.</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary">Update Event</button>
|
||||
<a href="<?= site_url('administrator/events') ?>" class="btn btn-secondary">Cancel</a>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
<?= $this->section('scripts') ?>
|
||||
<script src="<?= base_url('assets/tinymce/tinymce.min.js') ?>"></script>
|
||||
<script>
|
||||
(function () {
|
||||
const toggle = document.getElementById('add_to_calendar');
|
||||
const recipients = document.getElementById('calendar_recipients');
|
||||
const description = document.getElementById('event_description');
|
||||
|
||||
if (toggle && recipients) {
|
||||
function sync() {
|
||||
recipients.style.display = toggle.checked ? '' : 'none';
|
||||
}
|
||||
toggle.addEventListener('change', sync);
|
||||
sync();
|
||||
}
|
||||
|
||||
if (description && window.tinymce) {
|
||||
tinymce.init({
|
||||
selector: '#event_description',
|
||||
base_url: '<?= base_url('assets/tinymce') ?>',
|
||||
suffix: '.min',
|
||||
license_key: 'gpl',
|
||||
height: 320,
|
||||
menubar: true,
|
||||
branding: false,
|
||||
promotion: false,
|
||||
plugins: 'advlist autolink lists link charmap preview anchor searchreplace visualblocks code fullscreen insertdatetime table help wordcount',
|
||||
toolbar: 'undo redo | blocks | bold italic underline strikethrough forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link table | removeformat | preview code',
|
||||
convert_urls: false,
|
||||
content_style: 'body { font-family: system-ui, -apple-system, Segoe UI, Roboto, Helvetica, Arial, sans-serif; font-size: 14px; }'
|
||||
});
|
||||
}
|
||||
})();
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
Regular → Executable
+718
-70
@@ -3,6 +3,54 @@
|
||||
|
||||
<div class="container mt-5">
|
||||
<h3>Event Charges</h3>
|
||||
<style>
|
||||
.event-card-header {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: 1rem;
|
||||
}
|
||||
.event-card-header-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.sortable-header {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.35rem;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: inherit;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
}
|
||||
.sortable-header:hover,
|
||||
.sortable-header:focus {
|
||||
color: var(--bs-primary);
|
||||
text-decoration: none;
|
||||
}
|
||||
.sortable-header::after {
|
||||
content: '↕';
|
||||
font-size: 0.85rem;
|
||||
opacity: 0.45;
|
||||
}
|
||||
.sortable-header.sorted-asc::after {
|
||||
content: '↑';
|
||||
opacity: 1;
|
||||
}
|
||||
.sortable-header.sorted-desc::after {
|
||||
content: '↓';
|
||||
opacity: 1;
|
||||
}
|
||||
@media print {
|
||||
.no-print {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
<?php if (session()->getFlashdata('success')): ?>
|
||||
<div class="alert alert-success"><?= session()->getFlashdata('success') ?></div>
|
||||
@@ -11,106 +59,404 @@
|
||||
<div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<!-- Add New Charge Form -->
|
||||
<form action="<?= site_url('payment/event_charges') ?>" method="post">
|
||||
<?= csrf_field() ?>
|
||||
<div class="row">
|
||||
<div class="col-md-3 mt-3">
|
||||
<label for="event_id" class="form-label">Select Event</label>
|
||||
<select name="event_id" id="event_id" class="form-select" required>
|
||||
<option value="">-- Select Event --</option>
|
||||
<?php foreach ($events as $event): ?>
|
||||
<option value="<?= esc($event['id']) ?>">
|
||||
<?= esc($event['event_name']) ?>
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<?php
|
||||
$classSectionNames = $classSectionNames ?? [];
|
||||
$semesterOptions = $semesterOptions ?? [];
|
||||
$schoolYearOptions = $schoolYearOptions ?? [];
|
||||
?>
|
||||
|
||||
<div class="col-md-3 mt-3">
|
||||
<label for="parent_id" class="form-label">Parent</label>
|
||||
<select id="parent_id" name="parent_id" class="form-select" required>
|
||||
<option value="">-- Select Parent --</option>
|
||||
<?php foreach ($parents as $parent): ?>
|
||||
<option value="<?= $parent['id'] ?>">
|
||||
<?= esc($parent['firstname'] . ' ' . $parent['lastname']) ?> (<?= esc($parent['school_id']) ?>)
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-12 mt-3" id="studentCheckboxContainer" style="display: none;">
|
||||
<label>Select Students:</label>
|
||||
<div id="studentList" class="row"></div>
|
||||
</div>
|
||||
<?php
|
||||
$filterParentId = $filterParentId ?? 0;
|
||||
$parentBalances = $parentBalances ?? [];
|
||||
$selectedEvent = null;
|
||||
if (!empty($filterEventId)) {
|
||||
foreach ($events as $event) {
|
||||
if ((int)$event['id'] === (int)$filterEventId) {
|
||||
$selectedEvent = $event;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<form method="get" action="<?= site_url('administrator/event-charges') ?>" class="row g-3 align-items-end">
|
||||
<?php if ($filterEventId > 0): ?>
|
||||
<input type="hidden" name="event_id" value="<?= esc($filterEventId) ?>">
|
||||
<?php endif; ?>
|
||||
<?php if ($filterParentId > 0): ?>
|
||||
<input type="hidden" name="parent_id" value="<?= esc($filterParentId) ?>">
|
||||
<?php endif; ?>
|
||||
<div class="col-md-4">
|
||||
<label for="semester_filter" class="form-label">Semester</label>
|
||||
<select id="semester_filter" name="semester" class="form-select">
|
||||
<option value="">-- All semesters --</option>
|
||||
<?php foreach ($semesterOptions as $option): ?>
|
||||
<option value="<?= esc($option) ?>" <?= $semester === $option ? 'selected' : '' ?>>
|
||||
<?= esc($option) ?>
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="school_year_filter" class="form-label">School Year</label>
|
||||
<select id="school_year_filter" name="school_year" class="form-select">
|
||||
<option value="">-- All school years --</option>
|
||||
<?php foreach ($schoolYearOptions as $option): ?>
|
||||
<option value="<?= esc($option) ?>" <?= $school_year === $option ? 'selected' : '' ?>>
|
||||
<?= esc($option) ?>
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-auto">
|
||||
<button type="submit" class="btn btn-outline-primary">Filter</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button type="submit" class="btn btn-primary mt-3">Submit</button>
|
||||
<a href="<?= site_url('administrator/events') ?>" class="btn btn-success mt-3">Event List</a>
|
||||
</form>
|
||||
<br>
|
||||
<!-- Add New Charge Form -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<form id="event-participant-form" action="<?= site_url('payment/event_charges') ?>" method="post">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="school_year" value="<?= esc($school_year) ?>">
|
||||
<input type="hidden" name="semester" value="<?= esc($semester) ?>">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-4">
|
||||
<label for="event_id" class="form-label">Select Event</label>
|
||||
<select name="event_id" id="event_id" class="form-select" required>
|
||||
<option value="">-- All events --</option>
|
||||
<?php foreach ($events as $event): ?>
|
||||
<option value="<?= esc($event['id']) ?>" data-amount="<?= esc(number_format($event['amount'] ?? 0, 2, '.', '')) ?>" <?= isset($filterEventId) && $filterEventId == $event['id'] ? 'selected' : '' ?>>
|
||||
<?= esc($event['event_name']) ?>
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<?php if ($selectedEvent): ?>
|
||||
<div class="col-md-8">
|
||||
<div class="border rounded bg-light p-3 h-100">
|
||||
<div class="d-flex justify-content-between align-items-center mb-2">
|
||||
<h6 class="m-0"><?= esc($selectedEvent['event_name']) ?></h6>
|
||||
<span class="badge bg-info text-dark">
|
||||
$<?= esc(number_format($selectedEvent['amount'] ?? 0, 2)) ?> fee
|
||||
</span>
|
||||
</div>
|
||||
<p class="mb-1 text-muted small">
|
||||
<?= esc($selectedEvent['description'] ?: 'No description provided for this event.') ?>
|
||||
</p>
|
||||
<?php if (!empty($selectedEvent['expiration_date'])): ?>
|
||||
<small class="text-secondary">
|
||||
Expires: <?= esc(local_date($selectedEvent['expiration_date'], 'm-d-Y')) ?>
|
||||
</small>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label for="parent_id" class="form-label">Parents List</label>
|
||||
<select id="parent_id" name="parent_id" class="form-select">
|
||||
<option value="">-- Select Parent --</option>
|
||||
<?php foreach ($parents as $parent): ?>
|
||||
<option value="<?= esc($parent['id']) ?>" <?= $filterParentId && $filterParentId == $parent['id'] ? 'selected' : '' ?>>
|
||||
<?= esc($parent['firstname'] . ' ' . $parent['lastname']) ?> (<?= esc($parent['school_id']) ?>)
|
||||
</option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4" id="studentCheckboxContainer" style="display: none;">
|
||||
<label class="form-label">Select Students:</label>
|
||||
<div id="studentList" class="row g-3"></div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4">
|
||||
<?php if (!in_array(strtolower((string)(session()->get('role') ?? '')), ['parent', 'teacher', 'teacher_assistant'], true)): ?>
|
||||
<button type="button" class="btn btn-outline-primary" data-bs-toggle="modal" data-bs-target="#externalParticipantModal">
|
||||
Add non-school participant
|
||||
</button>
|
||||
<?php endif; ?>
|
||||
<div class="form-text">Enrolled students are saved when you click Submit. Non-school participants are saved immediately and will then appear in all browsers.</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex flex-wrap gap-2 mt-3">
|
||||
<button type="submit" class="btn btn-primary">Submit</button>
|
||||
<a href="<?= site_url('administrator/events') ?>" class="btn btn-success">Event List</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Charge Tables grouped by event -->
|
||||
<?php
|
||||
$grouped = [];
|
||||
foreach ($charges as $charge) {
|
||||
$label = $charge['event_name'] ?? 'N/A';
|
||||
$grouped[$label][] = $charge;
|
||||
$eventId = (int)($charge['event_id'] ?? 0);
|
||||
if (!isset($grouped[$eventId])) {
|
||||
$grouped[$eventId] = [
|
||||
'label' => $charge['event_name'] ?? 'N/A',
|
||||
'rows' => [],
|
||||
];
|
||||
}
|
||||
$grouped[$eventId]['rows'][] = $charge;
|
||||
}
|
||||
?>
|
||||
|
||||
<?php if (empty($grouped)): ?>
|
||||
<div class="alert alert-info">No charges found.</div>
|
||||
<?php else: ?>
|
||||
<?php foreach ($grouped as $eventLabel => $rows): ?>
|
||||
<div class="card mb-4">
|
||||
<div class="card-header bg-light fw-semibold">
|
||||
<?= esc($eventLabel) ?>
|
||||
<div class="d-flex justify-content-between align-items-center flex-wrap gap-2 mb-3 no-print">
|
||||
<p class="text-muted mb-0">Click a column header to sort the participants list.</p>
|
||||
<button type="button" class="btn btn-outline-secondary" id="printAllEventCharges">
|
||||
Print All Participant Lists
|
||||
</button>
|
||||
</div>
|
||||
<div id="eventChargeCards">
|
||||
<?php foreach ($grouped as $eventId => $data): ?>
|
||||
<?php $eventLabel = $data['label']; ?>
|
||||
<?php $rows = $data['rows']; ?>
|
||||
<div class="card mb-4 event-card" data-event-id="<?= esc($eventId) ?>">
|
||||
<div class="card-header bg-light fw-semibold event-card-header">
|
||||
<span><?= esc($eventLabel) ?></span>
|
||||
<div class="event-card-header-actions no-print">
|
||||
<button type="button" class="btn btn-outline-secondary btn-sm print-event-card" data-event-id="<?= esc($eventId) ?>">
|
||||
Print This List
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<?php
|
||||
$totalParticipants = 0;
|
||||
$totalCharged = 0.0;
|
||||
?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered table-striped mb-0 no-mgmt-sticky">
|
||||
<table id="eventTable_<?= esc($eventId) ?>" class="table table-bordered table-striped mb-0 no-mgmt-sticky event-charges-table">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Parent Name</th>
|
||||
<th>Student Name</th>
|
||||
<th>Charged Amount</th>
|
||||
<th>Is Participating</th>
|
||||
<th>Semester</th>
|
||||
<th>Year</th>
|
||||
<th>Created</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="0" data-sort-type="number">ID</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="1" data-sort-type="text">Parent Name</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="2" data-sort-type="text">Student Name</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="3" data-sort-type="text">External Info</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="4" data-sort-type="text">Class Section</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="5" data-sort-type="number">Charged Amount</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="6" data-sort-type="date">Created</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="7" data-sort-type="text">Waiver</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="8" data-sort-type="text">Fees Paid</button></th>
|
||||
<th><button type="button" class="sortable-header" data-sort-index="9" data-sort-type="text">Payment</button></th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($rows as $charge): ?>
|
||||
<?php
|
||||
$isParticipating = ($charge['participation'] === 'yes');
|
||||
$isEventPaid = !empty($charge['event_paid']);
|
||||
$returnParams = [];
|
||||
if (!empty($semester)) {
|
||||
$returnParams['semester'] = $semester;
|
||||
}
|
||||
if (!empty($school_year)) {
|
||||
$returnParams['school_year'] = $school_year;
|
||||
}
|
||||
if (!empty($filterEventId)) {
|
||||
$returnParams['event_id'] = $filterEventId;
|
||||
}
|
||||
if (!empty($filterParentId)) {
|
||||
$returnParams['parent_id'] = $filterParentId;
|
||||
}
|
||||
$returnTo = site_url('administrator/event-charges')
|
||||
. (!empty($returnParams) ? '?' . http_build_query($returnParams) : '')
|
||||
. '#eventTable_' . (int) ($charge['event_id'] ?? 0);
|
||||
?>
|
||||
<tr>
|
||||
<td><?= esc($charge['id']) ?></td>
|
||||
<td><?= esc($charge['parent_firstname'] . ' ' . $charge['parent_lastname']) ?></td>
|
||||
<td>
|
||||
<?= $charge['student_firstname']
|
||||
? esc($charge['student_firstname'] . ' ' . $charge['student_lastname'])
|
||||
: '-' ?>
|
||||
<td data-sort-value="<?= esc((string) ($charge['id'] ?? '')) ?>"><?= esc($charge['id']) ?></td>
|
||||
<?php
|
||||
$studentName = $charge['student_firstname']
|
||||
? trim($charge['student_firstname'] . ' ' . $charge['student_lastname'])
|
||||
: '';
|
||||
$externalName = trim(
|
||||
($charge['external_firstname'] ?? '') . ' ' .
|
||||
($charge['external_lastname'] ?? '')
|
||||
);
|
||||
$displayName = $studentName ?: ($externalName ?: '—');
|
||||
$externalNote = $charge['external_note'] ?? '';
|
||||
$externalParentLabel = trim(
|
||||
($charge['external_parent_firstname'] ?? '') . ' ' .
|
||||
($charge['external_parent_lastname'] ?? '')
|
||||
);
|
||||
$externalParentPhone = $charge['external_parent_phone'] ?? '';
|
||||
$externalParentEmail = $charge['external_parent_email'] ?? '';
|
||||
$standardParentName = trim($charge['parent_firstname'] . ' ' . $charge['parent_lastname']);
|
||||
$parentColumnName = $externalParentLabel ?: ($standardParentName ?: '—');
|
||||
$externalInfoValue = trim(implode(' ', array_filter([
|
||||
$externalParentPhone,
|
||||
$externalParentEmail,
|
||||
$externalNote,
|
||||
])));
|
||||
?>
|
||||
<td data-sort-value="<?= esc(strtolower($parentColumnName)) ?>"><?= esc($parentColumnName) ?></td>
|
||||
<td data-sort-value="<?= esc(strtolower($displayName)) ?>">
|
||||
<?= esc($displayName) ?>
|
||||
<?php if ($externalNote): ?>
|
||||
<small class="text-muted d-block"><?= esc($externalNote) ?></small>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>$<?= esc(number_format($charge['charged'] ?? 0, 2)) ?></td>
|
||||
<td>
|
||||
<?= $charge['participation']
|
||||
? '<span class="badge bg-success">Yes</span>'
|
||||
: '<span class="badge bg-warning">No</span>' ?>
|
||||
<td data-sort-value="<?= esc(strtolower($externalInfoValue)) ?>">
|
||||
<?php if ($externalParentPhone): ?>
|
||||
<div class="text-muted small"><?= esc($externalParentPhone) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php if ($externalParentEmail): ?>
|
||||
<div class="text-muted small"><?= esc($externalParentEmail) ?></div>
|
||||
<?php endif; ?>
|
||||
<?php if (!$externalParentPhone && !$externalParentEmail): ?>
|
||||
<span class="text-muted small">—</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td data-sort-value="<?= esc(strtolower((string) ($classSectionNames[$charge['class_section_id'] ?? ''] ?? ''))) ?>">
|
||||
<?= esc($classSectionNames[$charge['class_section_id'] ?? ''] ?? '—') ?>
|
||||
</td>
|
||||
<td data-sort-value="<?= esc(number_format((float) ($charge['event_amount'] ?? 0), 2, '.', '')) ?>">$<?= esc(number_format($charge['event_amount'] ?? 0, 2)) ?></td>
|
||||
<td data-sort-value="<?= esc((string) ($charge['created_at'] ?? '')) ?>"><?= esc(!empty($charge['created_at']) ? local_datetime($charge['created_at'], 'm-d-Y H:i') : '') ?></td>
|
||||
<?php
|
||||
$feeAmount = (float) ($charge['event_amount'] ?? 0);
|
||||
$hasBalanceRecord = array_key_exists((int)$charge['parent_id'], $parentBalances);
|
||||
$parentBalance = $hasBalanceRecord ? (float)$parentBalances[$charge['parent_id']] : null;
|
||||
$waiverSigned = !empty($charge['waiver_signed']);
|
||||
$feeIsPaid = $isParticipating && ($isEventPaid || ($hasBalanceRecord && $parentBalance <= 0));
|
||||
?>
|
||||
<td class="text-center" data-sort-value="<?= $waiverSigned ? 'signed' : 'unsigned' ?>">
|
||||
<form method="post" action="<?= site_url('administrator/event-charges/waiver/' . esc($charge['id'])) ?>" class="d-inline-flex align-items-center">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="return_to" value="<?= esc($returnTo) ?>">
|
||||
<input type="hidden" name="waiver_signed" value="<?= $waiverSigned ? '1' : '0' ?>">
|
||||
<input type="checkbox" class="form-check-input" id="eventWaiver_<?= esc($charge['id']) ?>"
|
||||
<?= $waiverSigned ? 'checked' : '' ?>
|
||||
onchange="this.form.waiver_signed.value = this.checked ? 1 : 0; this.form.submit();">
|
||||
<label class="form-check-label ms-2" for="eventWaiver_<?= esc($charge['id']) ?>" aria-hidden="true">
|
||||
<?= $waiverSigned ? 'Signed' : 'Unsigned' ?>
|
||||
</label>
|
||||
</form>
|
||||
</td>
|
||||
<td class="text-center" data-sort-value="<?= $feeIsPaid ? 'paid' : 'unpaid' ?>">
|
||||
<?php if ($feeIsPaid): ?>
|
||||
<span class="badge bg-success">Paid</span>
|
||||
<?php else: ?>
|
||||
<span class="badge bg-danger">Unpaid</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="text-center" data-sort-value="<?= $isEventPaid ? 'paid' : 'unpaid' ?>">
|
||||
<form method="post" action="<?= site_url('administrator/event-charges/payment/' . esc($charge['id'])) ?>" class="d-inline-flex align-items-center">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="return_to" value="<?= esc($returnTo) ?>">
|
||||
<input type="hidden" name="paid" value="<?= $feeIsPaid ? '1' : '0' ?>">
|
||||
<input type="checkbox" class="form-check-input" id="eventPayment_<?= esc($charge['id']) ?>"
|
||||
<?= $isEventPaid ? 'checked' : '' ?>
|
||||
onchange="this.form.paid.value = this.checked ? 1 : 0; this.form.submit();">
|
||||
<label class="form-check-label ms-2" for="eventPayment_<?= esc($charge['id']) ?>" aria-hidden="true">Paid</label>
|
||||
</form>
|
||||
</td>
|
||||
<td class="text-nowrap">
|
||||
<div class="d-flex gap-1 align-items-center">
|
||||
<a href="<?= site_url('administrator/event-charges') ?>?event_id=<?= esc($charge['event_id']) ?>&parent_id=<?= esc($charge['parent_id']) ?>#event-participant-form" class="btn btn-outline-primary btn-sm">
|
||||
Edit
|
||||
</a>
|
||||
<form action="<?= site_url('administrator/event-charges/remove/' . esc($charge['id'])) ?>" method="post" onsubmit="return confirm('Remove this participation and update the charge?');">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="return_to" value="<?= esc($returnTo) ?>">
|
||||
<button type="submit" class="btn btn-outline-danger btn-sm">Remove</button>
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
<td><?= esc($charge['semester'] ?? '-') ?></td>
|
||||
<td><?= esc($charge['school_year'] ?? '-') ?></td>
|
||||
<td><?= esc(!empty($charge['created_at']) ? local_datetime($charge['created_at'], 'm-d-Y H:i') : '') ?></td>
|
||||
</tr>
|
||||
<?php
|
||||
if ($isParticipating) {
|
||||
$totalParticipants++;
|
||||
$totalCharged += (float) ($charge['event_amount'] ?? 0);
|
||||
}
|
||||
?>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
<tfoot class="table-light">
|
||||
<tr>
|
||||
<th colspan="4">Totals</th>
|
||||
<th>$<?= esc(number_format($totalCharged, 2)) ?></th>
|
||||
<th colspan="6">
|
||||
<span class="badge bg-secondary">
|
||||
<?= esc($totalParticipants) ?> participating
|
||||
</span>
|
||||
</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
<?php if (!in_array(strtolower((string)(session()->get('role') ?? '')), ['parent', 'teacher', 'teacher_assistant'], true)): ?>
|
||||
<div class="modal fade" id="externalParticipantModal" tabindex="-1" aria-labelledby="externalParticipantModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<form id="externalParticipantForm" class="needs-validation" novalidate>
|
||||
<?= csrf_field() ?>
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="externalParticipantModalLabel">Add Non-School Participant</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p class="small text-muted">Provide the student’s name and the accompanying guardian/contact details.</p>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Student / Kid Info</label>
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" id="modalExternalFirstName" placeholder="First name" required>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" id="modalExternalLastName" placeholder="Last name" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Parent / Contact Info</label>
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" id="modalParentFirstName" placeholder="Parent first name" required>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<input type="text" class="form-control" id="modalParentLastName" placeholder="Parent last name" required>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<input type="text" class="form-control" id="modalParentPhone" placeholder="Parent phone or contact">
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<input type="email" class="form-control" id="modalParentEmail" placeholder="Parent email" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label" for="modalExternalNote">Note <span class="text-muted small">(optional)</span></label>
|
||||
<textarea rows="2" class="form-control" id="modalExternalNote" placeholder="Additional info (e.g., guest, sibling, etc.)"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
|
||||
<button type="button" class="btn btn-primary" id="externalParticipantSave">
|
||||
Add to list
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
<?= $this->section('scripts') ?>
|
||||
@@ -156,7 +502,309 @@ function loadStudentsWithCharges() {
|
||||
}
|
||||
}
|
||||
|
||||
$('#parent_id').on('change', loadStudentsWithCharges);
|
||||
$('#event_id').on('change', loadStudentsWithCharges);
|
||||
const capitalizeName = (value) => {
|
||||
if (!value) return '';
|
||||
return value
|
||||
.split(' ')
|
||||
.map(part => {
|
||||
const trimmed = part.trim();
|
||||
if (!trimmed) return '';
|
||||
return trimmed.charAt(0).toUpperCase() + trimmed.slice(1).toLowerCase();
|
||||
})
|
||||
.filter(Boolean)
|
||||
.join(' ');
|
||||
};
|
||||
|
||||
$(function() {
|
||||
$('#parent_id').on('change', loadStudentsWithCharges);
|
||||
|
||||
$('#event_id').on('change', function() {
|
||||
let eventId = $(this).val();
|
||||
let url = new URL(window.location.href);
|
||||
if (eventId) {
|
||||
url.searchParams.set('event_id', eventId);
|
||||
} else {
|
||||
url.searchParams.delete('event_id');
|
||||
}
|
||||
window.location.href = url.toString();
|
||||
});
|
||||
|
||||
if ($('#event_id').val() && $('#parent_id').val()) {
|
||||
loadStudentsWithCharges();
|
||||
}
|
||||
|
||||
const $externalSaveButton = $('#externalParticipantSave');
|
||||
|
||||
const modalElement = document.getElementById('externalParticipantModal');
|
||||
const modalInstance = modalElement ? new bootstrap.Modal(modalElement) : null;
|
||||
|
||||
function clearModalInputs() {
|
||||
$('#modalExternalFirstName').val('');
|
||||
$('#modalExternalLastName').val('');
|
||||
$('#modalExternalNote').val('');
|
||||
$('#modalParentFirstName').val('');
|
||||
$('#modalParentLastName').val('');
|
||||
$('#modalParentPhone').val('');
|
||||
$('#modalParentEmail').val('');
|
||||
}
|
||||
|
||||
function appendHiddenField(form, name, value) {
|
||||
const input = document.createElement('input');
|
||||
input.type = 'hidden';
|
||||
input.name = name;
|
||||
input.value = value;
|
||||
form.appendChild(input);
|
||||
}
|
||||
|
||||
function escapeHtml(value) {
|
||||
const s = String(value ?? '');
|
||||
return s.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
|
||||
function submitExternalParticipant(payload) {
|
||||
const form = document.createElement('form');
|
||||
form.method = 'post';
|
||||
form.action = '<?= site_url('payment/event_charges') ?>';
|
||||
|
||||
appendHiddenField(form, '<?= csrf_token() ?>', '<?= csrf_hash() ?>');
|
||||
appendHiddenField(form, 'school_year', '<?= esc($school_year) ?>');
|
||||
appendHiddenField(form, 'semester', '<?= esc($semester) ?>');
|
||||
appendHiddenField(form, 'event_id', payload.eventId);
|
||||
appendHiddenField(form, 'external_participants[new][firstname]', payload.firstname);
|
||||
appendHiddenField(form, 'external_participants[new][lastname]', payload.lastname);
|
||||
appendHiddenField(form, 'external_participants[new][note]', payload.note);
|
||||
appendHiddenField(form, 'external_participants[new][parent_firstname]', payload.parentFirstname);
|
||||
appendHiddenField(form, 'external_participants[new][parent_lastname]', payload.parentLastname);
|
||||
appendHiddenField(form, 'external_participants[new][parent_phone]', payload.parentPhone);
|
||||
appendHiddenField(form, 'external_participants[new][parent_email]', payload.parentEmail);
|
||||
appendHiddenField(form, 'external_participants[new][waiver_signed]', '0');
|
||||
appendHiddenField(form, 'external_participants[new][paid]', '0');
|
||||
|
||||
document.body.appendChild(form);
|
||||
form.submit();
|
||||
}
|
||||
|
||||
function getSortValue(row, columnIndex, sortType) {
|
||||
const cell = row.children[columnIndex];
|
||||
if (!cell) {
|
||||
return sortType === 'number' ? 0 : '';
|
||||
}
|
||||
const rawValue = cell.getAttribute('data-sort-value');
|
||||
const fallbackValue = (cell.textContent || '').trim();
|
||||
const value = rawValue !== null ? rawValue : fallbackValue;
|
||||
if (sortType === 'number') {
|
||||
const parsed = parseFloat(String(value).replace(/[^0-9.-]/g, ''));
|
||||
return Number.isNaN(parsed) ? 0 : parsed;
|
||||
}
|
||||
if (sortType === 'date') {
|
||||
const time = Date.parse(value);
|
||||
return Number.isNaN(time) ? 0 : time;
|
||||
}
|
||||
return String(value).toLowerCase();
|
||||
}
|
||||
|
||||
function updateSortIndicators(table, columnIndex, direction) {
|
||||
$(table).find('.sortable-header').each(function() {
|
||||
const isCurrent = Number($(this).data('sortIndex')) === Number(columnIndex);
|
||||
$(this)
|
||||
.toggleClass('sorted-asc', isCurrent && direction === 'asc')
|
||||
.toggleClass('sorted-desc', isCurrent && direction === 'desc')
|
||||
.attr('aria-sort', isCurrent ? direction : 'none');
|
||||
});
|
||||
}
|
||||
|
||||
function sortEventTable(table, columnIndex, sortType, direction) {
|
||||
if (!table || !table.tBodies.length) {
|
||||
return;
|
||||
}
|
||||
const tbody = table.tBodies[0];
|
||||
const rows = Array.from(tbody.rows);
|
||||
rows.sort((a, b) => {
|
||||
const first = getSortValue(a, columnIndex, sortType);
|
||||
const second = getSortValue(b, columnIndex, sortType);
|
||||
if (first < second) {
|
||||
return direction === 'asc' ? -1 : 1;
|
||||
}
|
||||
if (first > second) {
|
||||
return direction === 'asc' ? 1 : -1;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
rows.forEach((row) => tbody.appendChild(row));
|
||||
table.dataset.sortColumn = String(columnIndex);
|
||||
table.dataset.sortType = sortType;
|
||||
table.dataset.sortDirection = direction;
|
||||
updateSortIndicators(table, columnIndex, direction);
|
||||
}
|
||||
|
||||
function applyActiveSort(table) {
|
||||
if (!table || !table.dataset || !table.dataset.sortColumn) {
|
||||
return;
|
||||
}
|
||||
sortEventTable(
|
||||
table,
|
||||
Number(table.dataset.sortColumn),
|
||||
table.dataset.sortType || 'text',
|
||||
table.dataset.sortDirection || 'asc'
|
||||
);
|
||||
}
|
||||
|
||||
function buildPrintableCard(card) {
|
||||
const clone = card.cloneNode(true);
|
||||
clone.querySelectorAll('.no-print').forEach((node) => node.remove());
|
||||
clone.querySelectorAll('.sortable-header').forEach((button) => {
|
||||
const headerText = button.textContent || '';
|
||||
const textNode = document.createTextNode(headerText);
|
||||
button.parentNode.replaceChild(textNode, button);
|
||||
});
|
||||
clone.querySelectorAll('form').forEach((form) => {
|
||||
const cell = form.closest('td');
|
||||
if (!cell) {
|
||||
form.remove();
|
||||
return;
|
||||
}
|
||||
const label = form.querySelector('.form-check-label');
|
||||
const checkbox = form.querySelector('input[type="checkbox"]');
|
||||
const text = label
|
||||
? label.textContent.trim()
|
||||
: (checkbox && checkbox.checked ? 'Paid' : 'Unpaid');
|
||||
cell.textContent = text || '—';
|
||||
});
|
||||
clone.querySelectorAll('tr').forEach((row) => {
|
||||
if (row.children.length > 10) {
|
||||
row.removeChild(row.lastElementChild);
|
||||
}
|
||||
});
|
||||
return clone.outerHTML;
|
||||
}
|
||||
|
||||
function openPrintWindow(title, contentHtml) {
|
||||
const printWindow = window.open('', '_blank', 'noopener,noreferrer,width=1200,height=900');
|
||||
if (!printWindow) {
|
||||
alert('Unable to open the print preview window. Please allow pop-ups for this site.');
|
||||
return;
|
||||
}
|
||||
const style = `
|
||||
<style>
|
||||
body { font-family: Arial, sans-serif; margin: 24px; color: #212529; }
|
||||
h1 { font-size: 1.5rem; margin-bottom: 0.25rem; }
|
||||
p { margin-top: 0; color: #6c757d; }
|
||||
.card { border: 1px solid #dee2e6; border-radius: 0.5rem; margin-bottom: 1.5rem; overflow: hidden; }
|
||||
.card-header { background: #f8f9fa; padding: 0.9rem 1rem; font-weight: 700; }
|
||||
.table { width: 100%; border-collapse: collapse; }
|
||||
.table th, .table td { border: 1px solid #dee2e6; padding: 0.55rem 0.7rem; text-align: left; vertical-align: top; }
|
||||
.table thead th, .table tfoot th { background: #f8f9fa; }
|
||||
.badge { display: inline-block; padding: 0.2rem 0.45rem; border-radius: 999px; font-size: 0.8rem; font-weight: 700; }
|
||||
.bg-success { background: #198754; color: #fff; }
|
||||
.bg-danger { background: #dc3545; color: #fff; }
|
||||
.bg-secondary { background: #6c757d; color: #fff; }
|
||||
.text-muted { color: #6c757d; }
|
||||
.small { font-size: 0.875rem; }
|
||||
@media print {
|
||||
body { margin: 0; }
|
||||
}
|
||||
</style>
|
||||
`;
|
||||
printWindow.document.open();
|
||||
printWindow.document.write(`
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>${escapeHtml(title)}</title>
|
||||
${style}
|
||||
</head>
|
||||
<body>
|
||||
<h1>${escapeHtml(title)}</h1>
|
||||
<p>Generated on ${escapeHtml(new Date().toLocaleString())}</p>
|
||||
${contentHtml}
|
||||
<script>
|
||||
window.onload = function() {
|
||||
window.print();
|
||||
};
|
||||
<\/script>
|
||||
</body>
|
||||
</html>
|
||||
`);
|
||||
printWindow.document.close();
|
||||
}
|
||||
|
||||
function printEventCards(cards, title) {
|
||||
const printable = cards.map((card) => buildPrintableCard(card)).join('');
|
||||
openPrintWindow(title, printable);
|
||||
}
|
||||
|
||||
$('.sortable-header').on('click', function() {
|
||||
const $button = $(this);
|
||||
const table = $button.closest('table').get(0);
|
||||
const columnIndex = Number($button.data('sortIndex'));
|
||||
const sortType = String($button.data('sortType') || 'text');
|
||||
const currentColumn = Number(table.dataset.sortColumn);
|
||||
const currentDirection = table.dataset.sortDirection || 'asc';
|
||||
const direction = currentColumn === columnIndex && currentDirection === 'asc' ? 'desc' : 'asc';
|
||||
sortEventTable(table, columnIndex, sortType, direction);
|
||||
});
|
||||
|
||||
$('.print-event-card').on('click', function() {
|
||||
const eventId = String($(this).data('eventId'));
|
||||
const card = document.querySelector(`.event-card[data-event-id="${eventId}"]`);
|
||||
if (!card) {
|
||||
return;
|
||||
}
|
||||
const title = $(card).find('.card-header span').first().text().trim() || 'Event Participants';
|
||||
printEventCards([card], `${title} Participant List`);
|
||||
});
|
||||
|
||||
$('#printAllEventCharges').on('click', function() {
|
||||
const cards = Array.from(document.querySelectorAll('.event-card'));
|
||||
if (!cards.length) {
|
||||
return;
|
||||
}
|
||||
printEventCards(cards, 'All Event Participant Lists');
|
||||
});
|
||||
|
||||
$('#externalParticipantSave').on('click', function() {
|
||||
const firstName = capitalizeName($('#modalExternalFirstName').val().trim());
|
||||
const lastName = capitalizeName($('#modalExternalLastName').val().trim());
|
||||
const note = $('#modalExternalNote').val().trim();
|
||||
if (!firstName && !lastName) {
|
||||
alert('Please provide at least a first or last name for the non-school participant.');
|
||||
return;
|
||||
}
|
||||
const parentFirst = capitalizeName($('#modalParentFirstName').val().trim());
|
||||
const parentLast = capitalizeName($('#modalParentLastName').val().trim());
|
||||
const parentPhone = $('#modalParentPhone').val().trim();
|
||||
const parentEmail = $('#modalParentEmail').val().trim();
|
||||
const eventId = $('#event_id').val();
|
||||
if (!eventId) {
|
||||
alert('Select an event before adding a non-school participant.');
|
||||
return;
|
||||
}
|
||||
const explicitParentName = `${parentFirst} ${parentLast}`.trim();
|
||||
if (!explicitParentName) {
|
||||
alert('Please enter the external kid parent name.');
|
||||
return;
|
||||
}
|
||||
if (!parentEmail) {
|
||||
alert('Please enter the external kid parent email.');
|
||||
return;
|
||||
}
|
||||
submitExternalParticipant({
|
||||
firstname: firstName,
|
||||
lastname: lastName,
|
||||
note: note,
|
||||
parentFirstname: parentFirst,
|
||||
parentLastname: parentLast,
|
||||
parentPhone: parentPhone,
|
||||
parentEmail: parentEmail,
|
||||
eventId: eventId
|
||||
});
|
||||
clearModalInputs();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
Regular → Executable
+12
-2
@@ -12,6 +12,14 @@
|
||||
<div class="alert alert-danger"><?= session()->getFlashdata('error') ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (session()->getFlashdata('email_status')): ?>
|
||||
<div class="alert alert-info"><?= session()->getFlashdata('email_status') ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (session()->getFlashdata('email_error')): ?>
|
||||
<div class="alert alert-warning"><?= session()->getFlashdata('email_error') ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if (empty($events)): ?>
|
||||
<div class="alert alert-info mb-3 d-inline-block">No events found.</div>
|
||||
<?php else: ?>
|
||||
@@ -21,7 +29,8 @@
|
||||
<tr>
|
||||
<th>Event Name</th>
|
||||
<th>Category</th>
|
||||
<th>Amount</th>
|
||||
<th>Description</th>
|
||||
<th>Event Fees</th>
|
||||
<th>Expiration Date</th>
|
||||
<th>Semester</th>
|
||||
<th>School Year</th>
|
||||
@@ -33,7 +42,8 @@
|
||||
<tr>
|
||||
<td><?= esc($event['event_name']) ?></td>
|
||||
<td><?= esc($event['event_category'] ?? '—') ?></td>
|
||||
<td><?= esc($event['amount']) ?></td>
|
||||
<td><?= esc(!empty($event['description']) ? $event['description'] : '—') ?></td>
|
||||
<td>$<?= esc(number_format($event['amount'], 2)) ?></td>
|
||||
<td><?= esc(!empty($event['expiration_date']) ? local_date($event['expiration_date'], 'm-d-Y') : '') ?></td>
|
||||
<td><?= esc($event['semester']) ?></td>
|
||||
<td><?= esc($event['school_year']) ?></td>
|
||||
|
||||
Regular → Executable
+457
-155
@@ -1,11 +1,36 @@
|
||||
<?= $this->extend('layout/management_layout') ?>
|
||||
<?= $this->section('content') ?>
|
||||
<?php
|
||||
$statusBadges = $statusBadges ?? [];
|
||||
$drafts = $drafts ?? [];
|
||||
$legacyByClass = $legacyByClass ?? [];
|
||||
$classSections = $classSections ?? [];
|
||||
$examTypes = $examTypes ?? [];
|
||||
$visibleClasses = $visibleClasses ?? [];
|
||||
$classDraftGroups = $classDraftGroups ?? [];
|
||||
$newSubmissionClasses = $newSubmissionClasses ?? [];
|
||||
$schoolYear = $schoolYear ?? '';
|
||||
$semester = $semester ?? '';
|
||||
$maxUploadBytes = $maxUploadBytes ?? (12 * 1024 * 1024);
|
||||
$allowedExtensions = $allowedExtensions ?? ['doc', 'docx', 'pdf'];
|
||||
$reviewActionUrl = $reviewActionUrl ?? base_url('administrator/exam-drafts/review');
|
||||
$legacyUploadUrl = $legacyUploadUrl ?? base_url('administrator/exam-drafts/upload-legacy');
|
||||
$reviewPortalLabel = $reviewPortalLabel ?? 'Administrator';
|
||||
|
||||
$renderBadge = static function (string $status, array $badges): string {
|
||||
$b = $badges[$status] ?? ['label' => $status, 'class' => 'bg-secondary text-white'];
|
||||
$style = !empty($b['style']) ? ' style="' . esc($b['style']) . '"' : '';
|
||||
return '<span class="badge ' . esc($b['class']) . '"' . $style . '>' . esc($b['label']) . '</span>';
|
||||
};
|
||||
|
||||
$fileAccept = implode(',', array_map(static fn ($x) => '.' . $x, $allowedExtensions));
|
||||
?>
|
||||
<div class="container-fluid px-4 py-4">
|
||||
<div class="d-flex flex-column flex-lg-row justify-content-between align-items-lg-center gap-3 mb-4">
|
||||
<div>
|
||||
<h1 class="h3 mb-1">Exam Draft Submissions</h1>
|
||||
<h1 class="h3 mb-1">Exam draft submissions</h1>
|
||||
<p class="text-muted mb-0 small">
|
||||
<?= esc($semester ?: 'Semester') ?> <?= esc($schoolYear ?: '') ?>
|
||||
<?= esc($reviewPortalLabel) ?> review portal · <?= esc($semester ?: 'Semester') ?> <?= esc($schoolYear ?: '') ?>
|
||||
</p>
|
||||
</div>
|
||||
<div class="text-muted small d-flex flex-column align-items-lg-end">
|
||||
@@ -15,13 +40,9 @@
|
||||
</div>
|
||||
|
||||
<?php if (session()->getFlashdata('success')): ?>
|
||||
<div class="alert alert-success">
|
||||
<?= esc(session()->getFlashdata('success')) ?>
|
||||
</div>
|
||||
<div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
|
||||
<?php elseif (session()->getFlashdata('error')): ?>
|
||||
<div class="alert alert-danger">
|
||||
<?= esc(session()->getFlashdata('error')) ?>
|
||||
</div>
|
||||
<div class="alert alert-danger"><?= esc(session()->getFlashdata('error')) ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<ul class="nav nav-pills mb-3" id="examDraftTabs" role="tablist">
|
||||
@@ -32,177 +53,253 @@
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="legacy-tab" data-bs-toggle="pill" data-bs-target="#legacy" type="button" role="tab" aria-controls="legacy" aria-selected="false">
|
||||
Legacy Exams
|
||||
Legacy exams
|
||||
</button>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="tab-content" id="examDraftTabsContent">
|
||||
<div class="tab-pane fade show active" id="submissions" role="tabpanel" aria-labelledby="submissions-tab">
|
||||
<div class="card mb-4">
|
||||
<div class="card-body">
|
||||
<?php if (empty($drafts)): ?>
|
||||
<p class="text-muted mb-0">No exam drafts have been submitted yet.</p>
|
||||
<?php if (empty($visibleClasses)): ?>
|
||||
<p class="text-muted mb-0">No classes with enrolled students are available for this term.</p>
|
||||
<?php else: ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Teacher</th>
|
||||
<th>Class</th>
|
||||
<th>Title / Type</th>
|
||||
<th>Version</th>
|
||||
<th>Submitted</th>
|
||||
<th>Status</th>
|
||||
<th>Files</th>
|
||||
<th>PDF</th>
|
||||
<th>Review</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($drafts as $draft): ?>
|
||||
<?php
|
||||
$teacherName = trim(($draft['teacher_first'] ?? '') . ' ' . ($draft['teacher_last'] ?? ''));
|
||||
if ($teacherName === '') {
|
||||
$teacherName = ($draft['admin_id'] ?? null) === ($draft['teacher_id'] ?? null)
|
||||
? 'Admin Upload'
|
||||
: 'User #' . ($draft['teacher_id'] ?? 'N/A');
|
||||
}
|
||||
$statusInfo = $statusBadges[$draft['status'] ?? 'pending'] ?? ['label' => 'Unknown', 'class' => 'bg-secondary text-white'];
|
||||
$adminName = trim(($draft['admin_first'] ?? '') . ' ' . ($draft['admin_last'] ?? ''));
|
||||
?>
|
||||
<tr>
|
||||
<td><?= esc($teacherName) ?></td>
|
||||
<td><?= esc($draft['class_section_name'] ?? 'Unknown') ?></td>
|
||||
<td>
|
||||
<strong><?= esc($draft['draft_title'] ?? 'Untitled') ?></strong>
|
||||
<div class="small text-muted"><?= esc($draft['exam_type'] ?? 'N/A') ?></div>
|
||||
<?php if (!empty($draft['description'])): ?>
|
||||
<div class="small text-muted"><?= esc($draft['description']) ?></div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="text-nowrap">v<?= esc($draft['version'] ?? 1) ?></td>
|
||||
<td class="text-nowrap"><?= esc((!empty($draft['created_at']) ? local_datetime($draft['created_at'], 'M j, Y g:i A') : '—')) ?></td>
|
||||
<td>
|
||||
<span class="badge <?= esc($statusInfo['class']) ?>">
|
||||
<?= esc($statusInfo['label']) ?>
|
||||
</span>
|
||||
<?php if (!empty($draft['reviewed_at'])): ?>
|
||||
<div class="small text-muted mt-1">
|
||||
Reviewed <?= esc(local_datetime($draft['reviewed_at'], 'M j, Y g:i A')) ?>
|
||||
<?php if ($adminName !== ''): ?>
|
||||
by <?= esc($adminName) ?>
|
||||
<div class="accordion exam-drafts-accordion" id="examDraftsAccordion">
|
||||
<?php foreach ($visibleClasses as $classSectionId => $classInfo): ?>
|
||||
<?php $classDraftsForSection = $classDraftGroups[$classSectionId] ?? []; ?>
|
||||
<?php $collapseId = 'classDraftGroup_' . $classSectionId; ?>
|
||||
<div class="accordion-item mb-3">
|
||||
<h2 class="accordion-header" id="heading_<?= esc($collapseId) ?>">
|
||||
<button class="accordion-button collapsed px-3" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
|
||||
<div class="d-flex flex-column flex-lg-row w-100 justify-content-between gap-2">
|
||||
<div>
|
||||
<strong><?= esc($classInfo['class_section_name'] ?? ('Class ' . $classSectionId)) ?></strong>
|
||||
<div class="small text-muted">
|
||||
<?= esc($classInfo['student_count'] ?? 0) ?> students · <?= esc(count($classDraftsForSection)) ?> submissions
|
||||
<?php if (!empty($newSubmissionClasses[$classSectionId])): ?>
|
||||
<span class="badge bg-info text-dark ms-2">New submission</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if (!empty($draft['teacher_file'])): ?>
|
||||
<div>
|
||||
<a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank">
|
||||
<?= esc($draft['teacher_filename'] ?? 'Submitted draft') ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">No teacher file</span>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($draft['final_file'])): ?>
|
||||
<div class="mt-2">
|
||||
<a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" class="link-success small">
|
||||
<?= esc($draft['final_filename'] ?? 'Final draft') ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="text-nowrap">
|
||||
<?php
|
||||
$pdfFile = $draft['final_pdf_file'] ?? null;
|
||||
// Fallback: if final_file itself is a pdf, use it
|
||||
if (empty($pdfFile) && !empty($draft['final_file']) && strtolower(pathinfo($draft['final_file'], PATHINFO_EXTENSION)) === 'pdf') {
|
||||
$pdfFile = $draft['final_file'];
|
||||
}
|
||||
?>
|
||||
<?php if (!empty($pdfFile)): ?>
|
||||
<a href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" class="link-success small">
|
||||
PDF
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">—</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<form method="post" action="<?= base_url('/administrator/exam-drafts/review') ?>" enctype="multipart/form-data">
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="draft_id" value="<?= esc($draft['id']) ?>">
|
||||
<div class="mb-2">
|
||||
<textarea
|
||||
name="admin_comments"
|
||||
rows="2"
|
||||
class="form-control form-control-sm"
|
||||
placeholder="Optional note for the teacher"
|
||||
><?= esc($draft['admin_comments'] ?? '') ?></textarea>
|
||||
</div>
|
||||
<div class="mb-2">
|
||||
<label class="form-label small mb-1">Status</label>
|
||||
<select name="review_status" class="form-select form-select-sm">
|
||||
<?php foreach ($statusOptions as $option): ?>
|
||||
<option value="<?= esc($option) ?>" <?= ($option === ($draft['status'] ?? '')) ? 'selected' : '' ?>>
|
||||
<?= esc(ucfirst($option)) ?>
|
||||
</option>
|
||||
</div>
|
||||
<span class="badge bg-secondary align-self-start">
|
||||
<?= esc(count($classDraftsForSection)) ?>
|
||||
<?= count($classDraftsForSection) === 1 ? 'submission' : 'submissions' ?>
|
||||
</span>
|
||||
</div>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="heading_<?= esc($collapseId) ?>">
|
||||
<div class="accordion-body pt-0 px-3">
|
||||
<?php if (empty($classDraftsForSection)): ?>
|
||||
<p class="text-muted mb-0">No submissions yet for this class.</p>
|
||||
<?php else: ?>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered align-middle mb-0 exam-drafts-table no-mgmt-sticky">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Teacher</th>
|
||||
<th>Class</th>
|
||||
<th>Title & AuthorNote</th>
|
||||
<th>Version</th>
|
||||
<th>Date-Time</th>
|
||||
<th>Status</th>
|
||||
<th>Files</th>
|
||||
<th>Reviewer Action</th>
|
||||
<th>Final version</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($classDraftsForSection as $draft): ?>
|
||||
<?php
|
||||
$teacherName = trim(($draft['teacher_first'] ?? '') . ' ' . ($draft['teacher_last'] ?? ''));
|
||||
if ($teacherName === '') {
|
||||
$teacherName = ($draft['admin_id'] ?? null) === ($draft['teacher_id'] ?? null)
|
||||
? 'Admin upload'
|
||||
: 'User #' . ($draft['teacher_id'] ?? 'N/A');
|
||||
}
|
||||
$st = strtolower((string) ($draft['status'] ?? ''));
|
||||
$adminName = trim(($draft['admin_first'] ?? '') . ' ' . ($draft['admin_last'] ?? ''));
|
||||
$authorNote = $draft['author_comment'] ?? $draft['description'] ?? '';
|
||||
$reviewerNote = $draft['reviewer_comment'] ?? $draft['admin_comments'] ?? '';
|
||||
?>
|
||||
<tr>
|
||||
<td><?= esc($teacherName) ?></td>
|
||||
<td><?= esc($draft['class_section_name'] ?? 'Unknown') ?></td>
|
||||
<td>
|
||||
<strong><?= esc($draft['draft_title'] ?? 'Untitled') ?></strong>
|
||||
<div class="small text-muted"><?= esc($draft['exam_type'] ?? 'N/A') ?></div>
|
||||
<?php if ($authorNote !== ''): ?>
|
||||
<div class="small mt-1">
|
||||
<span class="text-muted fw-semibold">Author:</span>
|
||||
<?= esc($authorNote) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if ($reviewerNote !== ''): ?>
|
||||
<div class="small mt-1 border-top pt-1">
|
||||
<span class="text-muted fw-semibold">Reviewer:</span>
|
||||
<?= esc($reviewerNote) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td class="text-nowrap">v<?= esc((string) ($draft['version'] ?? 1)) ?></td>
|
||||
<td class="text-nowrap"><?= esc(!empty($draft['created_at']) ? local_datetime($draft['created_at'], 'M j, Y g:i A') : '—') ?></td>
|
||||
<td>
|
||||
<?php
|
||||
$badgeData = $statusBadges[$st] ?? ['label' => $st, 'class' => 'bg-secondary text-white'];
|
||||
$badgeStyle = !empty($badgeData['style']) ? ' style="' . esc($badgeData['style']) . '"' : '';
|
||||
?>
|
||||
<span class="badge <?= esc($badgeData['class']) ?> js-status-badge" data-status="<?= esc($st) ?>"<?= $badgeStyle ?>>
|
||||
<?= esc($badgeData['label']) ?>
|
||||
</span>
|
||||
<div class="small text-muted mt-1 js-acceptance-note">
|
||||
<?php if ($st === 'accepted' && !empty($draft['acceptance_type'])): ?>
|
||||
<?= $draft['acceptance_type'] === 'minor_edits' ? 'Accepted w/ minor edits' : 'Accepted as is' ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php if (!empty($draft['reviewed_at'])): ?>
|
||||
<div class="small text-muted mt-1">
|
||||
Reviewed <?= esc(local_datetime($draft['reviewed_at'], 'M j, Y g:i A')) ?>
|
||||
<?php if ($adminName !== ''): ?>
|
||||
by <?= esc($adminName) ?>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php $formId = 'review_form_' . (int) ($draft['id'] ?? 0); ?>
|
||||
<?php $revNumber = max(1, (int) ($draft['version'] ?? 1)); ?>
|
||||
<?php if (!empty($draft['teacher_file'])): ?>
|
||||
<div>
|
||||
<a href="<?= base_url('exam-drafts/files/teacher/' . $draft['teacher_file']) ?>" target="_blank" rel="noopener">
|
||||
<?= esc('Ver' . $revNumber . ' ' . ($draft['teacher_filename'] ?? 'Submitted draft')) ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">No teacher file</span>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($draft['final_file']) && strtolower((string) ($draft['status'] ?? '')) === 'accepted'): ?>
|
||||
<div class="mt-2">
|
||||
<a href="<?= base_url('exam-drafts/files/final/' . $draft['final_file']) ?>" target="_blank" rel="noopener" class="link-success small">
|
||||
<?= esc('Final ' . ($draft['final_filename'] ?? 'Final draft')) ?>
|
||||
</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($draft['review_files'])): ?>
|
||||
<div class="mt-2">
|
||||
<?php
|
||||
$reviewLinks = [];
|
||||
foreach ($draft['review_files'] as $rf) {
|
||||
$rev = max(1, (int) ($rf['review_revision'] ?? 1));
|
||||
$name = $rf['final_filename'] ?? 'Review file';
|
||||
$file = $rf['final_file'] ?? '';
|
||||
if ($file !== '') {
|
||||
$reviewLinks[] = '<a href="' . esc(base_url('exam-drafts/files/final/' . $file)) . '" target="_blank" rel="noopener" class="link-success small">' . esc('Ver' . $revNumber . '_' . $rev . ' ' . $name) . '</a>';
|
||||
}
|
||||
}
|
||||
?>
|
||||
<?= !empty($reviewLinks) ? implode(' | ', $reviewLinks) : '' ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<div class="mt-2">
|
||||
<?php $fileInputId = 'review_file_' . (int) ($draft['id'] ?? 0); ?>
|
||||
<input type="file" name="final_file" id="<?= esc($fileInputId) ?>" class="form-control form-control-sm" accept="<?= esc($fileAccept) ?>" form="<?= esc($formId) ?>">
|
||||
<button type="submit" class="btn btn-sm btn-outline-primary mt-2" form="<?= esc($formId) ?>">Upload review file</button>
|
||||
</div>
|
||||
</td>
|
||||
<td style="min-width: 280px;">
|
||||
<?= form_open_multipart($reviewActionUrl, ['class' => 'vstack gap-2', 'id' => $formId]) ?>
|
||||
<?= csrf_field() ?>
|
||||
<input type="hidden" name="draft_id" value="<?= (int) ($draft['id'] ?? 0) ?>">
|
||||
<?php $selectedStatus = ''; ?>
|
||||
<select name="review_status" class="form-select form-select-sm" required>
|
||||
<option value="" <?= $selectedStatus === '' ? 'selected' : '' ?> disabled>— Select status —</option>
|
||||
<option value="accepted" <?= $selectedStatus === 'accepted' ? 'selected' : '' ?>>Accepted</option>
|
||||
<option value="legacy" <?= $selectedStatus === 'legacy' ? 'selected' : '' ?>>Legacy</option>
|
||||
<option value="canceled" <?= $selectedStatus === 'canceled' ? 'selected' : '' ?>>Canceled</option>
|
||||
<option value="rejected" <?= $selectedStatus === 'rejected' ? 'selected' : '' ?>>Rejected</option>
|
||||
<option value="review needed" <?= $selectedStatus === 'review needed' ? 'selected' : '' ?>>Review needed</option>
|
||||
<option value="under review" <?= $selectedStatus === 'under review' ? 'selected' : '' ?>>Under review</option>
|
||||
</select>
|
||||
<div class="small js-acceptance-group d-none">
|
||||
<span class="d-block mb-1">As is / Minor edits</span>
|
||||
<?php $acc = (string) ($draft['acceptance_type'] ?? ''); ?>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="acceptance_type" value="as_is" id="as_is_<?= (int) ($draft['id'] ?? 0) ?>" <?= $acc !== 'minor_edits' ? 'checked' : '' ?>>
|
||||
<label class="form-check-label" for="as_is_<?= (int) ($draft['id'] ?? 0) ?>">As is</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="acceptance_type" value="minor_edits" id="minor_<?= (int) ($draft['id'] ?? 0) ?>" <?= $acc === 'minor_edits' ? 'checked' : '' ?>>
|
||||
<label class="form-check-label" for="minor_<?= (int) ($draft['id'] ?? 0) ?>">Minor edits</label>
|
||||
</div>
|
||||
</div>
|
||||
<textarea name="reviewer_comment" class="form-control form-control-sm js-review-comment" rows="3" placeholder="Feedback for the teacher"><?= esc($draft['reviewer_comment'] ?? $draft['reviewer_comments'] ?? $draft['admin_comments'] ?? '') ?></textarea>
|
||||
<div class="d-flex flex-wrap gap-2">
|
||||
<span class="text-muted small js-review-status"></span>
|
||||
</div>
|
||||
<?= form_close() ?>
|
||||
</td>
|
||||
<td class="text-nowrap" style="min-width: 220px;">
|
||||
<?php
|
||||
$pdfFile = $draft['final_pdf_file'] ?? null;
|
||||
if (empty($pdfFile) && !empty($draft['final_file']) && strtolower(pathinfo($draft['final_file'], PATHINFO_EXTENSION)) === 'pdf') {
|
||||
$pdfFile = $draft['final_file'];
|
||||
}
|
||||
?>
|
||||
<?php if (!empty($pdfFile)): ?>
|
||||
<div class="mt-2 d-flex flex-wrap gap-2">
|
||||
<a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" rel="noopener">View</a>
|
||||
<a class="btn btn-sm btn-outline-secondary" href="<?= base_url('exam-drafts/files/final/' . $pdfFile) ?>" target="_blank" rel="noopener" download>Download</a>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-2">
|
||||
<label class="form-label small mb-1">Upload final draft</label>
|
||||
<input type="file" name="final_file" class="form-control form-control-sm">
|
||||
</div>
|
||||
<button type="submit" class="btn btn-sm btn-primary w-100">
|
||||
Save review
|
||||
</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tab-pane fade" id="legacy" role="tabpanel" aria-labelledby="legacy-tab">
|
||||
<div class="card border-primary-subtle mb-3">
|
||||
<div class="card-header bg-light d-flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<strong>Upload Old / Legacy Exam</strong>
|
||||
<div class="small text-muted">Store historic exams as finalized records.</div>
|
||||
<strong>Upload old / legacy exam</strong>
|
||||
<div class="small text-muted">Store historic exams as accepted records.</div>
|
||||
</div>
|
||||
<span class="badge bg-primary-subtle text-primary">Admin only</span>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<form method="post" action="<?= base_url('/administrator/exam-drafts/upload-legacy') ?>" enctype="multipart/form-data" class="row g-3">
|
||||
<?= form_open_multipart($legacyUploadUrl, ['class' => 'row g-3']) ?>
|
||||
<?= csrf_field() ?>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label small">Class Section</label>
|
||||
<select name="class_section_id" class="form-select" required>
|
||||
<option value="">Select class</option>
|
||||
<label class="form-label small">Class sections</label>
|
||||
<select name="class_section_ids[]" class="form-select" multiple required size="6">
|
||||
<?php foreach ($classSections as $cs): ?>
|
||||
<option value="<?= esc($cs['class_section_id']) ?>"><?= esc($cs['class_section_name']) ?></option>
|
||||
<option value="<?= esc($cs['class_section_id'] ?? '') ?>"><?= esc($cs['class_section_name'] ?? '') ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
<div class="form-text">Hold Ctrl (Windows) or Command (Mac) to select multiple sections.</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">School Year</label>
|
||||
<label class="form-label small">School year</label>
|
||||
<input type="text" name="school_year" class="form-control" value="<?= esc($schoolYear) ?>" placeholder="2025-2026" required>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<label class="form-label small">Semester</label>
|
||||
<select name="semester" class="form-select" required>
|
||||
<option value="Fall" <?= ($semester === 'Fall') ? 'selected' : '' ?>>Fall</option>
|
||||
<option value="Spring" <?= ($semester === 'Spring') ? 'selected' : '' ?>>Spring</option>
|
||||
</select>
|
||||
<input type="text" name="semester" class="form-control" value="<?= esc($semester) ?>" placeholder="Fall / Spring" required>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label small">Exam Type</label>
|
||||
<label class="form-label small">Exam type</label>
|
||||
<select name="exam_type" class="form-select">
|
||||
<option value="">— Select type —</option>
|
||||
<?php foreach ($examTypes as $type): ?>
|
||||
@@ -211,14 +308,14 @@
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="form-label small">Upload File</label>
|
||||
<input type="file" name="old_exam_file" class="form-control" accept=".doc,.docx,.pdf" required>
|
||||
<label class="form-label small">Upload file</label>
|
||||
<input type="file" name="old_exam_file" class="form-control" accept="<?= esc($fileAccept) ?>" required>
|
||||
<div class="form-text">Allowed: <?= esc(implode(', ', $allowedExtensions)) ?> • Max <?= number_format($maxUploadBytes / 1024 / 1024, 0) ?> MB</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<button type="submit" class="btn btn-primary">Upload Legacy Exam</button>
|
||||
<button type="submit" class="btn btn-primary">Upload legacy exam</button>
|
||||
</div>
|
||||
</form>
|
||||
<?= form_close() ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -231,20 +328,21 @@
|
||||
<div class="mb-4">
|
||||
<h6 class="mb-2"><?= esc($group['class_section_name'] ?? 'Class') ?></h6>
|
||||
<div class="list-group">
|
||||
<?php foreach ($group['items'] as $item): ?>
|
||||
<div class="list-group-item d-flex justify-content-between align-items-start">
|
||||
<?php foreach ($group['items'] ?? [] as $item): ?>
|
||||
<?php $lst = strtolower((string) ($item['status'] ?? '')); ?>
|
||||
<div class="list-group-item d-flex justify-content-between align-items-start flex-wrap gap-2">
|
||||
<div class="me-3">
|
||||
<div class="fw-semibold"><?= esc($item['draft_title'] ?? 'Legacy Exam') ?></div>
|
||||
<div class="fw-semibold"><?= esc($item['draft_title'] ?? 'Legacy exam') ?></div>
|
||||
<div class="small text-muted">
|
||||
<?= esc($item['exam_type'] ?? 'N/A') ?> •
|
||||
<?= esc($item['semester'] ?? '') ?> <?= esc($item['school_year'] ?? '') ?>
|
||||
</div>
|
||||
<div class="small mt-1"><?= $renderBadge($lst, $statusBadges) ?></div>
|
||||
</div>
|
||||
<div class="text-end">
|
||||
<div class="text-end d-flex flex-wrap gap-2 justify-content-end">
|
||||
<?php if (!empty($item['final_file'])): ?>
|
||||
<a href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" class="btn btn-sm btn-outline-primary">
|
||||
Download
|
||||
</a>
|
||||
<a class="btn btn-sm btn-outline-primary" href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" rel="noopener">View</a>
|
||||
<a class="btn btn-sm btn-outline-secondary" href="<?= base_url('exam-drafts/files/final/' . $item['final_file']) ?>" target="_blank" rel="noopener" download>Download</a>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">File missing</span>
|
||||
<?php endif; ?>
|
||||
@@ -260,6 +358,208 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
const submissionsTab = document.getElementById('submissions-tab');
|
||||
if (submissionsTab) {
|
||||
submissionsTab.addEventListener('click', () => {
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
const statusBadges = <?= json_encode($statusBadges, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
|
||||
const csrfTokenName = <?= json_encode(csrf_token(), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
|
||||
const csrfCookieNames = <?= json_encode(array_values(array_filter([
|
||||
config('Security')->csrfCookieName ?? null,
|
||||
config('Security')->cookieName ?? null,
|
||||
'csrf_cookie_name',
|
||||
])), JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT) ?>;
|
||||
|
||||
const readCookie = (name) => {
|
||||
const match = document.cookie.match(new RegExp('(?:^|; )' + name.replace(/[$()*+.?[\\\]^{|}-]/g, '\\$&') + '=([^;]*)'));
|
||||
return match ? decodeURIComponent(match[1]) : '';
|
||||
};
|
||||
|
||||
const syncCsrfToken = (form) => {
|
||||
let tokenValue = '';
|
||||
csrfCookieNames.some((name) => {
|
||||
tokenValue = readCookie(name);
|
||||
return tokenValue !== '';
|
||||
});
|
||||
if (!tokenValue && form) {
|
||||
const tokenInput = form.querySelector(`input[name="${csrfTokenName}"]`);
|
||||
if (tokenInput && tokenInput.value) {
|
||||
tokenValue = tokenInput.value;
|
||||
}
|
||||
}
|
||||
if (!tokenValue || !form) {
|
||||
return tokenValue;
|
||||
}
|
||||
const tokenInput = form.querySelector(`input[name="${csrfTokenName}"]`);
|
||||
if (tokenInput) {
|
||||
tokenInput.value = tokenValue;
|
||||
}
|
||||
return tokenValue;
|
||||
};
|
||||
const updateRow = (row) => {
|
||||
const statusSelect = row.querySelector('select[name="review_status"]');
|
||||
const acceptanceGroup = row.querySelector('.js-acceptance-group');
|
||||
if (!statusSelect || !acceptanceGroup) {
|
||||
return;
|
||||
}
|
||||
acceptanceGroup.classList.toggle('d-none', statusSelect.value !== 'accepted');
|
||||
};
|
||||
|
||||
const updateStatusUI = (row) => {
|
||||
const statusSelect = row.querySelector('select[name="review_status"]');
|
||||
const badge = row.querySelector('.js-status-badge');
|
||||
if (!statusSelect || !badge || statusSelect.value === '') {
|
||||
return;
|
||||
}
|
||||
const status = statusSelect.value;
|
||||
const badgeData = statusBadges[status] || { label: status, class: 'bg-secondary text-white' };
|
||||
badge.textContent = badgeData.label || status;
|
||||
badge.className = `badge ${badgeData.class} js-status-badge`;
|
||||
if (badgeData.style) {
|
||||
badge.setAttribute('style', badgeData.style);
|
||||
} else {
|
||||
badge.removeAttribute('style');
|
||||
}
|
||||
badge.dataset.status = status;
|
||||
|
||||
const acceptanceNote = row.querySelector('.js-acceptance-note');
|
||||
if (acceptanceNote) {
|
||||
if (status === 'accepted') {
|
||||
const acc = row.querySelector('input[name="acceptance_type"]:checked');
|
||||
acceptanceNote.textContent = acc && acc.value === 'minor_edits'
|
||||
? 'Accepted w/ minor edits'
|
||||
: 'Accepted as is';
|
||||
} else {
|
||||
acceptanceNote.textContent = '';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const saveRow = (row, options = {}) => {
|
||||
const form = row.querySelector('form');
|
||||
if (!form) {
|
||||
return;
|
||||
}
|
||||
const statusSelect = form.querySelector('select[name="review_status"]');
|
||||
if (!statusSelect) {
|
||||
return;
|
||||
}
|
||||
const statusLabel = form.querySelector('.js-review-status');
|
||||
const data = new FormData(form);
|
||||
data.delete('final_file');
|
||||
data.delete('old_exam_file');
|
||||
if (options.commitComment) {
|
||||
const commentInput = form.querySelector('textarea[name="reviewer_comment"]');
|
||||
if (commentInput) {
|
||||
const raw = commentInput.value || '';
|
||||
const committed = raw.endsWith('\n') ? raw : raw + '\n';
|
||||
data.set('reviewer_comment', committed);
|
||||
}
|
||||
}
|
||||
const csrfToken = syncCsrfToken(form);
|
||||
if (csrfToken) {
|
||||
data.set(csrfTokenName, csrfToken);
|
||||
}
|
||||
if (statusLabel) {
|
||||
statusLabel.textContent = 'Saving...';
|
||||
}
|
||||
fetch(form.action, {
|
||||
method: 'POST',
|
||||
body: data,
|
||||
credentials: 'same-origin',
|
||||
headers: {
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
'X-CSRF-TOKEN': csrfToken,
|
||||
},
|
||||
})
|
||||
.then((resp) => {
|
||||
if (!resp.ok) {
|
||||
throw new Error('Save failed');
|
||||
}
|
||||
syncCsrfToken(form);
|
||||
updateStatusUI(row);
|
||||
if (statusLabel) {
|
||||
statusLabel.textContent = 'Saved';
|
||||
}
|
||||
setTimeout(() => {
|
||||
if (statusLabel && statusLabel.textContent === 'Saved') {
|
||||
statusLabel.textContent = '';
|
||||
}
|
||||
}, 1500);
|
||||
})
|
||||
.catch(() => {
|
||||
if (statusLabel) {
|
||||
statusLabel.textContent = 'Error saving';
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
const debounce = (fn, wait) => {
|
||||
let timer;
|
||||
return (...args) => {
|
||||
clearTimeout(timer);
|
||||
timer = setTimeout(() => fn(...args), wait);
|
||||
};
|
||||
};
|
||||
|
||||
const debouncedSave = debounce(saveRow, 500);
|
||||
|
||||
document.querySelectorAll('.exam-drafts-table tbody tr').forEach(updateRow);
|
||||
|
||||
document.addEventListener('change', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLElement)) {
|
||||
return;
|
||||
}
|
||||
const row = target.closest('tr');
|
||||
if (!row) {
|
||||
return;
|
||||
}
|
||||
if (target instanceof HTMLSelectElement && target.name === 'review_status') {
|
||||
updateRow(row);
|
||||
debouncedSave(row);
|
||||
return;
|
||||
}
|
||||
if (target instanceof HTMLInputElement && target.name === 'acceptance_type') {
|
||||
debouncedSave(row);
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('input', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLTextAreaElement) || target.name !== 'reviewer_comment') {
|
||||
return;
|
||||
}
|
||||
const row = target.closest('tr');
|
||||
if (row && target.value.endsWith('\n')) {
|
||||
const lastCommitted = target.dataset.lastCommitted || '';
|
||||
if (target.value !== lastCommitted) {
|
||||
target.dataset.lastCommitted = target.value;
|
||||
debouncedSave(row, { commitComment: true });
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('blur', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLTextAreaElement) || target.name !== 'reviewer_comment') {
|
||||
return;
|
||||
}
|
||||
const row = target.closest('tr');
|
||||
if (row) {
|
||||
const lastCommitted = target.dataset.lastCommitted || '';
|
||||
if (target.value !== lastCommitted) {
|
||||
target.dataset.lastCommitted = target.value;
|
||||
debouncedSave(row, { commitComment: true });
|
||||
}
|
||||
}
|
||||
}, true);
|
||||
});
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
<?= $this->section('styles') ?>
|
||||
@@ -270,13 +570,15 @@
|
||||
word-break: break-word;
|
||||
}
|
||||
.exam-drafts-table th {
|
||||
min-width: 120px;
|
||||
min-width: 0;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.exam-drafts-table td {
|
||||
max-width: 220px;
|
||||
max-width: none;
|
||||
}
|
||||
.exam-drafts-table {
|
||||
table-layout: auto;
|
||||
width: max-content;
|
||||
}
|
||||
.exam-drafts-table thead th {
|
||||
background-color: #f8f9fa;
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+9
-7
@@ -13,17 +13,19 @@
|
||||
</a>
|
||||
</div>
|
||||
<!-- Search Form -->
|
||||
<!--form method="get" action="<--?= base_url('admin/paypal-transactions') ?>" class="mb-3">
|
||||
<--?= csrf_field(); ?>
|
||||
<!--
|
||||
<form method="get" action="<?= base_url('admin/paypal-transactions') ?>" class="mb-3">
|
||||
<?= csrf_field(); ?>
|
||||
<div class="input-group">
|
||||
<input type="text" name="q" value="<--?= esc($keyword) ?>" class="form-control"
|
||||
<input type="text" name="q" value="<?= esc($keyword) ?>" class="form-control"
|
||||
placeholder="Search by transaction ID, email, order ID, or event type">
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
<--?php if ($keyword): ?>
|
||||
<a href="<--?= base_url('admin/paypal-transactions') ?>" class="btn btn-secondary">Clear</a>
|
||||
<--?php endif; ?>
|
||||
<?php if ($keyword): ?>
|
||||
<a href="<?= base_url('admin/paypal-transactions') ?>" class="btn btn-secondary">Clear</a>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</form-->
|
||||
</form>
|
||||
-->
|
||||
|
||||
<!-- Transactions Table -->
|
||||
<table id="myTable" class="display table table-striped">
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+80
-52
@@ -144,58 +144,86 @@
|
||||
<span class="text-muted small"><?= count($entries) ?> record<?= count($entries) === 1 ? '' : 's' ?></span>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered table-hover align-middle mb-0" data-no-mgmt-sticky>
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Class</th>
|
||||
<th>Subject</th>
|
||||
<th>Unit</th>
|
||||
<th>Unit title</th>
|
||||
<th>Chapter / Surah</th>
|
||||
<th>Updated</th>
|
||||
<th style="min-width: 170px;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php if (empty($entries)): ?>
|
||||
<tr>
|
||||
<td colspan="7" class="text-center text-muted">No curriculum records yet.</td>
|
||||
</tr>
|
||||
<?php else: ?>
|
||||
<?php foreach ($entries as $entry): ?>
|
||||
<?php
|
||||
$subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
|
||||
$updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
|
||||
$updatedDisplay = '';
|
||||
if ($updatedAt) {
|
||||
try {
|
||||
$updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
|
||||
} catch (\Exception $e) {
|
||||
$updatedDisplay = $updatedAt;
|
||||
}
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td><?= esc(($entry['class_name'] ?? '') ?: '—') ?></td>
|
||||
<td><?= esc($subjectLabel) ?></td>
|
||||
<td><?= $entry['unit_number'] ? esc((string)$entry['unit_number']) : '—' ?></td>
|
||||
<td><?= esc(($entry['unit_title'] ?? '') ?: '—') ?></td>
|
||||
<td><?= esc(($entry['chapter_name'] ?? '') ?: '—') ?></td>
|
||||
<td><?= esc($updatedDisplay ?: '—') ?></td>
|
||||
<td class="d-flex gap-2 flex-wrap">
|
||||
<a href="<?= site_url('administrator/subject-curriculum/edit/' . $entry['id']) ?>" class="btn btn-sm btn-outline-primary">Edit</a>
|
||||
<form action="<?= site_url('administrator/subject-curriculum/delete/' . $entry['id']) ?>" method="post" onsubmit="return confirm('Remove this curriculum entry?');">
|
||||
<?= csrf_field() ?>
|
||||
<button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<?php if (empty($entries)): ?>
|
||||
<div class="text-center text-muted">No curriculum records yet.</div>
|
||||
<?php else: ?>
|
||||
<?php
|
||||
$entriesByClass = [];
|
||||
foreach ($entries as $entry) {
|
||||
$className = ($entry['class_name'] ?? '') ?: '—';
|
||||
if (!isset($entriesByClass[$className])) {
|
||||
$entriesByClass[$className] = [];
|
||||
}
|
||||
$entriesByClass[$className][] = $entry;
|
||||
}
|
||||
?>
|
||||
<div class="accordion" id="curriculumAccordion">
|
||||
<?php $accIndex = 0; ?>
|
||||
<?php foreach ($entriesByClass as $className => $classEntries): ?>
|
||||
<?php
|
||||
$accIndex++;
|
||||
$collapseId = 'curriculum-class-' . $accIndex;
|
||||
$headingId = 'curriculum-heading-' . $accIndex;
|
||||
?>
|
||||
<div class="accordion-item mb-2">
|
||||
<h2 class="accordion-header" id="<?= esc($headingId) ?>">
|
||||
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<?= esc($collapseId) ?>" aria-expanded="false" aria-controls="<?= esc($collapseId) ?>">
|
||||
<?= esc($className) ?>
|
||||
<span class="badge bg-secondary ms-2"><?= count($classEntries) ?> entries</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="<?= esc($headingId) ?>" data-bs-parent="#curriculumAccordion">
|
||||
<div class="accordion-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered table-hover align-middle mb-0" data-no-mgmt-sticky>
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Subject</th>
|
||||
<th>Unit</th>
|
||||
<th>Unit title</th>
|
||||
<th>Chapter / Surah</th>
|
||||
<th>Updated</th>
|
||||
<th style="min-width: 170px;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($classEntries as $entry): ?>
|
||||
<?php
|
||||
$subjectLabel = $subjectLabels[$entry['subject']] ?? ucfirst($entry['subject'] ?? '');
|
||||
$updatedAt = $entry['updated_at'] ?? $entry['created_at'] ?? '';
|
||||
$updatedDisplay = '';
|
||||
if ($updatedAt) {
|
||||
try {
|
||||
$updatedDisplay = (new \DateTime($updatedAt))->format('M d, Y H:i');
|
||||
} catch (\Exception $e) {
|
||||
$updatedDisplay = $updatedAt;
|
||||
}
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td><?= esc($subjectLabel) ?></td>
|
||||
<td><?= $entry['unit_number'] ? esc((string)$entry['unit_number']) : '—' ?></td>
|
||||
<td><?= esc(($entry['unit_title'] ?? '') ?: '—') ?></td>
|
||||
<td><?= esc(($entry['chapter_name'] ?? '') ?: '—') ?></td>
|
||||
<td><?= esc($updatedDisplay ?: '—') ?></td>
|
||||
<td class="d-flex gap-2 flex-wrap">
|
||||
<a href="<?= site_url('administrator/subject-curriculum/edit/' . $entry['id']) ?>" class="btn btn-sm btn-outline-primary">Edit</a>
|
||||
<form action="<?= site_url('administrator/subject-curriculum/delete/' . $entry['id']) ?>" method="post" onsubmit="return confirm('Remove this curriculum entry?');">
|
||||
<?= csrf_field() ?>
|
||||
<button type="submit" class="btn btn-sm btn-outline-danger">Delete</button>
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Regular → Executable
+16
-3
@@ -63,7 +63,15 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td colspan="9" class="text-center text-muted">Loading...</td>
|
||||
<td class="text-center text-muted">Loading...</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -198,10 +206,12 @@ document.addEventListener('DOMContentLoaded', function () {
|
||||
if (!teachers || teachers.length === 0) {
|
||||
var emptyRow = document.createElement('tr');
|
||||
var emptyCell = document.createElement('td');
|
||||
emptyCell.colSpan = 9;
|
||||
emptyCell.className = 'text-center text-muted';
|
||||
emptyCell.textContent = 'No teachers found.';
|
||||
emptyRow.appendChild(emptyCell);
|
||||
for (var i = 0; i < 8; i++) {
|
||||
emptyRow.appendChild(document.createElement('td'));
|
||||
}
|
||||
tbody.appendChild(emptyRow);
|
||||
} else {
|
||||
teachers.forEach(function (teacher, index) {
|
||||
@@ -312,7 +322,10 @@ document.addEventListener('DOMContentLoaded', function () {
|
||||
return;
|
||||
}
|
||||
|
||||
tbody.innerHTML = '<tr><td colspan="9" class="text-center text-muted">Loading...</td></tr>';
|
||||
tbody.innerHTML = '<tr>'
|
||||
+ '<td class="text-center text-muted">Loading...</td>'
|
||||
+ '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
|
||||
+ '</tr>';
|
||||
|
||||
var url = apiList + (selectedYear ? ('?schoolYear=' + encodeURIComponent(selectedYear)) : '');
|
||||
fetch(url, {
|
||||
|
||||
Regular → Executable
+386
-125
@@ -21,140 +21,329 @@
|
||||
$totalItems = max(0, (int)($summary['total_items'] ?? 0));
|
||||
?>
|
||||
<div class="card-body">
|
||||
<div class="border rounded-3 p-3 mb-4 bg-light">
|
||||
<div class="d-flex flex-wrap gap-4 align-items-center">
|
||||
<div>
|
||||
<div class="text-uppercase small text-muted">Submission completion</div>
|
||||
<div class="h4 fw-semibold mb-1"><?= esc($completionPercent) ?>%</div>
|
||||
<div class="progress" style="height:6px;">
|
||||
<div
|
||||
class="progress-bar bg-primary"
|
||||
role="progressbar"
|
||||
style="width: <?= esc($completionPercent) ?>%;"
|
||||
aria-valuenow="<?= esc($completionPercent) ?>"
|
||||
aria-valuemin="0"
|
||||
aria-valuemax="100"
|
||||
></div>
|
||||
<?php
|
||||
$termExamLabel = (isset($semester) && strtolower((string) $semester) === 'spring') ? 'Final' : 'Midterm';
|
||||
$lowProgressSectionIds = $lowProgressSectionIds ?? [];
|
||||
$flaggedClasses = count($lowProgressSectionIds);
|
||||
$pageNotifications = [];
|
||||
if ($missingItemsCount > 0) {
|
||||
$pageNotifications[] = [
|
||||
'level' => 'danger',
|
||||
'message' => "{$missingItemsCount} missing item" . ($missingItemsCount === 1 ? '' : 's') . " awaiting teacher uploads.",
|
||||
];
|
||||
}
|
||||
if ($completionPercent < 70) {
|
||||
$pageNotifications[] = [
|
||||
'level' => 'warning',
|
||||
'message' => "Submission completion is below 70% — follow up with remaining teachers.",
|
||||
];
|
||||
}
|
||||
if ($flaggedClasses > 0) {
|
||||
$pageNotifications[] = [
|
||||
'level' => 'warning',
|
||||
'message' => "Progress is under 50% for {$flaggedClasses} class section" . ($flaggedClasses === 1 ? '' : 's') . ".",
|
||||
];
|
||||
}
|
||||
if (empty($rows)) {
|
||||
$pageNotifications[] = [
|
||||
'level' => 'info',
|
||||
'message' => 'No class-section assignments submitted yet; encourage teachers to upload drafts.',
|
||||
];
|
||||
}
|
||||
if (empty($pageNotifications)) {
|
||||
$pageNotifications[] = [
|
||||
'level' => 'info',
|
||||
'message' => 'All tracked classes are current. Use the controls below to send reminders.',
|
||||
];
|
||||
}
|
||||
$examDraftDeadlineConfig = $examDraftDeadlineConfig ?? '';
|
||||
$examDraftDeadlineFormatted = $examDraftDeadlineFormatted ?? '';
|
||||
?>
|
||||
<?php if (session()->getFlashdata('success')): ?>
|
||||
<div class="alert alert-success">
|
||||
<?= esc(session()->getFlashdata('success')) ?>
|
||||
</div>
|
||||
<?php elseif (session()->getFlashdata('warning')): ?>
|
||||
<div class="alert alert-warning">
|
||||
<?= esc(session()->getFlashdata('warning')) ?>
|
||||
</div>
|
||||
<?php elseif (session()->getFlashdata('info')): ?>
|
||||
<div class="alert alert-info">
|
||||
<?= esc(session()->getFlashdata('info')) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
$groupedRows = [];
|
||||
foreach ($rows as $idx => $row) {
|
||||
$classKey = (string) ($row['class_section_id'] ?? $row['class_section'] ?? 'class_' . $idx);
|
||||
$groupedRows[$classKey][] = $row;
|
||||
}
|
||||
?>
|
||||
<div class="row g-3 mb-4 align-items-stretch">
|
||||
<div class="col-lg-8">
|
||||
<div class="row g-3 summary-row">
|
||||
<div class="col-12 col-sm-6 col-xl-3">
|
||||
<div class="summary-card h-100 shadow-sm border-0">
|
||||
<div class="summary-card-body">
|
||||
<div class="summary-label text-uppercase">Completion</div>
|
||||
<div class="summary-value"><?= esc($completionPercent) ?>%</div>
|
||||
<div class="progress summary-progress">
|
||||
<div
|
||||
class="progress-bar"
|
||||
role="progressbar"
|
||||
style="width: <?= esc($completionPercent) ?>%;"
|
||||
aria-valuenow="<?= esc($completionPercent) ?>"
|
||||
aria-valuemin="0"
|
||||
aria-valuemax="100"
|
||||
></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-6 col-xl-3">
|
||||
<div class="summary-card h-100 shadow-sm border-0">
|
||||
<div class="summary-card-body">
|
||||
<div class="summary-label text-uppercase">Missing items</div>
|
||||
<div class="summary-value <?= $missingItemsCount > 0 ? 'text-danger' : '' ?>"><?= esc($missingItemsCount) ?></div>
|
||||
<div class="summary-note"><?= esc($submittedItems) ?> submitted / <?= esc($totalItems) ?> total</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-6 col-xl-3">
|
||||
<div class="summary-card h-100 shadow-sm border-0">
|
||||
<div class="summary-card-body">
|
||||
<div class="summary-label text-uppercase">Submissions</div>
|
||||
<div class="summary-value"><?= esc($submittedItems) ?></div>
|
||||
<div class="summary-note"><?= esc($totalItems) ?> teachers tracked</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-6 col-xl-3">
|
||||
<div class="summary-card h-100 shadow-sm border-0">
|
||||
<div class="summary-card-body">
|
||||
<div class="summary-label text-uppercase">Flagged</div>
|
||||
<div class="summary-value"><?= esc($flaggedClasses) ?></div>
|
||||
<div class="summary-note">Sections under 50% complete</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="text-uppercase small text-muted">Missing items</div>
|
||||
<div class="h4 fw-semibold text-danger mb-0"><?= esc($missingItemsCount) ?></div>
|
||||
</div>
|
||||
<div class="text-muted small">
|
||||
<?= esc($submittedItems) ?> submitted / <?= esc($totalItems) ?> total items
|
||||
</div>
|
||||
<div class="col-lg-4">
|
||||
<div class="card page-notifications-card h-100 shadow-sm">
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<span>Page notifications</span>
|
||||
<span class="badge bg-light text-dark"><?= count($pageNotifications) ?> alerts</span>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<ul class="page-notifications-list mb-0">
|
||||
<?php foreach ($pageNotifications as $notification): ?>
|
||||
<li class="page-notification-item page-notification-<?= esc($notification['level']) ?>">
|
||||
<span class="notification-indicator" aria-hidden="true"></span>
|
||||
<span><?= esc($notification['message']) ?></span>
|
||||
</li>
|
||||
<?php endforeach; ?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<form method="post" action="<?= site_url('administrator/teacher-submissions/notify') ?>">
|
||||
<?= csrf_field() ?>
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
class="table table-striped table-bordered m-0 align-middle teacher-submissions-table"
|
||||
data-no-mgmt-sticky
|
||||
data-no-dt-fixedheader
|
||||
>
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Class Section</th>
|
||||
<th>Teacher</th>
|
||||
<th class="text-center">Midterm Score</th>
|
||||
<th class="text-center">Midterm Comment</th>
|
||||
<th class="text-center">Participation</th>
|
||||
<th class="text-center">PTAP Comment</th>
|
||||
<th class="text-center">Notifications</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php if (!empty($rows)): ?>
|
||||
<?php foreach ($rows as $row): ?>
|
||||
<tr>
|
||||
<td><?= esc($row['class_section']) ?></td>
|
||||
<td>
|
||||
<?php if (!empty($row['teachers'])): ?>
|
||||
<?php foreach ($row['teachers'] as $teacher): ?>
|
||||
<div><?= esc($teacher['label'] ?? 'Teacher') ?></div>
|
||||
<?php endforeach; ?>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">Unassigned</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php foreach ([
|
||||
'midterm_score_status',
|
||||
'midterm_comment_status',
|
||||
'participation_status',
|
||||
'ptap_comment_status'
|
||||
] as $statusKey): ?>
|
||||
<?php $status = $row[$statusKey] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
|
||||
<td class="text-center">
|
||||
<span class="badge <?= esc($status['badge'] ?? 'bg-secondary') ?>">
|
||||
<?= esc($status['label'] ?? 'N/A') ?>
|
||||
</span>
|
||||
<?php if (!empty($status['detail'])): ?>
|
||||
<div class="small text-muted"><?= esc($status['detail']) ?></div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php endforeach; ?>
|
||||
<td>
|
||||
<?php if (!empty($row['teachers'])): ?>
|
||||
<?php $missingPayload = base64_encode(json_encode($row['missing_items'] ?? [])); ?>
|
||||
<?php foreach ($row['teachers'] as $teacher): ?>
|
||||
<?php $history = $notificationHistory[$row['class_section_id']][$teacher['id']] ?? []; ?>
|
||||
<?php $lastEntry = $history[0] ?? null; ?>
|
||||
<div class="mb-2">
|
||||
<label class="d-flex align-items-center gap-2 mb-1">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="form-check-input"
|
||||
name="notify[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
|
||||
value="1"
|
||||
/>
|
||||
<span class="fw-semibold"><?= esc($teacher['label'] ?? 'Teacher') ?></span>
|
||||
</label>
|
||||
<input
|
||||
type="hidden"
|
||||
name="missing_items[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
|
||||
value="<?= esc($missingPayload) ?>"
|
||||
/>
|
||||
<div class="small text-muted">
|
||||
<?php if ($lastEntry !== null): ?>
|
||||
<span>
|
||||
Last <?= esc($lastEntry['status'] === 'sent' ? 'sent' : 'attempted') ?> on <?= esc($lastEntry['sent_at_text'] ?: 'N/A') ?>
|
||||
by <?= esc($lastEntry['admin_name'] ?? '') ?>
|
||||
</span>
|
||||
<?php if (count($history) > 1): ?>
|
||||
<div>History: <?= count($history) ?> entries</div>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<span>No notifications sent yet</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">No teacher assigned</span>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($row['missing_items'])): ?>
|
||||
<div class="small text-danger mt-1">
|
||||
Outstanding: <?= esc(implode(', ', $row['missing_items'])) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
<?php if (empty($rows)): ?>
|
||||
<p class="text-center text-muted mt-4">No teacher-class assignments found for this term.</p>
|
||||
<?php else: ?>
|
||||
<div class="table-control-bar mb-3 d-flex flex-wrap align-items-center gap-3">
|
||||
<div class="d-flex flex-wrap align-items-center gap-3">
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_midterm_score" value="1">
|
||||
<span class="form-check-label small">Include <?= esc($termExamLabel) ?> score</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_midterm_comment" value="1">
|
||||
<span class="form-check-label small">Include <?= esc($termExamLabel) ?> comment</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_participation" value="1">
|
||||
<span class="form-check-label small">Include participation</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_ptap_comment" value="1">
|
||||
<span class="form-check-label small">Include PTAP comment</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_class_progress" value="1">
|
||||
<span class="form-check-label small">Include class progress</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="notify_exam_draft" value="1">
|
||||
<span class="form-check-label small">Include exam draft</span>
|
||||
</label>
|
||||
<label class="form-check form-check-inline mb-0">
|
||||
<input class="form-check-input" type="checkbox" name="homework_notify_all" value="1">
|
||||
<span class="form-check-label small">Include homework</span>
|
||||
</label>
|
||||
</div>
|
||||
<div class="small text-muted">
|
||||
<span class="text-uppercase" style="font-size:0.65rem;">Exam draft deadline</span><br>
|
||||
<?php if ($examDraftDeadlineConfig !== ''): ?>
|
||||
<?= esc($examDraftDeadlineConfig) ?>
|
||||
<?php if ($examDraftDeadlineFormatted !== ''): ?>
|
||||
<span class="text-muted"> → <?= esc($examDraftDeadlineFormatted) ?></span>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<tr>
|
||||
<td colspan="7" class="text-center">No teacher-class assignments found for this term.</td>
|
||||
</tr>
|
||||
<span class="text-warning">Not set</span>
|
||||
<?php endif; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="mt-3 text-end">
|
||||
<button type="submit" class="btn btn-primary" <?= empty($rows) ? 'disabled' : '' ?>>
|
||||
Send notifications to selected teachers
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion" id="teacherSubmissionAccordion">
|
||||
<?php foreach ($groupedRows as $sectionKey => $sectionRows): ?>
|
||||
<?php
|
||||
$firstRow = $sectionRows[0] ?? [];
|
||||
$sectionLabel = esc($firstRow['class_section'] ?? 'Class section');
|
||||
$collapseId = 'teacherSectionCollapse_' . md5($sectionKey);
|
||||
$badgeStatus = count($sectionRows) === 1 ? 'submission' : 'submissions';
|
||||
?>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="heading_<?= esc($collapseId) ?>">
|
||||
<button
|
||||
class="accordion-button collapsed d-flex justify-content-between align-items-center"
|
||||
type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#<?= esc($collapseId) ?>"
|
||||
aria-expanded="false"
|
||||
aria-controls="<?= esc($collapseId) ?>"
|
||||
>
|
||||
<div>
|
||||
<strong><?= $sectionLabel ?></strong>
|
||||
<div class="small text-muted"><?= esc(count($sectionRows)) ?> <?= $badgeStatus ?></div>
|
||||
</div>
|
||||
<span class="badge bg-primary-subtle text-primary"><?= count($sectionRows) ?> rows</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="<?= esc($collapseId) ?>" class="accordion-collapse collapse" aria-labelledby="heading_<?= esc($collapseId) ?>">
|
||||
<div class="accordion-body p-0">
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
class="table table-striped table-bordered m-0 align-middle teacher-submissions-table mb-0"
|
||||
data-no-mgmt-sticky
|
||||
data-no-dt-fixedheader
|
||||
>
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Class-Section</th>
|
||||
<th>Teachers Name</th>
|
||||
<th class="text-center"><?= esc($termExamLabel) ?> Score</th>
|
||||
<th class="text-center"><?= esc($termExamLabel) ?> Comment</th>
|
||||
<th class="text-center">Participation</th>
|
||||
<th class="text-center">PTAP Comment</th>
|
||||
<th class="text-center">Class Progress</th>
|
||||
<th class="text-center">Exam Draft</th>
|
||||
<th class="text-center">Homework</th>
|
||||
<th class="text-center">Notifications</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<?php foreach ($sectionRows as $row): ?>
|
||||
<tr>
|
||||
<td><?= esc($row['class_section']) ?></td>
|
||||
<td>
|
||||
<?php if (!empty($row['teachers'])): ?>
|
||||
<?php foreach ($row['teachers'] as $teacher): ?>
|
||||
<div><?= esc($teacher['label'] ?? 'Teacher') ?></div>
|
||||
<?php endforeach; ?>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">Unassigned</span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php foreach ([
|
||||
'midterm_score_status',
|
||||
'midterm_comment_status',
|
||||
'participation_status',
|
||||
'ptap_comment_status',
|
||||
'class_progress_status',
|
||||
'exam_draft_status',
|
||||
] as $statusKey): ?>
|
||||
<?php $status = $row[$statusKey] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
|
||||
<td class="text-center">
|
||||
<span class="badge <?= esc($status['badge'] ?? 'bg-secondary') ?>">
|
||||
<?= esc($status['label'] ?? 'N/A') ?>
|
||||
</span>
|
||||
<?php if (!empty($status['detail'])): ?>
|
||||
<div class="small text-muted"><?= esc($status['detail']) ?></div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php endforeach; ?>
|
||||
<?php $homeworkStatus = $row['homework_status'] ?? ['label' => 'N/A', 'badge' => 'bg-secondary']; ?>
|
||||
<td class="text-center">
|
||||
<span class="badge <?= esc($homeworkStatus['badge'] ?? 'bg-secondary') ?>">
|
||||
<?= esc($homeworkStatus['label'] ?? 'N/A') ?>
|
||||
</span>
|
||||
<?php if (!empty($homeworkStatus['detail'])): ?>
|
||||
<div class="small text-muted"><?= esc($homeworkStatus['detail']) ?></div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<td>
|
||||
<?php if (!empty($row['teachers'])): ?>
|
||||
<?php $missingPayload = base64_encode(json_encode($row['missing_items'] ?? [])); ?>
|
||||
<?php foreach ($row['teachers'] as $teacher): ?>
|
||||
<?php $history = $notificationHistory[$row['class_section_id']][$teacher['id']] ?? []; ?>
|
||||
<?php $lastEntry = $history[0] ?? null; ?>
|
||||
<div class="mb-2">
|
||||
<label class="d-flex align-items-center gap-2 mb-1">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="form-check-input"
|
||||
name="notify[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
|
||||
value="1"
|
||||
/>
|
||||
<span class="fw-semibold"><?= esc($teacher['label'] ?? 'Teacher') ?></span>
|
||||
</label>
|
||||
<input
|
||||
type="hidden"
|
||||
name="missing_items[<?= esc($row['class_section_id']) ?>][<?= esc($teacher['id']) ?>]"
|
||||
value="<?= esc($missingPayload) ?>"
|
||||
/>
|
||||
<div class="small text-muted">
|
||||
<?php if ($lastEntry !== null): ?>
|
||||
<span>
|
||||
Last <?= esc($lastEntry['status'] === 'sent' ? 'sent' : 'attempted') ?> on <?= esc($lastEntry['sent_at_text'] ?: 'N/A') ?>
|
||||
by <?= esc($lastEntry['admin_name'] ?? '') ?>
|
||||
</span>
|
||||
<?php if (count($history) > 1): ?>
|
||||
<div>History: <?= count($history) ?> entries</div>
|
||||
<?php endif; ?>
|
||||
<?php else: ?>
|
||||
<span>No notifications sent yet</span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
<?php else: ?>
|
||||
<span class="text-muted small">No teacher assigned</span>
|
||||
<?php endif; ?>
|
||||
<?php if (!empty($row['missing_items'])): ?>
|
||||
<div class="small text-danger mt-1">
|
||||
Outstanding: <?= esc(implode(', ', $row['missing_items'])) ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php endforeach; ?>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<div class="mt-3 text-end">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Send notifications to selected teachers
|
||||
</button>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@@ -186,5 +375,77 @@
|
||||
.card-body .table-responsive .teacher-submissions-table td {
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
.summary-card {
|
||||
background: var(--bs-white);
|
||||
border-radius: 0.75rem;
|
||||
}
|
||||
.summary-card-body {
|
||||
padding: 1.25rem;
|
||||
}
|
||||
.summary-label {
|
||||
font-size: 0.7rem;
|
||||
letter-spacing: 0.08em;
|
||||
color: #6c757d;
|
||||
}
|
||||
.summary-value {
|
||||
font-size: 1.75rem;
|
||||
font-weight: 600;
|
||||
margin-top: 0.35rem;
|
||||
}
|
||||
.summary-note {
|
||||
font-size: 0.85rem;
|
||||
color: #6c757d;
|
||||
}
|
||||
.summary-progress {
|
||||
height: 6px;
|
||||
margin-top: 0.65rem;
|
||||
}
|
||||
.summary-progress .progress-bar {
|
||||
background: var(--bs-primary);
|
||||
}
|
||||
.page-notifications-card {
|
||||
border-radius: 0.75rem;
|
||||
}
|
||||
.page-notifications-list {
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
.page-notification-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
.page-notification-info .notification-indicator {
|
||||
background: #0dcaf0;
|
||||
}
|
||||
.page-notification-warning .notification-indicator {
|
||||
background: #ffc107;
|
||||
}
|
||||
.page-notification-danger .notification-indicator {
|
||||
background: #dc3545;
|
||||
}
|
||||
.notification-indicator {
|
||||
width: 0.75rem;
|
||||
height: 0.75rem;
|
||||
border-radius: 50%;
|
||||
display: inline-block;
|
||||
}
|
||||
.table-control-bar {
|
||||
border: 1px solid rgba(0,0,0,0.08);
|
||||
border-radius: 0.75rem;
|
||||
padding: 0.75rem 1rem;
|
||||
background: #f8f9fa;
|
||||
}
|
||||
.table-control-bar .form-check-label {
|
||||
font-size: 0.8rem;
|
||||
margin-left: 0.15rem;
|
||||
text-transform: none;
|
||||
}
|
||||
</style>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
+7
-7
@@ -195,22 +195,22 @@
|
||||
<h3 class="text-white mb-4">Photo Gallery</h3>
|
||||
<div class="row g-2 pt-2">
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-1.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-2.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-3.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-4.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-5.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-6.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -267,4 +267,4 @@
|
||||
<script src="js/main.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
Regular → Executable
+2
-1
@@ -25,6 +25,7 @@
|
||||
|
||||
<br>
|
||||
<input type="hidden" name="selected_role" id="selected_role">
|
||||
<input type="hidden" name="redirect_to" value="<?= esc((string) ($redirect_to ?? '')) ?>">
|
||||
|
||||
<div class="d-flex flex-wrap justify-content-center gap-3 mt-3">
|
||||
<?php foreach ($roles as $role): ?>
|
||||
@@ -68,4 +69,4 @@
|
||||
tooltipTriggerList.forEach(el => new bootstrap.Tooltip(el));
|
||||
});
|
||||
</script>
|
||||
<?= $this->endSection() ?>
|
||||
<?= $this->endSection() ?>
|
||||
|
||||
Regular → Executable
Regular → Executable
+7
-7
@@ -155,22 +155,22 @@
|
||||
<h3 class="text-white mb-4">Photo Gallery</h3>
|
||||
<div class="row g-2 pt-2">
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-1.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-2.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-3.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-4.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-5.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src=""assets/images/classes-6.jpg" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -227,4 +227,4 @@
|
||||
<script src="js/main.js"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
+10
-10
@@ -93,7 +93,7 @@
|
||||
<div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.1s">
|
||||
<div class="classes-item">
|
||||
<div class="bg-light rounded-circle w-75 mx-auto p-3">
|
||||
<img class="img-fluid rounded-circle" src=""assets/images/classes-1.jpg" alt="">
|
||||
<img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="bg-light rounded p-4 pt-5 mt-n5">
|
||||
<a class="d-block text-center h3 mt-3 mb-4" href="">Quran Learning</a>
|
||||
@@ -104,7 +104,7 @@
|
||||
<div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.3s">
|
||||
<div class="classes-item">
|
||||
<div class="bg-light rounded-circle w-75 mx-auto p-3">
|
||||
<img class="img-fluid rounded-circle" src=""assets/images/classes-2.jpg" alt="">
|
||||
<img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="bg-light rounded p-4 pt-5 mt-n5">
|
||||
<a class="d-block text-center h3 mt-3 mb-4" href="">Islamic Studies</a>
|
||||
@@ -114,7 +114,7 @@
|
||||
<div class="col-lg-4 col-md-6 wow fadeInUp" data-wow-delay="0.5s">
|
||||
<div class="classes-item">
|
||||
<div class="bg-light rounded-circle w-75 mx-auto p-3">
|
||||
<img class="img-fluid rounded-circle" src=""assets/images/classes-3.jpg" alt="">
|
||||
<img class="img-fluid rounded-circle" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="bg-light rounded p-4 pt-5 mt-n5">
|
||||
<a class="d-block text-center h3 mt-3 mb-4" href="">Arabic Learning</a>
|
||||
@@ -160,22 +160,22 @@
|
||||
<h3 class="text-white mb-4">Photo Gallery</h3>
|
||||
<div class="row g-2 pt-2">
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -228,4 +228,4 @@
|
||||
<script src="<?= base_url('js/main.js') ?>"></script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Regular → Executable
Regular → Executable
Regular → Executable
+7
-7
@@ -195,22 +195,22 @@
|
||||
<h3 class="text-white mb-4">Photo Gallery</h3>
|
||||
<div class="row g-2 pt-2">
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-1.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-1.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-2.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-2.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-3.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-3.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-4.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-4.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-5.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-5.jpg') ?>" alt="">
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('"assets/images/classes-6.jpg') ?>" alt="">
|
||||
<img class="img-fluid rounded bg-light p-1" src="<?= base_url('assets/images/classes-6.jpg') ?>" alt="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -280,4 +280,4 @@
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
</html>
|
||||
|
||||
Regular → Executable
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user