From 86f2bb12fc6f7955a6499d3ce4bc804f37393517 Mon Sep 17 00:00:00 2001 From: Truong Vo <41848815+vmtruong301296@users.noreply.github.com> Date: Thu, 13 Mar 2025 14:50:57 +0700 Subject: [PATCH] =?UTF-8?q?[Ng=C3=A0y=20Ph=C3=A9p]=20C=E1=BA=ADp=20nh?= =?UTF-8?q?=E1=BA=ADt=20l=E1=BA=A1i=20t=C3=AAn=20c=E1=BB=99t=20cho=20b?= =?UTF-8?q?=E1=BA=A3ng=20ng=C3=A0y=20ngh=E1=BB=89=20ph=C3=A9p=20n=C4=83m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LeaveManagementController.php | 4 ++-- BACKEND/app/Exports/LeaveManagementExport.php | 2 +- BACKEND/app/Jobs/InitializeLeaveDays.php | 6 ++--- BACKEND/app/Models/LeaveDays.php | 2 +- ...4_08_06_013033_create_leave_days_table.php | 2 +- ...ay_to_ld_day_total_in_leave_days_table.php | 22 +++++++++++++++++++ .../pages/LeaveManagement/LeaveManagement.tsx | 8 +++---- 7 files changed, 34 insertions(+), 12 deletions(-) create mode 100644 BACKEND/database/migrations/2025_03_13_070714_rename_ld_day_to_ld_day_total_in_leave_days_table.php diff --git a/BACKEND/Modules/Admin/app/Http/Controllers/LeaveManagementController.php b/BACKEND/Modules/Admin/app/Http/Controllers/LeaveManagementController.php index 477b056..9eff7e5 100644 --- a/BACKEND/Modules/Admin/app/Http/Controllers/LeaveManagementController.php +++ b/BACKEND/Modules/Admin/app/Http/Controllers/LeaveManagementController.php @@ -105,7 +105,7 @@ class LeaveManagementController extends Controller 'leaveDay' => [ 'id' => $item->id, 'ld_user_id' => $item->ld_user_id, - 'ld_day' => $item->ld_day, + 'ld_day_total' => $item->ld_day_total, 'ld_year' => $item->ld_year, 'ld_date_additional' => $item->ld_date_additional, 'ld_note' => $item->ld_note, @@ -133,7 +133,7 @@ class LeaveManagementController extends Controller $validatedData = $request->all(); $leaveDays = LeaveDays::find($validatedData['id']); - $leaveDays->ld_day = $validatedData['totalLeave']; + $leaveDays->ld_day_total = $validatedData['totalLeave']; $leaveDays->ld_date_additional = $validatedData['dayAdditional']; // Assuming you have this field to store additional days $leaveDays->ld_note = $validatedData['note']; diff --git a/BACKEND/app/Exports/LeaveManagementExport.php b/BACKEND/app/Exports/LeaveManagementExport.php index 038ade9..236ae42 100644 --- a/BACKEND/app/Exports/LeaveManagementExport.php +++ b/BACKEND/app/Exports/LeaveManagementExport.php @@ -41,7 +41,7 @@ class LeaveManagementExport implements FromArray, WithHeadings, WithStyles, With $stt = 0; foreach ($this->data as $index => $user) { $totalDayOff = 0; - $totalDayLeave = $user['leaveDay']['ld_day'] + $user['leaveDay']['ld_date_additional']; + $totalDayLeave = $user['leaveDay']['ld_day_total'] + $user['leaveDay']['ld_date_additional']; // Tính tổng ngày nghỉ theo tháng $monthlyLeaves = array_fill(1, 12, 0); diff --git a/BACKEND/app/Jobs/InitializeLeaveDays.php b/BACKEND/app/Jobs/InitializeLeaveDays.php index 3c545b5..57ec833 100644 --- a/BACKEND/app/Jobs/InitializeLeaveDays.php +++ b/BACKEND/app/Jobs/InitializeLeaveDays.php @@ -34,7 +34,7 @@ class InitializeLeaveDays implements ShouldQueue public function handle(): void { $users = User::get(); - $ld_day = 12; + $ld_day_total = 12; foreach ($users as $user) { // Kiểm tra xem dữ liệu của user này đã tồn tại cho năm hiện tại chưa $existingData = LeaveDays::where('ld_user_id', $user->id) @@ -55,7 +55,7 @@ class InitializeLeaveDays implements ShouldQueue $ld_note = ''; if ($previousYearData) { - $ld_date_additional = $previousYearData->ld_day + $previousYearData->ld_date_additional; + $ld_date_additional = $previousYearData->ld_day_total + $previousYearData->ld_date_additional; $totalLeaveDaysByMonth = Notes::join('categories', function ($join) { $join->on('notes.n_time_type', '=', 'categories.c_code') ->where('categories.c_type', 'TIME_TYPE'); @@ -82,7 +82,7 @@ class InitializeLeaveDays implements ShouldQueue // Tạo dữ liệu cho năm hiện tại LeaveDays::insert([ 'ld_user_id' => $user->id, - 'ld_day' => $ld_day, + 'ld_day_total' => $ld_day_total, 'ld_year' => $this->year, 'ld_date_additional' => $ld_date_additional, 'ld_note' => $ld_note, diff --git a/BACKEND/app/Models/LeaveDays.php b/BACKEND/app/Models/LeaveDays.php index 67b2024..8fad637 100644 --- a/BACKEND/app/Models/LeaveDays.php +++ b/BACKEND/app/Models/LeaveDays.php @@ -10,7 +10,7 @@ class LeaveDays extends Model use HasFactory; protected $fillable = [ - 'id', 'ld_user_id', 'ld_day', 'ld_year', 'ld_date_additional', 'ld_note' + 'id', 'ld_user_id', 'ld_day_total', 'ld_year', 'ld_date_additional', 'ld_note' ]; protected $table = 'leave_days'; diff --git a/BACKEND/database/migrations/2024_08_06_013033_create_leave_days_table.php b/BACKEND/database/migrations/2024_08_06_013033_create_leave_days_table.php index bb4db24..ec4db4e 100644 --- a/BACKEND/database/migrations/2024_08_06_013033_create_leave_days_table.php +++ b/BACKEND/database/migrations/2024_08_06_013033_create_leave_days_table.php @@ -14,7 +14,7 @@ return new class extends Migration Schema::create('leave_days', function (Blueprint $table) { $table->id(); $table->integer('ld_user_id'); // Giả định user_id là khóa ngoại - $table->float('ld_day'); + $table->float('ld_day_total'); $table->integer('ld_year'); $table->float('ld_date_additional')->default(0); $table->text('ld_note')->nullable(); diff --git a/BACKEND/database/migrations/2025_03_13_070714_rename_ld_day_to_ld_day_total_in_leave_days_table.php b/BACKEND/database/migrations/2025_03_13_070714_rename_ld_day_to_ld_day_total_in_leave_days_table.php new file mode 100644 index 0000000..51b4754 --- /dev/null +++ b/BACKEND/database/migrations/2025_03_13_070714_rename_ld_day_to_ld_day_total_in_leave_days_table.php @@ -0,0 +1,22 @@ +renameColumn('ld_day_total', 'ld_day_total'); + }); + } + + public function down() + { + Schema::table('leave_days', function (Blueprint $table) { + $table->renameColumn('ld_day_total', 'ld_day_total'); + }); + } +} diff --git a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx index 1a8b020..181e615 100644 --- a/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx +++ b/FRONTEND/src/pages/LeaveManagement/LeaveManagement.tsx @@ -40,7 +40,7 @@ interface LeaveDay { id: number ld_user_id: number ld_year: number - ld_day: number + ld_day_total: number ld_date_additional: number ld_note: string created_at: string | null @@ -472,7 +472,7 @@ const LeaveManagement = () => { {data.map((user, index) => { let totalDayOff = 0 let totalDayLeave = - user.leaveDay.ld_day + user.leaveDay.ld_date_additional + user.leaveDay.ld_day_total + user.leaveDay.ld_date_additional let ld_note = user.leaveDay.ld_note return ( @@ -585,9 +585,9 @@ const LeaveManagement = () => { style={{ cursor: 'pointer' }} onClick={() => { let totalLeave = - user.leaveDay.ld_day == 0 + user.leaveDay.ld_day_total == 0 ? '' - : String(user.leaveDay.ld_day) + : String(user.leaveDay.ld_day_total) let dayAdditional = user.leaveDay.ld_date_additional == 0 ? ''