formatting
This commit is contained in:
parent
d01e1e8eeb
commit
4dd479dad7
1 changed files with 0 additions and 10 deletions
|
@ -687,8 +687,6 @@ class ReportsController extends Controller
|
||||||
$assets->whereBetween('assets.created_at', [$created_start, $created_end]);
|
$assets->whereBetween('assets.created_at', [$created_start, $created_end]);
|
||||||
}
|
}
|
||||||
|
|
||||||
//This should parse the action log, and not the hardware table.
|
|
||||||
//There can be multiple checkouts in a given time that we want to track.
|
|
||||||
if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
|
if (($request->filled('checkout_date_start')) && ($request->filled('checkout_date_end'))) {
|
||||||
$checkout_start = \Carbon::parse($request->input('checkout_date_start'))->startOfDay();
|
$checkout_start = \Carbon::parse($request->input('checkout_date_start'))->startOfDay();
|
||||||
$checkout_end = \Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();
|
$checkout_end = \Carbon::parse($request->input('checkout_date_end',now()))->endOfDay();
|
||||||
|
@ -699,14 +697,6 @@ class ReportsController extends Controller
|
||||||
->pluck('item_id');
|
->pluck('item_id');
|
||||||
|
|
||||||
$assets->whereIn('id',$actionlogassets);
|
$assets->whereIn('id',$actionlogassets);
|
||||||
|
|
||||||
//$assets->whereBetween('action_logs.created_at', [$checkout_start, $checkout_end]);
|
|
||||||
//action_logs bit was returning an ERR_INVALID_RESPONSE so I probably missed something
|
|
||||||
//sql query? -> WHERE (`action_type` = 'checkout') AND (`item_type` LIKE '%Asset%')
|
|
||||||
// AND whereBetween('action_logs.created_at', [$checkout_start, $checkout_end]);
|
|
||||||
// if ($action_logs->action_type == "checkout") {}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (($request->filled('checkin_date_start'))) {
|
if (($request->filled('checkin_date_start'))) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue