fix db tables to have school year
This commit is contained in:
@@ -106,14 +106,12 @@ class WhatsappController extends BaseController
|
|||||||
$existing = $this->linkModel->where([
|
$existing = $this->linkModel->where([
|
||||||
'class_section_id' => $sectionId,
|
'class_section_id' => $sectionId,
|
||||||
'school_year' => $this->schoolYear,
|
'school_year' => $this->schoolYear,
|
||||||
'semester' => $this->semester,
|
|
||||||
])->first();
|
])->first();
|
||||||
|
|
||||||
$payload = [
|
$payload = [
|
||||||
'class_section_id' => $sectionId,
|
'class_section_id' => $sectionId,
|
||||||
'class_section_name' => $sectionName,
|
'class_section_name' => $sectionName,
|
||||||
'school_year' => $this->schoolYear,
|
'school_year' => $this->schoolYear,
|
||||||
'semester' => $this->semester,
|
|
||||||
'invite_link' => trim($inviteLink),
|
'invite_link' => trim($inviteLink),
|
||||||
'active' => $active,
|
'active' => $active,
|
||||||
];
|
];
|
||||||
@@ -434,8 +432,6 @@ class WhatsappController extends BaseController
|
|||||||
sp.secondparent_lastname AS sp_lastname,
|
sp.secondparent_lastname AS sp_lastname,
|
||||||
sp.secondparent_email AS sp_email,
|
sp.secondparent_email AS sp_email,
|
||||||
sp.secondparent_phone AS sp_phone,
|
sp.secondparent_phone AS sp_phone,
|
||||||
sp.school_year AS sp_school_year,
|
|
||||||
sp.semester AS sp_semester,
|
|
||||||
|
|
||||||
u.id AS u_id,
|
u.id AS u_id,
|
||||||
u.firstname AS u_firstname,
|
u.firstname AS u_firstname,
|
||||||
@@ -448,14 +444,6 @@ class WhatsappController extends BaseController
|
|||||||
|
|
||||||
$b->join('users u', 'u.id = sp.firstparent_id', 'left');
|
$b->join('users u', 'u.id = sp.firstparent_id', 'left');
|
||||||
|
|
||||||
// Scope by term using parents table (authoritative for the pairing)
|
|
||||||
if ($schoolYear !== '') {
|
|
||||||
$b->where('sp.school_year', $schoolYear);
|
|
||||||
}
|
|
||||||
if ($semester !== '') {
|
|
||||||
$b->where('sp.semester', $semester);
|
|
||||||
}
|
|
||||||
|
|
||||||
$rows = $b->get()->getResultArray();
|
$rows = $b->get()->getResultArray();
|
||||||
|
|
||||||
// Flatten into a single contacts list (primary + second parent as separate rows)
|
// Flatten into a single contacts list (primary + second parent as separate rows)
|
||||||
@@ -606,11 +594,10 @@ class WhatsappController extends BaseController
|
|||||||
$pb->join('students s', 's.id = sc.student_id', 'inner'); // adjust if your table is named `student` (singular)
|
$pb->join('students s', 's.id = sc.student_id', 'inner'); // adjust if your table is named `student` (singular)
|
||||||
$pb->join('users u', 'u.id = s.parent_id', 'inner'); // primary parent lives on students.parent_id
|
$pb->join('users u', 'u.id = s.parent_id', 'inner'); // primary parent lives on students.parent_id
|
||||||
|
|
||||||
// Second parent row for the same term (allow NULL/'' semester if you sometimes omit it)
|
// Second parent row for the primary parent.
|
||||||
$pb->join(
|
$pb->join(
|
||||||
'parents sp',
|
'parents sp',
|
||||||
"sp.firstparent_id = u.id
|
'sp.firstparent_id = u.id',
|
||||||
AND sp.school_year = sc.school_year",
|
|
||||||
'left'
|
'left'
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1202,7 +1189,7 @@ class WhatsappController extends BaseController
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Class mode:
|
* Class mode:
|
||||||
* - Given classSectionId, find students (student_class) for the term
|
* - Given classSectionId, find students (student_class) for the year
|
||||||
* - Map to primaries (users) and second-parents (parents)
|
* - Map to primaries (users) and second-parents (parents)
|
||||||
* - Return one bundle **per primary parent** (so each parent gets their own email)
|
* - Return one bundle **per primary parent** (so each parent gets their own email)
|
||||||
*/
|
*/
|
||||||
@@ -1215,7 +1202,6 @@ class WhatsappController extends BaseController
|
|||||||
$stuRows = $this->db->table('student_class')
|
$stuRows = $this->db->table('student_class')
|
||||||
->select('student_id')
|
->select('student_id')
|
||||||
->where('school_year', $this->schoolYear)
|
->where('school_year', $this->schoolYear)
|
||||||
->where('semester', $this->semester)
|
|
||||||
->where('class_section_id', $classSectionId)
|
->where('class_section_id', $classSectionId)
|
||||||
->get()->getResultArray();
|
->get()->getResultArray();
|
||||||
if (empty($stuRows)) return [];
|
if (empty($stuRows)) return [];
|
||||||
@@ -1302,7 +1288,7 @@ class WhatsappController extends BaseController
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* All mode:
|
* All mode:
|
||||||
* - Iterate all distinct class_section_id in student_class (for the term)
|
* - Iterate all distinct class_section_id in student_class (for the year)
|
||||||
* - Reuse class bundles per section and flatten
|
* - Reuse class bundles per section and flatten
|
||||||
*/
|
*/
|
||||||
private function bundlesForAllParentsAllClasses(array $linkBySection): array
|
private function bundlesForAllParentsAllClasses(array $linkBySection): array
|
||||||
@@ -1310,7 +1296,6 @@ class WhatsappController extends BaseController
|
|||||||
$secRows = $this->db->table('student_class')
|
$secRows = $this->db->table('student_class')
|
||||||
->select('DISTINCT class_section_id', false)
|
->select('DISTINCT class_section_id', false)
|
||||||
->where('school_year', $this->schoolYear)
|
->where('school_year', $this->schoolYear)
|
||||||
->where('semester', $this->semester)
|
|
||||||
->orderBy('class_section_id', 'ASC')
|
->orderBy('class_section_id', 'ASC')
|
||||||
->get()->getResultArray();
|
->get()->getResultArray();
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,372 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Database\Migrations;
|
||||||
|
|
||||||
|
use CodeIgniter\Database\Migration;
|
||||||
|
|
||||||
|
class FixSchoolYearColumns extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Tables that directly own an academic year.
|
||||||
|
*
|
||||||
|
* school_year stays as text by design. Valid values use YYYY-YYYY and
|
||||||
|
* the second year must be exactly the first year + 1.
|
||||||
|
*/
|
||||||
|
private array $yearOwnerTables = [
|
||||||
|
'additional_charges',
|
||||||
|
'archived_paypal_transactions',
|
||||||
|
'attendance_data',
|
||||||
|
'attendance_day',
|
||||||
|
'attendance_record',
|
||||||
|
'attendance_tracking',
|
||||||
|
'badge_print_logs',
|
||||||
|
'below_sixty_decisions',
|
||||||
|
'calendar_events',
|
||||||
|
'certificate_records',
|
||||||
|
'classSection',
|
||||||
|
'class_progress_reports',
|
||||||
|
'competitions',
|
||||||
|
'current_flag',
|
||||||
|
'discount_vouchers',
|
||||||
|
'early_dismissal_signatures',
|
||||||
|
'enrollments',
|
||||||
|
'events',
|
||||||
|
'exams',
|
||||||
|
'exam_drafts',
|
||||||
|
'expenses',
|
||||||
|
'final_exam',
|
||||||
|
'final_score',
|
||||||
|
'flag',
|
||||||
|
'grading_locks',
|
||||||
|
'homework',
|
||||||
|
'inventory_movements',
|
||||||
|
'invoices',
|
||||||
|
'late_slip_logs',
|
||||||
|
'manual_payments',
|
||||||
|
'midterm_exam',
|
||||||
|
'missing_score_overrides',
|
||||||
|
'parent_attendance_reports',
|
||||||
|
'parent_meeting_schedules',
|
||||||
|
'parent_notifications',
|
||||||
|
'participation',
|
||||||
|
'payments',
|
||||||
|
'placement_batches',
|
||||||
|
'print_requests',
|
||||||
|
'project',
|
||||||
|
'quiz',
|
||||||
|
'refunds',
|
||||||
|
'reimbursements',
|
||||||
|
'reimbursement_batches',
|
||||||
|
'report_card_acknowledgements',
|
||||||
|
'scan_log',
|
||||||
|
'score_comments',
|
||||||
|
'semester_scores',
|
||||||
|
'staff_attendance',
|
||||||
|
'student_class',
|
||||||
|
'student_decisions',
|
||||||
|
'teacher_attendance_data',
|
||||||
|
'teacher_class',
|
||||||
|
'teacher_submission_notification_history',
|
||||||
|
'whatsapp_group_links',
|
||||||
|
'whatsapp_group_memberships',
|
||||||
|
];
|
||||||
|
|
||||||
|
/** Tables where school_year is redundant or conceptually incorrect. */
|
||||||
|
private array $tablesWithoutDirectYear = [
|
||||||
|
'chapters',
|
||||||
|
'classes',
|
||||||
|
'class_preparation_log',
|
||||||
|
'class_prep_adjustments',
|
||||||
|
'contactus',
|
||||||
|
'emergency_contacts',
|
||||||
|
'inventory_items',
|
||||||
|
'invoice_students_list',
|
||||||
|
'ip_attempts',
|
||||||
|
'login_activity',
|
||||||
|
'messages',
|
||||||
|
'notifications',
|
||||||
|
'notification_recipients',
|
||||||
|
'parents',
|
||||||
|
'paypal_transactions',
|
||||||
|
'placement_levels',
|
||||||
|
'preferences',
|
||||||
|
'staff',
|
||||||
|
'students',
|
||||||
|
'support_requests',
|
||||||
|
'users',
|
||||||
|
'user_notifications',
|
||||||
|
];
|
||||||
|
|
||||||
|
/** Tables where semester is redundant or conceptually incorrect. */
|
||||||
|
private array $tablesWithoutDirectSemester = [
|
||||||
|
'badge_print_logs',
|
||||||
|
'classes',
|
||||||
|
'contactus',
|
||||||
|
'emergency_contacts',
|
||||||
|
'inventory_items',
|
||||||
|
'invoice_students_list',
|
||||||
|
'ip_attempts',
|
||||||
|
'notification_recipients',
|
||||||
|
'notifications',
|
||||||
|
'parents',
|
||||||
|
'support_requests',
|
||||||
|
'user_notifications',
|
||||||
|
'whatsapp_group_links',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if ($this->db->DBDriver !== 'MySQLi') {
|
||||||
|
throw new \RuntimeException(
|
||||||
|
'This migration targets MySQL 8 because it uses enforced CHECK constraints.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// These annual entities lacked a school_year column in the audited schema.
|
||||||
|
foreach (['class_progress_reports', 'exams', 'print_requests'] as $table) {
|
||||||
|
if ($this->db->tableExists($table) && ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
// Nullable avoids inventing a year for existing rows.
|
||||||
|
// Backfill it, then make it NOT NULL in a later migration.
|
||||||
|
$this->forge->addColumn($table, [
|
||||||
|
'school_year' => [
|
||||||
|
'type' => 'VARCHAR',
|
||||||
|
'constraint' => 9,
|
||||||
|
'null' => true,
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate and normalize every direct owner to VARCHAR(9).
|
||||||
|
foreach ($this->yearOwnerTables as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertValidSchoolYears($table, 'school_year');
|
||||||
|
$this->normalizeYearColumn($table, 'school_year');
|
||||||
|
$this->ensureYearCheckConstraint($table, 'school_year');
|
||||||
|
$this->ensureYearIndex($table, 'school_year');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Promotion is a transition and legitimately owns both source and target years.
|
||||||
|
if ($this->db->tableExists('promotion_queue')) {
|
||||||
|
foreach (['school_year_from', 'school_year_to'] as $column) {
|
||||||
|
if (! $this->db->fieldExists($column, 'promotion_queue')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertValidSchoolYears('promotion_queue', $column);
|
||||||
|
$this->normalizeYearColumn('promotion_queue', $column);
|
||||||
|
$this->ensureYearCheckConstraint('promotion_queue', $column);
|
||||||
|
$this->ensureYearIndex('promotion_queue', $column);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove redundant columns. Dependent non-primary indexes are removed first.
|
||||||
|
foreach ($this->tablesWithoutDirectYear as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->dropIndexesContainingColumn($table, 'school_year');
|
||||||
|
$this->dropChecksContainingColumn($table, 'school_year');
|
||||||
|
$this->forge->dropColumn($table, 'school_year');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->tablesWithoutDirectSemester as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('semester', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->dropIndexesContainingColumn($table, 'semester');
|
||||||
|
$this->dropChecksContainingColumn($table, 'semester');
|
||||||
|
$this->forge->dropColumn($table, 'semester');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->yearOwnerTables as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->ensureYearIndex($table, 'school_year');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
throw new \RuntimeException(
|
||||||
|
'This migration is intentionally irreversible because dropping school_year columns destroys data. Restore from backup instead of pretending rollback can resurrect it.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertValidSchoolYears(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$tableName = $this->quoteIdentifier($table);
|
||||||
|
$columnName = $this->quoteIdentifier($column);
|
||||||
|
|
||||||
|
$invalid = $this->db->query(
|
||||||
|
"SELECT COUNT(*) AS aggregate
|
||||||
|
FROM {$tableName}
|
||||||
|
WHERE {$columnName} IS NOT NULL
|
||||||
|
AND (
|
||||||
|
{$columnName} NOT REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
OR CAST(RIGHT({$columnName}, 4) AS UNSIGNED)
|
||||||
|
<> CAST(LEFT({$columnName}, 4) AS UNSIGNED) + 1
|
||||||
|
)"
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($invalid->aggregate ?? 0) > 0) {
|
||||||
|
throw new \RuntimeException(
|
||||||
|
"Cannot migrate {$table}.{$column}: found {$invalid->aggregate} invalid school-year value(s). Expected YYYY-YYYY with consecutive years, for example 2025-2026."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeYearColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$metadata = $this->db->query(
|
||||||
|
'SELECT IS_NULLABLE, COLLATION_NAME
|
||||||
|
FROM information_schema.COLUMNS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
[$table, $column]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ($metadata === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$nullable = $metadata->IS_NULLABLE === 'YES' ? 'NULL' : 'NOT NULL';
|
||||||
|
$collation = $metadata->COLLATION_NAME && preg_match('/^[A-Za-z0-9_]+$/', $metadata->COLLATION_NAME)
|
||||||
|
? ' COLLATE ' . $metadata->COLLATION_NAME
|
||||||
|
: '';
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s MODIFY COLUMN %s VARCHAR(9)%s %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($column),
|
||||||
|
$collation,
|
||||||
|
$nullable
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureYearCheckConstraint(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$constraint = $this->objectName('chk_sy', $table, $column);
|
||||||
|
|
||||||
|
$exists = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS aggregate
|
||||||
|
FROM information_schema.TABLE_CONSTRAINTS
|
||||||
|
WHERE CONSTRAINT_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND CONSTRAINT_NAME = ?
|
||||||
|
AND CONSTRAINT_TYPE = \'CHECK\'',
|
||||||
|
[$table, $constraint]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($exists->aggregate ?? 0) > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$columnName = $this->quoteIdentifier($column);
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
"ALTER TABLE %s ADD CONSTRAINT %s CHECK (
|
||||||
|
%s IS NULL OR (
|
||||||
|
%s REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
AND CAST(RIGHT(%s, 4) AS UNSIGNED)
|
||||||
|
= CAST(LEFT(%s, 4) AS UNSIGNED) + 1
|
||||||
|
)
|
||||||
|
)",
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($constraint),
|
||||||
|
$columnName,
|
||||||
|
$columnName,
|
||||||
|
$columnName,
|
||||||
|
$columnName
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureYearIndex(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$indexed = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS aggregate
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
[$table, $column]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($indexed->aggregate ?? 0) > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$index = $this->objectName('idx_sy', $table, $column);
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s ADD INDEX %s (%s)',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($index),
|
||||||
|
$this->quoteIdentifier($column)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function dropIndexesContainingColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$indexes = $this->db->query(
|
||||||
|
'SELECT DISTINCT INDEX_NAME
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?
|
||||||
|
AND INDEX_NAME <> \'PRIMARY\'',
|
||||||
|
[$table, $column]
|
||||||
|
)->getResult();
|
||||||
|
|
||||||
|
foreach ($indexes as $index) {
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s DROP INDEX %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($index->INDEX_NAME)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function dropChecksContainingColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$checks = $this->db->query(
|
||||||
|
'SELECT tc.CONSTRAINT_NAME
|
||||||
|
FROM information_schema.TABLE_CONSTRAINTS tc
|
||||||
|
INNER JOIN information_schema.CHECK_CONSTRAINTS cc
|
||||||
|
ON cc.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
|
||||||
|
AND cc.CONSTRAINT_NAME = tc.CONSTRAINT_NAME
|
||||||
|
WHERE tc.CONSTRAINT_SCHEMA = DATABASE()
|
||||||
|
AND tc.TABLE_NAME = ?
|
||||||
|
AND tc.CONSTRAINT_TYPE = \'CHECK\'
|
||||||
|
AND cc.CHECK_CLAUSE LIKE ?',
|
||||||
|
[$table, '%' . $column . '%']
|
||||||
|
)->getResult();
|
||||||
|
|
||||||
|
foreach ($checks as $check) {
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s DROP CHECK %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($check->CONSTRAINT_NAME)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function objectName(string $prefix, string $table, string $column): string
|
||||||
|
{
|
||||||
|
// MySQL identifiers are limited to 64 characters.
|
||||||
|
return substr($prefix . '_' . $table . '_' . $column . '_' . substr(sha1($table . '.' . $column), 0, 8), 0, 64);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function quoteIdentifier(string $identifier): string
|
||||||
|
{
|
||||||
|
return '`' . str_replace('`', '``', $identifier) . '`';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Database\Migrations;
|
||||||
|
|
||||||
|
use CodeIgniter\Database\Migration;
|
||||||
|
use RuntimeException;
|
||||||
|
|
||||||
|
final class EnsureSchoolYearOnFinancialTables extends Migration
|
||||||
|
{
|
||||||
|
/** @var array<string, bool> table => nullable */
|
||||||
|
private array $tables = [
|
||||||
|
'discount_usages' => false,
|
||||||
|
'event_charges' => true,
|
||||||
|
'invoice_event' => true,
|
||||||
|
'payment_error' => true,
|
||||||
|
'payment_notification_logs' => true,
|
||||||
|
'payment_transactions' => true,
|
||||||
|
'reimbursement_batch_items' => true,
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if ($this->db->DBDriver !== 'MySQLi') {
|
||||||
|
throw new RuntimeException('This migration requires MySQL/MariaDB through the MySQLi driver.');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->tables as $table => $nullable) {
|
||||||
|
if (! $this->db->tableExists($table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
$this->forge->addColumn($table, [
|
||||||
|
'school_year' => [
|
||||||
|
'type' => 'VARCHAR',
|
||||||
|
'constraint' => 9,
|
||||||
|
'null' => $nullable,
|
||||||
|
'after' => $this->afterColumn($table),
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->backfillSchoolYear($table);
|
||||||
|
$this->assertValidYears($table);
|
||||||
|
|
||||||
|
$nullSql = $nullable ? 'NULL' : 'NOT NULL';
|
||||||
|
$this->db->query(
|
||||||
|
sprintf(
|
||||||
|
'ALTER TABLE `%s` MODIFY `school_year` VARCHAR(9) %s',
|
||||||
|
str_replace('`', '``', $table),
|
||||||
|
$nullSql
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
$this->ensureIndex($table);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
// These columns are part of the business model and must not be dropped on rollback.
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertValidYears(string $table): void
|
||||||
|
{
|
||||||
|
$sql = sprintf(
|
||||||
|
"SELECT COUNT(*) AS invalid_count
|
||||||
|
FROM `%s`
|
||||||
|
WHERE `school_year` IS NOT NULL
|
||||||
|
AND (
|
||||||
|
`school_year` NOT REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
OR CAST(RIGHT(`school_year`, 4) AS UNSIGNED)
|
||||||
|
<> CAST(LEFT(`school_year`, 4) AS UNSIGNED) + 1
|
||||||
|
)",
|
||||||
|
str_replace('`', '``', $table)
|
||||||
|
);
|
||||||
|
|
||||||
|
$row = $this->db->query($sql)->getRowArray();
|
||||||
|
$invalid = (int) ($row['invalid_count'] ?? 0);
|
||||||
|
|
||||||
|
if ($invalid > 0) {
|
||||||
|
throw new RuntimeException(
|
||||||
|
"Cannot normalize {$table}.school_year: {$invalid} invalid value(s). Expected YYYY-YYYY, for example 2025-2026."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function backfillSchoolYear(string $table): void
|
||||||
|
{
|
||||||
|
if ($table === 'discount_usages' && $this->db->tableExists('invoices')) {
|
||||||
|
$this->db->query(
|
||||||
|
"UPDATE `discount_usages` du
|
||||||
|
INNER JOIN `invoices` i ON i.`id` = du.`invoice_id`
|
||||||
|
SET du.`school_year` = i.`school_year`
|
||||||
|
WHERE (du.`school_year` IS NULL OR TRIM(du.`school_year`) = '')
|
||||||
|
AND i.`school_year` REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
AND CAST(RIGHT(i.`school_year`, 4) AS UNSIGNED)
|
||||||
|
= CAST(LEFT(i.`school_year`, 4) AS UNSIGNED) + 1"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureIndex(string $table): void
|
||||||
|
{
|
||||||
|
$indexName = 'idx_' . $table . '_school_year';
|
||||||
|
if (strlen($indexName) > 64) {
|
||||||
|
$indexName = 'idx_' . substr(hash('sha256', $table . '_school_year'), 0, 24);
|
||||||
|
}
|
||||||
|
|
||||||
|
$row = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS index_count
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
[$table, 'school_year']
|
||||||
|
)->getRowArray();
|
||||||
|
|
||||||
|
if ((int) ($row['index_count'] ?? 0) === 0) {
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'CREATE INDEX `%s` ON `%s` (`school_year`)',
|
||||||
|
str_replace('`', '``', $indexName),
|
||||||
|
str_replace('`', '``', $table)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function afterColumn(string $table): string
|
||||||
|
{
|
||||||
|
$preferred = ['semester', 'invoice_id', 'payment_id', 'batch_id'];
|
||||||
|
foreach ($preferred as $column) {
|
||||||
|
if ($this->db->fieldExists($column, $table)) {
|
||||||
|
return $column;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return 'id';
|
||||||
|
}
|
||||||
|
}
|
||||||
+256
@@ -0,0 +1,256 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Database\Migrations;
|
||||||
|
|
||||||
|
use CodeIgniter\Database\Migration;
|
||||||
|
use RuntimeException;
|
||||||
|
|
||||||
|
final class ApplySchoolYearSemesterAuditCorrections extends Migration
|
||||||
|
{
|
||||||
|
private array $schoolYearIndexTables = [
|
||||||
|
'archived_paypal_transactions',
|
||||||
|
'class_progress_reports',
|
||||||
|
'exams',
|
||||||
|
'missing_score_overrides',
|
||||||
|
'payments',
|
||||||
|
'placement_batches',
|
||||||
|
'print_requests',
|
||||||
|
'report_card_acknowledgements',
|
||||||
|
'semester_scores',
|
||||||
|
'staff_attendance',
|
||||||
|
'teacher_attendance_data',
|
||||||
|
'whatsapp_group_links',
|
||||||
|
];
|
||||||
|
|
||||||
|
private array $semesterDropTables = [
|
||||||
|
'badge_print_logs',
|
||||||
|
'classes',
|
||||||
|
'contactus',
|
||||||
|
'emergency_contacts',
|
||||||
|
'inventory_items',
|
||||||
|
'invoice_students_list',
|
||||||
|
'ip_attempts',
|
||||||
|
'notification_recipients',
|
||||||
|
'notifications',
|
||||||
|
'parents',
|
||||||
|
'support_requests',
|
||||||
|
'user_notifications',
|
||||||
|
'whatsapp_group_links',
|
||||||
|
];
|
||||||
|
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if ($this->db->DBDriver !== 'MySQLi') {
|
||||||
|
throw new RuntimeException('This migration requires MySQL/MariaDB through the MySQLi driver.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->db->tableExists('archived_paypal_transactions')
|
||||||
|
&& $this->db->fieldExists('school_year', 'archived_paypal_transactions')) {
|
||||||
|
$this->assertValidSchoolYears('archived_paypal_transactions', 'school_year');
|
||||||
|
$this->normalizeYearColumn('archived_paypal_transactions', 'school_year');
|
||||||
|
$this->ensureYearCheckConstraint('archived_paypal_transactions', 'school_year');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->schoolYearIndexTables as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->ensureIndex($table, 'school_year');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->semesterDropTables as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('semester', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->dropIndexesContainingColumn($table, 'semester');
|
||||||
|
$this->dropChecksContainingColumn($table, 'semester');
|
||||||
|
$this->forge->dropColumn($table, 'semester');
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($this->schoolYearIndexTables as $table) {
|
||||||
|
if (! $this->db->tableExists($table) || ! $this->db->fieldExists('school_year', $table)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->ensureIndex($table, 'school_year');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
throw new RuntimeException(
|
||||||
|
'This migration is intentionally irreversible because dropping semester columns destroys data.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function assertValidSchoolYears(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$tableName = $this->quoteIdentifier($table);
|
||||||
|
$columnName = $this->quoteIdentifier($column);
|
||||||
|
|
||||||
|
$invalid = $this->db->query(
|
||||||
|
"SELECT COUNT(*) AS aggregate
|
||||||
|
FROM {$tableName}
|
||||||
|
WHERE {$columnName} IS NOT NULL
|
||||||
|
AND (
|
||||||
|
{$columnName} NOT REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
OR CAST(RIGHT({$columnName}, 4) AS UNSIGNED)
|
||||||
|
<> CAST(LEFT({$columnName}, 4) AS UNSIGNED) + 1
|
||||||
|
)"
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($invalid->aggregate ?? 0) > 0) {
|
||||||
|
throw new RuntimeException(
|
||||||
|
"Cannot migrate {$table}.{$column}: found {$invalid->aggregate} invalid school-year value(s)."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function normalizeYearColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$metadata = $this->db->query(
|
||||||
|
'SELECT IS_NULLABLE, COLLATION_NAME
|
||||||
|
FROM information_schema.COLUMNS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
[$table, $column]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ($metadata === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$nullable = $metadata->IS_NULLABLE === 'YES' ? 'NULL' : 'NOT NULL';
|
||||||
|
$collation = $metadata->COLLATION_NAME && preg_match('/^[A-Za-z0-9_]+$/', $metadata->COLLATION_NAME)
|
||||||
|
? ' COLLATE ' . $metadata->COLLATION_NAME
|
||||||
|
: '';
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s MODIFY COLUMN %s VARCHAR(9)%s %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($column),
|
||||||
|
$collation,
|
||||||
|
$nullable
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureYearCheckConstraint(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$constraint = $this->objectName('chk_sy', $table, $column);
|
||||||
|
|
||||||
|
$exists = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS aggregate
|
||||||
|
FROM information_schema.TABLE_CONSTRAINTS
|
||||||
|
WHERE CONSTRAINT_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND CONSTRAINT_NAME = ?
|
||||||
|
AND CONSTRAINT_TYPE = \'CHECK\'',
|
||||||
|
[$table, $constraint]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($exists->aggregate ?? 0) > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$columnName = $this->quoteIdentifier($column);
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
"ALTER TABLE %s ADD CONSTRAINT %s CHECK (
|
||||||
|
%s IS NULL OR (
|
||||||
|
%s REGEXP '^[0-9]{4}-[0-9]{4}$'
|
||||||
|
AND CAST(RIGHT(%s, 4) AS UNSIGNED)
|
||||||
|
= CAST(LEFT(%s, 4) AS UNSIGNED) + 1
|
||||||
|
)
|
||||||
|
)",
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($constraint),
|
||||||
|
$columnName,
|
||||||
|
$columnName,
|
||||||
|
$columnName,
|
||||||
|
$columnName
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function ensureIndex(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$indexed = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS aggregate
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
[$table, $column]
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($indexed->aggregate ?? 0) > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s ADD INDEX %s (%s)',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($this->objectName('idx_sy', $table, $column)),
|
||||||
|
$this->quoteIdentifier($column)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function dropIndexesContainingColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$indexes = $this->db->query(
|
||||||
|
'SELECT DISTINCT INDEX_NAME
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?
|
||||||
|
AND INDEX_NAME <> \'PRIMARY\'',
|
||||||
|
[$table, $column]
|
||||||
|
)->getResult();
|
||||||
|
|
||||||
|
foreach ($indexes as $index) {
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s DROP INDEX %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($index->INDEX_NAME)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function dropChecksContainingColumn(string $table, string $column): void
|
||||||
|
{
|
||||||
|
$checks = $this->db->query(
|
||||||
|
'SELECT tc.CONSTRAINT_NAME
|
||||||
|
FROM information_schema.TABLE_CONSTRAINTS tc
|
||||||
|
INNER JOIN information_schema.CHECK_CONSTRAINTS cc
|
||||||
|
ON cc.CONSTRAINT_SCHEMA = tc.CONSTRAINT_SCHEMA
|
||||||
|
AND cc.CONSTRAINT_NAME = tc.CONSTRAINT_NAME
|
||||||
|
WHERE tc.CONSTRAINT_SCHEMA = DATABASE()
|
||||||
|
AND tc.TABLE_NAME = ?
|
||||||
|
AND tc.CONSTRAINT_TYPE = \'CHECK\'
|
||||||
|
AND cc.CHECK_CLAUSE LIKE ?',
|
||||||
|
[$table, '%' . $column . '%']
|
||||||
|
)->getResult();
|
||||||
|
|
||||||
|
foreach ($checks as $check) {
|
||||||
|
$this->db->query(sprintf(
|
||||||
|
'ALTER TABLE %s DROP CHECK %s',
|
||||||
|
$this->quoteIdentifier($table),
|
||||||
|
$this->quoteIdentifier($check->CONSTRAINT_NAME)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function objectName(string $prefix, string $table, string $column): string
|
||||||
|
{
|
||||||
|
return substr($prefix . '_' . $table . '_' . $column . '_' . substr(sha1($table . '.' . $column), 0, 8), 0, 64);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function quoteIdentifier(string $identifier): string
|
||||||
|
{
|
||||||
|
return '`' . str_replace('`', '``', $identifier) . '`';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Database\Migrations;
|
||||||
|
|
||||||
|
use CodeIgniter\Database\Migration;
|
||||||
|
use RuntimeException;
|
||||||
|
|
||||||
|
final class EnsureWhatsappGroupLinksSchoolYearIndex extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if ($this->db->DBDriver !== 'MySQLi') {
|
||||||
|
throw new RuntimeException('This migration requires MySQL/MariaDB through the MySQLi driver.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $this->db->tableExists('whatsapp_group_links')
|
||||||
|
|| ! $this->db->fieldExists('school_year', 'whatsapp_group_links')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$indexed = $this->db->query(
|
||||||
|
'SELECT COUNT(*) AS aggregate
|
||||||
|
FROM information_schema.STATISTICS
|
||||||
|
WHERE TABLE_SCHEMA = DATABASE()
|
||||||
|
AND TABLE_NAME = ?
|
||||||
|
AND COLUMN_NAME = ?',
|
||||||
|
['whatsapp_group_links', 'school_year']
|
||||||
|
)->getRow();
|
||||||
|
|
||||||
|
if ((int) ($indexed->aggregate ?? 0) > 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->db->query(
|
||||||
|
'ALTER TABLE `whatsapp_group_links` ADD INDEX `idx_sy_whatsapp_group_links_school_year` (`school_year`)'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
if ($this->db->tableExists('whatsapp_group_links')) {
|
||||||
|
$this->db->query('ALTER TABLE `whatsapp_group_links` DROP INDEX `idx_sy_whatsapp_group_links_school_year`');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,7 +18,6 @@ class AttendanceDataModel extends Model
|
|||||||
'date',
|
'date',
|
||||||
'status',
|
'status',
|
||||||
'reason',
|
'reason',
|
||||||
'reported',
|
|
||||||
'is_reported',
|
'is_reported',
|
||||||
'is_notified',
|
'is_notified',
|
||||||
'semester',
|
'semester',
|
||||||
|
|||||||
@@ -7,6 +7,6 @@ class ClassPrepAdjustmentModel extends Model
|
|||||||
{
|
{
|
||||||
protected $table = 'class_prep_adjustments';
|
protected $table = 'class_prep_adjustments';
|
||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'class_section_id', 'item_name', 'adjustment', 'school_year', 'created_at'
|
'class_section_id', 'item_name', 'adjustment', 'adjustable', 'created_at'
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -11,7 +11,6 @@ class ClassPreparationLogModel extends Model
|
|||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'class_section_id',
|
'class_section_id',
|
||||||
'class_section',
|
'class_section',
|
||||||
'school_year',
|
|
||||||
'prep_data',
|
'prep_data',
|
||||||
'created_at',
|
'created_at',
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -19,8 +19,6 @@ class ContactUsModel extends Model
|
|||||||
'reciever_id',
|
'reciever_id',
|
||||||
'subject',
|
'subject',
|
||||||
'message',
|
'message',
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
];
|
];
|
||||||
@@ -35,8 +33,6 @@ class ContactUsModel extends Model
|
|||||||
'reciever_id' => 'required|integer',
|
'reciever_id' => 'required|integer',
|
||||||
'subject' => 'required|string|max_length[255]',
|
'subject' => 'required|string|max_length[255]',
|
||||||
'message' => 'required|string',
|
'message' => 'required|string',
|
||||||
'semester' => 'required|string|max_length[255]',
|
|
||||||
'school_year' => 'permit_empty|string|max_length[9]'
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $validationMessages = [];
|
protected $validationMessages = [];
|
||||||
@@ -51,10 +47,7 @@ class ContactUsModel extends Model
|
|||||||
*/
|
*/
|
||||||
public function getMessagesBySemesterAndYear($semester, $school_year)
|
public function getMessagesBySemesterAndYear($semester, $school_year)
|
||||||
{
|
{
|
||||||
return $this->where([
|
return $this->findAll();
|
||||||
'semester' => $semester,
|
|
||||||
'school_year' => $school_year
|
|
||||||
])->findAll();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -6,12 +6,19 @@ use CodeIgniter\Model;
|
|||||||
class EmailTemplateModel extends Model {
|
class EmailTemplateModel extends Model {
|
||||||
protected $table = 'email_templates';
|
protected $table = 'email_templates';
|
||||||
protected $primaryKey = 'id';
|
protected $primaryKey = 'id';
|
||||||
protected $allowedFields = ['template_key','name','subject','body','is_active'];
|
protected $allowedFields = ['code', 'variant', 'subject', 'body_html', 'is_active', 'updated_by', 'updated_at'];
|
||||||
|
|
||||||
public function getActiveTemplates(): array {
|
public function getActiveTemplates(): array {
|
||||||
return $this->where('is_active', 1)->orderBy('template_key','asc')->findAll();
|
return $this->select('email_templates.*, code AS template_key, code AS name, body_html AS body')
|
||||||
|
->where('is_active', 1)
|
||||||
|
->orderBy('code', 'asc')
|
||||||
|
->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findByKey(string $key): ?array {
|
public function findByKey(string $key): ?array {
|
||||||
return $this->where('template_key', $key)->where('is_active', 1)->first();
|
return $this->select('email_templates.*, code AS template_key, code AS name, body_html AS body')
|
||||||
|
->where('code', $key)
|
||||||
|
->where('is_active', 1)
|
||||||
|
->first();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ class EmergencyContactModel extends Model
|
|||||||
'cellphone',
|
'cellphone',
|
||||||
'email',
|
'email',
|
||||||
'relation',
|
'relation',
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ class EnrollmentModel extends Model
|
|||||||
/**
|
/**
|
||||||
* Get all enrolled students (full student info) for a given parent.
|
* Get all enrolled students (full student info) for a given parent.
|
||||||
*/
|
*/
|
||||||
public function getEnrolledStudents(int $parentId, string $schoolYear = null, string $semester = null): array
|
public function getEnrolledStudents(int $parentId, ?string $schoolYear = null, ?string $semester = null): array
|
||||||
{
|
{
|
||||||
$builder = $this->select('students.*')
|
$builder = $this->select('students.*')
|
||||||
->join('students', 'students.id = enrollments.student_id')
|
->join('students', 'students.id = enrollments.student_id')
|
||||||
@@ -106,7 +106,7 @@ class EnrollmentModel extends Model
|
|||||||
/**
|
/**
|
||||||
* Get student basic info (ID, name, grade) for a given parent where status is enrolled or Payment pending.
|
* Get student basic info (ID, name, grade) for a given parent where status is enrolled or Payment pending.
|
||||||
*/
|
*/
|
||||||
public function getenrolledStudentDetails(int $parentId, string $schoolYear = null): array
|
public function getenrolledStudentDetails(int $parentId, ?string $schoolYear = null): array
|
||||||
{
|
{
|
||||||
$builder = $this->db->table('enrollments')
|
$builder = $this->db->table('enrollments')
|
||||||
->select('students.id, students.firstname, students.lastname, students.grade_level')
|
->select('students.id, students.firstname, students.lastname, students.grade_level')
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class EventChargesModel extends Model
|
|||||||
'external_parent_email',
|
'external_parent_email',
|
||||||
'semester',
|
'semester',
|
||||||
'school_year',
|
'school_year',
|
||||||
'created_by',
|
|
||||||
'updated_by',
|
'updated_by',
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
|
|||||||
@@ -32,7 +32,6 @@ class ExamDraftModel extends Model
|
|||||||
];
|
];
|
||||||
|
|
||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'teacher_id',
|
|
||||||
'author_id',
|
'author_id',
|
||||||
'class_section_id',
|
'class_section_id',
|
||||||
'semester',
|
'semester',
|
||||||
@@ -40,20 +39,14 @@ class ExamDraftModel extends Model
|
|||||||
'exam_type',
|
'exam_type',
|
||||||
'draft_title',
|
'draft_title',
|
||||||
'author_comment',
|
'author_comment',
|
||||||
'description',
|
|
||||||
'teacher_file',
|
|
||||||
'teacher_filename',
|
|
||||||
'author_file',
|
'author_file',
|
||||||
'author_filename',
|
'author_filename',
|
||||||
'status',
|
'status',
|
||||||
'acceptance_type',
|
'acceptance_type',
|
||||||
'review_revision',
|
'review_revision',
|
||||||
'reviewer_id',
|
'reviewer_id',
|
||||||
'admin_id',
|
|
||||||
'is_legacy',
|
'is_legacy',
|
||||||
'reviewer_comment',
|
|
||||||
'reviewer_comments',
|
'reviewer_comments',
|
||||||
'admin_comments',
|
|
||||||
'reviewed_at',
|
'reviewed_at',
|
||||||
'final_file',
|
'final_file',
|
||||||
'final_filename',
|
'final_filename',
|
||||||
@@ -87,11 +80,9 @@ class ExamDraftModel extends Model
|
|||||||
* @var array<string, string>
|
* @var array<string, string>
|
||||||
*/
|
*/
|
||||||
protected array $casts = [
|
protected array $casts = [
|
||||||
'teacher_id' => 'int',
|
|
||||||
'author_id' => 'int',
|
'author_id' => 'int',
|
||||||
'class_section_id' => 'int',
|
'class_section_id' => 'int',
|
||||||
'reviewer_id' => '?int',
|
'reviewer_id' => '?int',
|
||||||
'admin_id' => '?int',
|
|
||||||
'review_revision' => 'int',
|
'review_revision' => 'int',
|
||||||
'version' => 'int',
|
'version' => 'int',
|
||||||
'previous_draft_id' => '?int',
|
'previous_draft_id' => '?int',
|
||||||
|
|||||||
@@ -12,9 +12,10 @@ class ExamModel extends Model
|
|||||||
|
|
||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'student_id',
|
'student_id',
|
||||||
'school_id',
|
'student_school_id',
|
||||||
'class_section_id',
|
'class_section_id',
|
||||||
'exam_name',
|
'exam_name',
|
||||||
|
'school_year',
|
||||||
'created_at'
|
'created_at'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ class FinalExamModel extends Model
|
|||||||
'class_section_id',
|
'class_section_id',
|
||||||
'updated_by',
|
'updated_by',
|
||||||
'score',
|
'score',
|
||||||
'comment',
|
|
||||||
'semester',
|
'semester',
|
||||||
'school_year',
|
'school_year',
|
||||||
'created_at',
|
'created_at',
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class FinalScoreModel extends Model
|
|||||||
'student_id',
|
'student_id',
|
||||||
'school_id',
|
'school_id',
|
||||||
'class_section_id',
|
'class_section_id',
|
||||||
'teacher_id',
|
'updated_by',
|
||||||
'score',
|
'score',
|
||||||
'score_letter',
|
'score_letter',
|
||||||
'comment',
|
'comment',
|
||||||
|
|||||||
@@ -30,10 +30,6 @@ protected $table = 'inventory_items';
|
|||||||
'sku',
|
'sku',
|
||||||
'notes',
|
'notes',
|
||||||
|
|
||||||
// academic tags
|
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
|
|
||||||
// audit
|
// audit
|
||||||
'updated_by',
|
'updated_by',
|
||||||
|
|
||||||
@@ -50,7 +46,5 @@ protected $table = 'inventory_items';
|
|||||||
'name' => 'required|min_length[2]',
|
'name' => 'required|min_length[2]',
|
||||||
'quantity' => 'permit_empty|integer',
|
'quantity' => 'permit_empty|integer',
|
||||||
'unit_price' => 'permit_empty|decimal',
|
'unit_price' => 'permit_empty|decimal',
|
||||||
'semester' => 'permit_empty|in_list[Spring,Fall]',
|
|
||||||
'school_year' => 'permit_empty|max_length[16]', // e.g. 2025-2026
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,8 +20,6 @@ class InvoiceStudentListModel extends Model
|
|||||||
'student_lastname',
|
'student_lastname',
|
||||||
'school_id',
|
'school_id',
|
||||||
'enrolled',
|
'enrolled',
|
||||||
'school_year',
|
|
||||||
'semester',
|
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ class IpAttemptModel extends Model
|
|||||||
'ip_address',
|
'ip_address',
|
||||||
'attempts',
|
'attempts',
|
||||||
'last_attempt_at',
|
'last_attempt_at',
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
'blocked_until'
|
'blocked_until'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ class LoginActivityModel extends Model
|
|||||||
'logout_time',
|
'logout_time',
|
||||||
'ip_address',
|
'ip_address',
|
||||||
'user_agent',
|
'user_agent',
|
||||||
'school_year',
|
|
||||||
'semester',
|
'semester',
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
|
|||||||
@@ -21,8 +21,7 @@ class MessageModel extends Model
|
|||||||
'priority',
|
'priority',
|
||||||
'attachment',
|
'attachment',
|
||||||
'status',
|
'status',
|
||||||
'semester', // Added field
|
'semester'
|
||||||
'school_year' // Added field
|
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $useTimestamps = false; // Since you're manually handling date fields
|
protected $useTimestamps = false; // Since you're manually handling date fields
|
||||||
@@ -150,10 +149,8 @@ class MessageModel extends Model
|
|||||||
*/
|
*/
|
||||||
public function getMessagesBySemesterAndYear($semester, $school_year = null)
|
public function getMessagesBySemesterAndYear($semester, $school_year = null)
|
||||||
{
|
{
|
||||||
$builder = $this->where('semester', $semester);
|
return $this->where('semester', $semester)
|
||||||
if ($school_year) {
|
->orderBy('sent_datetime', 'DESC')
|
||||||
$builder->where('school_year', $school_year);
|
->findAll();
|
||||||
}
|
|
||||||
return $builder->orderBy('sent_datetime', 'DESC')->findAll();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,8 +17,8 @@ class NotificationModel extends Model
|
|||||||
'status',
|
'status',
|
||||||
'action_url',
|
'action_url',
|
||||||
'attachment_path',
|
'attachment_path',
|
||||||
'semester',
|
'expires_at',
|
||||||
'school_year',
|
'sent_at',
|
||||||
'scheduled_at'
|
'scheduled_at'
|
||||||
];
|
];
|
||||||
protected $useTimestamps = true;
|
protected $useTimestamps = true;
|
||||||
|
|||||||
@@ -15,7 +15,5 @@ class ParentModel extends Model
|
|||||||
'secondparent_email',
|
'secondparent_email',
|
||||||
'secondparent_phone',
|
'secondparent_phone',
|
||||||
'firstparent_id',
|
'firstparent_id',
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,18 +18,11 @@ class PaymentTransactionModel extends Model
|
|||||||
'payment_method',
|
'payment_method',
|
||||||
'payment_status',
|
'payment_status',
|
||||||
'transaction_fee',
|
'transaction_fee',
|
||||||
'payment_reference',
|
|
||||||
'semester',
|
'semester',
|
||||||
'school_year',
|
'school_year'
|
||||||
'is_full_payment', // Flag to track full payment status
|
|
||||||
'created_at',
|
|
||||||
'updated_at'
|
|
||||||
];
|
];
|
||||||
|
|
||||||
// Set automatic timestamps
|
protected $useTimestamps = false;
|
||||||
protected $useTimestamps = true;
|
|
||||||
protected $createdField = 'created_at';
|
|
||||||
protected $updatedField = 'updated_at';
|
|
||||||
|
|
||||||
// Validation rules
|
// Validation rules
|
||||||
protected $validationRules = [
|
protected $validationRules = [
|
||||||
@@ -38,8 +31,8 @@ class PaymentTransactionModel extends Model
|
|||||||
'amount' => 'required|decimal',
|
'amount' => 'required|decimal',
|
||||||
'payment_method' => 'required|string|max_length[50]',
|
'payment_method' => 'required|string|max_length[50]',
|
||||||
'payment_status' => 'required|string|max_length[50]',
|
'payment_status' => 'required|string|max_length[50]',
|
||||||
'payment_reference' => 'permit_empty|string|max_length[255]',
|
'semester' => 'permit_empty|string|max_length[30]',
|
||||||
'is_full_payment' => 'required|in_list[0,1]', // 0 for installment, 1 for full payment
|
'school_year' => 'permit_empty|string|max_length[9]',
|
||||||
];
|
];
|
||||||
|
|
||||||
// Custom error messages
|
// Custom error messages
|
||||||
@@ -64,13 +57,6 @@ class PaymentTransactionModel extends Model
|
|||||||
'required' => 'The payment status is required.',
|
'required' => 'The payment status is required.',
|
||||||
'max_length' => 'The payment status must not exceed 50 characters.',
|
'max_length' => 'The payment status must not exceed 50 characters.',
|
||||||
],
|
],
|
||||||
'payment_reference' => [
|
|
||||||
'max_length' => 'The payment reference must not exceed 255 characters.',
|
|
||||||
],
|
|
||||||
'is_full_payment' => [
|
|
||||||
'required' => 'The full payment flag is required.',
|
|
||||||
'in_list' => 'The full payment flag must be either 0 (installment) or 1 (full payment).',
|
|
||||||
],
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -106,7 +92,9 @@ class PaymentTransactionModel extends Model
|
|||||||
*/
|
*/
|
||||||
public function updateTransactionStatus($transactionId, $status)
|
public function updateTransactionStatus($transactionId, $status)
|
||||||
{
|
{
|
||||||
return $this->update($transactionId, ['payment_status' => $status]);
|
return $this->where('transaction_id', $transactionId)
|
||||||
|
->set(['payment_status' => $status])
|
||||||
|
->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -130,7 +118,9 @@ class PaymentTransactionModel extends Model
|
|||||||
*/
|
*/
|
||||||
public function updateTransactionFee($transactionId, $transactionFee)
|
public function updateTransactionFee($transactionId, $transactionFee)
|
||||||
{
|
{
|
||||||
return $this->update($transactionId, ['transaction_fee' => $transactionFee]);
|
return $this->where('transaction_id', $transactionId)
|
||||||
|
->set(['transaction_fee' => $transactionFee])
|
||||||
|
->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ class PlacementLevelModel extends Model
|
|||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'student_id',
|
'student_id',
|
||||||
'level',
|
'level',
|
||||||
'school_year',
|
|
||||||
'created_by',
|
'created_by',
|
||||||
'updated_by',
|
'updated_by',
|
||||||
'created_at',
|
'created_at',
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ class PreferencesModel extends Model
|
|||||||
// Allowed fields to enable mass assignment
|
// Allowed fields to enable mass assignment
|
||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'user_id', // Foreign key linking preferences to a user
|
'user_id', // Foreign key linking preferences to a user
|
||||||
'receive_email_notifications', // Email notifications preference
|
'notification_email', // Email notifications preference
|
||||||
'receive_sms_notifications', // SMS notifications preference
|
'notification_sms', // SMS notifications preference
|
||||||
'theme', // Theme preference (e.g., light or dark)
|
'theme', // Theme preference (e.g., light or dark)
|
||||||
'language', // Language preference
|
'language', // Language preference
|
||||||
'timezone', // Timezone preference
|
'timezone', // Timezone preference
|
||||||
@@ -22,11 +22,6 @@ class PreferencesModel extends Model
|
|||||||
'menu_custom_bg', // Custom menu background color
|
'menu_custom_bg', // Custom menu background color
|
||||||
'menu_custom_text', // Custom menu text color
|
'menu_custom_text', // Custom menu text color
|
||||||
'menu_custom_mode', // Custom menu mode: light|dark
|
'menu_custom_mode', // Custom menu mode: light|dark
|
||||||
'receive_push_notifications', // Push notifications preference
|
|
||||||
'daily_summary_email', // Daily summary email preference
|
|
||||||
'privacy_mode', // Privacy mode setting
|
|
||||||
'marketing_emails', // Marketing emails preference
|
|
||||||
'account_activity_alerts', // Account activity alerts preference
|
|
||||||
'created_at', // Timestamp of when the record was created
|
'created_at', // Timestamp of when the record was created
|
||||||
'updated_at' // Timestamp of when the record was last updated
|
'updated_at' // Timestamp of when the record was last updated
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ class SectionModel extends Model
|
|||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'section_name',
|
'section_name',
|
||||||
'description',
|
'description',
|
||||||
'created_at',
|
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'updated_by'
|
'updated_by'
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -21,8 +21,6 @@ class StaffModel extends Model
|
|||||||
'phone',
|
'phone',
|
||||||
'role_name',
|
'role_name',
|
||||||
'active_role',
|
'active_role',
|
||||||
'status',
|
|
||||||
'school_year',
|
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at'
|
'updated_at'
|
||||||
];
|
];
|
||||||
@@ -44,7 +42,7 @@ class StaffModel extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert or update a staff row keyed by (user_id, school_year).
|
* Insert or update a staff row keyed by user_id.
|
||||||
* Ensures created_at is only set on insert and updated_at can be provided by caller.
|
* Ensures created_at is only set on insert and updated_at can be provided by caller.
|
||||||
*/
|
*/
|
||||||
public function upsert(array $data): bool
|
public function upsert(array $data): bool
|
||||||
@@ -53,27 +51,9 @@ class StaffModel extends Model
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If school_year not provided, try to keep existing or fall back to current year string
|
unset($data['school_year'], $data['status']);
|
||||||
$schoolYear = $data['school_year'] ?? null;
|
|
||||||
|
|
||||||
if ($schoolYear === null) {
|
$existing = $this->where('user_id', $data['user_id'])->first();
|
||||||
// Try to find any existing row by user_id to reuse its school_year
|
|
||||||
$existingAny = $this->where('user_id', $data['user_id'])->orderBy('id', 'DESC')->first();
|
|
||||||
if ($existingAny && isset($existingAny['school_year'])) {
|
|
||||||
$schoolYear = $existingAny['school_year'];
|
|
||||||
$data['school_year'] = $schoolYear;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$existing = null;
|
|
||||||
if ($schoolYear !== null) {
|
|
||||||
$existing = $this->where('user_id', $data['user_id'])
|
|
||||||
->where('school_year', $schoolYear)
|
|
||||||
->first();
|
|
||||||
} else {
|
|
||||||
// If no school_year, treat (user_id) as key
|
|
||||||
$existing = $this->where('user_id', $data['user_id'])->first();
|
|
||||||
}
|
|
||||||
|
|
||||||
$now = utc_now();
|
$now = utc_now();
|
||||||
|
|
||||||
@@ -100,4 +80,3 @@ class StaffModel extends Model
|
|||||||
return $this->insert($data) !== false;
|
return $this->insert($data) !== false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ class StudentClassModel extends Model
|
|||||||
|
|
||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'student_id',
|
'student_id',
|
||||||
'school_id',
|
|
||||||
'class_section_id',
|
'class_section_id',
|
||||||
'school_year',
|
'school_year',
|
||||||
'is_event_only',
|
'is_event_only',
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ class StudentModel extends Model
|
|||||||
'photo_consent',
|
'photo_consent',
|
||||||
'is_new',
|
'is_new',
|
||||||
'parent_id',
|
'parent_id',
|
||||||
'school_year',
|
|
||||||
'registration_date',
|
'registration_date',
|
||||||
'tuition_paid',
|
'tuition_paid',
|
||||||
'year_of_registration',
|
'year_of_registration',
|
||||||
@@ -122,7 +121,9 @@ class StudentModel extends Model
|
|||||||
|
|
||||||
// school_year filter (skip if null or "all")
|
// school_year filter (skip if null or "all")
|
||||||
if ($schoolYear !== null && strtolower($schoolYear) !== 'all') {
|
if ($schoolYear !== null && strtolower($schoolYear) !== 'all') {
|
||||||
$builder->where('students.school_year', $schoolYear);
|
$builder
|
||||||
|
->join('student_class sc_filter', 'sc_filter.student_id = students.id', 'inner')
|
||||||
|
->where('sc_filter.school_year', $schoolYear);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $builder
|
return $builder
|
||||||
@@ -171,12 +172,13 @@ class StudentModel extends Model
|
|||||||
users.cellphone as phone,
|
users.cellphone as phone,
|
||||||
students.registration_grade,
|
students.registration_grade,
|
||||||
classSection.class_section_name as current_class,
|
classSection.class_section_name as current_class,
|
||||||
"' . $schoolYear . '" as school_year,
|
student_class.school_year,
|
||||||
"' . $semester . '" as semester
|
"' . $semester . '" as semester
|
||||||
')
|
')
|
||||||
->join('users', 'users.id = students.parent_id', 'left')
|
->join('users', 'users.id = students.parent_id', 'left')
|
||||||
->join('student_class', 'student_class.student_id = students.id', 'left')
|
->join('student_class', 'student_class.student_id = students.id', 'left')
|
||||||
->join('class_section', 'student_class.class_section_id = classSection.id', 'left')
|
->join('classSection', 'student_class.class_section_id = classSection.class_section_id', 'left')
|
||||||
|
->where('student_class.school_year', $schoolYear)
|
||||||
->get()
|
->get()
|
||||||
->getResultArray();
|
->getResultArray();
|
||||||
}
|
}
|
||||||
@@ -199,7 +201,7 @@ class StudentModel extends Model
|
|||||||
')
|
')
|
||||||
->join('student_class', 'students.id = student_class.student_id', 'left')
|
->join('student_class', 'students.id = student_class.student_id', 'left')
|
||||||
->join('teacher_class', 'student_class.class_section_id = teacher_class.class_section_id', 'left')
|
->join('teacher_class', 'student_class.class_section_id = teacher_class.class_section_id', 'left')
|
||||||
->join('class_section', 'student_class.class_section_id = classSection.id', 'left')
|
->join('classSection', 'student_class.class_section_id = classSection.class_section_id', 'left')
|
||||||
->where('teacher_class.teacher_id', $teacherId)
|
->where('teacher_class.teacher_id', $teacherId)
|
||||||
->get()
|
->get()
|
||||||
->getResultArray();
|
->getResultArray();
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ class UserModel extends Model
|
|||||||
'failed_attempts',
|
'failed_attempts',
|
||||||
'last_failed_at',
|
'last_failed_at',
|
||||||
'semester',
|
'semester',
|
||||||
'school_year',
|
|
||||||
'status',
|
'status',
|
||||||
'is_suspended',
|
'is_suspended',
|
||||||
'is_verified',
|
'is_verified',
|
||||||
@@ -237,13 +236,23 @@ class UserModel extends Model
|
|||||||
|
|
||||||
public function getUsersByRoleAndSchoolYear(string $roleName, string $schoolYear): array
|
public function getUsersByRoleAndSchoolYear(string $roleName, string $schoolYear): array
|
||||||
{
|
{
|
||||||
return $this->select('users.*')
|
$builder = $this->select('users.*')
|
||||||
->join('user_roles', 'user_roles.user_id = users.id')
|
->join('user_roles', 'user_roles.user_id = users.id')
|
||||||
->join('roles', 'roles.id = user_roles.role_id')
|
->join('roles', 'roles.id = user_roles.role_id')
|
||||||
->where('roles.name', $roleName)
|
->where('roles.name', $roleName)
|
||||||
->where('users.school_year', $schoolYear)
|
->where('user_roles.deleted_at', null);
|
||||||
->where('user_roles.deleted_at', null)
|
|
||||||
->findAll();
|
if ($this->userRolesHaveSchoolYear()) {
|
||||||
|
$builder->where('user_roles.school_year', $schoolYear);
|
||||||
|
} elseif ($this->roleUsesTeacherAssignments($roleName)) {
|
||||||
|
$builder->join(
|
||||||
|
'teacher_class tc_year',
|
||||||
|
'tc_year.teacher_id = users.id AND tc_year.school_year = ' . $this->db->escape($schoolYear),
|
||||||
|
'inner'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $builder->groupBy('users.id')->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function countAdminsBySchoolYear(string $schoolYear): int
|
public function countAdminsBySchoolYear(string $schoolYear): int
|
||||||
@@ -260,8 +269,8 @@ class UserModel extends Model
|
|||||||
)
|
)
|
||||||
->join('user_roles ur', 'ur.user_id = u.id', 'inner')
|
->join('user_roles ur', 'ur.user_id = u.id', 'inner')
|
||||||
->join('roles r', 'r.id = ur.role_id', 'inner')
|
->join('roles r', 'r.id = ur.role_id', 'inner')
|
||||||
->where('u.school_year', $schoolYear)
|
|
||||||
->where('r.is_active', 1)
|
->where('r.is_active', 1)
|
||||||
|
->where('LOWER(r.name) NOT IN ("guest","teacher","teacher_assistant","parent")', null, false)
|
||||||
->groupBy('u.id')
|
->groupBy('u.id')
|
||||||
->having('is_admin', 1);
|
->having('is_admin', 1);
|
||||||
|
|
||||||
@@ -407,4 +416,19 @@ class UserModel extends Model
|
|||||||
->orderBy($sort === 'roles' ? 'roles' : $sort, $order)
|
->orderBy($sort === 'roles' ? 'roles' : $sort, $order)
|
||||||
->findAll();
|
->findAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function userRolesHaveSchoolYear(): bool
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
return in_array('school_year', $this->db->getFieldNames('user_roles'), true);
|
||||||
|
} catch (\Throwable $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function roleUsesTeacherAssignments(string $roleName): bool
|
||||||
|
{
|
||||||
|
$role = strtolower(trim($roleName));
|
||||||
|
return $role === 'ta' || str_contains($role, 'teacher');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ class UserRoleModel extends Model
|
|||||||
protected $allowedFields = [
|
protected $allowedFields = [
|
||||||
'user_id',
|
'user_id',
|
||||||
'role_id',
|
'role_id',
|
||||||
'semester',
|
|
||||||
'school_year',
|
|
||||||
'created_at',
|
'created_at',
|
||||||
'updated_at',
|
'updated_at',
|
||||||
'updated_by',
|
'updated_by',
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
'class_section_id',
|
'class_section_id',
|
||||||
'class_section_name',
|
'class_section_name',
|
||||||
'school_year',
|
'school_year',
|
||||||
'semester',
|
|
||||||
'invite_link',
|
'invite_link',
|
||||||
'active',
|
'active',
|
||||||
];
|
];
|
||||||
@@ -22,9 +21,9 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
*
|
*
|
||||||
* @param int $sectionId Class/section code (not PK).
|
* @param int $sectionId Class/section code (not PK).
|
||||||
* @param string $year School year, e.g. "2025-2026".
|
* @param string $year School year, e.g. "2025-2026".
|
||||||
* @param string $sem Semester, e.g. "Fall".
|
* @param string $sem Deprecated/ignored; links are scoped by school year.
|
||||||
* @param bool $onlyActive If true, require active=1.
|
* @param bool $onlyActive If true, require active=1.
|
||||||
* @param bool $allowNullSemester If true, accept rows with semester IS NULL as well.
|
* @param bool $allowNullSemester Deprecated/ignored.
|
||||||
*/
|
*/
|
||||||
public function getLinkForSection(
|
public function getLinkForSection(
|
||||||
int $sectionId,
|
int $sectionId,
|
||||||
@@ -40,17 +39,6 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
->where('class_section_id', $sectionId)
|
->where('class_section_id', $sectionId)
|
||||||
->where('school_year', $year);
|
->where('school_year', $year);
|
||||||
|
|
||||||
if ($sem !== '') {
|
|
||||||
if ($allowNullSemester) {
|
|
||||||
$b = $b->groupStart()
|
|
||||||
->where('semester', $sem)
|
|
||||||
->orWhere('semester IS NULL', null, false)
|
|
||||||
->groupEnd();
|
|
||||||
} else {
|
|
||||||
$b = $b->where('semester', $sem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($onlyActive) {
|
if ($onlyActive) {
|
||||||
$b = $b->where('active', 1);
|
$b = $b->where('active', 1);
|
||||||
}
|
}
|
||||||
@@ -70,7 +58,7 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
* @param string $year
|
* @param string $year
|
||||||
* @param string $sem
|
* @param string $sem
|
||||||
* @param bool|null $onlyActive true: active only, false: inactive only, null: both
|
* @param bool|null $onlyActive true: active only, false: inactive only, null: both
|
||||||
* @param bool $allowNullSemester If true, include rows with semester IS NULL.
|
* @param bool $allowNullSemester Deprecated/ignored.
|
||||||
*/
|
*/
|
||||||
public function getAllForTerm(
|
public function getAllForTerm(
|
||||||
string $year,
|
string $year,
|
||||||
@@ -84,17 +72,6 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
$b = $this->asArray()
|
$b = $this->asArray()
|
||||||
->where('school_year', $year);
|
->where('school_year', $year);
|
||||||
|
|
||||||
if ($sem !== '') {
|
|
||||||
if ($allowNullSemester) {
|
|
||||||
$b = $b->groupStart()
|
|
||||||
->where('semester', $sem)
|
|
||||||
->orWhere('semester IS NULL', null, false)
|
|
||||||
->groupEnd();
|
|
||||||
} else {
|
|
||||||
$b = $b->where('semester', $sem);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($onlyActive === true) {
|
if ($onlyActive === true) {
|
||||||
$b = $b->where('active', 1);
|
$b = $b->where('active', 1);
|
||||||
} elseif ($onlyActive === false) {
|
} elseif ($onlyActive === false) {
|
||||||
@@ -122,7 +99,6 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
'class_section_id' => $sectionId,
|
'class_section_id' => $sectionId,
|
||||||
'class_section_name' => $sectionName,
|
'class_section_name' => $sectionName,
|
||||||
'school_year' => trim($year),
|
'school_year' => trim($year),
|
||||||
'semester' => trim($sem),
|
|
||||||
'invite_link' => trim($inviteLink),
|
'invite_link' => trim($inviteLink),
|
||||||
'active' => $active ? 1 : 0,
|
'active' => $active ? 1 : 0,
|
||||||
];
|
];
|
||||||
@@ -131,7 +107,6 @@ class WhatsappGroupLinkModel extends Model
|
|||||||
$existing = $this->asArray()
|
$existing = $this->asArray()
|
||||||
->where('class_section_id', $sectionId)
|
->where('class_section_id', $sectionId)
|
||||||
->where('school_year', $payload['school_year'])
|
->where('school_year', $payload['school_year'])
|
||||||
->where('semester', $payload['semester'])
|
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
if ($existing) {
|
if ($existing) {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class WhatsappInviteLogModel extends Model
|
|||||||
/**
|
/**
|
||||||
* Log a successful send.
|
* Log a successful send.
|
||||||
*/
|
*/
|
||||||
public function logSuccess(int $parentId, string $email, int $classSectionId = null, int $linkId = null): bool
|
public function logSuccess(int $parentId, string $email, ?int $classSectionId = null, ?int $linkId = null): bool
|
||||||
{
|
{
|
||||||
return (bool) $this->insert([
|
return (bool) $this->insert([
|
||||||
'parent_id' => $parentId,
|
'parent_id' => $parentId,
|
||||||
@@ -58,7 +58,7 @@ class WhatsappInviteLogModel extends Model
|
|||||||
/**
|
/**
|
||||||
* Log a failure with error message.
|
* Log a failure with error message.
|
||||||
*/
|
*/
|
||||||
public function logFailure(int $parentId, string $email, string $error, int $classSectionId = null, int $linkId = null): bool
|
public function logFailure(int $parentId, string $email, string $error, ?int $classSectionId = null, ?int $linkId = null): bool
|
||||||
{
|
{
|
||||||
return (bool) $this->insert([
|
return (bool) $this->insert([
|
||||||
'parent_id' => $parentId,
|
'parent_id' => $parentId,
|
||||||
|
|||||||
@@ -262,9 +262,9 @@ $show_actions = false; // notified page hides actions by design
|
|||||||
|
|
||||||
// Initialize Bootstrap tooltips (for "View full" note)
|
// Initialize Bootstrap tooltips (for "View full" note)
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
document.addEventListener('DOMContentLoaded', function () {
|
||||||
if (window.bootstrap) {
|
if (window.bootstrap && bootstrap.Tooltip) {
|
||||||
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
||||||
tooltipTriggerList.forEach(function (el) { new bootstrap.Tooltip(el); });
|
tooltipTriggerList.forEach(function (el) { bootstrap.Tooltip.getOrCreateInstance(el); });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,6 @@
|
|||||||
|
|
||||||
<!-- Bootstrap Bundle JS (for modal, tooltips, etc.) -->
|
<!-- Bootstrap Bundle JS (for modal, tooltips, etc.) -->
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
<!-- Optional: Your other custom scripts -->
|
|
||||||
<script src="<?= base_url('assets/js/bootstrap.min.js') ?>"></script>
|
|
||||||
<!-- ✅ Your validation logic (depends on jQuery & Select2) -->
|
<!-- ✅ Your validation logic (depends on jQuery & Select2) -->
|
||||||
<script type="module" src="/public/assets/js/validate_student.js"></script>
|
<script type="module" src="/public/assets/js/validate_student.js"></script>
|
||||||
<script src="<?= base_url('assets/js/modal_validation.js') ?>"></script>
|
<script src="<?= base_url('assets/js/modal_validation.js') ?>"></script>
|
||||||
|
|||||||
@@ -250,18 +250,19 @@ html, body { overflow-x: hidden; }
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Bootstrap Bundle (with Popper) -->
|
||||||
|
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
if (!window.bootstrap || !bootstrap.Tooltip) return;
|
||||||
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
const tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
||||||
tooltipTriggerList.forEach(function(tooltipTriggerEl) {
|
tooltipTriggerList.forEach(function(tooltipTriggerEl) {
|
||||||
new bootstrap.Tooltip(tooltipTriggerEl);
|
bootstrap.Tooltip.getOrCreateInstance(tooltipTriggerEl);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<!-- Bootstrap Bundle (with Popper) -->
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
|
|
||||||
|
|
||||||
<!-- Additional JS Libraries -->
|
<!-- Additional JS Libraries -->
|
||||||
<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
|
<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
|
||||||
<script src="<?= base_url('lib/wow/wow.min.js') ?>"></script>
|
<script src="<?= base_url('lib/wow/wow.min.js') ?>"></script>
|
||||||
|
|||||||
@@ -36,7 +36,6 @@
|
|||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js"></script>
|
||||||
|
|
||||||
<!-- ✅ Custom JS -->
|
<!-- ✅ Custom JS -->
|
||||||
<script src="<?= base_url('assets/js/bootstrap.min.js') ?>"></script>
|
|
||||||
<script src="<?= base_url('assets/js/modal_validation.js') ?>"></script>
|
<script src="<?= base_url('assets/js/modal_validation.js') ?>"></script>
|
||||||
<script src="<?= base_url('assets/js/validation.js') ?>" defer></script>
|
<script src="<?= base_url('assets/js/validation.js') ?>" defer></script>
|
||||||
|
|
||||||
|
|||||||
@@ -118,11 +118,6 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br>
|
<br>
|
||||||
<?php include(__DIR__ . '/../partials/footer.php'); ?>
|
|
||||||
|
|
||||||
<!-- Bootstrap JS -->
|
|
||||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
|
|
||||||
|
|
||||||
<!-- JavaScript for Phone and Email Validation -->
|
<!-- JavaScript for Phone and Email Validation -->
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
|||||||
@@ -101,9 +101,10 @@
|
|||||||
<!-- Tooltip activation script (include once near bottom of page) -->
|
<!-- Tooltip activation script (include once near bottom of page) -->
|
||||||
<script>
|
<script>
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
document.addEventListener('DOMContentLoaded', function() {
|
||||||
|
if (!window.bootstrap || !bootstrap.Tooltip) return;
|
||||||
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
|
||||||
tooltipTriggerList.forEach(function(tooltipTriggerEl) {
|
tooltipTriggerList.forEach(function(tooltipTriggerEl) {
|
||||||
new bootstrap.Tooltip(tooltipTriggerEl);
|
bootstrap.Tooltip.getOrCreateInstance(tooltipTriggerEl);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -0,0 +1,68 @@
|
|||||||
|
# School Year and Semester Schema Audit
|
||||||
|
|
||||||
|
Source: `scool_view2.sql`
|
||||||
|
Tables found: 73
|
||||||
|
|
||||||
|
## Result
|
||||||
|
|
||||||
|
The schema is not fully fixed.
|
||||||
|
|
||||||
|
## Required financial tables
|
||||||
|
|
||||||
|
Confirmed with `school_year`:
|
||||||
|
- payment_notification_logs
|
||||||
|
- payment_transactions
|
||||||
|
- reimbursement_batch_items
|
||||||
|
|
||||||
|
Absent from this dump and therefore not verifiable:
|
||||||
|
- discount_usages
|
||||||
|
- event_charges
|
||||||
|
- invoice_event
|
||||||
|
- payment_error
|
||||||
|
|
||||||
|
## School-year defects
|
||||||
|
|
||||||
|
- `archived_paypal_transactions.school_year` is `VARCHAR(20)` instead of `VARCHAR(9)`.
|
||||||
|
- Tables with `school_year` but no direct school-year index:
|
||||||
|
- archived_paypal_transactions
|
||||||
|
- class_progress_reports
|
||||||
|
- exams
|
||||||
|
- missing_score_overrides
|
||||||
|
- payments
|
||||||
|
- placement_batches
|
||||||
|
- print_requests
|
||||||
|
- report_card_acknowledgements
|
||||||
|
- semester_scores
|
||||||
|
- staff_attendance
|
||||||
|
- teacher_attendance_data
|
||||||
|
- whatsapp_group_links
|
||||||
|
|
||||||
|
## Tables where `semester` should be removed
|
||||||
|
|
||||||
|
- badge_print_logs
|
||||||
|
- classes
|
||||||
|
- contactus
|
||||||
|
- emergency_contacts
|
||||||
|
- inventory_items
|
||||||
|
- invoice_students_list
|
||||||
|
- ip_attempts
|
||||||
|
- notification_recipients
|
||||||
|
- notifications
|
||||||
|
- parents
|
||||||
|
- support_requests
|
||||||
|
- user_notifications
|
||||||
|
- whatsapp_group_links
|
||||||
|
|
||||||
|
## Tables requiring business-rule confirmation before removing `semester`
|
||||||
|
|
||||||
|
- archived_paypal_transactions
|
||||||
|
- discount_vouchers
|
||||||
|
- payment_transactions
|
||||||
|
- reimbursement_batch_items
|
||||||
|
- scan_log
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
`semester` should remain on semester-owned academic and operational records such as exams, quizzes, grades, class sections, attendance, semester reports, and semester-specific charges or payments.
|
||||||
|
|
||||||
|
Child tables should not duplicate `semester` when it can be obtained reliably through their parent record, unless immutable historical snapshots are an explicit requirement.
|
||||||
Reference in New Issue
Block a user