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

fix last code

Browse Source
This commit is contained in:
joddyabott
2025-09-03 16:28:32 +03:30
parent 4308a6443f
commit df04125cb4
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Requests/V3/RoadItem/Operator/StoreRequest.php
View File

@@ -53,10 +53,7 @@ class StoreRequest extends FormRequest
function (Validator $validator) { function (Validator $validator) {
$mission = Mission::find($this->mission_id); $mission = Mission::find($this->mission_id);
if (!$mission) {
$validator->errors()->add('mission_id', 'مأموریت یافت نشد.');
return;
}
$startTime = Carbon::parse($mission->start_time); $startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time); $finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}"); $activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");

6
app/Http/Requests/V3/RoadItem/Operator/UpdateRequest.php
View File

@@ -6,7 +6,6 @@ use App\Models\Mission;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use Illuminate\Validation\Validator; use Illuminate\Validation\Validator;
class UpdateRequest extends FormRequest class UpdateRequest extends FormRequest
@@ -58,10 +57,7 @@ class UpdateRequest extends FormRequest
function (Validator $validator) { function (Validator $validator) {
$mission = Mission::find($this->mission_id); $mission = Mission::find($this->mission_id);
if (!$mission) {
$validator->errors()->add('mission_id', 'مأموریت یافت نشد.');
return;
}
$startTime = Carbon::parse($mission->start_time); $startTime = Carbon::parse($mission->start_time);
$finishTime = Carbon::parse($mission->finish_time); $finishTime = Carbon::parse($mission->finish_time);
$activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}"); $activityTime = Carbon::parse("{$this->activity_date} {$this->activity_time}");

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

@@ -12,8 +12,8 @@ class OperatorService
public function dataTable(Request $request, $loadRelations = false) public function dataTable(Request $request, $loadRelations = false)
{ {
$query = RoadPatrol::query() $query = RoadPatrol::query()
->where('operator_id', '=', auth()->user()->id); ->where('operator_id', '=', auth()->user()->id)
// ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])); ->when($loadRelations, fn ($query) => $query->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']));
return DataTableFacade::run( return DataTableFacade::run(
$query, $query,

2
database/migrations/2025_09_03_095512_add_phone_to_rahdaran_table.php
View File

@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void public function up(): void
{ {
Schema::table('rahdaran', function (Blueprint $table) { Schema::table('rahdaran', function (Blueprint $table) {
$table->char('mobile', 11)->nullable(); $table->string('mobile', 11)->nullable();
}); });
} }