payment/backend
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

fix and update v2 for operator

Browse Source
This commit is contained in:
joddyabott
2025-02-24 11:12:54 +03:30
parent 080f0e2212
commit d9d51c63c6
5 changed files with 180 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/Http/Controllers/V3/Dashboard/RoadObservationController.php
View File

@@ -1,9 +1,11 @@
<?php
namespace App\Http\Controllers\V3\Dashboard;
use App\Exports\V3\RoadObservation\OperatorCartableReport;
use App\Exports\V3\RoadObservation\SupervisorCartableReport;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\RoadObservation\VerifyBySupervisorRequest;
use App\Http\Traits\ApiResponse;
use App\Models\RoadObserved;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -15,42 +17,54 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
class RoadObservationController extends Controller
{
public function supervisorIndex (Request $request,RoadObservationTableservice $roadObservationTableservice ): JsonResponse
use ApiResponse;
public function supervisorindex (Request $request,RoadObservationTableservice $roadObservationTableservice ): JsonResponse
{
$data = $roadObservationTableservice-> supervisorCartableIndex($request);
foreach ($data['data'] as &$roadItem) {
$roadItem['can_supervise'] = Gate::allows('gate-supervise-road-item', $roadItem) ? 1 : 0;
}
return response()->json($data);
}
public function verifyBySupervisor(VerifyBySupervisorRequest $request, RoadObserved $roadObserved): JsonResponse
public function verifybysupervisor (VerifyBySupervisorRequest $request, RoadObserved $roadObserved): JsonResponse
{
$statusFa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
$roadObserved->update([
'status' => $request->verify,
'status_fa' => $statusFa,
'supervisor_id' => Auth::id(),
'supervisor_name' => Auth::user()->name,
'supervisor_description' => $request->description,
'supervising_time' => now(),
]);
'status' => $request->verify,
'status_fa' => $statusFa,
'supervisor_id' => auth()->user()->id(),
'supervisor_name' => auth()->user()->name,
'supervisor_description' => $request->description,
'supervising_time' => now(),
]);
Auth::user()->addActivityComplete(1138);
auth()->user()->addActivityComplete(1138);
return $this->successResponse(['status' => 'succeed']);
return response()->json(['status' => 'succeed']);
}
public function supervisorCartableReport (Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
public function supervisorcartablereport (Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی واکنش سریع '. verta()->now()->format('Y-m-d') . '.xlsx';
$name = 'گزارش از کارتابل ارزیابی واکنش سریع '. verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $roadObservationTableService->supervisorCartableIndex($request, true);
return Excel::download(new SupervisorCartableReport($data['data']), $name);
}
return Excel::download(new SupervisorCartableReport($data), $name);
}
public function operatorindex(Request $request, RoadObservationTableService $roadObservationTableService): JsonResponse
{
$data = $roadObservationTableService->operatorCartableIndex($request);
return response()->json($data);
}
public function operatorcartablereport(Request $request, RoadObservationTableService $roadObservationTableService): BinaryFileResponse
{
$name = 'گزارش از کارتابل ارزیابی واکنش سریع ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
$data = $roadObservationTableService->operatorCartableIndex($request);
return Excel::download(new OperatorCartableReport($data), $name);
}
}

5
app/Http/Requests/V3/RoadObservation/VerifyBySupervisorRequest.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\RoadObservation;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
class VerifyBySupervisorRequest extends FormRequest
{
@@ -11,7 +12,7 @@ class VerifyBySupervisorRequest extends FormRequest
*/
public function authorize(): bool
{
return true;
return Gate::allows('gate-supervise-road-observed');
}
/**
@@ -22,7 +23,7 @@ class VerifyBySupervisorRequest extends FormRequest
public function rules(): array
{return [
'verify' => ['required', 'in:1,2'],
'description' => ['nullable', 'string'],
'description' => ['string'],
];
}
}