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

fix db tables to have school year

Browse Source
This commit is contained in:
root
2026-07-12 01:02:04 -04:00
parent ed11cccecc
commit ec9fca8c45
42 changed files with 988 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/AttendanceDataModel.php
-1
View File
@@ -18,7 +18,6 @@ class AttendanceDataModel extends Model
'date',
'status',
'reason',
'reported',
'is_reported',
'is_notified',
'semester',
app/Models/ClassPrepAdjustmentModel.php
+2 -2
View File
@@ -7,6 +7,6 @@ class ClassPrepAdjustmentModel extends Model
{
protected $table = 'class_prep_adjustments';
protected $allowedFields = [
'class_section_id', 'item_name', 'adjustment', 'school_year', 'created_at'
'class_section_id', 'item_name', 'adjustment', 'adjustable', 'created_at'
];
}
}
app/Models/ClassPreparationLogModel.php
-1
View File
@@ -11,7 +11,6 @@ class ClassPreparationLogModel extends Model
protected $allowedFields = [
'class_section_id',
'class_section',
'school_year',
'prep_data',
'created_at',
];
app/Models/ContactUsModel.php
+2 -9
View File
@@ -19,8 +19,6 @@ class ContactUsModel extends Model
'reciever_id',
'subject',
'message',
'semester',
'school_year',
'created_at',
'updated_at'
];
@@ -35,8 +33,6 @@ class ContactUsModel extends Model
'reciever_id' => 'required|integer',
'subject' => 'required|string|max_length[255]',
'message' => 'required|string',
'semester' => 'required|string|max_length[255]',
'school_year' => 'permit_empty|string|max_length[9]'
];
protected $validationMessages = [];
@@ -51,10 +47,7 @@ class ContactUsModel extends Model
*/
public function getMessagesBySemesterAndYear($semester, $school_year)
{
return $this->where([
'semester' => $semester,
'school_year' => $school_year
])->findAll();
return $this->findAll();
}
/**
@@ -92,4 +85,4 @@ class ContactUsModel extends Model
{
return $this->update($id, $data);
}
}
}
app/Models/EmailTemplateModel.php
+10 -3
View File
@@ -6,12 +6,19 @@ use CodeIgniter\Model;
class EmailTemplateModel extends Model {
protected $table = 'email_templates';
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 {
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 {
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();
}
}
app/Models/EmergencyContactModel.php
-2
View File
@@ -16,8 +16,6 @@ class EmergencyContactModel extends Model
'cellphone',
'email',
'relation',
'semester',
'school_year',
'created_at',
'updated_at'
];
app/Models/EnrollmentModel.php
+2 -2
View File
@@ -86,7 +86,7 @@ class EnrollmentModel extends Model
/**
* 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.*')
->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.
*/
public function getenrolledStudentDetails(int $parentId, string $schoolYear = null): array
public function getenrolledStudentDetails(int $parentId, ?string $schoolYear = null): array
{
$builder = $this->db->table('enrollments')
->select('students.id, students.firstname, students.lastname, students.grade_level')
app/Models/EventChargesModel.php
-1
View File
@@ -28,7 +28,6 @@ class EventChargesModel extends Model
'external_parent_email',
'semester',
'school_year',
'created_by',
'updated_by',
'created_at',
'updated_at'
app/Models/ExamDraftModel.php
-9
View File
@@ -32,7 +32,6 @@ class ExamDraftModel extends Model
];
protected $allowedFields = [
'teacher_id',
'author_id',
'class_section_id',
'semester',
@@ -40,20 +39,14 @@ class ExamDraftModel extends Model
'exam_type',
'draft_title',
'author_comment',
'description',
'teacher_file',
'teacher_filename',
'author_file',
'author_filename',
'status',
'acceptance_type',
'review_revision',
'reviewer_id',
'admin_id',
'is_legacy',
'reviewer_comment',
'reviewer_comments',
'admin_comments',
'reviewed_at',
'final_file',
'final_filename',
@@ -87,11 +80,9 @@ class ExamDraftModel extends Model
* @var array<string, string>
*/
protected array $casts = [
'teacher_id' => 'int',
'author_id' => 'int',
'class_section_id' => 'int',
'reviewer_id' => '?int',
'admin_id' => '?int',
'review_revision' => 'int',
'version' => 'int',
'previous_draft_id' => '?int',
app/Models/ExamModel.php
+3 -2
View File
@@ -12,9 +12,10 @@ class ExamModel extends Model
protected $allowedFields = [
'student_id',
'school_id',
'student_school_id',
'class_section_id',
'exam_name',
'school_year',
'created_at'
];
@@ -24,4 +25,4 @@ class ExamModel extends Model
protected $updatedField = ''; // Set this if you later add an `updated_at` column
protected $returnType = 'array'; // You can change this to 'object' if preferred
}
}
app/Models/FinalExamModel.php
-1
View File
@@ -18,7 +18,6 @@ class FinalExamModel extends Model
'class_section_id',
'updated_by',
'score',
'comment',
'semester',
'school_year',
'created_at',
app/Models/FinalScoreModel.php
+2 -2
View File
@@ -14,7 +14,7 @@ class FinalScoreModel extends Model
'student_id',
'school_id',
'class_section_id',
'teacher_id',
'updated_by',
'score',
'score_letter',
'comment',
@@ -37,4 +37,4 @@ class FinalScoreModel extends Model
// Return the score, or null if no result is found
return $result ? $result['score'] : null;
}
}
}
app/Models/InventoryItemModel.php
-6
View File
@@ -30,10 +30,6 @@ protected $table = 'inventory_items';
'sku',
'notes',
// academic tags
'semester',
'school_year',
// audit
'updated_by',
@@ -50,7 +46,5 @@ protected $table = 'inventory_items';
'name' => 'required|min_length[2]',
'quantity' => 'permit_empty|integer',
'unit_price' => 'permit_empty|decimal',
'semester' => 'permit_empty|in_list[Spring,Fall]',
'school_year' => 'permit_empty|max_length[16]', // e.g. 2025-2026
];
}
app/Models/InvoiceStudentListModel.php
-2
View File
@@ -20,8 +20,6 @@ class InvoiceStudentListModel extends Model
'student_lastname',
'school_id',
'enrolled',
'school_year',
'semester',
'created_at',
'updated_at'
];
app/Models/IpAttemptModel.php
+1 -3
View File
@@ -13,8 +13,6 @@ class IpAttemptModel extends Model
'ip_address',
'attempts',
'last_attempt_at',
'semester',
'school_year',
'blocked_until'
];
@@ -48,4 +46,4 @@ class IpAttemptModel extends Model
{
return $this->insert($data);
}
}
}
app/Models/LoginActivityModel.php
+1 -2
View File
@@ -15,7 +15,6 @@ class LoginActivityModel extends Model
'logout_time',
'ip_address',
'user_agent',
'school_year',
'semester',
'created_at',
'updated_at'
@@ -35,4 +34,4 @@ class LoginActivityModel extends Model
}
?>
?>
app/Models/MessageModel.php
+5 -8
View File
@@ -21,8 +21,7 @@ class MessageModel extends Model
'priority',
'attachment',
'status',
'semester', // Added field
'school_year' // Added field
'semester'
];
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)
{
$builder = $this->where('semester', $semester);
if ($school_year) {
$builder->where('school_year', $school_year);
}
return $builder->orderBy('sent_datetime', 'DESC')->findAll();
return $this->where('semester', $semester)
->orderBy('sent_datetime', 'DESC')
->findAll();
}
}
}
app/Models/NotificationModel.php
+2 -2
View File
@@ -17,8 +17,8 @@ class NotificationModel extends Model
'status',
'action_url',
'attachment_path',
'semester',
'school_year',
'expires_at',
'sent_at',
'scheduled_at'
];
protected $useTimestamps = true;
app/Models/ParentModel.php
-2
View File
@@ -15,7 +15,5 @@ class ParentModel extends Model
'secondparent_email',
'secondparent_phone',
'firstparent_id',
'semester',
'school_year',
];
}
app/Models/PaymentTransactionModel.php
+10 -20
View File
@@ -18,18 +18,11 @@ class PaymentTransactionModel extends Model
'payment_method',
'payment_status',
'transaction_fee',
'payment_reference',
'semester',
'school_year',
'is_full_payment', // Flag to track full payment status
'created_at',
'updated_at'
'school_year'
];
// Set automatic timestamps
protected $useTimestamps = true;
protected $createdField = 'created_at';
protected $updatedField = 'updated_at';
protected $useTimestamps = false;
// Validation rules
protected $validationRules = [
@@ -38,8 +31,8 @@ class PaymentTransactionModel extends Model
'amount' => 'required|decimal',
'payment_method' => 'required|string|max_length[50]',
'payment_status' => 'required|string|max_length[50]',
'payment_reference' => 'permit_empty|string|max_length[255]',
'is_full_payment' => 'required|in_list[0,1]', // 0 for installment, 1 for full payment
'semester' => 'permit_empty|string|max_length[30]',
'school_year' => 'permit_empty|string|max_length[9]',
];
// Custom error messages
@@ -64,13 +57,6 @@ class PaymentTransactionModel extends Model
'required' => 'The payment status is required.',
'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)
{
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)
{
return $this->update($transactionId, ['transaction_fee' => $transactionFee]);
return $this->where('transaction_id', $transactionId)
->set(['transaction_fee' => $transactionFee])
->update();
}
/**
app/Models/PlacementLevelModel.php
-1
View File
@@ -12,7 +12,6 @@ class PlacementLevelModel extends Model
protected $allowedFields = [
'student_id',
'level',
'school_year',
'created_by',
'updated_by',
'created_at',
app/Models/PreferencesModel.php
+2 -7
View File
@@ -12,8 +12,8 @@ class PreferencesModel extends Model
// Allowed fields to enable mass assignment
protected $allowedFields = [
'user_id', // Foreign key linking preferences to a user
'receive_email_notifications', // Email notifications preference
'receive_sms_notifications', // SMS notifications preference
'notification_email', // Email notifications preference
'notification_sms', // SMS notifications preference
'theme', // Theme preference (e.g., light or dark)
'language', // Language preference
'timezone', // Timezone preference
@@ -22,11 +22,6 @@ class PreferencesModel extends Model
'menu_custom_bg', // Custom menu background color
'menu_custom_text', // Custom menu text color
'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
'updated_at' // Timestamp of when the record was last updated
];
app/Models/SectionModel.php
+1 -2
View File
@@ -12,7 +12,6 @@ class SectionModel extends Model
protected $allowedFields = [
'section_name',
'description',
'created_at',
'updated_at',
'updated_by'
];
@@ -55,4 +54,4 @@ class SectionModel extends Model
{
return $this->delete($sectionId);
}
}
}
app/Models/StaffModel.php
+3 -24
View File
@@ -21,8 +21,6 @@ class StaffModel extends Model
'phone',
'role_name',
'active_role',
'status',
'school_year',
'created_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.
*/
public function upsert(array $data): bool
@@ -53,27 +51,9 @@ class StaffModel extends Model
return false;
}
// If school_year not provided, try to keep existing or fall back to current year string
$schoolYear = $data['school_year'] ?? null;
unset($data['school_year'], $data['status']);
if ($schoolYear === null) {
// 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();
}
$existing = $this->where('user_id', $data['user_id'])->first();
$now = utc_now();
@@ -100,4 +80,3 @@ class StaffModel extends Model
return $this->insert($data) !== false;
}
}
app/Models/StudentClassModel.php
-1
View File
@@ -11,7 +11,6 @@ class StudentClassModel extends Model
protected $allowedFields = [
'student_id',
'school_id',
'class_section_id',
'school_year',
'is_event_only',
app/Models/StudentModel.php
+7 -5
View File
@@ -19,7 +19,6 @@ class StudentModel extends Model
'photo_consent',
'is_new',
'parent_id',
'school_year',
'registration_date',
'tuition_paid',
'year_of_registration',
@@ -122,7 +121,9 @@ class StudentModel extends Model
// school_year filter (skip if null or "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
@@ -171,12 +172,13 @@ class StudentModel extends Model
users.cellphone as phone,
students.registration_grade,
classSection.class_section_name as current_class,
"' . $schoolYear . '" as school_year,
student_class.school_year,
"' . $semester . '" as semester
')
->join('users', 'users.id = students.parent_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()
->getResultArray();
}
@@ -199,7 +201,7 @@ class StudentModel extends Model
')
->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('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)
->get()
->getResultArray();
app/Models/UserModel.php
+30 -6
View File
@@ -28,7 +28,6 @@ class UserModel extends Model
'failed_attempts',
'last_failed_at',
'semester',
'school_year',
'status',
'is_suspended',
'is_verified',
@@ -237,13 +236,23 @@ class UserModel extends Model
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('roles', 'roles.id = user_roles.role_id')
->where('roles.name', $roleName)
->where('users.school_year', $schoolYear)
->where('user_roles.deleted_at', null)
->findAll();
->where('user_roles.deleted_at', null);
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
@@ -260,8 +269,8 @@ class UserModel extends Model
)
->join('user_roles ur', 'ur.user_id = u.id', 'inner')
->join('roles r', 'r.id = ur.role_id', 'inner')
->where('u.school_year', $schoolYear)
->where('r.is_active', 1)
->where('LOWER(r.name) NOT IN ("guest","teacher","teacher_assistant","parent")', null, false)
->groupBy('u.id')
->having('is_admin', 1);
@@ -407,4 +416,19 @@ class UserModel extends Model
->orderBy($sort === 'roles' ? 'roles' : $sort, $order)
->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');
}
}
app/Models/UserRoleModel.php
+1 -3
View File
@@ -13,8 +13,6 @@ class UserRoleModel extends Model
protected $allowedFields = [
'user_id',
'role_id',
'semester',
'school_year',
'created_at',
'updated_at',
'updated_by',
@@ -99,4 +97,4 @@ public function getRolesByUserId(int $userId): array
'updated_by' => session()->get('user_id')
]);
}
}
}
app/Models/WhatsappGroupLinkModel.php
+3 -28
View File
@@ -11,7 +11,6 @@ class WhatsappGroupLinkModel extends Model
'class_section_id',
'class_section_name',
'school_year',
'semester',
'invite_link',
'active',
];
@@ -22,9 +21,9 @@ class WhatsappGroupLinkModel extends Model
*
* @param int $sectionId Class/section code (not PK).
* @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 $allowNullSemester If true, accept rows with semester IS NULL as well.
* @param bool $allowNullSemester Deprecated/ignored.
*/
public function getLinkForSection(
int $sectionId,
@@ -40,17 +39,6 @@ class WhatsappGroupLinkModel extends Model
->where('class_section_id', $sectionId)
->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) {
$b = $b->where('active', 1);
}
@@ -70,7 +58,7 @@ class WhatsappGroupLinkModel extends Model
* @param string $year
* @param string $sem
* @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(
string $year,
@@ -84,17 +72,6 @@ class WhatsappGroupLinkModel extends Model
$b = $this->asArray()
->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) {
$b = $b->where('active', 1);
} elseif ($onlyActive === false) {
@@ -122,7 +99,6 @@ class WhatsappGroupLinkModel extends Model
'class_section_id' => $sectionId,
'class_section_name' => $sectionName,
'school_year' => trim($year),
'semester' => trim($sem),
'invite_link' => trim($inviteLink),
'active' => $active ? 1 : 0,
];
@@ -131,7 +107,6 @@ class WhatsappGroupLinkModel extends Model
$existing = $this->asArray()
->where('class_section_id', $sectionId)
->where('school_year', $payload['school_year'])
->where('semester', $payload['semester'])
->first();
if ($existing) {
app/Models/WhatsappInviteLogModel.php
+2 -2
View File
@@ -42,7 +42,7 @@ class WhatsappInviteLogModel extends Model
/**
* 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([
'parent_id' => $parentId,
@@ -58,7 +58,7 @@ class WhatsappInviteLogModel extends Model
/**
* 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([
'parent_id' => $parentId,