diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
index f9d065a1..b62da19b 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
@@ -51,7 +51,6 @@ class OperatorController extends Controller
*/
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
{
-
$info_item = InfoItem::query()->where('item', $request->item_id)
->where('sub_item', $request->sub_item_id)
->firstOrFail();
@@ -72,7 +71,9 @@ class OperatorController extends Controller
$start_coordinates = explode(',', $request->start_point);
$end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
- DB::transaction(function () use ($request, $nominatimService, $start_coordinates, $end_coordinates, $info_item) {
+ DB::transaction(function () use ($request, $nominatimService,
+ $start_coordinates, $end_coordinates, $info_item)
+ {
$user = auth()->user();
$road_item = RoadItemsProject::query()->create([
'user_id' => $user->id,
@@ -104,6 +105,7 @@ class OperatorController extends Controller
'activity_time' => $request->activity_time,
'activity_date_time' => $request->activity_date." ".$request->activity_time,
'is_new' => 1,
+ 'mission_id' => $request->mission_id,
]);
if ($request->has('after_image')) {
@@ -123,8 +125,6 @@ class OperatorController extends Controller
new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.')
);
- $road_item->missions()->attach($request->mission_id);
-
$user->addActivityComplete(1154);
});
diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
index 9e906fe8..230bb22a 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php
@@ -50,10 +50,9 @@ class OperatorController extends Controller
'edare_name' => $mission->edare_shahri_name,
'start_time' => $mission->start_time,
'end_time' => $mission->finish_time,
+ 'mission_id' => $mission->id,
]);
- $road_patrol->missions()->attach($mission->id);
-
auth()->user()->addActivityComplete(1147);
});
diff --git a/app/Models/Mission.php b/app/Models/Mission.php
index aaa7ca40..347c738d 100644
--- a/app/Models/Mission.php
+++ b/app/Models/Mission.php
@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
class Mission extends Model
@@ -34,14 +35,14 @@ class Mission extends Model
return $this->hasMany(MissionHistory::class);
}
- public function roadItems(): MorphToMany
+ public function roadPatrol(): HasOne
{
- return $this->morphedByMany(RoadItemsProject::class, 'missionable');
+ return $this->hasOne(RoadPatrol::class);
}
- public function roadPatrols(): MorphToMany
+ public function roadItems(): HasMany
{
- return $this->morphedByMany(RoadPatrol::class, 'missionable');
+ return $this->hasMany(RoadItemsProject::class);
}
public function roadObserveds(): MorphToMany
diff --git a/app/Models/RoadItemsProject.php b/app/Models/RoadItemsProject.php
index 9929b84c..6617115f 100644
--- a/app/Models/RoadItemsProject.php
+++ b/app/Models/RoadItemsProject.php
@@ -3,11 +3,10 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Http\UploadedFile;
use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class RoadItemsProject extends Model
{
@@ -188,13 +187,8 @@ class RoadItemsProject extends Model
);
}
- public function missions(): MorphToMany
+ public function mission(): BelongsTo
{
- return $this->morphToMany(Mission::class,
- 'missionable',
- 'missionables',
- 'missionable_id',
- 'mission_id',
- );
+ return $this->belongsTo(Mission::class);
}
}
diff --git a/app/Models/RoadPatrol.php b/app/Models/RoadPatrol.php
index 819467f2..3f1c8ed6 100644
--- a/app/Models/RoadPatrol.php
+++ b/app/Models/RoadPatrol.php
@@ -4,6 +4,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -46,13 +47,8 @@ class RoadPatrol extends Model
);
}
- public function missions(): MorphToMany
+ public function mission(): BelongsTo
{
- return $this->morphToMany(Mission::class,
- 'missionable',
- 'missionables',
- 'missionable_id',
- 'mission_id',
- );
+ return $this->belongsTo(Mission::class);
}
}
diff --git a/app/Services/Cartables/RoadItem/OperatorService.php b/app/Services/Cartables/RoadItem/OperatorService.php
index cba4699a..80fe27db 100644
--- a/app/Services/Cartables/RoadItem/OperatorService.php
+++ b/app/Services/Cartables/RoadItem/OperatorService.php
@@ -11,9 +11,9 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false)
{
$query = RoadItemsProject::query()
+ ->with('mission:id')
->where('is_new', '=', 1)
- ->where('user_id', '=', auth()->user()->id)
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->where('user_id', '=', auth()->user()->id);
return DataTableFacade::run(
$query,
@@ -23,7 +23,8 @@ class OperatorService
allowedSelects: [
'id', 'province_fa', 'edarat_name', 'supervisor_description', 'item', 'item_fa',
'sub_item', 'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
- 'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'
+ 'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status',
+ 'mission_id'
],
);
}
diff --git a/app/Services/Cartables/RoadItem/SupervisorService.php b/app/Services/Cartables/RoadItem/SupervisorService.php
index ee7510fb..d0d79ef4 100644
--- a/app/Services/Cartables/RoadItem/SupervisorService.php
+++ b/app/Services/Cartables/RoadItem/SupervisorService.php
@@ -20,15 +20,15 @@ class SupervisorService
if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
$query = RoadItemsProject::query()
- ->where('is_new', 1)
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->with('mission:id')
+ ->where('is_new', 1);
}
elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
throw_if(is_null($user->province_id), new ProhibitedAction('استانی برای شما در سامانه ثبت نشده است!'));
$query = RoadItemsProject::query()
+ ->with('mission:id')
->where('is_new', 1)
- ->where('province_id', auth()->user()->province_id)
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->where('province_id', auth()->user()->province_id);
}
return DataTableFacade::run(
@@ -39,7 +39,8 @@ class SupervisorService
allowedSelects: [
'id', 'province_fa', 'edarat_name', 'item', 'item_fa', 'sub_item',
'sub_item_fa', 'sub_item_data', 'unit_fa', 'start_lat', 'start_lng',
- 'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa', 'status'
+ 'end_lat', 'end_lng', 'activity_date_time', 'created_at', 'status_fa',
+ 'status', 'mission_id'
]
);
}
diff --git a/app/Services/Cartables/RoadPatrol/OperatorService.php b/app/Services/Cartables/RoadPatrol/OperatorService.php
index ce754c57..f3e57810 100644
--- a/app/Services/Cartables/RoadPatrol/OperatorService.php
+++ b/app/Services/Cartables/RoadPatrol/OperatorService.php
@@ -12,8 +12,8 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false)
{
$query = RoadPatrol::query()
- ->where('operator_id', '=', auth()->user()->id)
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->with('mission:id')
+ ->where('operator_id', '=', auth()->user()->id);
return DataTableFacade::run(
$query,
@@ -23,7 +23,7 @@ class OperatorService
allowedSelects: [
'province_fa', 'province_id', 'id', 'edare_id', 'edare_name',
'start_time', 'end_time', 'created_at', 'description',
- 'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+ 'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points', 'mission_id'
],
);
}
diff --git a/app/Services/Cartables/RoadPatrol/SupervisorService.php b/app/Services/Cartables/RoadPatrol/SupervisorService.php
index e726dbc2..7d91838f 100644
--- a/app/Services/Cartables/RoadPatrol/SupervisorService.php
+++ b/app/Services/Cartables/RoadPatrol/SupervisorService.php
@@ -21,7 +21,7 @@ class SupervisorService
if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
$query = RoadPatrol::query()
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->with('mission:id');
}
elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province'))
{
@@ -29,7 +29,7 @@ class SupervisorService
$query = RoadPatrol::query()
->where('province_id', '=', $user->province_id)
- ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
+ ->with('mission:id');
}
return DataTableFacade::run(
@@ -40,7 +40,8 @@ class SupervisorService
allowedSelects: [
'province_fa', 'province_id', 'id', 'edare_id', 'edare_name',
'start_time', 'end_time', 'created_at', 'description',
- 'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points'
+ 'distance', 'vehicle_runtime', 'fuel_consumption', 'stop_points',
+ 'mission_id'
]
);
}
diff --git a/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php b/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php
new file mode 100644
index 00000000..60148d95
--- /dev/null
+++ b/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php
@@ -0,0 +1,29 @@
+foreignId('mission_id')->nullable()->constrained('missions');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('road_patrols', function (Blueprint $table) {
+ $table->dropForeign('road_patrols_mission_id_foreign');
+ $table->dropColumn('mission_id');
+ });
+ }
+};
diff --git a/database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php b/database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php
new file mode 100644
index 00000000..62d511c4
--- /dev/null
+++ b/database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php
@@ -0,0 +1,29 @@
+foreignId('mission_id')->nullable()->constrained('missions');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('road_items_projects', function (Blueprint $table) {
+ $table->dropForeign('road_items_projects_mission_id_foreign');
+ $table->dropColumn('mission_id');
+ });
+ }
+};
diff --git a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
index 76431163..801c7917 100644
--- a/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/OperatorCartableReport.blade.php
@@ -21,18 +21,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش کارتابل عملیات فعالیت های روزانه و جاری
|
@@ -60,10 +60,7 @@
مقدار
- کد خودرو(ها) |
-
- کد راهدار(ها) |
+ کد ماموریت
نقطه شروع |
@@ -97,8 +94,7 @@
{{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' : $item['sub_item_data'] . '(-)') : '-' }}
|
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
- {{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
+ {{ $item['mission_id'] ?? '-' }} |
{{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' . $item['start_lng'] : '-' }}
|
diff --git a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
index d7bb9a9f..ac0f2fe4 100644
--- a/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadItems/SupervisorCartableReport.blade.php
@@ -21,18 +21,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش کارتابل ارزیابی فعالیت های روزانه و جاری
|
@@ -60,10 +60,7 @@
مقدار
- کد خودرو(ها) |
-
- کد راهدار(ها) |
+ کد ماموریت
نقطه شروع |
@@ -97,8 +94,7 @@
{{ $item['sub_item_data'] ? ($item['unit_fa'] ? $item['sub_item_data'] . '(' . $item['unit_fa'] . ')' : $item['sub_item_data'] . '(-)') : '-' }}
|
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
- {{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
+ {{ $item['mission_id'] ?? '-' }} |
{{ isset($item['start_lat']) && isset($item['start_lng']) ? $item['start_lat'] . ' ' . $item['start_lng'] : '-' }}
|
diff --git a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
index 92e1f1d6..121e193b 100644
--- a/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/OperatorCartableReport.blade.php
@@ -21,18 +21,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش کارتابل عملیات گشت راهداری
|
@@ -49,10 +49,7 @@
اداره
- کد خودرو(ها) |
-
- کد راهدار(ها) |
+ کد ماموریت
تاریخ شروع |
@@ -74,8 +71,7 @@
{{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
{{ $item['edare_name'] ?? '-' }} |
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
- {{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
+ {{ $item['mission_id'] ?? '-' }} |
{{ $item['start_time'] ? verta($item['start_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['end_time'] ? verta($item['end_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |
diff --git a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
index af572a66..ca080749 100644
--- a/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
+++ b/resources/views/v3/Reports/RoadPatrols/SupervisorCartableReport.blade.php
@@ -21,18 +21,18 @@
- |
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
|
- |
|
- |
گزارش کارتابل ارزیابی گشت راهداری
|
@@ -49,10 +49,7 @@
اداره
- کد خودرو(ها) |
-
- کد راهدار(ها) |
+ کد ماموریت
تاریخ شروع |
@@ -74,8 +71,7 @@
{{ $item['id'] ?? '-' }} |
{{ $item['province_fa'] ?? '-' }} |
{{ $item['edare_name'] ?? '-' }} |
- {{ $item['cmmsMachines'] != null ? $item['cmmsMachines']->pluck('machine_code')->implode(', ') : '-' }} |
- {{ $item['rahdaran'] != null ? $item['rahdaran']->pluck('code')->implode(', ') : '-' }} |
+ {{ $item['mission_id'] ?? '-' }} |
{{ $item['start_time'] ? verta($item['start_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['end_time'] ? verta($item['end_time'])->format('Y/n/j H:i:s') : '-' }}
| {{ $item['created_at'] ? verta($item['created_at'])->format('Y/n/j H:i:s') : '-' }} |