fix potention
This commit is contained in:
@@ -30,7 +30,10 @@ class RequestAssignmentController extends Controller
|
|||||||
])->orderBy('id', 'desc');
|
])->orderBy('id', 'desc');
|
||||||
|
|
||||||
if ($request->has('filter') && !empty($request->get('filter'))) {
|
if ($request->has('filter') && !empty($request->get('filter'))) {
|
||||||
$filter = strtolower($request->get('filter'));
|
$filter = strtolower(trim($request->get('filter')));
|
||||||
|
|
||||||
|
// Log filter for debugging
|
||||||
|
Log::info('RequestAssignmentController filter applied', ['filter' => $filter, 'original' => $request->get('filter')]);
|
||||||
|
|
||||||
switch ($filter) {
|
switch ($filter) {
|
||||||
case 'non-business':
|
case 'non-business':
|
||||||
@@ -65,7 +68,16 @@ class RequestAssignmentController extends Controller
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'potention':
|
case 'potention':
|
||||||
$query->whereIn("status", PbgTaskStatus::getPotention());
|
$potentionStatuses = PbgTaskStatus::getPotention();
|
||||||
|
$rejectedStatuses = PbgTaskStatus::getRejected();
|
||||||
|
$query->whereIn("status", $potentionStatuses)
|
||||||
|
->whereNotIn("status", $rejectedStatuses);
|
||||||
|
Log::info('Potention filter applied', [
|
||||||
|
'status_list' => $potentionStatuses,
|
||||||
|
'excluded_rejected' => $rejectedStatuses,
|
||||||
|
'count_before_filter' => PbgTask::count(),
|
||||||
|
'count_after_filter' => $query->count()
|
||||||
|
]);
|
||||||
break;
|
break;
|
||||||
case 'issuance-realization-pbg':
|
case 'issuance-realization-pbg':
|
||||||
$query->whereIn("status", PbgTaskStatus::getIssuanceRealizationPbg());
|
$query->whereIn("status", PbgTaskStatus::getIssuanceRealizationPbg());
|
||||||
@@ -76,6 +88,10 @@ class RequestAssignmentController extends Controller
|
|||||||
case 'waiting-click-dpmptsp':
|
case 'waiting-click-dpmptsp':
|
||||||
$query->whereIn("status", PbgTaskStatus::getWaitingClickDpmptsp());
|
$query->whereIn("status", PbgTaskStatus::getWaitingClickDpmptsp());
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
// Log unrecognized filter for debugging
|
||||||
|
Log::warning('Unrecognized filter value', ['filter' => $filter, 'original' => $request->get('filter')]);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +104,32 @@ class RequestAssignmentController extends Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Log final query count for debugging
|
||||||
|
$finalCount = $query->count();
|
||||||
|
Log::info('RequestAssignmentController final result', [
|
||||||
|
'filter' => $request->get('filter'),
|
||||||
|
'search' => $request->get('search'),
|
||||||
|
'total_count' => $finalCount,
|
||||||
|
'request_url' => $request->fullUrl(),
|
||||||
|
'all_params' => $request->all()
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Additional logging for potention filter
|
||||||
|
if ($request->get('filter') === 'potention') {
|
||||||
|
$rejectedCount = PbgTask::whereIn('status', PbgTaskStatus::getRejected())->count();
|
||||||
|
Log::info('Potention filter details', [
|
||||||
|
'potention_count' => $finalCount,
|
||||||
|
'rejected_count' => $rejectedCount,
|
||||||
|
'total_all_records' => PbgTask::count(),
|
||||||
|
'note' => 'Potention filter excludes rejected data'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Also log to console for immediate debugging
|
||||||
|
if ($request->has('filter')) {
|
||||||
|
error_log('RequestAssignment Filter Debug: ' . $request->get('filter') . ' -> Count: ' . $finalCount);
|
||||||
|
}
|
||||||
|
|
||||||
return RequestAssignmentResouce::collection($query->paginate());
|
return RequestAssignmentResouce::collection($query->paginate());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user