12 Commits

35 changed files with 633 additions and 266 deletions

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Console\Commands;
use App\Models\Mission;
use App\Services\PolylineEncoder;
use Illuminate\Console\Command;
class EncodePolyLineCommand extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:encode-poly-line-command';
/**
* The console command description.
*
* @var string
*/
protected $description = 'encode all missions that have poly line';
/**
* Execute the console command.
*/
public function handle(PolylineEncoder $polylineEncoder): void
{
Mission::query()->whereNotNull('area')->each(function ($mission) use ($polylineEncoder) {
$encodedValue = $polylineEncoder->encodePolyLine($mission, lng_lat_format:true);
$mission->update([
'encoded_route' => $encodedValue,
]);
});
$this->info("updated successfully");
}
}

View File

@@ -18,7 +18,7 @@ enum CmmsMachineStatus: int
self::AMADE => 'آماده',
self::RESERVE => 'رزرو',
self::DAR_MAMORIAT => 'در ماموریت',
self::KHAREGE_AZ_RADE => 'خارج از محدوده',
self::KHAREGE_AZ_RADE => 'خارج از رده',
self::DAR_TAMIR => 'در تعمیر',
self::FOROKHTEH_SHODE => ' فروخته شده',
self::NIZE_BE_TAMIR => 'نیاز به تعمیر',

View File

@@ -26,4 +26,17 @@ enum MissionStates: int
return $mapArray[$state];
}
public function label(): string
{
return match ($this) {
self::REQUEST_CREATED => 'درخواست ایجاد شد و در حال بررسی توسط واحد تایید کننده است',
self::PENDING_CONFIRMATION => 'خودرو اختصاص داده شد و درخواست توسط واحد کنترل در حال بررسی است',
self::START_MISSION => 'درخواست توسط واحد کنترل تایید شد و ماموریت آغاز می شود',
self::END_MISSION => 'اتمام ماموریت',
self::REJECT_BY_TRANSPORTATION => 'عدم تخصیص خودرو توسط واحد تایید کننده و بازگشت درخواست به کارتابل کاربر',
self::CANCELLED => 'ماموریت لغو شد',
self::CREATED_NO_PROCESS => 'ماموریت بدون فرایند ثبت شد',
};
}
}

View File

@@ -2,16 +2,20 @@
namespace App\Enums;
use function Symfony\Component\String\s;
enum MissionViolationStatus: int
{
case BEDON_EGHDAM = 0;
case EGHDAM_SHODE = 1;
case SABT_SHODE = 2;
public function label(): string
{
return match ($this) {
self::BEDON_EGHDAM => "بدون اقدام",
self::EGHDAM_SHODE => "اقدام شده",
self::SABT_SHODE => "ثبت شده توسط حراست"
};
}
}

View File

@@ -23,7 +23,8 @@ class CMMSMachinesController extends Controller
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name', 'car_type', 'status'],
allowedSelects: ['machine_code', 'id', 'plak_number', 'car_name', 'car_type', 'status',
'province_id', 'city_id', 'station_id', 'status','driver_name'],
));
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Controllers\V3;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\Province;
use Illuminate\Http\Request;
class CityController extends Controller
{
use ApiResponse;
public function list(Request $request)
{
return $this->successResponse(City::query()->where('cities.province_id', $request->query('province_id'))->get(['id', 'name_fa']));
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\CmmsMachineStatus;
use App\Enums\FMSResultCode;
use App\Enums\MissionStates;
use App\Events\V3\Dashboard\Mission\SendDataToFMSEvent;
@@ -39,10 +40,13 @@ class ControlUnitController extends Controller
// 'previous_state_name' => $mission->state_name,
// ]);
$state = MissionStates::START_MISSION->value;
$mission->machine()->update([
'status' => CmmsMachineStatus::DAR_MAMORIAT->value
]);
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'state_id' => MissionStates::START_MISSION->value,
'state_name' => MissionStates::START_MISSION->label(),
'start_time' => $request->time,
'km' => $request->km,
]);
@@ -63,33 +67,32 @@ class ControlUnitController extends Controller
// 'previous_state_name' => $mission->state_name,
// ]);
$state = MissionStates::END_MISSION->value;
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'finish_time' => $request->time,
'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
'end_km' => $request->end_km,
$mission->machine()->update([
'status' => CmmsMachineStatus::AMADE->value
]);
// $getErrorRateService->setInputParameters($mission);
// $responseData = $getErrorRateService->run();
//
// $mission->update([
$mission->update([
// 'in_area_duration' => $responseData['timeInAreaSeconds'],
// 'first_enter' => $responseData['firstEnter'],
// 'last_exit' => $responseData['lastExit'],
// 'point_number_sent' => $responseData['noOfPointsInMission'],
// 'fms_result_code' => $responseData['resultCode'],
// 'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
// ]);
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::END_MISSION->label(),
'finish_time' => $request->time,
'mission_duration' => strtotime($request->time) - strtotime($mission->start_time),
'end_km' => $request->end_km,
]);
});
if ($mission->category_id == 2) {
$rpc = new OperatorController;
$rpc->store($mission);
}
// if ($mission->category_id == 2) {
// $rpc = new OperatorController;
// $rpc->store($mission);
// }
// SendDataToFMSEvent::dispatch($mission);

View File

@@ -3,8 +3,11 @@
namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
use App\Exports\V3\Mission\Report\Machine\machineReport;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\Mission;
use App\Models\Province;
use App\Services\Cartables\Mission\Report\ReportMachineService;
use Illuminate\Http\JsonResponse;
@@ -17,11 +20,11 @@ class ReportMachineController extends Controller
{
use ApiResponse;
public function activity(Request $request, ReportMachineService $reportMachineService): JsonResponse
public function countryMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->activity($request),
'provinces' => Province::all(['id', 'name_fa']),
'activities' => $reportMachineService->countryMachinesActivity($request),
// 'provinces' => Province::all(['id', 'name_fa']),
]);
}
@@ -29,12 +32,97 @@ class ReportMachineController extends Controller
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function excelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
public function countryMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->activity($request);
$name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx';
$data = $reportMachineService->countryMachinesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
public function provinceMachinesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachinesActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
// $query->where('type_id', 1)
// ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
// })
// ->get(['id', 'name_fa'])
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function provinceMachinesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->countryMachinesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
public function countryMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->countryMachineTypesActivity($request),
// 'provinces' => Province::all(['id', 'name_fa']),
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function countryMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->countryMachineTypesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
public function provinceMachineTypesActivity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->provinceMachineTypesActivity($request),
// 'city' => City::query()
// ->where('province_id', $request->province_id)
// ->where(function ($query) {
// $query->where('type_id', 1)
// ->orWhereIn('name_fa', ['اداره ماشين‌آلات', 'اداره نقلیه']);
// })
// ->get(['id', 'name_fa'])
]);
}
public function machineDetailsReport(Request $request)
{
return DataTableFacade::run(
Mission::query()->where('machine_id', '=', $request->query('machine_id')),
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
allowedSelects: [
'id', 'province_id', 'province_name', 'city_id', 'city_name',
'end_km', 'km', 'driver_name', 'state_name', 'station_name'
]
);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function provinceMachineTypesActivityExcel(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->provinceMachineTypesActivity($request);
$name = 'گزارش ماشین آلات'.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
}

View File

@@ -6,10 +6,13 @@ use App\Enums\FMSResultCode;
use App\Enums\MissionCategory;
use App\Enums\MissionStates;
use App\Enums\MissionTypes;
use App\Enums\MissionViolationStatus;
use App\Enums\MissionZones;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
use App\Http\Requests\V3\Mission\RequestPortal\ChangeStateRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ClarifyUnauthorizedExitRequest;
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
@@ -17,6 +20,8 @@ use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\CMMSMachine;
use App\Models\Mission;
use App\Models\MissionViolation;
use App\Models\Rahdaran;
use App\Models\RahdariPoint;
use App\Models\RoadObserved;
use App\Services\Cartables\Mission\RequestPortalService;
@@ -36,6 +41,21 @@ class RequestPortalController extends Controller
return response()->json($requestPortalService->datatable($request));
}
public function violations(Request $request): array
{
$query = MissionViolation::query()->where([
['status', '=', MissionViolationStatus::BEDON_EGHDAM->value],
['station_id', '=', auth()->user()->station_id]
]);
return DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
);
}
/**
* @throws Throwable
*/
@@ -44,9 +64,6 @@ 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,
'username' => $user->username,
@@ -56,8 +73,8 @@ class RequestPortalController extends Controller
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'state_id' => MissionStates::REQUEST_CREATED->value,
'state_name' => MissionStates::REQUEST_CREATED->label(),
'requested_machines' => json_encode($request->requested_machines),
'type' => $request->type,
'type_fa' => MissionTypes::name($request->type),
@@ -68,13 +85,13 @@ class RequestPortalController extends Controller
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'category_id' => $category,
'category_name' => MissionCategory::name($category),
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
'code' => rand(100000, 999999),
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
'station_name' => RahdariPoint::query()->find($user->station_id)->name,
]);
$mission->rahdaran()->sync($request->rahdaran);
@@ -96,31 +113,26 @@ class RequestPortalController extends Controller
DB::transaction(function () use ($request, $mission, $getErrorRateService) {
$user = auth()->user();
// $getErrorRateService->setInputParameters($mission);
// $responseData = $getErrorRateService->run();
$mission->update([
// 'in_area_duration' => $responseData['timeInAreaSeconds'],
// 'first_enter' => $responseData['firstEnter'],
// 'last_exit' => $responseData['lastExit'],
// 'point_number_sent' => $responseData['noOfPointsInMission'],
// 'fms_result_code' => $responseData['resultCode'],
// 'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
'finish_time' => now(),
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::name(MissionStates::END_MISSION->value),
]);
$getErrorRateService->setInputParameters($mission);
$responseData = $getErrorRateService->run();
$mission->update([
'in_area_duration' => $responseData['timeInAreaSeconds'],
'first_enter' => $responseData['firstEnter'],
'last_exit' => $responseData['lastExit'],
'point_number_sent' => $responseData['noOfPointsInMission'],
'fms_result_code' => $responseData['resultCode'],
'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
]);
// if ($mission->category_id == 2) {
// $rpc = new OperatorController;
// $rpc->store($mission);
// }
$state = MissionStates::START_MISSION->value;
$category = $request->category_id;
$machine = CMMSMachine::query()->find($request->machine_id);
$newMission = Mission::query()->create([
@@ -132,8 +144,8 @@ class RequestPortalController extends Controller
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'state_id' => MissionStates::START_MISSION->value,
'state_name' => MissionStates::START_MISSION->label(),
'type' => $request->type,
'type_fa' => MissionTypes::name($request->type),
'zone' => $request->zone,
@@ -143,19 +155,20 @@ class RequestPortalController extends Controller
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'category_id' => $category,
'category_name' => MissionCategory::name($category),
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
'start_time' => now(),
'machine_id' => $machine->id,
'machine_code' => $machine->machine_code,
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
'driver_id' => $request->driver,
'driver_name' => Rahdaran::query()->find($request->driver)->name,
]);
$newMission->rahdaran()->sync($request->rahdaran);
$newMission->rahdaran()->attach($request->driver, ['is_driver' => true]);
});
return $this->successResponse();
@@ -180,7 +193,7 @@ class RequestPortalController extends Controller
'end_date' => $request->end_date,
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($request->area),
'encoded_route' => $request->encoded_route,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'explanation' => $request->explanation,
@@ -206,19 +219,29 @@ class RequestPortalController extends Controller
return $this->successResponse();
}
public function changeState(ChangeStateRequest $request, Mission $mission): JsonResponse
{
$mission->update([
'state_id' => $request->state_id,
'state_name' => MissionStates::name($request->state_id),
]);
return $this->successResponse($mission);
}
/**
* @throws Throwable
*/
public function noProcess(NoProcessRequest $request, GetErrorRateService $getErrorRateService): JsonResponse
public function clarifyUnauthorizedExit(ClarifyUnauthorizedExitRequest $request, MissionViolation $violation): JsonResponse
{
DB::transaction(function () use ($request, $getErrorRateService) {
$start = Carbon::parse($request->start_date);
$end = Carbon::parse($request->end_date);
DB::transaction(function () use ($request, $violation) {
$start = Carbon::parse($violation->exit_station);
$end = Carbon::parse($violation->enter_station);
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user();
$zone = $request->zone;
$state = MissionStates::END_MISSION->value;
$machine = CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->first(['id', 'machine_code']);
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
$mission = Mission::query()->create([
'user_id' => $user->id,
@@ -231,40 +254,34 @@ class RequestPortalController extends Controller
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'zone' => $zone,
'zone_fa' => MissionZones::name($zone),
'encoded_route' => $request->encoded_route,
'type' => $type,
'type_fa' => MissionTypes::name($type),
'start_date' => $request->start_date,
'area' => json_encode($request->area),
'end_date' => $request->end_date,
'start_date' => $violation->exit_station,
'end_date' => $violation->enter_station,
'end_point' => $request->end_point,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'start_time' => $request->start_date,
'finish_time' => $request->end_date,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'start_time' => $violation->exit_station,
'finish_time' => $violation->enter_station,
'mission_duration' => strtotime($violation->enter_station) - strtotime($violation->exit_station),
'state_id' => MissionStates::END_MISSION->value,
'state_name' => MissionStates::END_MISSION->label(),
'explanation' => $request->explanation,
'request_date' => now(),
'machine_id' => $machine->id,
'machine_code' => $machine->machine_code,
'requested_machines' => $machine->car_type,
'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,
'driver_id' => $request->driver,
'driver_name' => Rahdaran::query()->find($request->driver)->name,
]);
$mission->rahdaran()->sync($request->rahdaran);
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
$getErrorRateService->setInputParameters($mission);
$responseData = $getErrorRateService->run();
$mission->update([
'in_area_duration' => $responseData['timeInAreaSeconds'],
'first_enter' => $responseData['firstEnter'],
'last_exit' => $responseData['lastExit'],
'point_number_sent' => $responseData['noOfPointsInMission'],
'fms_result_code' => $responseData['resultCode'],
'fms_result_message' => FMSResultCode::name($responseData['resultCode']),
]);
$violation->update(['status' => 1]);
// if ($mission->category_id == 2) {
// $rpc = new OperatorController;
@@ -274,14 +291,4 @@ class RequestPortalController extends Controller
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);
}
}

View File

@@ -10,6 +10,7 @@ use App\Http\Requests\V3\Mission\TransportaionUnit\DeallocateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\CMMSMachine;
use App\Models\Mission;
use App\Models\Rahdaran;
use App\Services\Cartables\Mission\TransportationUnitService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -31,7 +32,6 @@ class TransportationUnitController extends Controller
public function allocate(AllocateRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($request, $mission) {
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
@@ -47,6 +47,12 @@ class TransportationUnitController extends Controller
'state_name' => MissionStates::name($state),
'machine_id' => $machine->id,
'machine_code' => $machine->machine_code,
'driver_id' => $request->driver_id,
'driver_name' => Rahdaran::query()->find($request->driver)->name,
]);
$machine->update([
'status' => CmmsMachineStatus::RESERVE->value
]);
});
@@ -59,7 +65,6 @@ class TransportationUnitController extends Controller
public function deallocate(DeallocateRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($request, $mission) {
$mission->rahdaran()->wherePivot('is_driver', '=', true)->detach();
// $mission->histories()->create([
// 'user_id' => auth()->user()->id,
@@ -70,12 +75,18 @@ class TransportationUnitController extends Controller
$state = MissionStates::REJECT_BY_TRANSPORTATION->value;
$mission->machine()->update([
'status' => CmmsMachineStatus::AMADE->value
]);
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'description' => $request->description,
'machine_id' => null,
'machine_code' => null,
'driver_id' => null,
'driver_name' => null,
]);
});

View File

@@ -16,6 +16,7 @@ use App\Http\Traits\ApiResponse;
use App\Models\CMMSMachine;
use App\Models\Mission;
use App\Models\MissionViolation;
use App\Models\Rahdaran;
use App\Models\RahdariPoint;
use App\Services\Cartables\Mission\DailyMoveMachineService;
use Carbon\Carbon;
@@ -35,65 +36,6 @@ class ViolationManagementController extends Controller
return response()->json($data);
}
/**
* @throws Throwable
*/
public function noProcess(NoProcessRequest $request, MissionViolation $violation): JsonResponse
{
DB::transaction(function () use ($request, $violation) {
$start = Carbon::parse($request->start_date);
$end = Carbon::parse($request->end_date);
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
$user = auth()->user();
$zone = $request->zone;
$state = MissionStates::END_MISSION->value;
$machine = CMMSMachine::query()->where('machine_code', '=', $violation->machine_code)->first(['id', 'machine_code']);
$mission = Mission::query()->create([
'user_id' => $user->id,
'username' => $user->username,
'province_id' => $user->province_id,
'province_name' => $user->province_fa,
'city_id' => $user->city_id ?? null,
'city_name' => $user->city_fa ?? null,
'edare_shahri_id' => $user->edarate_shahri_id ?? null,
'edare_shahri_name' => $user->edarate_shahri_name ?? null,
'zone' => $zone,
'zone_fa' => MissionZones::name($zone),
'type' => $type,
'type_fa' => MissionTypes::name($type),
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'end_point' => $request->end_point,
'category_id' => $request->category_id,
'category_name' => MissionCategory::name($request->category_id),
'start_time' => $request->start_date,
'finish_time' => $request->end_date,
'state_id' => $state,
'state_name' => MissionStates::name($state),
'explanation' => $request->explanation,
'request_date' => now(),
'machine_id' => $machine->id,
'machine_code' => $machine->machine_code,
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find( $user->station_id)->name,
'km' => $violation->km ?? null,
]);
$mission->rahdaran()->sync($request->rahdaran);
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
$violation->update(['status' => 1]);
// if ($mission->category_id == 2) {
// $rpc = new OperatorController;
// $rpc->store($mission);
// }
});
return $this->successResponse();
}
public function store(StoreRequest $request): JsonResponse
{
$user = auth()->user();
@@ -102,7 +44,7 @@ class ViolationManagementController extends Controller
'machine_id'=> CMMSMachine::query()->where('machine_code', '=', $request->machine_code)->value('id'),
'machine_code'=> $request->machine_code,
'type'=> MissionViolationType::KHOROJ_BEDONE_MOGAVEZ->value,
'status' => MissionViolationStatus::BEDON_EGHDAM->value,
'status' => MissionViolationStatus::SABT_SHODE->value,
'request_date' => now(),
'km' => $request->km,
'gps' => 0,
@@ -110,6 +52,9 @@ class ViolationManagementController extends Controller
'province_name' => $user->province_fa,
'city_id' => $user->city_id,
'city_name' => $user->city_fa,
'station_id' => $user->station_id,
'station_name' => RahdariPoint::query()->find($user->station_id)->name,
'exit_station' => $request->exit_station,
]);
return $this->successResponse();
@@ -123,8 +68,8 @@ class ViolationManagementController extends Controller
public function update(UpdateRequest $request, MissionViolation $violation): JsonResponse
{
$violation->update([
'enter_time' => $request->enter_time,
'exit_time' => $request->exit_time,
'enter_station' => $request->enter_station,
'status' => MissionViolationStatus::BEDON_EGHDAM->value,
]);
return $this->successResponse();
@@ -135,5 +80,4 @@ class ViolationManagementController extends Controller
$violation->delete();
return $this->successResponse();
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace App\Http\Controllers\V3;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\City;
use App\Models\Province;
use Illuminate\Http\Request;
class ProvinceController extends Controller
{
use ApiResponse;
public function list()
{
return $this->successResponse(Province::all(['id', 'name_fa']));
}
}

View File

@@ -2,17 +2,19 @@
namespace App\Http\Requests\V3\Mission\RequestPortal;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class NoProcessRequest extends FormRequest
class ClarifyUnauthorizedExitRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
return $this->violation->status === 0 && $this->violation->type === 1;
}
/**
@@ -27,22 +29,10 @@ class NoProcessRequest extends FormRequest
'rahdaran.*' => 'exists:rahdaran,id',
'driver' => 'required|integer|exists:rahdaran,id',
'zone' => 'required|in:1,2,3',
'start_date' => 'required|date',
'end_date' => 'required|date|after:start_date|before:now',
'end_point' => 'required|string',
'area' => 'array',
'area.type' => 'string',
'area.coordinates' => 'array',
'encoded_route' => 'required|string',
'category_id' => 'required|in:1,2,3',
'explanation' => 'required|string',
];
}
public function messages(): array
{
return [
'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.',
'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.',
];
}
}

View File

@@ -35,12 +35,9 @@ class ContinueMissionRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'encoded_route' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}

View File

@@ -34,12 +34,9 @@ class StoreRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'encoded_route' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}
@@ -58,6 +55,12 @@ class StoreRequest extends FormRequest
);
}
}
if (strtotime($this->end_date) < strtotime($this->start_date)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
},
];
}

View File

@@ -35,12 +35,9 @@ class UpdateRequest extends FormRequest
'end_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',
'area.type' => 'required|string',
'area.coordinates' => 'required|array',
'encoded_route' => 'required|string',
'explanation' => 'required|string',
'category_id' => 'required|in:1,2,3',
'road_observed_id' => 'required_if:category_id,3|exists:road_observeds,id',
];
}
@@ -59,6 +56,12 @@ class UpdateRequest extends FormRequest
);
}
}
if (strtotime($this->end_date) < strtotime($this->start_date)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
},
];
}

View File

@@ -15,8 +15,8 @@ class AllocateRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
|| $this->user()?->username === 'witel';
return $this->mission->station_id == auth()->user()->station_id && $this->mission->state_id == MissionStates::REQUEST_CREATED->value
|| auth()->user()->username === 'witel';
}
/**

View File

@@ -13,9 +13,9 @@ class DeallocateRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->mission->edare_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->mission->station_id == auth()->user()->station_id &&
in_array($this->mission->state_id, [MissionStates::REQUEST_CREATED->value, MissionStates::PENDING_CONFIRMATION->value])
|| $this->user()?->username === 'witel';
|| auth()->user()->username === 'witel';
}
/**

View File

@@ -2,8 +2,10 @@
namespace App\Http\Requests\V3\Mission\Violation;
use Carbon\Carbon;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class NoProcessRequest extends FormRequest
{
@@ -27,22 +29,10 @@ class NoProcessRequest extends FormRequest
'rahdaran.*' => 'exists:rahdaran,id',
'driver' => 'required|integer|exists:rahdaran,id',
'zone' => 'required|in:1,2,3',
'start_date' => 'required|date',
'end_date' => 'required|date|after:start_date|before:now',
'end_point' => 'required|string',
'area' => 'array',
'area.type' => 'string',
'area.coordinates' => 'array',
// 'encoded_route' => 'required|string',
'category_id' => 'required|in:1,2,3',
'explanation' => 'required|string',
];
}
public function messages(): array
{
return [
'end_date.before' => 'تاریخ پایان باید قبل از زمان فعلی باشد.',
'end_date.after' => 'تاریخ پایان نباید قبل از تاریخ شروع باشد.',
];
}
}

View File

@@ -25,7 +25,8 @@ class StoreRequest extends FormRequest
public function rules(): array
{
return [
'machine_code' => 'required',
'exit_station' => 'required|date',
'machine_code' => 'required',
'km'=> 'string',
];
}

View File

@@ -26,8 +26,7 @@ class UpdateRequest extends FormRequest
public function rules(): array
{
return [
'exit_time' => 'date',
'enter_time' => 'date',
'enter_station' => 'required|date',
];
}
}

View File

@@ -14,6 +14,7 @@ class City extends Model
*
* @var array
*/
protected $guarded = ['id'];
protected $hidden = [
'name_en',
'feature_id',

View File

@@ -28,13 +28,6 @@ class Mission extends Model
);
}
protected function area(): Attribute
{
return Attribute::make(
get: fn($value) => json_decode($value, true)
);
}
public function histories(): HasMany
{
return $this->hasMany(MissionHistory::class);
@@ -50,21 +43,6 @@ class Mission extends Model
return $this->hasMany(RoadItemsProject::class);
}
public function roadObserveds(): MorphToMany
{
return $this->morphedByMany(RoadObserved::class, 'missionable');
}
public function machines(): MorphToMany
{
return $this->morphToMany(CMMSMachine::class,
'machinable',
'machinables',
'machinable_id',
'machine_id'
);
}
public function rahdaran(): MorphToMany
{
return $this->morphToMany(Rahdaran::class,
@@ -75,17 +53,6 @@ class Mission extends Model
)->withPivot('is_driver');
}
public function roadObserved(): MorphToMany
{
return $this->morphedByMany(
RoadObserved::class,
'missionable',
'missionables',
'mission_id',
'missionable_id'
);
}
public function machine(): BelongsTo
{
return $this->belongsTo(CMMSMachine::class, 'machine_id');

View File

@@ -13,6 +13,7 @@ class Province extends Model
*
* @var array
*/
protected $guarded = ['id'];
protected $hidden = [
'feature_id',
//'center_lat',

View File

@@ -37,7 +37,7 @@ class ControlUnitService
allowedSelects: [
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
]
);

View File

@@ -2,6 +2,7 @@
namespace App\Services\Cartables\Mission;
use App\Enums\MissionViolationStatus;
use App\Facades\DataTable\DataTableFacade;
use App\Models\MissionViolation;
use Illuminate\Http\Request;
@@ -13,7 +14,8 @@ class DailyMoveMachineService
{
$user = Auth::user();
$query = MissionViolation::query()->with('machine:id,car_name');
$query = MissionViolation::query()->with('machine:id,car_name')
->where('mission_violations.status', '=', MissionViolationStatus::SABT_SHODE->value);
if ($user->hasPermissionTo('manage-violation-station')) {
$query->whereRelation('machine', 'station_id', '=', $user->station_id);

View File

@@ -10,31 +10,128 @@ use Illuminate\Support\Facades\DB;
class ReportMachineService
{
public function activity(Request $request): array
public function countryMachinesActivity(Request $request): array
{
$code = $request->machine_code;
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = "
SELECT*
m.city_name AS c.name,
m.city_id AS c_id,
m.province_name AS p_name,
m.province_id AS p_id,
COUNT(m.id) As missions,
(SUM(m.end_km)-SUM(m.km)) AS distance
FROM missions m
WHERE m.machine_code = :machineCode
AND m.created_at >= :from
AND m.created_at <= :to;
";
$sql = "SELECT
m.machine_id,
m.machine_code,
cm.car_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
GROUP BY machine_id;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
'machineCode' => $code,
]);
}
public function provinceMachinesActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$province = $request->province_id;
$sql = "SELECT machine_id, machine_code, cm.car_name, COUNT(*) AS missions, SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND start_time >= :from AND finish_time <= :to AND province_id = :province_id
GROUP BY machine_id;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
'province_id' => $province,
]);
}
public function countryMachineTypesActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = "SELECT
cm.car_type,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
GROUP BY cm.car_type;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
]);
}
public function provinceMachineTypesActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$province = $request->province_id;
$sql = "SELECT
cm.car_type,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func
FROM missions m
JOIN cmms_machines cm ON cm.id = m.machine_id
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
GROUP BY cm.car_type;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
'province_id' => $province,
]);
}
public function countryMachineDriversActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$sql = "SELECT
m.driver_id,
m.driver_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func
FROM missions m
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to
GROUP BY m.driver_id;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
]);
}
public function provinceMachineDriversActivity(Request $request): array
{
$from = $request->from_date ?? today()->startOfDay();
$to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
$province = $request->province_id;
$sql = "SELECT
m.driver_id,
m.driver_name,
COUNT(*) AS missions,
SUM(m.end_km - m.km) AS func
FROM missions m
WHERE m.state_id = 4 AND m.start_time >= :from AND m.finish_time <= :to AND province_id = :province_id
GROUP BY m.driver_id;";
return DB::select($sql, [
'from' => $from,
'to' => $to,
'province_id' => $province,
]);
}
}

View File

@@ -32,7 +32,7 @@ class RequestPortalService
allowedSelects: [
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'city_id', 'city_name', 'province_id', 'station_name',
]
);

View File

@@ -32,7 +32,7 @@ class TransportationUnitService
allowedSelects: [
'id', 'user_id', 'username', 'state_name', 'province_name', 'edare_shahri_name',
'description', 'requested_machines', 'type', 'type_fa', 'start_date', 'state_id',
'end_date', 'request_date', 'end_point', 'area', 'zone', 'zone_fa', 'start_time', 'finish_time',
'end_date', 'request_date', 'end_point', 'encoded_route', 'zone', 'zone_fa', 'start_time', 'finish_time',
'code', 'category_id', 'category_name', 'explanation', 'km', 'city_id', 'city_name', 'province_id', 'station_name',
]
);

View File

@@ -0,0 +1,88 @@
<?php
namespace App\Services;
/**
* Class PolylineEncoder
*
* Encodes a list of latitude/longitude coordinates into an encoded polyline string.
*
* This implementation is compatible with Google's Polyline Algorithm Format:
* https://developers.google.com/maps/documentation/utilities/polylinealgorithm
*
* Example input:
* [
* [lat, lng],
* [lat, lng]
* ]
*
* or if `$lng_lat_format = true`:
* [
* [lng, lat],
* [lng, lat]
* ]
*
* @package App\Services
*/
class PolylineEncoder
{
/**
* Encode an array of coordinates into a polyline string.
*
* Each coordinate is encoded as a delta from the previous point,
* scaled by the given precision factor.
*
* @param array $coords Array of coordinate pairs:
* - default: [lat, lng]
* - if $lng_lat_format = true: [lng, lat]
* @param int $precision Number of decimal places to preserve (default: 6)
* @param bool $lng_lat_format If true, input is treated as [lng, lat] instead of [lat, lng]
*
* @return string Encoded polyline string
*/
public function encodePolyline(array $coords, int $precision = 6, bool $lng_lat_format = false): string
{
$factor = 10 ** $precision;
$output = '';
$prevLat = 0;
$prevLng = 0;
foreach ($coords as [$a, $b]) {
[$lat, $lng] = $lng_lat_format ? [$b, $a] : [$a, $b];
$output .= $this->encodeValue((int)round($lat * $factor) - $prevLat);
$output .= $this->encodeValue((int)round($lng * $factor) - $prevLng);
$prevLat = (int)round($lat * $factor);
$prevLng = (int)round($lng * $factor);
}
return $output;
}
/**
* Encodes a single integer value using Google's polyline encoding algorithm.
*
* Steps:
* - Left shift the value
* - Invert bits if negative
* - Split into 5-bit chunks
* - Convert to ASCII characters
*
* @param int $value Signed integer delta to encode
*
* @return string Encoded character sequence
*/
public function encodeValue(int $value): string
{
$value = $value < 0 ? ~($value << 1) : ($value << 1);
$result = '';
while ($value >= 0x20) {
$result .= chr((0x20 | ($value & 0x1f)) + 63);
$value >>= 5;
}
return $result . chr($value + 63);
}
}

View File

@@ -24,7 +24,7 @@ return new class extends Migration
$table->unsignedBigInteger('edare_shahri_id')->nullable();
$table->foreign('edare_shahri_id')->references('id')->on('edarate_shahri')->noActionOnDelete();
$table->string('edare_shahri_name')->nullable();
$table->json('requested_machines');
$table->json('requested_machines')->nullable();
$table->string('type');
$table->dateTime('start_date');
$table->dateTime('end_date');

View File

@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void
{
Schema::table('missions', function (Blueprint $table) {
$table->json('area');
$table->json('area')->nullable();
$table->integer('zone');
$table->string('zone_fa');
$table->string('type_fa');

View File

@@ -0,0 +1,31 @@
<?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('mission_violations', function (Blueprint $table) {
$table->dateTime('exit_station')->nullable();
$table->dateTime('enter_station')->nullable();
$table->unsignedInteger('station_id')->nullable();
$table->string('station_name')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('mission_violations', function (Blueprint $table) {
$table->dropColumn(['exit_station', 'enter_station']);
});
}
};

View File

@@ -0,0 +1,28 @@
<?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->longText('encoded_route')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('missions', function (Blueprint $table) {
$table->dropColumn('encoded_route');
});
}
};

View File

@@ -1,6 +1,7 @@
<?php
use App\Http\Controllers\V3\Auth\LogoutController;
use App\Http\Controllers\V3\CityController;
use App\Http\Controllers\V3\CMMSMachinesController;
use App\Http\Controllers\V3\DamageManagementController;
use App\Http\Controllers\V3\Dashboard\Accident\AccidentReceiptController;
@@ -38,6 +39,7 @@ use App\Http\Controllers\V3\LogListManagementController;
use App\Http\Controllers\V3\NotificationController;
use App\Http\Controllers\V3\PermissionManagementController;
use App\Http\Controllers\V3\ProfileController;
use App\Http\Controllers\V3\ProvinceController;
use App\Http\Controllers\V3\RahdaranController;
use App\Http\Controllers\V3\WebServices\RoadItemController;
use Illuminate\Support\Facades\Route;
@@ -493,13 +495,14 @@ Route::prefix('missions')
->controller(RequestPortalController::class)
->group(function () {
Route::get('/', 'index')->name('index');
Route::get('/violations', 'violations')->name('violations');
Route::post('/', 'store')->name('store');
Route::post('/no_process','noProcess')->name('noProcess');
Route::post('/clarify_unauthorized_exit/{violation}','clarifyUnauthorizedExit')->name('clarifyUnauthorizedExit');
Route::post('/continue/{mission}','continueMission')->name('continueMission');
Route::get('/{mission}', 'show')->name('show');
Route::post('/{mission}', 'update')->name('update');
Route::delete('/{mission}', 'destroy')->name('destroy');
Route::post('/change_state/{mission}', 'changeState')->name('changeState');
Route::post('/change_state/{mission}', 'changeState')->name('changeState')->middleware('permission:mission-change-state');
});
Route::name('transportationUnit.')
->prefix('transportation_unit')
@@ -534,7 +537,6 @@ Route::prefix('missions')
->group(function () {
Route::get('/', 'index')->name('index');
Route::post('/', 'store')->name('store');
Route::post('/no_process/{violation}','noProcess')->name('noProcess');
Route::get('/{violation}', 'show')->name('show');
Route::post('/{violation}', 'update')->name('update');
Route::delete('/{violation}', 'destroy')->name('destroy');
@@ -564,8 +566,13 @@ Route::prefix('missions')
->middleware(['permission:mission-report-province|mission-report-country'])
->controller(ReportMachineController::class)
->group(function () {
Route::get('/activity', 'activity')->name('Activity');
Route::get('/excel_activity', 'excelActivity')->name('ProvinceActivity');
Route::get('/country_machines_activity', 'countryMachinesActivity')->name('countryMachinesActivity');
Route::get('/country_machines_activity_excel', 'countryMachinesActivityExcel')->name('countryMachinesActivityExcel');
Route::get('/province_machines_activity', 'provinceMachinesActivity')->name('provinceMachinesActivity');
Route::get('/province_machines_activity_excel', 'provinceMachinesActivityExcel')->name('provinceMachinesActivityExcel');
Route::get('/country_machine_types_activity', 'countryMachineTypesActivity')->name('countryMachineTypesActivity');
Route::get('/province_machine_types_activity', 'provinceMachineTypesActivity')->name('provinceMachineTypesActivity');
Route::get('/machine_details_report', 'machineDetailsReport')->name('machineDetailsReport');
});
});
@@ -678,4 +685,18 @@ Route::prefix('role')
Route::get('/test', function () {
$csvExporter = new \Laracsv\Export();
$csvExporter->build(\App\Models\User::all(), ['id' => 'کد یکتا', 'username' => 'نام کاربری'])->download();
});
});
Route::prefix('provinces')
->name('provinces.')
->controller(ProvinceController::class)
->group(function () {
Route::get('/list', 'list')->name('list');
});
Route::prefix('cities')
->name('cities.')
->controller(CityController::class)
->group(function () {
Route::get('/list', 'list')->name('list');
});