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

create and fix code

Browse Source
This commit is contained in:
joddyabott
2025-09-08 14:10:03 +03:30
parent 755ab2f67b
commit 52cd049e89
13 changed files with 104 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Models/Mission.php
View File

@@ -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

12
app/Models/RoadItemsProject.php
View File

@@ -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);
}
}

10
app/Models/RoadPatrol.php
View File

@@ -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);
}
}

7
app/Services/Cartables/RoadItem/OperatorService.php
View File

@@ -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'
],
);
}

11
app/Services/Cartables/RoadItem/SupervisorService.php
View File

@@ -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'
]
);
}

6
app/Services/Cartables/RoadPatrol/OperatorService.php
View File

@@ -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'
],
);
}

7
app/Services/Cartables/RoadPatrol/SupervisorService.php
View File

@@ -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'
]
);
}