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

add area for rahdari points

Browse Source
This commit is contained in:
amirghasempoor
2025-09-06 10:20:22 +03:30
parent 816f515940
commit 29de3a7d29
9 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionStates;
use App\Events\V3\Dashboard\Mission\SendDataToFMSEvent;
use App\Http\Controllers\Controller;
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
use App\Http\Requests\V3\Mission\ControlUnit\FinishRequest;
use App\Http\Requests\V3\Mission\ControlUnit\StartRequest;
use App\Http\Traits\ApiResponse;
@@ -60,6 +61,11 @@ class ControlUnitController extends Controller
]);
});
if ($mission->category_id == 2) {
$rpc = new OperatorController();
$rpc->store($mission);
}
SendDataToFMSEvent::dispatch($mission);
return $this->successResponse();

12
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -34,6 +34,7 @@ class RequestPortalController extends Controller
DB::transaction(function () use ($request) {
$user = auth()->user();
$state = MissionStates::REQUEST_CREATED->value;
$category = $request->category_id;
$mission = Mission::query()->create([
'user_id' => $user->id,
@@ -55,20 +56,15 @@ class RequestPortalController extends Controller
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'category_id' => $category,
'category_name' => MissionCategory::name($category),
'explanation' => $request->explanation,
'code' => rand(100000, 999999),
]);
$mission->rahdaran()->sync($request->rahdaran);
if ($request->category_id == 2) {
$rpc = new OperatorController();
$rpc->store($mission);
}
if ($request->category_id == 3){
if ($category == 3){
RoadObserved::query()
->find($request->road_observed_id)
->missions()

1
app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
View File

@@ -104,6 +104,7 @@ class RoadMaintenanceStationController extends Controller
'lat' => $request->lat,
'lng' => $request->lng,
'updated_at_fa' => verta()->now()->format('Y/m/d H:i:s'),
'area' => json_encode($request->area),
]);
$uploadPaths = [

4
app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
View File

@@ -48,8 +48,8 @@ class OperatorController extends Controller
'province_fa' => $mission->province_name,
'edare_id' => $mission->edare_shahri_id,
'edare_name' => $mission->edare_shahri_name,
'start_time' => $mission->start_date,
'end_time' => $mission->end_date,
'start_time' => $mission->start_time,
'end_time' => $mission->finish_time,
]);
$road_patrol->missions()->attach($mission->id);

10
app/Http/Controllers/V3/RahdaranController.php
View File

@@ -8,6 +8,7 @@ use App\Http\Requests\V3\Rahdaran\StoreRequest;
use App\Http\Requests\V3\Rahdaran\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Rahdaran;
use Illuminate\Database\QueryException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -52,8 +53,13 @@ class RahdaranController extends Controller
public function destroy(Rahdaran $rahdaran): JsonResponse
{
$rahdaran->delete();
return $this->successResponse();
try {
$rahdaran->delete();
return $this->successResponse();
}
catch (QueryException $exception) {
return $this->errorResponse('امکان حذف وجود ندارد');
}
}
public function list(): JsonResponse