update filter

This commit is contained in:
2024-02-27 15:22:30 +07:00
parent 5c2eba0c19
commit 41449fa6b1
2 changed files with 12 additions and 4 deletions

View File

@@ -22,6 +22,7 @@ use App\Models\File;
use App\Models\FilesMcu;
use Illuminate\Support\Facades\DB;
use App\Models\Member;
use Carbon\Carbon;
class ClaimRequestController extends Controller
{
@@ -41,11 +42,18 @@ class ClaimRequestController extends Controller
});
})
->when($request->start_date, function ($q, $startDate) {
$q->where('submission_date', '>', $startDate);
$q->where('submission_date', '>', Carbon::parse($startDate)->subDay());
})
->when($request->end_date, function ($q, $endDate) {
$q->where('submission_date', '<', $endDate);
->when($request->end_date, function ($q, $endDate) use ($request) {
// Jika tanggal akhir diberikan dan tidak sama dengan tanggal mulai
if ($request->start_date != $request->end_date) {
$q->where('submission_date', '<', Carbon::parse($endDate)->addDay());
} else {
$q->where('submission_date', '<=', Carbon::parse($endDate));
}
})
->when($request->service_code, function ($q, $serviceCode) {
$q->whereIn('service_code', $serviceCode);
})

View File

@@ -157,7 +157,7 @@ export default function List() {
<LocalizationProvider dateAdapter={AdapterDateFns}>
<DesktopDatePicker
label="End Date"
inputFormat="MM/dd/yyyy"
inputFormat="dd/MM/yyyy"
value={searchParams.get('end_date')}
onChange={(value) => {
try {