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

merge prod to main

Browse Source
This commit is contained in:
root
2026-05-16 13:44:12 -04:00
parent 663c0cdbda
commit b32fb853f6
901 changed files with 11241 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Views/teacher/class_progress_submit.php
Regular → Executable
+154 -15
View File
@@ -1,12 +1,16 @@
<?= $this->extend('layout/main_layout') ?>
<?= $this->section('content') ?>
<?php
$isEdit = (bool) ($isEdit ?? false);
$formAction = $formAction ?? base_url('teacher/progress/store');
$submitLabel = $submitLabel ?? 'Submit Progress';
$hasClass = !empty($classSectionId);
$assignedClassName = $classSectionName ?? '';
$sundayOptions = $sundayOptions ?? [];
$defaultWeekStart = $defaultWeekStart ?? ($sundayOptions[0] ?? '');
$weekStartSelected = set_value('week_start', $defaultWeekStart);
$weekEndValue = set_value('week_end');
$weekEndValue = set_value('week_end', $existingWeekEnd ?? '');
$existingReports = $existingReports ?? [];
if (!$weekEndValue && $weekStartSelected) {
try {
$dt = new \DateTime($weekStartSelected);
@@ -31,9 +35,15 @@
<div class="d-flex flex-wrap align-items-center justify-content-between mb-3">
<div>
<h3 class="mb-0">
<?= esc($classSectionName ? "Class {$classSectionName} Progress Submission" : 'Class Progress Submission') ?>
<?php if ($isEdit): ?>
<?= esc($classSectionName ? "Edit {$classSectionName} Progress" : 'Edit Class Progress') ?>
<?php else: ?>
<?= esc($classSectionName ? "Class {$classSectionName} Progress Submission" : 'Class Progress Submission') ?>
<?php endif; ?>
</h3>
<div class="text-muted">Submit weekly progress for a single subject</div>
<div class="text-muted">
<?= $isEdit ? 'Update your weekly progress submission.' : 'Submit weekly progress for a single subject' ?>
</div>
</div>
<a href="<?= base_url('teacher/progress/history') ?>" class="btn btn-outline-secondary">My Submissions</a>
</div>
@@ -41,6 +51,10 @@
<?php if (session()->getFlashdata('success')): ?>
<div class="alert alert-success"><?= esc(session()->getFlashdata('success')) ?></div>
<?php endif; ?>
<?php $overwritePrompt = session()->getFlashdata('confirm_overwrite'); ?>
<?php if (session()->getFlashdata('warning') && ! $overwritePrompt): ?>
<div class="alert alert-warning"><?= esc(session()->getFlashdata('warning')) ?></div>
<?php endif; ?>
<?php if (session()->getFlashdata('error')): ?>
<div class="alert alert-danger"><?= esc(session()->getFlashdata('error')) ?></div>
<?php endif; ?>
@@ -54,16 +68,17 @@
</div>
<?php endif; ?>
<form action="<?= base_url('teacher/progress/store') ?>" method="post" enctype="multipart/form-data" class="needs-validation" novalidate>
<form action="<?= esc($formAction) ?>" method="post" enctype="multipart/form-data" class="needs-validation" novalidate>
<?= csrf_field() ?>
<input type="hidden" name="class_section_id" value="<?= esc($classSectionId ?? '') ?>">
<input type="hidden" name="confirm_overwrite" id="confirmOverwriteInput" value="0">
<div class="row g-3">
<div class="col">
<div class="card shadow-sm mb-3">
<div class="card-header bg-white d-flex flex-wrap align-items-center justify-content-between gap-3">
<strong class="mb-0">Date Selection</strong>
<div class="d-flex align-items-center gap-2">
<select id="weekStartSelect" name="week_start" class="form-select form-select-sm" required>
<select id="weekStartSelect" name="week_start" class="form-select form-select-sm" required <?= $isEdit ? 'data-original-week="' . esc($weekStartSelected) . '"' : '' ?>>
<option value="">Select week</option>
<?php foreach ($sundayOptions as $sunday): ?>
<?php
@@ -96,8 +111,10 @@
?>
<?php foreach ($subjectSections as $slug => $section): ?>
<?php
$unitValues = old("unit_$slug") ?? [];
$chapterValues = old("chapter_$slug") ?? [];
$unitValues = old("unit_$slug") ?? ($existingReports[$slug]['unit_values'] ?? []);
$chapterValues = old("chapter_$slug") ?? ($existingReports[$slug]['chapter_values'] ?? []);
$coveredValue = old("covered_$slug", $existingReports[$slug]['covered'] ?? '');
$homeworkValue = old("homework_$slug", $existingReports[$slug]['homework'] ?? '');
$rowsCount = max(count($unitValues), count($chapterValues));
?>
<div class="col-lg-6">
@@ -166,6 +183,14 @@
</div>
<div class="form-text small text-muted">Add a custom Surah or Arabic target.</div>
</div>
<?php elseif ($slug === 'islamic'): ?>
<div class="px-2 py-2 border-top">
<div class="input-group input-group-sm">
<input type="text" class="form-control" placeholder="Type subject or topic" data-custom-input data-subject="<?= esc($slug) ?>">
<button type="button" class="btn btn-outline-secondary" data-custom-entry data-subject="<?= esc($slug) ?>">Add</button>
</div>
<div class="form-text small text-muted">Add a subject or unit not listed above (e.g. Seerah, Fiqh, Akhlaq).</div>
</div>
<?php endif; ?>
</div>
</div>
@@ -175,21 +200,24 @@
<?php for ($i = 0; $i < $rowsCount; $i++): ?>
<div class="row g-2 align-items-end mb-2 unit-chapter-entry">
<div class="col">
<input type="text" name="unit_<?= esc($slug) ?>[]" class="form-control form-control-sm" placeholder="Unit name" value="<?= esc($unitValues[$i] ?? '') ?>">
<input type="text" name="unit_<?= esc($slug) ?>[]" class="form-control form-control-sm" placeholder="Unit name" value="<?= esc($unitValues[$i] ?? '') ?>" readonly>
</div>
<div class="col">
<input type="text" name="chapter_<?= esc($slug) ?>[]" class="form-control form-control-sm" placeholder="Chapter" value="<?= esc($chapterValues[$i] ?? '') ?>">
<input type="text" name="chapter_<?= esc($slug) ?>[]" class="form-control form-control-sm" placeholder="Chapter" value="<?= esc($chapterValues[$i] ?? '') ?>" readonly>
</div>
<div class="col-auto">
<button type="button" class="btn btn-outline-danger btn-sm" data-remove-unit-chapter aria-label="Remove entry">X</button>
</div>
</div>
<?php endfor; ?>
</div>
<div class="mb-3">
<label class="form-label mb-1">What has been covered?</label>
<textarea name="covered_<?= esc($slug) ?>" class="form-control" rows="4" required placeholder="What was taught? Key topics, activities, memorization, etc."><?= esc(old("covered_$slug")) ?></textarea>
<textarea name="covered_<?= esc($slug) ?>" class="form-control" rows="4" required placeholder="What was taught? Key topics, activities, memorization, etc."><?= esc($coveredValue) ?></textarea>
</div>
<div class="mb-3">
<label class="form-label mb-1">Assigned homework:</label>
<textarea name="homework_<?= esc($slug) ?>" class="form-control" rows="3" placeholder="Homework, practice quizzes, review pages"><?= esc(old("homework_$slug")) ?></textarea>
<textarea name="homework_<?= esc($slug) ?>" class="form-control" rows="3" placeholder="Homework, practice quizzes, review pages"><?= esc($homeworkValue) ?></textarea>
</div>
<div class="mb-3">
<label class="form-label mb-1">Attachment (optional):</label>
@@ -204,7 +232,7 @@
<div class="col">
<div class="card shadow-sm">
<div class="card-body d-flex flex-column">
<button class="btn btn-primary w-100 mt-auto" type="submit" <?= $hasClass ? '' : 'disabled' ?>>Submit Progress</button>
<button class="btn btn-primary w-100 mt-auto" type="submit" <?= $hasClass ? '' : 'disabled' ?>><?= esc($submitLabel) ?></button>
<?php if (! $hasClass): ?>
<div class="text-muted small mt-2">
You are not assigned to a class. Contact the administrator to submit progress.
@@ -221,12 +249,78 @@
<?= $this->endSection() ?>
<?= $this->section('scripts') ?>
<?php
$submitSuccess = session()->getFlashdata('success');
$submitError = session()->getFlashdata('error');
$overwriteWarning = session()->getFlashdata('warning');
$overwritePrompt = session()->getFlashdata('confirm_overwrite');
?>
<?php if ($submitSuccess || $submitError): ?>
<div class="modal fade" id="submissionStatusModal" tabindex="-1" aria-labelledby="submissionStatusLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="submissionStatusLabel">
<?= $submitSuccess ? 'Submission Successful' : 'Submission Failed' ?>
</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<?= esc($submitSuccess ?: $submitError) ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
</div>
</div>
</div>
</div>
<?php endif; ?>
<?php if ($overwritePrompt && $overwriteWarning): ?>
<div class="modal fade" id="overwriteConfirmModal" tabindex="-1" aria-labelledby="overwriteConfirmLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="overwriteConfirmLabel">Override Existing Report</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<?= esc($overwriteWarning) ?>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
<button type="button" class="btn btn-primary" id="confirmOverwriteButton">Override</button>
</div>
</div>
</div>
</div>
<?php endif; ?>
<script>
(() => {
'use strict';
const forms = document.querySelectorAll('.needs-validation');
Array.from(forms).forEach(form => {
form.addEventListener('submit', event => {
const originalWeek = weekStartSelect?.dataset.originalWeek || '';
if (originalWeek && weekStartSelect && weekStartSelect.value && weekStartSelect.value !== originalWeek) {
const ok = confirm('A progress report already exists for the original week. Change the week and override any existing report for the new date?');
if (!ok) {
event.preventDefault();
event.stopPropagation();
return;
}
const confirmInput = document.getElementById('confirmOverwriteInput');
if (confirmInput) {
confirmInput.value = '1';
}
}
const islamicUnits = form.querySelectorAll('input[name="unit_islamic[]"]');
const hasIslamicUnit = Array.from(islamicUnits).some(input => input.value.trim() !== '');
if (!hasIslamicUnit) {
event.preventDefault();
event.stopPropagation();
alert('Please select at least one Islamic Studies unit.');
return;
}
if (!form.checkValidity()) {
event.preventDefault();
event.stopPropagation();
@@ -263,10 +357,13 @@
row.className = 'row g-2 align-items-end mb-2 unit-chapter-entry';
row.innerHTML = `
<div class="col">
<input type="text" name="unit_${slug}[]" class="form-control form-control-sm" placeholder="Unit name" />
<input type="text" name="unit_${slug}[]" class="form-control form-control-sm" placeholder="Unit name" readonly />
</div>
<div class="col">
<input type="text" name="chapter_${slug}[]" class="form-control form-control-sm" placeholder="Chapter" />
<input type="text" name="chapter_${slug}[]" class="form-control form-control-sm" placeholder="Chapter" readonly />
</div>
<div class="col-auto">
<button type="button" class="btn btn-outline-danger btn-sm" data-remove-unit-chapter aria-label="Remove entry">X</button>
</div>
`;
const inputs = row.querySelectorAll('input');
@@ -296,6 +393,9 @@
if (isQuran) {
return isCustom ? 'Custom' : 'Surah';
}
if (subject === 'islamic' && isCustom) {
return 'Custom';
}
return parts.join(' – ');
};
@@ -338,6 +438,15 @@
});
});
document.addEventListener('click', event => {
const button = event.target.closest('[data-remove-unit-chapter]');
if (!button) return;
const row = button.closest('.unit-chapter-entry');
if (row) {
row.remove();
}
});
document.querySelectorAll('[data-custom-entry]').forEach(button => {
button.addEventListener('click', event => {
event.stopPropagation();
@@ -347,12 +456,42 @@
if (!input) return;
const customValue = input.value.trim();
if (customValue === '') return;
const unitValue = buildUnitDisplay(subject, '', '', { isQuran: subject === 'quran', isCustom: true });
const unitValue = buildUnitDisplay(subject, '', '', {
isQuran: subject === 'quran',
isCustom: subject === 'quran' || subject === 'islamic',
});
appendUnitChapterRow(subject, unitValue, customValue);
input.value = '';
hideMenus();
});
});
const statusModalEl = document.getElementById('submissionStatusModal');
if (statusModalEl && typeof bootstrap !== 'undefined') {
const statusModal = new bootstrap.Modal(statusModalEl);
statusModal.show();
}
const overwriteModalEl = document.getElementById('overwriteConfirmModal');
if (overwriteModalEl && typeof bootstrap !== 'undefined') {
const overwriteModal = new bootstrap.Modal(overwriteModalEl);
overwriteModal.show();
const confirmButton = document.getElementById('confirmOverwriteButton');
const confirmInput = document.getElementById('confirmOverwriteInput');
if (confirmButton && confirmInput) {
confirmButton.addEventListener('click', () => {
confirmInput.value = '1';
const form = confirmButton.closest('form') || document.querySelector('form.needs-validation');
if (form && typeof form.requestSubmit === 'function') {
form.requestSubmit();
return;
}
if (form) {
form.submit();
}
});
}
}
})();
</script>
<?= $this->endSection() ?>