improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -2,9 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers\V3\Dashboard\RoadPatrol;
|
||||
|
||||
|
||||
use App\Exports\V3\RoadPatrols\OperatorCartableReport;
|
||||
use App\Facades\Sms\Sms;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Requests\V3\RoadPatrol\DeleteRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
@@ -18,7 +16,6 @@ use Illuminate\Support\Facades\Storage;
|
||||
use Maatwebsite\Excel\Facades\Excel;
|
||||
use Symfony\Component\HttpFoundation\BinaryFileResponse;
|
||||
|
||||
|
||||
class OperatorController extends Controller
|
||||
{
|
||||
use ApiResponse;
|
||||
@@ -26,12 +23,15 @@ class OperatorController extends Controller
|
||||
public function index(Request $request, OperatorService $operatorService): JsonResponse
|
||||
{
|
||||
$data = $operatorService->dataTable($request);
|
||||
|
||||
return response()->json($data);
|
||||
}
|
||||
|
||||
public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
|
||||
{
|
||||
$name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
|
||||
$name = 'گزارش از کارتابل عملیات گشت راهداری '.verta()->now()->format('Y-m-d H:i').'.xlsx';
|
||||
$data = $operatorService->dataTable($request, true);
|
||||
|
||||
return Excel::download(new OperatorCartableReport($data['data']), $name);
|
||||
}
|
||||
|
||||
@@ -42,15 +42,15 @@ class OperatorController extends Controller
|
||||
|
||||
$road_patrol = RoadPatrol::query()->create([
|
||||
'operator_id' => $user->id,
|
||||
'status' => 0,
|
||||
'status_fa' => 'در حال بررسی',
|
||||
'status' => 0,
|
||||
'status_fa' => 'در حال بررسی',
|
||||
'province_id' => $mission->province_id,
|
||||
'province_fa' => $mission->province_name,
|
||||
'edare_id' => $mission->edare_shahri_id,
|
||||
'edare_name' => $mission->edare_shahri_name,
|
||||
'start_time' => $mission->start_time,
|
||||
'end_time' => $mission->finish_time,
|
||||
'mission_id' => $mission->id,
|
||||
'edare_id' => $mission->edare_shahri_id,
|
||||
'edare_name' => $mission->edare_shahri_name,
|
||||
'start_time' => $mission->start_time,
|
||||
'end_time' => $mission->finish_time,
|
||||
'mission_id' => $mission->id,
|
||||
]);
|
||||
|
||||
auth()->user()->addActivityComplete(1147);
|
||||
@@ -74,8 +74,8 @@ class OperatorController extends Controller
|
||||
$road_item = $observed_item->roadItemProject;
|
||||
|
||||
if ($road_item->files()->exists()) {
|
||||
Storage::delete('public/' . $road_item->files[0]->path);
|
||||
Storage::delete('public/' . $road_item->files[1]->path);
|
||||
Storage::delete('public/'.$road_item->files[0]->path);
|
||||
Storage::delete('public/'.$road_item->files[1]->path);
|
||||
$road_item->files()->delete();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user