testing

app/Modules/HR/Controllers/DisciplinaryController.php

@@ -54,8 +54,7 @@ class DisciplinaryController extends Controller
         $db = App::getInstance()->db();
         $employee = $this->currentEmployee();
 
-        $data['status'] = 'reported';
-        $data['reported_by'] = $employee ? (int) $employee->id : null;
+        $data['status'] = 'investigation';
         $data['created_at'] = date('Y-m-d H:i:s');
         $data['updated_at'] = date('Y-m-d H:i:s');
         $data['created_by'] = $employee ? (int) $employee->id : null;
@@ -79,10 +78,6 @@ class DisciplinaryController extends Controller
         $canAppeal = DisciplinaryService::canAppeal($action->toArray());
 
         $db = App::getInstance()->db();
-        $reporter = $action->reported_by
-            ? $db->selectOne("SELECT name FROM employees WHERE id = ?", [(int) $action->reported_by])
-            : null;
-
         $decider = $action->decided_by
             ? $db->selectOne("SELECT name FROM employees WHERE id = ?", [(int) $action->decided_by])
             : null;
@@ -91,7 +86,6 @@ class DisciplinaryController extends Controller
             'action'    => $action,
             'profile'   => $profile,
             'canAppeal' => $canAppeal,
-            'reporter'  => $reporter,
             'decider'   => $decider,
         ]);
     }
@@ -103,7 +97,7 @@ class DisciplinaryController extends Controller
             return $this->redirect('/hr/disciplinary')->withError('الإجراء التأديبي غير موجود');
         }
 
-        if (!in_array($action->status, ['reported', 'under_investigation'], true)) {
+        if (!in_array($action->status, ['investigation', 'pending_decision'], true)) {
             return $this->redirect('/hr/disciplinary/' . $id)->withError('لا يمكن تعديل إجراء تأديبي في هذه الحالة');
         }
 
@@ -122,7 +116,7 @@ class DisciplinaryController extends Controller
             return $this->redirect('/hr/disciplinary')->withError('الإجراء التأديبي غير موجود');
         }
 
-        if (!in_array($action->status, ['reported', 'under_investigation'], true)) {
+        if (!in_array($action->status, ['investigation', 'pending_decision'], true)) {
             return $this->redirect('/hr/disciplinary/' . $id)->withError('لا يمكن تعديل إجراء تأديبي في هذه الحالة');
         }
 
@@ -146,27 +140,27 @@ class DisciplinaryController extends Controller
             return $this->redirect('/hr/disciplinary')->withError('الإجراء التأديبي غير موجود');
         }
 
-        if (!in_array($action->status, ['reported', 'under_investigation'], true)) {
+        if (!in_array($action->status, ['investigation', 'pending_decision'], true)) {
             return $this->redirect('/hr/disciplinary/' . $id)->withError('لا يمكن اتخاذ قرار في هذه الحالة');
         }
 
         $penaltyType = trim((string) $request->post('penalty_type', ''));
         $penaltyDays = (int) $request->post('penalty_days', 0);
-        $enforcementDate = trim((string) $request->post('enforcement_date', date('Y-m-d')));
-        $decisionNotes = trim((string) $request->post('decision_notes', ''));
+        $effectiveDate = trim((string) $request->post('effective_date', date('Y-m-d')));
+        $notes = trim((string) $request->post('notes', ''));
 
         $errors = [];
-        if (!in_array($penaltyType, ['warning', 'deduction', 'suspension', 'demotion', 'termination'], true)) {
+        if (!in_array($penaltyType, ['warning', 'wage_deduction', 'raise_postponement', 'suspension', 'demotion', 'termination'], true)) {
             $errors[] = 'نوع الجزاء غير صالح';
         }
 
         // Validate against Art.58 limits
-        if (in_array($penaltyType, ['deduction', 'suspension'], true) && $penaltyDays > 0) {
+        if (in_array($penaltyType, ['wage_deduction', 'suspension'], true) && $penaltyDays > 0) {
             $limitErrors = DisciplinaryService::validatePenalty(
                 (int) $action->employee_profile_id,
                 $penaltyType,
                 $penaltyDays,
-                $enforcementDate
+                $effectiveDate
             );
             $errors = array_merge($errors, $limitErrors);
         }
@@ -180,17 +174,24 @@ class DisciplinaryController extends Controller
         $db = App::getInstance()->db();
         $employee = $this->currentEmployee();
 
-        $db->update('hr_disciplinary_actions', [
-            'penalty_type'     => $penaltyType,
-            'penalty_days'     => $penaltyDays,
-            'enforcement_date' => $enforcementDate,
-            'decision_notes'   => $decisionNotes ?: null,
-            'decided_by'       => $employee ? (int) $employee->id : null,
-            'decided_at'       => date('Y-m-d H:i:s'),
-            'status'           => 'enforced',
-            'updated_at'       => date('Y-m-d H:i:s'),
-            'updated_by'       => $employee ? (int) $employee->id : null,
-        ], '`id` = ?', [(int) $id]);
+        $updateData = [
+            'penalty_type'  => $penaltyType,
+            'effective_date' => $effectiveDate,
+            'notes'         => $notes ?: null,
+            'decided_by'    => $employee ? (int) $employee->id : null,
+            'decided_at'    => date('Y-m-d H:i:s'),
+            'status'        => 'decided',
+            'updated_at'    => date('Y-m-d H:i:s'),
+            'updated_by'    => $employee ? (int) $employee->id : null,
+        ];
+
+        if ($penaltyType === 'wage_deduction') {
+            $updateData['wage_deduction_days'] = $penaltyDays;
+        } elseif ($penaltyType === 'suspension') {
+            $updateData['suspension_days'] = $penaltyDays;
+        }
+
+        $db->update('hr_disciplinary_actions', $updateData, '`id` = ?', [(int) $id]);
 
         Logger::info("Disciplinary decision made", [
             'action_id'    => (int) $id,
@@ -212,8 +213,8 @@ class DisciplinaryController extends Controller
             return $this->redirect('/hr/disciplinary/' . $id)->withError('انتهت فترة التظلم (7 أيام من تاريخ التنفيذ)');
         }
 
-        $appealReason = trim((string) $request->post('appeal_reason', ''));
-        if ($appealReason === '') {
+        $appealText = trim((string) $request->post('appeal_text', ''));
+        if ($appealText === '') {
             return $this->redirect('/hr/disciplinary/' . $id)->withError('سبب التظلم مطلوب');
         }
 
@@ -221,11 +222,11 @@ class DisciplinaryController extends Controller
         $employee = $this->currentEmployee();
 
         $db->update('hr_disciplinary_actions', [
-            'status'        => 'appealed',
-            'appeal_reason' => $appealReason,
-            'appeal_date'   => date('Y-m-d'),
-            'updated_at'    => date('Y-m-d H:i:s'),
-            'updated_by'    => $employee ? (int) $employee->id : null,
+            'status'      => 'appealed',
+            'appeal_text' => $appealText,
+            'appeal_date' => date('Y-m-d'),
+            'updated_at'  => date('Y-m-d H:i:s'),
+            'updated_by'  => $employee ? (int) $employee->id : null,
         ], '`id` = ?', [(int) $id]);
 
         return $this->redirect('/hr/disciplinary/' . $id)->withSuccess('تم تقديم التظلم بنجاح');
@@ -234,11 +235,10 @@ class DisciplinaryController extends Controller
     private function extractData(Request $request): array
     {
         return [
-            'employee_profile_id' => (int) $request->post('employee_profile_id', 0),
-            'incident_date'       => trim((string) $request->post('incident_date', '')),
+            'employee_profile_id'  => (int) $request->post('employee_profile_id', 0),
+            'incident_date'        => trim((string) $request->post('incident_date', '')),
             'incident_description' => trim((string) $request->post('incident_description', '')),
-            'investigation_notes' => trim((string) $request->post('investigation_notes', '')) ?: null,
-            'violation_type'      => trim((string) $request->post('violation_type', '')) ?: null,
+            'investigation_notes'  => trim((string) $request->post('investigation_notes', '')) ?: null,
         ];
     }
 

app/Modules/HR/Controllers/EmployeeDocumentController.php

@@ -56,8 +56,7 @@ class EmployeeDocumentController extends Controller
     {
         $profileId = (int) $request->post('employee_profile_id', 0);
         $documentType = trim((string) $request->post('document_type', ''));
-        $documentNumber = trim((string) $request->post('document_number', '')) ?: null;
-        $issueDate = trim((string) $request->post('issue_date', '')) ?: null;
+        $titleAr = trim((string) $request->post('title_ar', '')) ?: null;
         $expiryDate = trim((string) $request->post('expiry_date', '')) ?: null;
         $notes = trim((string) $request->post('notes', '')) ?: null;
 
@@ -69,14 +68,24 @@ class EmployeeDocumentController extends Controller
             $errors[] = 'نوع المستند مطلوب';
         }
 
+        // File is required (NOT NULL columns depend on it)
+        if (!isset($_FILES['document_file']) || $_FILES['document_file']['error'] !== UPLOAD_ERR_OK) {
+            $errors[] = 'يجب رفع ملف';
+        }
+
         // Handle file upload
         $filePath = null;
+        $originalFilename = '';
+        $storedFilename = '';
+        $fileSize = 0;
+        $mimeType = '';
         if (isset($_FILES['document_file']) && $_FILES['document_file']['error'] === UPLOAD_ERR_OK) {
             $allowedTypes = ['application/pdf', 'image/jpeg', 'image/png', 'image/jpg'];
-            $fileType = $_FILES['document_file']['type'];
-            $fileSize = $_FILES['document_file']['size'];
+            $mimeType = $_FILES['document_file']['type'];
+            $fileSize = (int) $_FILES['document_file']['size'];
+            $originalFilename = $_FILES['document_file']['name'];
 
-            if (!in_array($fileType, $allowedTypes, true)) {
+            if (!in_array($mimeType, $allowedTypes, true)) {
                 $errors[] = 'نوع الملف غير مسموح. المسموح: PDF, JPEG, PNG';
             }
             if ($fileSize > 5 * 1024 * 1024) {
@@ -91,12 +100,12 @@ class EmployeeDocumentController extends Controller
                     mkdir($absUploadDir, 0755, true);
                 }
 
-                $ext = pathinfo($_FILES['document_file']['name'], PATHINFO_EXTENSION);
-                $fileName = $documentType . '_' . date('Ymd_His') . '.' . $ext;
-                $targetPath = $absUploadDir . '/' . $fileName;
+                $ext = pathinfo($originalFilename, PATHINFO_EXTENSION);
+                $storedFilename = $documentType . '_' . date('Ymd_His') . '.' . $ext;
+                $targetPath = $absUploadDir . '/' . $storedFilename;
 
                 if (move_uploaded_file($_FILES['document_file']['tmp_name'], $targetPath)) {
-                    $filePath = $uploadDir . '/' . $fileName;
+                    $filePath = $uploadDir . '/' . $storedFilename;
                 } else {
                     $errors[] = 'فشل رفع الملف';
                 }
@@ -112,16 +121,21 @@ class EmployeeDocumentController extends Controller
 
         $db = App::getInstance()->db();
         $employee = $this->currentEmployee();
+        $docTypes = HrEmployeeDocument::getDocumentTypes();
 
         $docId = $db->insert('hr_employee_documents', [
             'employee_profile_id' => $profileId,
             'document_type'       => $documentType,
-            'document_number'     => $documentNumber,
-            'issue_date'          => $issueDate,
-            'expiry_date'         => $expiryDate,
+            'title_ar'            => $titleAr ?: ($docTypes[$documentType] ?? $documentType),
+            'original_filename'   => $originalFilename,
+            'stored_filename'     => $storedFilename,
             'file_path'           => $filePath,
+            'file_size'           => $fileSize,
+            'mime_type'           => $mimeType,
+            'expiry_date'         => $expiryDate,
             'notes'               => $notes,
             'is_verified'         => 0,
+            'uploaded_by'         => $employee ? (int) $employee->id : null,
             'created_at'          => date('Y-m-d H:i:s'),
             'updated_at'          => date('Y-m-d H:i:s'),
             'created_by'          => $employee ? (int) $employee->id : null,

app/Modules/HR/Controllers/EndOfServiceController.php

@@ -46,8 +46,8 @@ class EndOfServiceController extends Controller
     {
         $profileId = (int) $request->post('employee_profile_id', 0);
         $terminationType = trim((string) $request->post('termination_type', ''));
-        $terminationDate = trim((string) $request->post('termination_date', date('Y-m-d')));
-        $terminationReason = trim((string) $request->post('termination_reason', ''));
+        $effectiveDate = trim((string) $request->post('effective_date', date('Y-m-d')));
+        $notes = trim((string) $request->post('notes', ''));
 
         $errors = [];
         if ($profileId <= 0) {
@@ -56,7 +56,7 @@ class EndOfServiceController extends Controller
         if ($terminationType === '') {
             $errors[] = 'نوع إنهاء الخدمة مطلوب';
         }
-        if ($terminationDate === '') {
+        if ($effectiveDate === '') {
             $errors[] = 'تاريخ إنهاء الخدمة مطلوب';
         }
 
@@ -73,8 +73,13 @@ class EndOfServiceController extends Controller
         $recordId = $db->insert('hr_end_of_service', [
             'employee_profile_id' => $profileId,
             'termination_type'    => $terminationType,
-            'termination_date'    => $terminationDate,
-            'termination_reason'  => $terminationReason ?: null,
+            'request_date'        => date('Y-m-d'),
+            'effective_date'      => $effectiveDate,
+            'notes'               => $notes ?: null,
+            'years_of_service'    => '0.00',
+            'last_basic_salary'   => '0.00',
+            'last_total_salary'   => '0.00',
+            'calculation_json'    => '{}',
             'status'              => 'draft',
             'created_at'          => date('Y-m-d H:i:s'),
             'updated_at'          => date('Y-m-d H:i:s'),
@@ -118,8 +123,8 @@ class EndOfServiceController extends Controller
 
         $result = EndOfServiceService::calculate(
             (int) $record->employee_profile_id,
-            $record->termination_date,
-            $record->termination_type
+            $record->termination_type,
+            $record->effective_date
         );
 
         if (!$result['success']) {
@@ -128,19 +133,22 @@ class EndOfServiceController extends Controller
 
         $db = App::getInstance()->db();
         $db->update('hr_end_of_service', [
-            'years_of_service'      => $result['years_of_service'],
-            'last_basic_salary'     => $result['last_basic_salary'],
-            'severance_amount'      => $result['severance_amount'],
-            'notice_compensation'   => $result['notice_compensation'],
-            'leave_compensation'    => $result['leave_compensation'],
-            'other_compensation'    => '0.00',
-            'total_entitlements'    => $result['total_entitlements'],
-            'outstanding_loans'     => $result['outstanding_loans'],
-            'other_deductions'      => '0.00',
-            'net_settlement'        => $result['net_settlement'],
-            'calculation_json'      => json_encode($result['breakdown'], JSON_UNESCAPED_UNICODE),
-            'status'                => 'calculated',
-            'updated_at'            => date('Y-m-d H:i:s'),
+            'years_of_service'           => $result['years_of_service'],
+            'last_basic_salary'          => $result['last_basic_salary'],
+            'last_total_salary'          => $result['last_total_salary'],
+            'severance_first_5y'         => $result['severance_first_5y'],
+            'severance_after_5y'         => $result['severance_after_5y'],
+            'total_severance'            => $result['total_severance'],
+            'notice_period_compensation' => $result['notice_period_compensation'],
+            'remaining_leave_days'       => $result['remaining_leave_days'],
+            'leave_compensation'         => $result['leave_compensation'],
+            'total_entitlement'          => $result['total_entitlement'],
+            'deductions_json'            => json_encode($result['deductions_json'], JSON_UNESCAPED_UNICODE),
+            'total_deductions'           => $result['total_deductions'],
+            'net_settlement'             => $result['net_settlement'],
+            'calculation_json'           => json_encode($result['calculation_json'], JSON_UNESCAPED_UNICODE),
+            'status'                     => 'calculated',
+            'updated_at'                 => date('Y-m-d H:i:s'),
         ], '`id` = ?', [(int) $id]);
 
         Logger::info("End of service calculated", ['record_id' => (int) $id, 'net_settlement' => $result['net_settlement']]);
@@ -174,9 +182,9 @@ class EndOfServiceController extends Controller
         // Update employee status to terminated
         $db->update('hr_employee_profiles', [
             'employment_status'  => 'terminated',
-            'termination_date'   => $record->termination_date,
+            'termination_date'   => $record->effective_date,
             'termination_type'   => $record->termination_type,
-            'termination_reason' => $record->termination_reason,
+            'termination_reason' => $record->notes,
             'updated_at'         => date('Y-m-d H:i:s'),
         ], '`id` = ? AND `is_archived` = 0', [(int) $record->employee_profile_id]);
 

app/Modules/HR/Controllers/LeaveController.php

@@ -151,14 +151,24 @@ class LeaveController extends Controller
         $db = App::getInstance()->db();
         $employee = $this->currentEmployee();
 
-        // If was approved, restore balance
-        if ($leaveRequest->status === 'approved') {
-            HrLeaveBalance::releasePendingDays(
-                (int) $leaveRequest->employee_profile_id,
-                (int) $leaveRequest->leave_type_id,
-                (int) date('Y', strtotime($leaveRequest->start_date)),
-                (float) $leaveRequest->total_days
-            );
+        // Restore balance
+        $year = (int) date('Y', strtotime($leaveRequest->start_date));
+        $balance = HrLeaveBalance::getBalance(
+            (int) $leaveRequest->employee_profile_id,
+            (int) $leaveRequest->leave_type_id,
+            $year
+        );
+        if ($balance) {
+            if ($leaveRequest->status === 'approved') {
+                // Approved leave: days are in used_days, reduce them
+                $db->update('hr_leave_balances', [
+                    'used_days'  => new \App\Core\RawExpression("GREATEST(used_days - {$leaveRequest->total_days}, 0)"),
+                    'updated_at' => date('Y-m-d H:i:s'),
+                ], '`id` = ?', [(int) $balance['id']]);
+            } else {
+                // Pending leave: days are in pending_days, release them
+                HrLeaveBalance::releasePendingDays((int) $balance['id'], (string) $leaveRequest->total_days);
+            }
         }
 
         $db->update('hr_leave_requests', [
@@ -277,10 +287,10 @@ class LeaveController extends Controller
 
         $newAdjustment = bcadd((string) ($balance['adjustment_days'] ?? '0'), (string) $adjustment, 2);
         $db->update('hr_leave_balances', [
-            'adjustment_days' => $newAdjustment,
-            'notes'           => $reason ?: null,
-            'updated_at'      => date('Y-m-d H:i:s'),
-            'updated_by'      => $employee ? (int) $employee->id : null,
+            'adjustment_days'  => $newAdjustment,
+            'adjustment_reason'=> $reason ?: null,
+            'updated_at'       => date('Y-m-d H:i:s'),
+            'updated_by'       => $employee ? (int) $employee->id : null,
         ], '`id` = ?', [(int) $balance['id']]);
 
         return $this->redirect('/hr/leaves/balances/' . $profileId . '?year=' . $year)->withSuccess('تم تعديل رصيد الإجازة بنجاح');

app/Modules/HR/Controllers/PerformanceController.php

@@ -200,8 +200,8 @@ class PerformanceController extends Controller
         $overallRating = (float) $request->post('overall_rating', 0);
         $strengths = trim((string) $request->post('strengths', '')) ?: null;
         $improvements = trim((string) $request->post('improvements', '')) ?: null;
-        $goals = trim((string) $request->post('goals', '')) ?: null;
-        $reviewerComments = trim((string) $request->post('reviewer_comments', '')) ?: null;
+        $goalsText = trim((string) $request->post('goals', '')) ?: null;
+        $notes = trim((string) $request->post('notes', '')) ?: null;
 
         $errors = [];
         if ($overallRating < 1 || $overallRating > 5) {
@@ -221,10 +221,10 @@ class PerformanceController extends Controller
             'overall_rating'    => $overallRating,
             'strengths'         => $strengths,
             'improvements'      => $improvements,
-            'goals'             => $goals,
-            'reviewer_comments' => $reviewerComments,
+            'goals_json'        => $goalsText ? json_encode($goalsText, JSON_UNESCAPED_UNICODE) : null,
+            'notes'             => $notes,
             'review_date'       => date('Y-m-d'),
-            'status'            => 'completed',
+            'status'            => 'submitted',
         ]);
 
         return $this->redirect('/hr/performance/reviews/' . $id)->withSuccess('تم حفظ تقييم الأداء بنجاح');

app/Modules/HR/Models/HrAttendance.php

@@ -31,7 +31,7 @@ class HrAttendance extends Model
             'absent'    => 'غائب',
             'late'      => 'متأخر',
             'half_day'  => 'نصف يوم',
-            'on_leave'  => 'في إجازة',
+            'leave'     => 'في إجازة',
             'holiday'   => 'عطلة رسمية',
             'rest_day'  => 'يوم راحة',
         ];
@@ -82,7 +82,7 @@ class HrAttendance extends Model
                 SUM(CASE WHEN status = 'present' THEN 1 ELSE 0 END) as present_days,
                 SUM(CASE WHEN status = 'absent' THEN 1 ELSE 0 END) as absent_days,
                 SUM(CASE WHEN status = 'late' THEN 1 ELSE 0 END) as late_days,
-                SUM(CASE WHEN status = 'on_leave' THEN 1 ELSE 0 END) as leave_days,
+                SUM(CASE WHEN status = 'leave' THEN 1 ELSE 0 END) as leave_days,
                 SUM(CASE WHEN status = 'holiday' THEN 1 ELSE 0 END) as holiday_days,
                 COALESCE(SUM(actual_hours), 0) as total_actual_hours,
                 COALESCE(SUM(overtime_hours), 0) as total_overtime_hours,

app/Modules/HR/Models/HrDisciplinaryAction.php

@@ -16,41 +16,39 @@ class HrDisciplinaryAction extends Model
     protected static bool $autoTrackAuthor = true;
 
     protected static array $fillable = [
-        'employee_profile_id', 'incident_date', 'reported_date', 'incident_description',
-        'investigation_notes', 'investigated_by', 'investigation_date',
+        'employee_profile_id', 'action_number', 'incident_date', 'incident_description',
+        'investigation_notes', 'investigation_by', 'investigation_date',
         'penalty_type', 'penalty_details_json',
-        'wage_deduction_days', 'suspension_days',
-        'decision_date', 'decided_by', 'decision_notes',
-        'appeal_date', 'appeal_reason', 'appeal_decision', 'appeal_decided_by', 'appeal_decision_date',
-        'enforcement_date', 'status', 'workflow_instance_id', 'notes',
+        'wage_deduction_days', 'wage_deduction_amount', 'suspension_days',
+        'effective_date', 'status',
+        'decided_by', 'decided_at',
+        'appeal_deadline', 'appeal_text', 'appeal_date',
+        'appeal_result', 'appeal_reviewed_by', 'appeal_reviewed_at',
+        'workflow_instance_id', 'document_path', 'notes',
     ];
 
     public static function getPenaltyTypes(): array
     {
         return [
-            'warning'     => 'إنذار',
-            'deduction'   => 'خصم من الراتب',
-            'suspension'  => 'إيقاف عن العمل',
-            'demotion'    => 'تخفيض الدرجة',
-            'termination' => 'فصل من العمل',
+            'warning'            => 'إنذار',
+            'wage_deduction'     => 'خصم من الراتب',
+            'raise_postponement' => 'تأجيل علاوة',
+            'suspension'         => 'إيقاف عن العمل',
+            'demotion'           => 'تخفيض الدرجة',
+            'termination'        => 'فصل من العمل',
         ];
     }
 
     public static function getStatuses(): array
     {
         return [
-            'reported'            => 'تم الإبلاغ',
-            'under_investigation' => 'تحت التحقيق',
-            'investigation_done'  => 'انتهى التحقيق',
-            'penalty_decided'     => 'تم تحديد العقوبة',
-            'enforced'            => 'تم التنفيذ',
-            'appealed'            => 'تم التظلم',
-            'appeal_reviewed'     => 'تم مراجعة التظلم',
-            'upheld'              => 'تم تأييد العقوبة',
-            'modified'            => 'تم تعديل العقوبة',
-            'overturned'          => 'تم إلغاء العقوبة',
-            'dismissed'           => 'تم الحفظ',
-            'closed'              => 'مغلق',
+            'investigation'    => 'تحت التحقيق',
+            'pending_decision' => 'في انتظار القرار',
+            'decided'          => 'تم تحديد العقوبة',
+            'appealed'         => 'تم التظلم',
+            'appeal_reviewed'  => 'تم مراجعة التظلم',
+            'enforced'         => 'تم التنفيذ',
+            'cancelled'        => 'ملغى',
         ];
     }
 
@@ -61,9 +59,9 @@ class HrDisciplinaryAction extends Model
             "SELECT COALESCE(SUM(wage_deduction_days), 0) as total
              FROM hr_disciplinary_actions
              WHERE employee_profile_id = ?
-               AND YEAR(enforcement_date) = ? AND MONTH(enforcement_date) = ?
-               AND penalty_type = 'deduction'
-               AND status IN ('enforced', 'upheld', 'closed')
+               AND YEAR(effective_date) = ? AND MONTH(effective_date) = ?
+               AND penalty_type = 'wage_deduction'
+               AND status IN ('enforced', 'decided')
                AND is_archived = 0",
             [$profileId, $year, $month]
         );
@@ -77,9 +75,9 @@ class HrDisciplinaryAction extends Model
             "SELECT COALESCE(SUM(suspension_days), 0) as total
              FROM hr_disciplinary_actions
              WHERE employee_profile_id = ?
-               AND YEAR(enforcement_date) = ? AND MONTH(enforcement_date) = ?
+               AND YEAR(effective_date) = ? AND MONTH(effective_date) = ?
                AND penalty_type = 'suspension'
-               AND status IN ('enforced', 'upheld', 'closed')
+               AND status IN ('enforced', 'decided')
                AND is_archived = 0",
             [$profileId, $year, $month]
         );
@@ -118,7 +116,7 @@ class HrDisciplinaryAction extends Model
              FROM hr_disciplinary_actions da
              JOIN hr_employee_profiles p ON p.id = da.employee_profile_id
              WHERE {$where}
-             ORDER BY da.reported_date DESC
+             ORDER BY da.incident_date DESC
              LIMIT {$perPage} OFFSET {$offset}",
             $params
         );

app/Modules/HR/Models/HrEmployeeDocument.php

@@ -16,10 +16,11 @@ class HrEmployeeDocument extends Model
     protected static bool $autoTrackAuthor = true;
 
     protected static array $fillable = [
-        'employee_profile_id', 'document_type', 'document_number',
-        'file_path', 'file_name', 'issue_date', 'expiry_date',
-        'issuing_authority', 'is_verified', 'verified_by', 'verified_at',
-        'notes',
+        'employee_profile_id', 'document_type', 'title_ar',
+        'original_filename', 'stored_filename', 'file_path',
+        'file_size', 'mime_type', 'expiry_date',
+        'is_verified', 'verified_by', 'verified_at',
+        'uploaded_by', 'notes',
     ];
 
     public static function getDocumentTypes(): array

app/Modules/HR/Models/HrEndOfService.php

@@ -63,9 +63,16 @@ class HrEndOfService extends Model
             $where .= ' AND eos.status = ?';
             $params[] = $filters['status'];
         }
-        if (!empty($filters['termination_type'])) {
+        if (!empty($filters['type'])) {
             $where .= ' AND eos.termination_type = ?';
-            $params[] = $filters['termination_type'];
+            $params[] = $filters['type'];
+        }
+        if (!empty($filters['q'])) {
+            $where .= ' AND (p.first_name_ar LIKE ? OR p.last_name_ar LIKE ? OR p.employee_number LIKE ?)';
+            $term = '%' . $filters['q'] . '%';
+            $params[] = $term;
+            $params[] = $term;
+            $params[] = $term;
         }
 
         $countRow = $db->selectOne(

app/Modules/HR/Services/DisciplinaryService.php

@@ -29,7 +29,7 @@ final class DisciplinaryService
 
         $errors = [];
 
-        if ($penaltyType === 'deduction') {
+        if ($penaltyType === 'wage_deduction') {
             $currentTotal = HrDisciplinaryAction::getMonthlyDeductionDays($profileId, $year, $month);
             $maxAllowed = self::getMaxDeductionDays();
             $remaining = $maxAllowed - $currentTotal;
@@ -55,14 +55,14 @@ final class DisciplinaryService
      */
     public static function canAppeal(array $action): bool
     {
-        if ($action['status'] !== 'enforced') {
+        if (!in_array($action['status'] ?? '', ['decided', 'enforced'], true)) {
             return false;
         }
-        $enforcementDate = $action['enforcement_date'] ?? null;
-        if (!$enforcementDate) {
+        $effectiveDate = $action['effective_date'] ?? $action['decided_at'] ?? null;
+        if (!$effectiveDate) {
             return false;
         }
-        $appealDeadline = date('Y-m-d', strtotime($enforcementDate . ' +' . self::getAppealWindowDays() . ' days'));
+        $appealDeadline = date('Y-m-d', strtotime($effectiveDate . ' +' . self::getAppealWindowDays() . ' days'));
         return date('Y-m-d') <= $appealDeadline;
     }
 

app/Modules/HR/Services/EndOfServiceService.php

@@ -30,12 +30,12 @@ use App\Modules\HR\Models\HrEmployeeLoan;
  */
 final class EndOfServiceService
 {
-    public static function calculate(int $employeeId, string $terminationType, string $effectiveDate): array
+    public static function calculate(int $profileId, string $terminationType, string $effectiveDate): array
     {
         $db = App::getInstance()->db();
         $config = self::loadConfig();
 
-        $profile = HrEmployeeProfile::findByEmployeeId($employeeId);
+        $profile = HrEmployeeProfile::find($profileId);
         if (!$profile) {
             return ['success' => false, 'error' => 'الموظف غير موجود'];
         }
@@ -134,7 +134,7 @@ final class EndOfServiceService
 
         return [
             'success'                    => true,
-            'employee_id'                => $employeeId,
+            'profile_id'                 => $profileId,
             'termination_type'           => $terminationType,
             'effective_date'             => $effectiveDate,
             'years_of_service'           => number_format($yearsOfService, 2),

app/Modules/HR/Services/PayrollCalculationService.php

@@ -63,10 +63,10 @@ final class PayrollCalculationService
         }
 
         // Delete previous runs for this period (recalculation)
-        $db->execute("DELETE FROM hr_payroll_components_log WHERE payroll_run_id IN (SELECT id FROM hr_payroll_runs WHERE period_id = ?)", [$periodId]);
-        $db->execute("DELETE FROM hr_insurance_records WHERE period_id = ?", [$periodId]);
-        $db->execute("DELETE FROM hr_tax_records WHERE period_id = ?", [$periodId]);
-        $db->execute("DELETE FROM hr_payroll_runs WHERE period_id = ?", [$periodId]);
+        $db->query("DELETE FROM hr_payroll_components_log WHERE payroll_run_id IN (SELECT id FROM hr_payroll_runs WHERE period_id = ?)", [$periodId]);
+        $db->query("DELETE FROM hr_insurance_records WHERE period_id = ?", [$periodId]);
+        $db->query("DELETE FROM hr_tax_records WHERE period_id = ?", [$periodId]);
+        $db->query("DELETE FROM hr_payroll_runs WHERE period_id = ?", [$periodId]);
 
         $totalGross = '0.00';
         $totalDeductions = '0.00';
@@ -100,10 +100,8 @@ final class PayrollCalculationService
             'total_gross'      => $totalGross,
             'total_deductions' => $totalDeductions,
             'total_net'        => $totalNet,
-            'employee_count'   => $processedCount,
-            'calculated_at'    => date('Y-m-d H:i:s'),
-            'calculated_by'    => $employee ? (int) $employee->id : null,
             'updated_at'       => date('Y-m-d H:i:s'),
+            'updated_by'       => $employee ? (int) $employee->id : null,
         ], '`id` = ?', [$periodId]);
 
         Logger::info("Payroll calculated", [
@@ -383,6 +381,7 @@ final class PayrollCalculationService
             'employee_id'            => $employeeId,
             'period_id'              => $periodId,
             'payroll_run_id'         => $runId,
+            'month'                  => $month,
             'gross_taxable_monthly'  => $tax['gross_taxable_monthly'],
             'annual_taxable_income'  => $tax['annual_taxable_income'],
             'personal_exemption'     => $tax['personal_exemption'],

app/Modules/HR/Views/attendance/edit.php

@@ -19,7 +19,9 @@
                     <option value="present" <?= $attendance->status === 'present' ? 'selected' : '' ?>>حاضر</option>
                     <option value="absent" <?= $attendance->status === 'absent' ? 'selected' : '' ?>>غائب</option>
                     <option value="late" <?= $attendance->status === 'late' ? 'selected' : '' ?>>متأخر</option>
-                    <option value="on_leave" <?= $attendance->status === 'on_leave' ? 'selected' : '' ?>>إجازة</option>
+                    <option value="leave" <?= $attendance->status === 'leave' ? 'selected' : '' ?>>إجازة</option>
+                    <option value="rest_day" <?= $attendance->status === 'rest_day' ? 'selected' : '' ?>>يوم راحة</option>
+                    <option value="half_day" <?= $attendance->status === 'half_day' ? 'selected' : '' ?>>نصف يوم</option>
                     <option value="holiday" <?= $attendance->status === 'holiday' ? 'selected' : '' ?>>عطلة</option>
                 </select>
             </div>

app/Modules/HR/Views/attendance/index.php

@@ -18,7 +18,7 @@
             <option value="present" <?= $filters['status'] === 'present' ? 'selected' : '' ?>>حاضر</option>
             <option value="absent" <?= $filters['status'] === 'absent' ? 'selected' : '' ?>>غائب</option>
             <option value="late" <?= $filters['status'] === 'late' ? 'selected' : '' ?>>متأخر</option>
-            <option value="on_leave" <?= $filters['status'] === 'on_leave' ? 'selected' : '' ?>>إجازة</option>
+            <option value="leave" <?= $filters['status'] === 'leave' ? 'selected' : '' ?>>إجازة</option>
             </select>
         </div>
         <button type="submit" class="btn btn-secondary">بحث</button>
@@ -35,8 +35,8 @@
                     <tr><td colspan="9" style="text-align:center;padding:40px;color:#9CA3AF;">لا توجد سجلات</td></tr>
                     <?php else: ?>
                     <?php foreach ($records as $r): ?>
-                    <?php $statusLabels = ['present' => 'حاضر', 'absent' => 'غائب', 'late' => 'متأخر', 'on_leave' => 'إجازة', 'holiday' => 'عطلة']; ?>
-                    <?php $statusColors = ['present' => '#DEF7EC;color:#03543F', 'absent' => '#FDE8E8;color:#9B1C1C', 'late' => '#FEF3C7;color:#92400E', 'on_leave' => '#DBEAFE;color:#1E40AF', 'holiday' => '#E5E7EB;color:#374151']; ?>
+                    <?php $statusLabels = ['present' => 'حاضر', 'absent' => 'غائب', 'late' => 'متأخر', 'leave' => 'إجازة', 'holiday' => 'عطلة', 'rest_day' => 'يوم راحة', 'half_day' => 'نصف يوم']; ?>
+                    <?php $statusColors = ['present' => '#DEF7EC;color:#03543F', 'absent' => '#FDE8E8;color:#9B1C1C', 'late' => '#FEF3C7;color:#92400E', 'leave' => '#DBEAFE;color:#1E40AF', 'holiday' => '#E5E7EB;color:#374151', 'rest_day' => '#E5E7EB;color:#374151', 'half_day' => '#FEF3C7;color:#92400E']; ?>
                     <tr>
                         <td><?php if (!$r['is_approved']): ?><input type="checkbox" name="ids[]" value="<?= (int) $r['id'] ?>"><?php endif; ?></td>
                         <td><?= e($r['attendance_date']) ?></td>

app/Modules/HR/Views/attendance/monthly.php

@@ -31,8 +31,8 @@
                     <td><?= number_format((float) ($r['actual_hours'] ?? 0), 1) ?></td>
                     <td><?= number_format((float) ($r['overtime_hours'] ?? 0), 1) ?></td>
                     <td>
-                        <?php $sl = ['present'=>'حاضر','absent'=>'غائب','late'=>'متأخر','on_leave'=>'إجازة','holiday'=>'عطلة']; ?>
-                        <?php $sc = ['present'=>'#DEF7EC;color:#03543F','absent'=>'#FDE8E8;color:#9B1C1C','late'=>'#FEF3C7;color:#92400E','on_leave'=>'#DBEAFE;color:#1E40AF','holiday'=>'#E5E7EB;color:#374151']; ?>
+                        <?php $sl = ['present'=>'حاضر','absent'=>'غائب','late'=>'متأخر','leave'=>'إجازة','holiday'=>'عطلة','rest_day'=>'يوم راحة','half_day'=>'نصف يوم']; ?>
+                        <?php $sc = ['present'=>'#DEF7EC;color:#03543F','absent'=>'#FDE8E8;color:#9B1C1C','late'=>'#FEF3C7;color:#92400E','leave'=>'#DBEAFE;color:#1E40AF','holiday'=>'#E5E7EB;color:#374151','rest_day'=>'#E5E7EB;color:#374151','half_day'=>'#FEF3C7;color:#92400E']; ?>
                         <span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $sc[$r['status']] ?? '#E5E7EB;color:#374151' ?>;"><?= e($sl[$r['status']] ?? $r['status']) ?></span>
                     </td>
                 </tr>

app/Modules/HR/Views/disciplinary/form.php

@@ -14,13 +14,6 @@
             </div>
             <?php endif; ?>
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ الواقعة <span style="color:#DC2626;">*</span></label><input type="date" name="incident_date" value="<?= e(old('incident_date') ?? ($action->incident_date ?? date('Y-m-d'))) ?>" class="form-control" required></div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">نوع المخالفة</label>
-                <?php $vtypes = ['attendance'=>'حضور وانصراف','misconduct'=>'سوء سلوك','negligence'=>'إهمال','insubordination'=>'عصيان','safety'=>'سلامة مهنية','other'=>'أخرى']; ?>
-                <select name="violation_type" class="form-control">
-                    <option value="">-- اختر --</option>
-                    <?php foreach ($vtypes as $k => $v): ?><option value="<?= $k ?>" <?= (old('violation_type') ?? ($action->violation_type ?? '')) === $k ? 'selected' : '' ?>><?= $v ?></option><?php endforeach; ?>
-                </select>
-            </div>
             <div style="grid-column:1/-1;"><label style="display:block;margin-bottom:4px;font-size:13px;">وصف الواقعة <span style="color:#DC2626;">*</span></label><textarea name="incident_description" class="form-control" rows="3" required><?= e(old('incident_description') ?? ($action->incident_description ?? '')) ?></textarea></div>
             <div style="grid-column:1/-1;"><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات التحقيق</label><textarea name="investigation_notes" class="form-control" rows="2"><?= e(old('investigation_notes') ?? ($action->investigation_notes ?? '')) ?></textarea></div>
         </div>

app/Modules/HR/Views/disciplinary/index.php

@@ -2,9 +2,9 @@
 <?php $__template->section('title'); ?>الإجراءات التأديبية<?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/disciplinary/create" class="btn btn-primary" style="display:inline-flex;align-items:center;gap:6px;"><i data-lucide="plus" style="width:16px;height:16px;"></i> إجراء تأديبي جديد</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $sl = ['reported'=>'مبلغ عنه','under_investigation'=>'تحت التحقيق','enforced'=>'منفذ','appealed'=>'متظلم','closed'=>'مغلق']; ?>
-<?php $sc = ['reported'=>'#FEF3C7;color:#92400E','under_investigation'=>'#DBEAFE;color:#1E40AF','enforced'=>'#FDE8E8;color:#9B1C1C','appealed'=>'#E0E7FF;color:#3730A3','closed'=>'#E5E7EB;color:#374151']; ?>
-<?php $pl = ['warning'=>'إنذار','deduction'=>'خصم','suspension'=>'إيقاف','demotion'=>'تنزيل درجة','termination'=>'فصل']; ?>
+<?php $sl = ['investigation'=>'تحت التحقيق','pending_decision'=>'في انتظار القرار','decided'=>'تم تحديد العقوبة','appealed'=>'متظلم','appeal_reviewed'=>'تم مراجعة التظلم','enforced'=>'منفذ','cancelled'=>'ملغى']; ?>
+<?php $sc = ['investigation'=>'#DBEAFE;color:#1E40AF','pending_decision'=>'#FEF3C7;color:#92400E','decided'=>'#FDE8E8;color:#9B1C1C','appealed'=>'#E0E7FF;color:#3730A3','appeal_reviewed'=>'#E0E7FF;color:#3730A3','enforced'=>'#DEF7EC;color:#03543F','cancelled'=>'#E5E7EB;color:#374151']; ?>
+<?php $pl = ['warning'=>'إنذار','wage_deduction'=>'خصم من الراتب','raise_postponement'=>'تأجيل علاوة','suspension'=>'إيقاف','demotion'=>'تنزيل درجة','termination'=>'فصل']; ?>
 <div class="card" style="margin-bottom:20px;">
     <form method="GET" action="/hr/disciplinary" style="display:flex;gap:10px;flex-wrap:wrap;align-items:end;padding:16px;">
         <div style="flex:1;min-width:160px;"><label style="display:block;margin-bottom:4px;font-size:13px;color:#6B7280;">بحث</label><input type="text" name="q" value="<?= e($filters['q']) ?>" placeholder="اسم الموظف..." class="form-control"></div>
@@ -33,8 +33,8 @@
                 <tr>
                     <td><a href="/hr/employees/<?= (int) $a['employee_profile_id'] ?>"><?= e(($a['first_name_ar'] ?? '') . ' ' . ($a['last_name_ar'] ?? '')) ?></a></td>
                     <td><?= e($a['incident_date'] ?? '') ?></td>
-                    <td><?= e($a['violation_type'] ?? '-') ?></td>
-                    <td><?php if (!empty($a['penalty_type'])): ?><span style="font-weight:600;"><?= e($pl[$a['penalty_type']] ?? $a['penalty_type']) ?></span><?php if ((int) ($a['penalty_days'] ?? 0) > 0): ?> (<?= (int) $a['penalty_days'] ?> يوم)<?php endif; ?><?php else: ?>-<?php endif; ?></td>
+                    <td><?= e(mb_substr($a['incident_description'] ?? '-', 0, 50)) ?></td>
+                    <td><?php if (!empty($a['penalty_type'])): ?><span style="font-weight:600;"><?= e($pl[$a['penalty_type']] ?? $a['penalty_type']) ?></span><?php $pd = (int) ($a['wage_deduction_days'] ?? $a['suspension_days'] ?? 0); if ($pd > 0): ?> (<?= $pd ?> يوم)<?php endif; ?><?php else: ?>-<?php endif; ?></td>
                     <td><span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $sc[$a['status']] ?? '#E5E7EB;color:#374151' ?>;"><?= e($sl[$a['status']] ?? $a['status']) ?></span></td>
                     <td><a href="/hr/disciplinary/<?= (int) $a['id'] ?>" style="color:#2563EB;"><i data-lucide="eye" style="width:16px;height:16px;"></i></a></td>
                 </tr>

app/Modules/HR/Views/disciplinary/show.php

@@ -2,18 +2,16 @@
 <?php $__template->section('title'); ?>إجراء تأديبي #<?= (int) $action->id ?><?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/disciplinary" class="btn btn-secondary">رجوع</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $sl = ['reported'=>'مبلغ عنه','under_investigation'=>'تحت التحقيق','enforced'=>'منفذ','appealed'=>'متظلم','closed'=>'مغلق']; ?>
-<?php $sc = ['reported'=>'#FEF3C7;color:#92400E','under_investigation'=>'#DBEAFE;color:#1E40AF','enforced'=>'#FDE8E8;color:#9B1C1C','appealed'=>'#E0E7FF;color:#3730A3','closed'=>'#E5E7EB;color:#374151']; ?>
-<?php $pl = ['warning'=>'إنذار','deduction'=>'خصم','suspension'=>'إيقاف','demotion'=>'تنزيل درجة','termination'=>'فصل']; ?>
-<?php $vtypes = ['attendance'=>'حضور وانصراف','misconduct'=>'سوء سلوك','negligence'=>'إهمال','insubordination'=>'عصيان','safety'=>'سلامة مهنية','other'=>'أخرى']; ?>
+<?php $sl = ['investigation'=>'تحت التحقيق','pending_decision'=>'في انتظار القرار','decided'=>'تم تحديد العقوبة','appealed'=>'متظلم','appeal_reviewed'=>'تم مراجعة التظلم','enforced'=>'منفذ','cancelled'=>'ملغى']; ?>
+<?php $sc = ['investigation'=>'#DBEAFE;color:#1E40AF','pending_decision'=>'#FEF3C7;color:#92400E','decided'=>'#FDE8E8;color:#9B1C1C','appealed'=>'#E0E7FF;color:#3730A3','appeal_reviewed'=>'#E0E7FF;color:#3730A3','enforced'=>'#DEF7EC;color:#03543F','cancelled'=>'#E5E7EB;color:#374151']; ?>
+<?php $pl = ['warning'=>'إنذار','wage_deduction'=>'خصم من الراتب','raise_postponement'=>'تأجيل علاوة','suspension'=>'إيقاف','demotion'=>'تنزيل درجة','termination'=>'فصل']; ?>
 
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;border-bottom:1px solid #E5E7EB;"><h3 style="margin:0;font-size:16px;display:flex;align-items:center;gap:8px;">تفاصيل الإجراء <span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $sc[$action->status] ?? '#E5E7EB;color:#374151' ?>;"><?= e($sl[$action->status] ?? $action->status) ?></span></h3></div>
     <div style="padding:16px;display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:16px;">
         <div><span style="color:#6B7280;font-size:13px;">الموظف</span><div style="font-weight:600;"><?php if ($profile): ?><a href="/hr/employees/<?= (int) $profile->id ?>"><?= e($profile->first_name_ar . ' ' . $profile->last_name_ar) ?></a><?php else: ?>-<?php endif; ?></div></div>
         <div><span style="color:#6B7280;font-size:13px;">تاريخ الواقعة</span><div><?= e($action->incident_date ?? '-') ?></div></div>
-        <div><span style="color:#6B7280;font-size:13px;">نوع المخالفة</span><div><?= e($vtypes[$action->violation_type] ?? ($action->violation_type ?: '-')) ?></div></div>
-        <?php if ($reporter): ?><div><span style="color:#6B7280;font-size:13px;">المبلغ</span><div><?= e($reporter['name']) ?></div></div><?php endif; ?>
+        <?php if ($action->action_number): ?><div><span style="color:#6B7280;font-size:13px;">رقم الإجراء</span><div><?= e($action->action_number) ?></div></div><?php endif; ?>
     </div>
     <div style="padding:0 16px 16px;">
         <span style="color:#6B7280;font-size:13px;">وصف الواقعة</span>
@@ -32,35 +30,35 @@
     <div style="padding:16px;border-bottom:1px solid #E5E7EB;"><h3 style="margin:0;font-size:16px;">القرار التأديبي</h3></div>
     <div style="padding:16px;display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:16px;">
         <div><span style="color:#6B7280;font-size:13px;">نوع الجزاء</span><div style="font-weight:700;color:#DC2626;"><?= e($pl[$action->penalty_type] ?? $action->penalty_type) ?></div></div>
-        <?php if ((int) ($action->penalty_days ?? 0) > 0): ?><div><span style="color:#6B7280;font-size:13px;">عدد الأيام</span><div style="font-weight:600;"><?= (int) $action->penalty_days ?> يوم</div></div><?php endif; ?>
-        <div><span style="color:#6B7280;font-size:13px;">تاريخ التنفيذ</span><div><?= e($action->enforcement_date ?? '-') ?></div></div>
+        <?php $pd = (int) ($action->wage_deduction_days ?? $action->suspension_days ?? 0); if ($pd > 0): ?><div><span style="color:#6B7280;font-size:13px;">عدد الأيام</span><div style="font-weight:600;"><?= $pd ?> يوم</div></div><?php endif; ?>
+        <div><span style="color:#6B7280;font-size:13px;">تاريخ التنفيذ</span><div><?= e($action->effective_date ?? '-') ?></div></div>
         <?php if ($decider): ?><div><span style="color:#6B7280;font-size:13px;">قرار بواسطة</span><div><?= e($decider['name']) ?></div></div><?php endif; ?>
     </div>
-    <?php if ($action->decision_notes): ?>
+    <?php if ($action->notes): ?>
     <div style="padding:0 16px 16px;">
-        <span style="color:#6B7280;font-size:13px;">ملاحظات القرار</span>
-        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;"><?= nl2br(e($action->decision_notes)) ?></div>
+        <span style="color:#6B7280;font-size:13px;">ملاحظات</span>
+        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;"><?= nl2br(e($action->notes)) ?></div>
     </div>
     <?php endif; ?>
 </div>
 <?php endif; ?>
 
-<?php if ($action->status === 'appealed' || $action->appeal_reason): ?>
+<?php if ($action->status === 'appealed' || $action->appeal_text): ?>
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;border-bottom:1px solid #E5E7EB;"><h3 style="margin:0;font-size:16px;">التظلم</h3></div>
     <div style="padding:16px;">
         <?php if ($action->appeal_date): ?><div style="margin-bottom:8px;"><span style="color:#6B7280;font-size:13px;">تاريخ التظلم:</span> <?= e($action->appeal_date) ?></div><?php endif; ?>
-        <div style="padding:12px;background:#FEF3C7;border-radius:6px;"><?= nl2br(e($action->appeal_reason ?? '')) ?></div>
+        <div style="padding:12px;background:#FEF3C7;border-radius:6px;"><?= nl2br(e($action->appeal_text ?? '')) ?></div>
     </div>
 </div>
 <?php endif; ?>
 
 <div style="display:flex;gap:10px;flex-wrap:wrap;">
-    <?php if (in_array($action->status, ['reported', 'under_investigation'], true)): ?>
+    <?php if (in_array($action->status, ['investigation', 'pending_decision'], true)): ?>
     <a href="/hr/disciplinary/<?= (int) $action->id ?>/edit" class="btn btn-secondary">تعديل</a>
     <?php endif; ?>
 
-    <?php if (in_array($action->status, ['reported', 'under_investigation'], true)): ?>
+    <?php if (in_array($action->status, ['investigation', 'pending_decision'], true)): ?>
     <div class="card" style="flex:1;min-width:300px;padding:16px;">
         <h4 style="margin:0 0 12px;font-size:14px;">اتخاذ قرار تأديبي</h4>
         <form method="POST" action="/hr/disciplinary/<?= (int) $action->id ?>/decide" style="display:flex;flex-direction:column;gap:10px;">
@@ -73,20 +71,20 @@
                 </div>
                 <div><label style="display:block;margin-bottom:4px;font-size:13px;">عدد الأيام</label><input type="number" name="penalty_days" value="0" min="0" max="6" class="form-control"></div>
             </div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ التنفيذ</label><input type="date" name="enforcement_date" value="<?= date('Y-m-d') ?>" class="form-control"></div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات القرار</label><textarea name="decision_notes" class="form-control" rows="2"></textarea></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ التنفيذ</label><input type="date" name="effective_date" value="<?= date('Y-m-d') ?>" class="form-control"></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات</label><textarea name="notes" class="form-control" rows="2"></textarea></div>
             <div style="display:flex;gap:6px;"><button type="submit" class="btn btn-danger">تنفيذ الجزاء</button></div>
             <div style="font-size:12px;color:#6B7280;">* وفقاً للمادة 58: أقصى خصم 5 أيام/شهر، أقصى إيقاف 6 أيام/شهر</div>
         </form>
     </div>
     <?php endif; ?>
 
-    <?php if ($canAppeal && $action->status === 'enforced'): ?>
+    <?php if ($canAppeal && in_array($action->status, ['decided', 'enforced'], true)): ?>
     <div class="card" style="flex:1;min-width:300px;padding:16px;">
-        <h4 style="margin:0 0 12px;font-size:14px;">تقديم تظلم <span style="color:#6B7280;font-size:12px;">(خلال 7 أيام من التنفيذ)</span></h4>
+        <h4 style="margin:0 0 12px;font-size:14px;">تقديم تظلم <span style="color:#6B7280;font-size:12px;">(خلال 7 أيام من القرار)</span></h4>
         <form method="POST" action="/hr/disciplinary/<?= (int) $action->id ?>/appeal" style="display:flex;flex-direction:column;gap:10px;">
             <?= csrf_field() ?>
-            <div><textarea name="appeal_reason" class="form-control" rows="3" placeholder="سبب التظلم..." required></textarea></div>
+            <div><textarea name="appeal_text" class="form-control" rows="3" placeholder="سبب التظلم..." required></textarea></div>
             <button type="submit" class="btn btn-primary">تقديم التظلم</button>
         </form>
     </div>

app/Modules/HR/Views/documents/by_employee.php

@@ -15,8 +15,7 @@
                     <?php foreach ($documentTypes as $k => $v): ?><option value="<?= e($k) ?>"><?= e($v) ?></option><?php endforeach; ?>
                 </select>
             </div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">رقم المستند</label><input type="text" name="document_number" class="form-control"></div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ الإصدار</label><input type="date" name="issue_date" class="form-control"></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">عنوان المستند</label><input type="text" name="title_ar" class="form-control" placeholder="اختياري - يُستخدم اسم النوع كافتراضي"></div>
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ الانتهاء</label><input type="date" name="expiry_date" class="form-control"></div>
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">الملف (PDF, JPG, PNG - حد 5MB)</label><input type="file" name="document_file" accept=".pdf,.jpg,.jpeg,.png" class="form-control"></div>
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات</label><input type="text" name="notes" class="form-control"></div>
@@ -32,14 +31,13 @@
     <?php else: ?>
     <div class="table-responsive">
         <table class="data-table">
-            <thead><tr><th>النوع</th><th>رقم المستند</th><th>الإصدار</th><th>الانتهاء</th><th>التحقق</th><th>إجراءات</th></tr></thead>
+            <thead><tr><th>النوع</th><th>العنوان</th><th>الانتهاء</th><th>التحقق</th><th>إجراءات</th></tr></thead>
             <tbody>
                 <?php foreach ($documents as $d): ?>
                 <?php $isExpired = !empty($d['expiry_date']) && $d['expiry_date'] < date('Y-m-d'); ?>
                 <tr>
                     <td><?= e($documentTypes[$d['document_type']] ?? $d['document_type']) ?></td>
-                    <td><?= e($d['document_number'] ?? '-') ?></td>
-                    <td><?= e($d['issue_date'] ?? '-') ?></td>
+                    <td><?= e($d['title_ar'] ?? '-') ?></td>
                     <td><span style="<?= $isExpired ? 'color:#DC2626;font-weight:600;' : '' ?>"><?= e($d['expiry_date'] ?? '-') ?><?php if ($isExpired): ?> (منتهي)<?php endif; ?></span></td>
                     <td>
                         <?php if ((int) ($d['is_verified'] ?? 0)): ?>

app/Modules/HR/Views/documents/index.php

@@ -21,7 +21,7 @@
 <div class="card">
     <div class="table-responsive">
         <table class="data-table">
-            <thead><tr><th>الموظف</th><th>نوع المستند</th><th>رقم المستند</th><th>تاريخ الانتهاء</th><th>التحقق</th><th>إجراءات</th></tr></thead>
+            <thead><tr><th>الموظف</th><th>نوع المستند</th><th>العنوان</th><th>تاريخ الانتهاء</th><th>التحقق</th><th>إجراءات</th></tr></thead>
             <tbody>
                 <?php if (empty($documents)): ?>
                 <tr><td colspan="6" style="text-align:center;padding:40px;color:#9CA3AF;">لا توجد مستندات</td></tr>
@@ -32,7 +32,7 @@
                 <tr>
                     <td><a href="/hr/documents/employee/<?= (int) $d['employee_profile_id'] ?>"><?= e(($d['first_name_ar'] ?? '') . ' ' . ($d['last_name_ar'] ?? '')) ?></a></td>
                     <td><?= e($documentTypes[$d['document_type']] ?? $d['document_type']) ?></td>
-                    <td><?= e($d['document_number'] ?? '-') ?></td>
+                    <td><?= e($d['title_ar'] ?? '-') ?></td>
                     <td><?php if (!empty($d['expiry_date'])): ?><span style="<?= $isExpired ? 'color:#DC2626;font-weight:600;' : ($isExpiringSoon ? 'color:#D97706;font-weight:600;' : '') ?>"><?= e($d['expiry_date']) ?><?php if ($isExpired): ?> (منتهي)<?php elseif ($isExpiringSoon): ?> (قارب)<?php endif; ?></span><?php else: ?>-<?php endif; ?></td>
                     <td><?php if ((int) ($d['is_verified'] ?? 0)): ?><span style="color:#059669;font-weight:600;">متحقق</span><?php else: ?><span style="color:#D97706;">غير متحقق</span><?php endif; ?></td>
                     <td><a href="/hr/documents/employee/<?= (int) $d['employee_profile_id'] ?>" style="color:#2563EB;"><i data-lucide="eye" style="width:16px;height:16px;"></i></a></td>

app/Modules/HR/Views/end_of_service/form.php

@@ -2,7 +2,7 @@
 <?php $__template->section('title'); ?>إنهاء خدمة جديد<?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/end-of-service" class="btn btn-secondary">رجوع</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','retirement'=>'تقاعد','contract_end'=>'انتهاء عقد','mutual'=>'إنهاء بالتراضي','death'=>'وفاة']; ?>
+<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','end_of_contract'=>'انتهاء عقد','retirement'=>'تقاعد','death'=>'وفاة','disability'=>'عجز','mutual_agreement'=>'اتفاق مشترك']; ?>
 <form method="POST" action="/hr/end-of-service">
     <?= csrf_field() ?>
     <div class="card" style="margin-bottom:20px;">
@@ -18,8 +18,8 @@
                     <?php foreach ($tl as $k => $v): ?><option value="<?= $k ?>" <?= old('termination_type') === $k ? 'selected' : '' ?>><?= $v ?></option><?php endforeach; ?>
                 </select>
             </div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ إنهاء الخدمة <span style="color:#DC2626;">*</span></label><input type="date" name="termination_date" value="<?= e(old('termination_date') ?? date('Y-m-d')) ?>" class="form-control" required></div>
-            <div style="grid-column:1/-1;"><label style="display:block;margin-bottom:4px;font-size:13px;">سبب إنهاء الخدمة</label><textarea name="termination_reason" class="form-control" rows="3"><?= e(old('termination_reason') ?? '') ?></textarea></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">تاريخ إنهاء الخدمة <span style="color:#DC2626;">*</span></label><input type="date" name="effective_date" value="<?= e(old('effective_date') ?? date('Y-m-d')) ?>" class="form-control" required></div>
+            <div style="grid-column:1/-1;"><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات</label><textarea name="notes" class="form-control" rows="3"><?= e(old('notes') ?? '') ?></textarea></div>
         </div>
     </div>
     <div style="display:flex;gap:10px;justify-content:flex-end;">

app/Modules/HR/Views/end_of_service/index.php

@@ -2,9 +2,9 @@
 <?php $__template->section('title'); ?>نهاية الخدمة<?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/end-of-service/create" class="btn btn-primary" style="display:inline-flex;align-items:center;gap:6px;"><i data-lucide="plus" style="width:16px;height:16px;"></i> إنهاء خدمة جديد</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $sl = ['draft'=>'مسودة','calculated'=>'محسوب','approved'=>'معتمد','paid'=>'مصروف']; ?>
-<?php $sc = ['draft'=>'#FEF3C7;color:#92400E','calculated'=>'#DBEAFE;color:#1E40AF','approved'=>'#D1FAE5;color:#065F46','paid'=>'#E5E7EB;color:#374151']; ?>
-<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','retirement'=>'تقاعد','contract_end'=>'انتهاء عقد','mutual'=>'إنهاء بالتراضي','death'=>'وفاة']; ?>
+<?php $sl = ['draft'=>'مسودة','calculated'=>'تم الحساب','pending_approval'=>'في انتظار الاعتماد','approved'=>'معتمد','paid'=>'تم الصرف','cancelled'=>'ملغى']; ?>
+<?php $sc = ['draft'=>'#FEF3C7;color:#92400E','calculated'=>'#DBEAFE;color:#1E40AF','pending_approval'=>'#FDE8E8;color:#9B1C1C','approved'=>'#D1FAE5;color:#065F46','paid'=>'#E5E7EB;color:#374151','cancelled'=>'#E5E7EB;color:#6B7280']; ?>
+<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','end_of_contract'=>'انتهاء عقد','retirement'=>'تقاعد','death'=>'وفاة','disability'=>'عجز','mutual_agreement'=>'اتفاق مشترك']; ?>
 <div class="card" style="margin-bottom:20px;">
     <form method="GET" action="/hr/end-of-service" style="display:flex;gap:10px;flex-wrap:wrap;align-items:end;padding:16px;">
         <div style="flex:1;min-width:160px;"><label style="display:block;margin-bottom:4px;font-size:13px;color:#6B7280;">بحث</label><input type="text" name="q" value="<?= e($filters['q']) ?>" placeholder="اسم الموظف..." class="form-control"></div>
@@ -31,9 +31,9 @@
                 <?php else: ?>
                 <?php foreach ($records as $r): ?>
                 <tr>
-                    <td><a href="/hr/employees/<?= (int) $r['employee_profile_id'] ?>"><?= e(($r['first_name_ar'] ?? '') . ' ' . ($r['last_name_ar'] ?? '')) ?></a></td>
+                    <td><a href="/hr/employees/<?= (int) $r['employee_profile_id'] ?>"><?= e($r['full_name_ar'] ?? '-') ?></a></td>
                     <td><?= e($tl[$r['termination_type']] ?? $r['termination_type']) ?></td>
-                    <td><?= e($r['termination_date'] ?? '-') ?></td>
+                    <td><?= e($r['effective_date'] ?? '-') ?></td>
                     <td style="font-weight:700;"><?= $r['net_settlement'] !== null ? number_format((float) $r['net_settlement'], 2) . ' ج.م' : '-' ?></td>
                     <td><span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $sc[$r['status']] ?? '#E5E7EB;color:#374151' ?>;"><?= e($sl[$r['status']] ?? $r['status']) ?></span></td>
                     <td><a href="/hr/end-of-service/<?= (int) $r['id'] ?>" style="color:#2563EB;"><i data-lucide="eye" style="width:16px;height:16px;"></i></a></td>

app/Modules/HR/Views/end_of_service/show.php

@@ -2,23 +2,23 @@
 <?php $__template->section('title'); ?>نهاية خدمة #<?= (int) $record->id ?><?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/end-of-service" class="btn btn-secondary">رجوع</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $sl = ['draft'=>'مسودة','calculated'=>'محسوب','approved'=>'معتمد','paid'=>'مصروف']; ?>
-<?php $sc = ['draft'=>'#FEF3C7;color:#92400E','calculated'=>'#DBEAFE;color:#1E40AF','approved'=>'#D1FAE5;color:#065F46','paid'=>'#E5E7EB;color:#374151']; ?>
-<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','retirement'=>'تقاعد','contract_end'=>'انتهاء عقد','mutual'=>'إنهاء بالتراضي','death'=>'وفاة']; ?>
+<?php $sl = ['draft'=>'مسودة','calculated'=>'تم الحساب','pending_approval'=>'في انتظار الاعتماد','approved'=>'معتمد','paid'=>'تم الصرف','cancelled'=>'ملغى']; ?>
+<?php $sc = ['draft'=>'#FEF3C7;color:#92400E','calculated'=>'#DBEAFE;color:#1E40AF','pending_approval'=>'#FDE8E8;color:#9B1C1C','approved'=>'#D1FAE5;color:#065F46','paid'=>'#E5E7EB;color:#374151','cancelled'=>'#E5E7EB;color:#6B7280']; ?>
+<?php $tl = ['resignation'=>'استقالة','termination'=>'فصل','end_of_contract'=>'انتهاء عقد','retirement'=>'تقاعد','death'=>'وفاة','disability'=>'عجز','mutual_agreement'=>'اتفاق مشترك']; ?>
 
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;border-bottom:1px solid #E5E7EB;"><h3 style="margin:0;font-size:16px;display:flex;align-items:center;gap:8px;">بيانات إنهاء الخدمة <span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $sc[$record->status] ?? '#E5E7EB;color:#374151' ?>;"><?= e($sl[$record->status] ?? $record->status) ?></span></h3></div>
     <div style="padding:16px;display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:16px;">
         <div><span style="color:#6B7280;font-size:13px;">الموظف</span><div style="font-weight:600;"><?php if ($profile): ?><a href="/hr/employees/<?= (int) $profile->id ?>"><?= e($profile->first_name_ar . ' ' . $profile->last_name_ar) ?></a><?php else: ?>-<?php endif; ?></div></div>
         <div><span style="color:#6B7280;font-size:13px;">نوع الإنهاء</span><div><?= e($tl[$record->termination_type] ?? $record->termination_type) ?></div></div>
-        <div><span style="color:#6B7280;font-size:13px;">تاريخ الإنهاء</span><div><?= e($record->termination_date ?? '-') ?></div></div>
+        <div><span style="color:#6B7280;font-size:13px;">تاريخ الإنهاء</span><div><?= e($record->effective_date ?? '-') ?></div></div>
         <?php if ($record->years_of_service !== null): ?><div><span style="color:#6B7280;font-size:13px;">سنوات الخدمة</span><div style="font-weight:600;"><?= number_format((float) $record->years_of_service, 1) ?> سنة</div></div><?php endif; ?>
         <?php if ($approver): ?><div><span style="color:#6B7280;font-size:13px;">معتمد بواسطة</span><div><?= e($approver['name']) ?></div></div><?php endif; ?>
     </div>
-    <?php if ($record->termination_reason): ?>
+    <?php if ($record->notes): ?>
     <div style="padding:0 16px 16px;">
-        <span style="color:#6B7280;font-size:13px;">سبب الإنهاء</span>
-        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;"><?= nl2br(e($record->termination_reason)) ?></div>
+        <span style="color:#6B7280;font-size:13px;">ملاحظات</span>
+        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;"><?= nl2br(e($record->notes)) ?></div>
     </div>
     <?php endif; ?>
 </div>
@@ -35,31 +35,23 @@
                 </tr>
                 <tr style="border-bottom:1px solid #F3F4F6;">
                     <td style="padding:10px 0;color:#6B7280;">مكافأة نهاية الخدمة</td>
-                    <td style="padding:10px 0;text-align:left;font-weight:600;"><?= number_format((float) ($record->severance_amount ?? 0), 2) ?> ج.م</td>
+                    <td style="padding:10px 0;text-align:left;font-weight:600;"><?= number_format((float) ($record->total_severance ?? 0), 2) ?> ج.م</td>
                 </tr>
                 <tr style="border-bottom:1px solid #F3F4F6;">
                     <td style="padding:10px 0;color:#6B7280;">تعويض فترة الإنذار</td>
-                    <td style="padding:10px 0;text-align:left;"><?= number_format((float) ($record->notice_compensation ?? 0), 2) ?> ج.م</td>
+                    <td style="padding:10px 0;text-align:left;"><?= number_format((float) ($record->notice_period_compensation ?? 0), 2) ?> ج.م</td>
                 </tr>
                 <tr style="border-bottom:1px solid #F3F4F6;">
                     <td style="padding:10px 0;color:#6B7280;">رصيد الإجازات</td>
                     <td style="padding:10px 0;text-align:left;"><?= number_format((float) ($record->leave_compensation ?? 0), 2) ?> ج.م</td>
                 </tr>
-                <tr style="border-bottom:1px solid #F3F4F6;">
-                    <td style="padding:10px 0;color:#6B7280;">تعويضات أخرى</td>
-                    <td style="padding:10px 0;text-align:left;"><?= number_format((float) ($record->other_compensation ?? 0), 2) ?> ج.م</td>
-                </tr>
                 <tr style="border-bottom:1px solid #F3F4F6;background:#F0FDF4;">
                     <td style="padding:10px 0;font-weight:700;">إجمالي المستحقات</td>
-                    <td style="padding:10px 0;text-align:left;font-weight:700;color:#059669;"><?= number_format((float) ($record->total_entitlements ?? 0), 2) ?> ج.م</td>
-                </tr>
-                <tr style="border-bottom:1px solid #F3F4F6;">
-                    <td style="padding:10px 0;color:#DC2626;">(-) سلف مستحقة</td>
-                    <td style="padding:10px 0;text-align:left;color:#DC2626;"><?= number_format((float) ($record->outstanding_loans ?? 0), 2) ?> ج.م</td>
+                    <td style="padding:10px 0;text-align:left;font-weight:700;color:#059669;"><?= number_format((float) ($record->total_entitlement ?? 0), 2) ?> ج.م</td>
                 </tr>
                 <tr style="border-bottom:1px solid #F3F4F6;">
-                    <td style="padding:10px 0;color:#DC2626;">(-) خصومات أخرى</td>
-                    <td style="padding:10px 0;text-align:left;color:#DC2626;"><?= number_format((float) ($record->other_deductions ?? 0), 2) ?> ج.م</td>
+                    <td style="padding:10px 0;color:#DC2626;">(-) خصومات (سلف وغيرها)</td>
+                    <td style="padding:10px 0;text-align:left;color:#DC2626;"><?= number_format((float) ($record->total_deductions ?? 0), 2) ?> ج.م</td>
                 </tr>
                 <tr style="background:#EFF6FF;">
                     <td style="padding:12px 0;font-weight:700;font-size:16px;">صافي التسوية</td>

app/Modules/HR/Views/performance/review_form.php

@@ -58,8 +58,8 @@ $existingScores = json_decode($review->scores_json ?? '{}', true);
         <div style="padding:16px;display:grid;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));gap:16px;">
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">نقاط القوة</label><textarea name="strengths" class="form-control" rows="3"><?= e(old('strengths') ?? ($review->strengths ?? '')) ?></textarea></div>
             <div><label style="display:block;margin-bottom:4px;font-size:13px;">مجالات التحسين</label><textarea name="improvements" class="form-control" rows="3"><?= e(old('improvements') ?? ($review->improvements ?? '')) ?></textarea></div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">الأهداف للفترة القادمة</label><textarea name="goals" class="form-control" rows="3"><?= e(old('goals') ?? ($review->goals ?? '')) ?></textarea></div>
-            <div><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات المقيّم</label><textarea name="reviewer_comments" class="form-control" rows="3"><?= e(old('reviewer_comments') ?? ($review->reviewer_comments ?? '')) ?></textarea></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">الأهداف للفترة القادمة</label><textarea name="goals" class="form-control" rows="3"><?= e(old('goals') ?? (($review->goals_json ? json_decode($review->goals_json, true) : '') ?: '')) ?></textarea></div>
+            <div><label style="display:block;margin-bottom:4px;font-size:13px;">ملاحظات المقيّم</label><textarea name="notes" class="form-control" rows="3"><?= e(old('notes') ?? ($review->notes ?? '')) ?></textarea></div>
         </div>
     </div>
 

app/Modules/HR/Views/performance/show_review.php

@@ -2,8 +2,8 @@
 <?php $__template->section('title'); ?>تقييم أداء: <?= e($profile->first_name_ar . ' ' . $profile->last_name_ar) ?><?php $__template->endSection(); ?>
 <?php $__template->section('page_actions'); ?><a href="/hr/performance/cycles/<?= (int) $review->cycle_id ?>" class="btn btn-secondary">رجوع للدورة</a><?php $__template->endSection(); ?>
 <?php $__template->section('content'); ?>
-<?php $rsl = ['pending'=>'بانتظار التقييم','completed'=>'مكتمل','acknowledged'=>'تم الإقرار']; ?>
-<?php $rsc = ['pending'=>'#FEF3C7;color:#92400E','completed'=>'#D1FAE5;color:#065F46','acknowledged'=>'#DBEAFE;color:#1E40AF']; ?>
+<?php $rsl = ['pending'=>'بانتظار التقييم','in_progress'=>'قيد التقييم','submitted'=>'مكتمل','acknowledged'=>'تم الإقرار']; ?>
+<?php $rsc = ['pending'=>'#FEF3C7;color:#92400E','in_progress'=>'#FEF3C7;color:#92400E','submitted'=>'#D1FAE5;color:#065F46','acknowledged'=>'#DBEAFE;color:#1E40AF']; ?>
 
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;border-bottom:1px solid #E5E7EB;"><h3 style="margin:0;font-size:16px;display:flex;align-items:center;gap:8px;">بيانات التقييم <span style="display:inline-block;padding:2px 8px;border-radius:9999px;font-size:12px;background:<?= $rsc[$review->status] ?? '#E5E7EB;color:#374151' ?>;"><?= e($rsl[$review->status] ?? $review->status) ?></span></h3></div>
@@ -51,7 +51,8 @@ $scores = json_decode($review->scores_json ?? '{}', true);
 </div>
 <?php endif; ?>
 
-<?php if ($review->strengths || $review->improvements || $review->goals): ?>
+<?php $goalsText = $review->goals_json ? json_decode($review->goals_json, true) : null; ?>
+<?php if ($review->strengths || $review->improvements || $goalsText): ?>
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;display:grid;grid-template-columns:repeat(auto-fit,minmax(250px,1fr));gap:16px;">
         <?php if ($review->strengths): ?>
@@ -60,18 +61,18 @@ $scores = json_decode($review->scores_json ?? '{}', true);
         <?php if ($review->improvements): ?>
         <div><span style="color:#D97706;font-size:13px;font-weight:600;">مجالات التحسين</span><div style="margin-top:4px;padding:12px;background:#FFFBEB;border-radius:6px;line-height:1.6;"><?= nl2br(e($review->improvements)) ?></div></div>
         <?php endif; ?>
-        <?php if ($review->goals): ?>
-        <div><span style="color:#2563EB;font-size:13px;font-weight:600;">الأهداف</span><div style="margin-top:4px;padding:12px;background:#EFF6FF;border-radius:6px;line-height:1.6;"><?= nl2br(e($review->goals)) ?></div></div>
+        <?php if ($goalsText): ?>
+        <div><span style="color:#2563EB;font-size:13px;font-weight:600;">الأهداف</span><div style="margin-top:4px;padding:12px;background:#EFF6FF;border-radius:6px;line-height:1.6;"><?= nl2br(e(is_string($goalsText) ? $goalsText : json_encode($goalsText, JSON_UNESCAPED_UNICODE))) ?></div></div>
         <?php endif; ?>
     </div>
 </div>
 <?php endif; ?>
 
-<?php if ($review->reviewer_comments): ?>
+<?php if ($review->notes): ?>
 <div class="card" style="margin-bottom:20px;">
     <div style="padding:16px;">
         <span style="color:#6B7280;font-size:13px;">ملاحظات المقيّم</span>
-        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;line-height:1.6;"><?= nl2br(e($review->reviewer_comments)) ?></div>
+        <div style="margin-top:4px;padding:12px;background:#F9FAFB;border-radius:6px;line-height:1.6;"><?= nl2br(e($review->notes)) ?></div>
     </div>
 </div>
 <?php endif; ?>

app/Modules/HR/Views/tax/employee_history.php

@@ -5,7 +5,7 @@
 <?php $__template->section('content'); ?>
 <?php if ($ytd): ?>
 <div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:12px;margin-bottom:20px;">
-    <div class="card" style="padding:16px;text-align:center;"><div style="font-size:13px;color:#6B7280;">إجمالي خاضع تراكمي</div><div style="font-size:18px;font-weight:700;"><?= number_format((float) ($ytd['ytd_taxable'] ?? 0), 2) ?></div></div>
+    <div class="card" style="padding:16px;text-align:center;"><div style="font-size:13px;color:#6B7280;">إجمالي خاضع تراكمي</div><div style="font-size:18px;font-weight:700;"><?= number_format((float) ($ytd['ytd_taxable_income'] ?? 0), 2) ?></div></div>
     <div class="card" style="padding:16px;text-align:center;"><div style="font-size:13px;color:#6B7280;">إجمالي ضريبة تراكمي</div><div style="font-size:18px;font-weight:700;color:#DC2626;"><?= number_format((float) ($ytd['ytd_tax'] ?? 0), 2) ?></div></div>
 </div>
 <?php endif; ?>