Compare commits
4 Commits
feature/Ad
...
feature/Ad
| Author | SHA1 | Date | |
|---|---|---|---|
| 235111ee57 | |||
| ccacb2f916 | |||
| aeb58ed27f | |||
| 2f3ebf5808 |
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\V3;
|
|||||||
|
|
||||||
use App\Facades\DataTable\DataTableFacade;
|
use App\Facades\DataTable\DataTableFacade;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Requests\V3\CMMSMachine\UpdateRequest;
|
|
||||||
use App\Http\Traits\ApiResponse;
|
use App\Http\Traits\ApiResponse;
|
||||||
use App\Models\CMMSMachine;
|
use App\Models\CMMSMachine;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
@@ -49,16 +48,4 @@ class CMMSMachinesController extends Controller
|
|||||||
->distinct()
|
->distinct()
|
||||||
->pluck('car_type');
|
->pluck('car_type');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function update(UpdateRequest $request , CMMSMachine $machine): JsonResponse
|
|
||||||
{
|
|
||||||
$machine->update([
|
|
||||||
'status' => $request->status,
|
|
||||||
'province_id' => $request->province_id,
|
|
||||||
'city_id' => $request->city_id,
|
|
||||||
'station_id' => $request->station_id,
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $this->successResponse();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,11 +33,11 @@ class ControlUnitController extends Controller
|
|||||||
public function start(StartRequest $request, Mission $mission): JsonResponse
|
public function start(StartRequest $request, Mission $mission): JsonResponse
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($mission, $request) {
|
DB::transaction(function () use ($mission, $request) {
|
||||||
// $mission->histories()->create([
|
$mission->histories()->create([
|
||||||
// 'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
// 'previous_state_id' => $mission->state_id,
|
'previous_state_id' => $mission->state_id,
|
||||||
// 'previous_state_name' => $mission->state_name,
|
'previous_state_name' => $mission->state_name,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
$state = MissionStates::START_MISSION->value;
|
$state = MissionStates::START_MISSION->value;
|
||||||
$mission->update([
|
$mission->update([
|
||||||
@@ -57,11 +57,11 @@ class ControlUnitController extends Controller
|
|||||||
public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse
|
public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse
|
||||||
{
|
{
|
||||||
DB::transaction(function () use ($mission, $getErrorRateService, $request) {
|
DB::transaction(function () use ($mission, $getErrorRateService, $request) {
|
||||||
// $mission->histories()->create([
|
$mission->histories()->create([
|
||||||
// 'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
// 'previous_state_id' => $mission->state_id,
|
'previous_state_id' => $mission->state_id,
|
||||||
// 'previous_state_name' => $mission->state_name,
|
'previous_state_name' => $mission->state_name,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
$state = MissionStates::END_MISSION->value;
|
$state = MissionStates::END_MISSION->value;
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ use App\Enums\MissionTypes;
|
|||||||
use App\Enums\MissionZones;
|
use App\Enums\MissionZones;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
|
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
|
||||||
use App\Http\Requests\V3\Mission\RequestPortal\ChangeStateRequest;
|
|
||||||
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
|
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
|
||||||
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
|
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
|
||||||
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
|
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
|
||||||
@@ -274,14 +273,4 @@ class RequestPortalController extends Controller
|
|||||||
|
|
||||||
return $this->successResponse();
|
return $this->successResponse();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function changeState(ChangeStateRequest $request, Mission $mission): JsonResponse
|
|
||||||
{
|
|
||||||
$mission->update([
|
|
||||||
'state' => $request->state_id,
|
|
||||||
'state_name' => MissionStates::name($request->status_id),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return $this->successResponse($mission);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,11 +33,11 @@ class TransportationUnitController extends Controller
|
|||||||
DB::transaction(function () use ($request, $mission) {
|
DB::transaction(function () use ($request, $mission) {
|
||||||
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
||||||
|
|
||||||
// $mission->histories()->create([
|
$mission->histories()->create([
|
||||||
// 'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
// 'previous_state_id' => $mission->state_id,
|
'previous_state_id' => $mission->state_id,
|
||||||
// 'previous_state_name' => $mission->state_name,
|
'previous_state_name' => $mission->state_name,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
$state = MissionStates::PENDING_CONFIRMATION->value;
|
$state = MissionStates::PENDING_CONFIRMATION->value;
|
||||||
$machine = CMMSMachine::query()->find($request->machine_id);
|
$machine = CMMSMachine::query()->find($request->machine_id);
|
||||||
@@ -61,12 +61,12 @@ class TransportationUnitController extends Controller
|
|||||||
DB::transaction(function () use ($request, $mission) {
|
DB::transaction(function () use ($request, $mission) {
|
||||||
$mission->rahdaran()->wherePivot('is_driver', '=', true)->detach();
|
$mission->rahdaran()->wherePivot('is_driver', '=', true)->detach();
|
||||||
|
|
||||||
// $mission->histories()->create([
|
$mission->histories()->create([
|
||||||
// 'user_id' => auth()->user()->id,
|
'user_id' => auth()->user()->id,
|
||||||
// 'previous_state_id' => $mission->state_id,
|
'previous_state_id' => $mission->state_id,
|
||||||
// 'previous_state_name' => $mission->state_name,
|
'previous_state_name' => $mission->state_name,
|
||||||
// 'user_description' => $request->description,
|
'user_description' => $request->description,
|
||||||
// ]);
|
]);
|
||||||
|
|
||||||
$state = MissionStates::REJECT_BY_TRANSPORTATION->value;
|
$state = MissionStates::REJECT_BY_TRANSPORTATION->value;
|
||||||
|
|
||||||
|
|||||||
@@ -63,19 +63,19 @@ class ViolationManagementController extends Controller
|
|||||||
'zone_fa' => MissionZones::name($zone),
|
'zone_fa' => MissionZones::name($zone),
|
||||||
'type' => $type,
|
'type' => $type,
|
||||||
'type_fa' => MissionTypes::name($type),
|
'type_fa' => MissionTypes::name($type),
|
||||||
'start_date' => $request->start_date,
|
'start_date' => $request->start_date,//
|
||||||
'end_date' => $request->end_date,
|
'end_date' => $request->end_date,//
|
||||||
'end_point' => $request->end_point,
|
'end_point' => $request->end_point,
|
||||||
'category_id' => $request->category_id,
|
'category_id' => $request->category_id,
|
||||||
'category_name' => MissionCategory::name($request->category_id),
|
'category_name' => MissionCategory::name($request->category_id),
|
||||||
'start_time' => $request->start_date,
|
'start_time' => $request->start_date,//
|
||||||
'finish_time' => $request->end_date,
|
'finish_time' => $request->end_date,//
|
||||||
'state_id' => $state,
|
'state_id' => $state,
|
||||||
'state_name' => MissionStates::name($state),
|
'state_name' => MissionStates::name($state),
|
||||||
'explanation' => $request->explanation,
|
'explanation' => $request->explanation,
|
||||||
'request_date' => now(),
|
'request_date' => now(),
|
||||||
'machine_id' => $machine->id,
|
'machine_id' => $machine->id,//
|
||||||
'machine_code' => $machine->machine_code,
|
'machine_code' => $machine->machine_code,//
|
||||||
'station_id' => $user->station_id,
|
'station_id' => $user->station_id,
|
||||||
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
|
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
|
||||||
'km' => $violation->km ?? null,
|
'km' => $violation->km ?? null,
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class RoadMaintenanceStationController extends Controller
|
|||||||
{
|
{
|
||||||
$stations = RahdariPoint::query()
|
$stations = RahdariPoint::query()
|
||||||
->where('city_id', $request->query('city_id'))
|
->where('city_id', $request->query('city_id'))
|
||||||
->get(['id', 'name']);
|
->get();
|
||||||
|
|
||||||
return $this->successResponse($stations);
|
return $this->successResponse($stations);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,33 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Requests\V3\CMMSMachine;
|
|
||||||
|
|
||||||
use Illuminate\Contracts\Validation\ValidationRule;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
use Illuminate\Validation\Rule;
|
|
||||||
|
|
||||||
class UpdateRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*/
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, ValidationRule|array|string>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'status' => 'integer',
|
|
||||||
'province_id' => 'integer|exists:provinces,id',
|
|
||||||
'city_id' => 'integer|exists:cities,id',
|
|
||||||
'station_id' => 'integer|exists:rahdari_points,id',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Requests\V3\Mission\RequestPortal;
|
|
||||||
|
|
||||||
use Illuminate\Contracts\Validation\ValidationRule;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
|
|
||||||
class ChangeStateRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*/
|
|
||||||
public function authorize(): bool
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, ValidationRule|array|string>
|
|
||||||
*/
|
|
||||||
public function rules(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'state_id' => 'required',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,7 +15,8 @@ class AllocateRequest extends FormRequest
|
|||||||
*/
|
*/
|
||||||
public function authorize(): bool
|
public function authorize(): bool
|
||||||
{
|
{
|
||||||
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value;
|
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
|
||||||
|
|| $this->user()?->username === 'witel';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ class DeallocateRequest extends FormRequest
|
|||||||
public function authorize(): bool
|
public function authorize(): bool
|
||||||
{
|
{
|
||||||
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id &&
|
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id &&
|
||||||
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value]);
|
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
|
||||||
|
|| $this->user()?->username === 'witel';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('missions', function (Blueprint $table) {
|
||||||
|
$table->integer('driver_id')->nullable();
|
||||||
|
$table->string('driver_name')->nullable();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('missions', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('driver_name','driver_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -185,7 +185,6 @@ Route::prefix('cmms_machines')
|
|||||||
Route::get('/list', 'list')->name('list');
|
Route::get('/list', 'list')->name('list');
|
||||||
Route::get('/search', 'search')->name('search');
|
Route::get('/search', 'search')->name('search');
|
||||||
Route::get('/car_types', 'carTypes')->name('carTypes');
|
Route::get('/car_types', 'carTypes')->name('carTypes');
|
||||||
Route::post('/{machine}', 'update')->name('update')->middleware('permission:update-machine');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::prefix('rahdaran')
|
Route::prefix('rahdaran')
|
||||||
@@ -498,7 +497,6 @@ Route::prefix('missions')
|
|||||||
Route::get('/{mission}', 'show')->name('show');
|
Route::get('/{mission}', 'show')->name('show');
|
||||||
Route::post('/{mission}', 'update')->name('update');
|
Route::post('/{mission}', 'update')->name('update');
|
||||||
Route::delete('/{mission}', 'destroy')->name('destroy');
|
Route::delete('/{mission}', 'destroy')->name('destroy');
|
||||||
Route::post('/change_state/{mission}', 'changeState')->name('changeState');
|
|
||||||
});
|
});
|
||||||
Route::name('transportationUnit.')
|
Route::name('transportationUnit.')
|
||||||
->prefix('transportation_unit')
|
->prefix('transportation_unit')
|
||||||
|
|||||||
Reference in New Issue
Block a user