joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #130

Merged
joseph merged 52 commits from dev into master 2025-06-30 18:37:39 +10:00
Conversation 0 Commits 52 Files Changed 46 +19 -5
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e05e92b96b - Show all commits

22
BACKEND/Modules/Admin/app/Http/Controllers/TicketController.php
View File

@ -238,10 +238,24 @@ class TicketController extends Controller
}
// Lấy thông tin tickets nghỉ phép đang ở trạng thái CONFIRMED
$ticketsConfirmed = Ticket::where('user_id', $user->id)->where('status', 'CONFIRMED')
$ticketsConfirmed = Ticket::where('user_id', $user->id)
->where('status', 'CONFIRMED')
->whereIn('type', ['ONLEAVE'])
->where(DB::raw('DATE(start_date)'), '>=', $start_date->toDateString())
->where(DB::raw('DATE(end_date)'), '<=', $end_date->toDateString())
->where(function($query) use ($start_date, $end_date) {
$query->where(function($q) use ($start_date, $end_date) {
// Trường hợp 1: start_date nằm trong khoảng
$q->whereBetween(DB::raw('DATE(start_date)'), [$start_date->toDateString(), $end_date->toDateString()]);
})
->orWhere(function($q) use ($start_date, $end_date) {
// Trường hợp 2: end_date nằm trong khoảng
$q->whereBetween(DB::raw('DATE(end_date)'), [$start_date->toDateString(), $end_date->toDateString()]);
})
->orWhere(function($q) use ($start_date, $end_date) {
// Trường hợp 3: Khoảng thời gian được chọn nằm trong khoảng của ticket
$q->where(DB::raw('DATE(start_date)'), '<=', $start_date->toDateString())
->where(DB::raw('DATE(end_date)'), '>=', $end_date->toDateString());
});
})
->get();
$dataListPeriodConfirmed = [];
@ -250,7 +264,7 @@ class TicketController extends Controller
$dataListPeriodConfirmed = array_merge($dataListPeriodConfirmed, $this->getAllPeriodNew($ticket->start_date, $ticket->start_period, $ticket->end_date, $ticket->end_period));
}
}
// dd($dataListPeriodConfirmed,$ticketsConfirmed,$start_date->toDateString(),$end_date->toDateString());
// Chuyển đổi mảng đa chiều thành mảng chuỗi để có thể so sánh
$periodStrings = [];
$waitingPeriodStrings = [];