fix the command
This commit is contained in:
@@ -109,7 +109,7 @@ class ReportMachineController extends Controller
|
||||
allowedSortings: ['*'],
|
||||
allowedSelects: [
|
||||
'id', 'province_id', 'province_name', 'city_id', 'city_name',
|
||||
'end_km', 'km', 'driver_name', 'state_name', 'station_name'
|
||||
'end_km', 'km', 'driver_name', 'state_id', 'station_name'
|
||||
]
|
||||
);
|
||||
}
|
||||
@@ -125,4 +125,26 @@ class ReportMachineController extends Controller
|
||||
|
||||
return Excel::download(new machineReport($data), $name);
|
||||
}
|
||||
|
||||
public function countryMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
|
||||
{
|
||||
return $this->successResponse([
|
||||
'activities' => $reportMachineService->countryMachineDriversActivity($request),
|
||||
// 'provinces' => Province::all(['id', 'name_fa']),
|
||||
]);
|
||||
}
|
||||
|
||||
public function provinceMachineDriversActivity(Request $request, ReportMachineService $reportMachineService)
|
||||
{
|
||||
return $this->successResponse([
|
||||
'activities' => $reportMachineService->provinceMachineDriversActivity($request),
|
||||
// 'city' => City::query()
|
||||
// ->where('province_id', $request->province_id)
|
||||
// ->where(function ($query) {
|
||||
// $query->where('type_id', 1)
|
||||
// ->orWhereIn('name_fa', ['اداره ماشينآلات', 'اداره نقلیه']);
|
||||
// })
|
||||
// ->get(['id', 'name_fa'])
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,4 +29,18 @@ class UpdateRequest extends FormRequest
|
||||
'enter_station' => 'required|date',
|
||||
];
|
||||
}
|
||||
|
||||
public function after(): array
|
||||
{
|
||||
return [
|
||||
function (Validator $validator) {
|
||||
if (strtotime($this->violation->exit_station) < strtotime($this->enter_station)) {
|
||||
$validator->errors()->add(
|
||||
'time',
|
||||
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
|
||||
);
|
||||
}
|
||||
}
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user