5 Commits

18 changed files with 296 additions and 123 deletions

View File

@@ -0,0 +1,73 @@
<?php
namespace App\Exports\V3\Mission\Report\Machine;
use Illuminate\Contracts\View\View;
use Maatwebsite\Excel\Concerns\FromView;
use Maatwebsite\Excel\Concerns\ShouldAutoSize;
use Maatwebsite\Excel\Concerns\WithDrawings;
use Maatwebsite\Excel\Concerns\WithEvents;
use Maatwebsite\Excel\Events\AfterSheet;
use PhpOffice\PhpSpreadsheet\Exception;
use PhpOffice\PhpSpreadsheet\Worksheet\Drawing;
class machineReport implements FromView, ShouldAutoSize, WithDrawings, WithEvents
{
public function __construct(private array $data)
{
}
public function view(): View
{ $exportRows = [];
foreach ($this->data as $r) {
$exportRows[] = [
'city_name' => $r->c_name ?? '',
'province_name' => $r->p_name ?? '',
'missions' => $r->missions ?? 0,
'distance' => (int) ($r->distance ?? 0),
];
}
return view('v3.Reports.Mission.Report.Machine.ActivityReport', [
'rows' => $exportRows,
]);
}
public function registerEvents(): array
{
return [
AfterSheet::class => function (AfterSheet $event) {
$event->sheet->getDelegate()->setRightToLeft(true);
},
];
}
/**
* @throws Exception
*/
public function drawings(): array
{
$drawing = new Drawing();
$drawing->setName('Logo');
$drawing->setDescription('This is my logo');
$drawing->setPath(public_path('/dist/logo.png'));
$drawing->setWidth(50);
$drawing->setHeight(50);
$drawing->setOffsetX(5);
$drawing->setOffsetY(5);
$drawing->setCoordinates('A1');
$drawing2 = new Drawing();
$drawing2->setName('Logo');
$drawing2->setDescription('This is my logo');
$drawing2->setPath(public_path('/dist/141icon.png'));
$drawing2->setWidth(50);
$drawing2->setHeight(50);
$drawing2->setOffsetX(5);
$drawing2->setOffsetY(5);
$drawing2->setCoordinates('D1');
return [$drawing, $drawing2];
}
}

View File

@@ -29,9 +29,9 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
$national = [ $national = [
'province_name' => $name, 'province_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'gps' => (int) ($r->gps ?? 0), 'gps' => (int) ($r->gps ?? 0),
'durations' => (int) ($r->durations ?? 0), 'durations' => (int) ($r->durations ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'bafarayand_saeti' => (int) ($r->far_h ?? 0), 'bafarayand_saeti' => (int) ($r->far_h ?? 0),
'bafarayand_rozaneh' => (int) ($r->far_d ?? 0), 'bafarayand_rozaneh' => (int) ($r->far_d ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0), 'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0),
@@ -50,9 +50,9 @@ class CountryReport implements FromView, ShouldAutoSize, WithDrawings, WithEvent
} }
$grid[$pid]['total'] = (int) ($r->total ?? 0); $grid[$pid]['total'] = (int) ($r->total ?? 0);
$grid[$pid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0);
$grid[$pid]['gps'] = (int) ($r->gps ?? 0); $grid[$pid]['gps'] = (int) ($r->gps ?? 0);
$grid[$pid]['durations'] = (int) ($r->durations ?? 0); $grid[$pid]['durations'] = (int) ($r->durations ?? 0);
$grid[$pid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0);
$grid[$pid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0); $grid[$pid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0);
$grid[$pid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0); $grid[$pid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0);
$grid[$pid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0); $grid[$pid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0);

View File

@@ -30,9 +30,9 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
$province = [ $province = [
'city_name' => $name, 'city_name' => $name,
'total' => (int) ($r->total ?? 0), 'total' => (int) ($r->total ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'gps' => (int) ($r->gps ?? 0), 'gps' => (int) ($r->gps ?? 0),
'durations' => (int) ($r->durations ?? 0), 'durations' => (int) ($r->durations ?? 0),
'khareg_mahdode' => (int) ($r->khareg_mahdode ?? 0),
'bafarayand_saeti' => (int) ($r->far_h ?? 0), 'bafarayand_saeti' => (int) ($r->far_h ?? 0),
'bafarayand_rozaneh' => (int) ($r->far_d ?? 0), 'bafarayand_rozaneh' => (int) ($r->far_d ?? 0),
'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0), 'bedon_bafarayand_saeti' => (int) ($r->un_far_h ?? 0),
@@ -51,9 +51,9 @@ class ProvinceReport implements FromView, ShouldAutoSize, WithDrawings, WithEven
} }
$grid[$cid]['total'] = (int) ($r->total ?? 0); $grid[$cid]['total'] = (int) ($r->total ?? 0);
$grid[$cid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0);
$grid[$cid]['gps'] = (int) ($r->gps ?? 0); $grid[$cid]['gps'] = (int) ($r->gps ?? 0);
$grid[$cid]['durations'] = (int) ($r->durations ?? 0); $grid[$cid]['durations'] = (int) ($r->durations ?? 0);
$grid[$cid]['khareg_mahdode'] = ($r->khareg_mahdode ?? 0);
$grid[$cid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0); $grid[$cid]['bafarayand_saeti'] = (int) ($r->far_h ?? 0);
$grid[$cid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0); $grid[$cid]['bafarayand_rozaneh'] = (int) ($r->far_d ?? 0);
$grid[$cid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0); $grid[$cid]['bedon_bafarayand_saeti'] = (int) ($r->un_far_h ?? 0);

View File

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

View File

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

View File

@@ -0,0 +1,40 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission\Report;
use App\Exports\V3\Mission\Report\Machine\machineReport;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\Province;
use App\Services\Cartables\Mission\Report\ReportMachineService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Maatwebsite\Excel\Facades\Excel;
use PhpOffice\PhpSpreadsheet\Exception;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class ReportMachineController extends Controller
{
use ApiResponse;
public function activity(Request $request, ReportMachineService $reportMachineService): JsonResponse
{
return $this->successResponse([
'activities' => $reportMachineService->activity($request),
'provinces' => Province::all(['id', 'name_fa']),
]);
}
/**
* @throws Exception
* @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
*/
public function excelActivity(Request $request, ReportMachineService $reportMachineService): BinaryFileResponse
{
$data = $reportMachineService->activity($request);
$name = 'گزارش کل تردد یک ماشین '.verta()->now()->format('Y-m-d H-i').'.xlsx';
return Excel::download(new machineReport($data), $name);
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -5,6 +5,7 @@ namespace App\Http\Requests\V3\Mission\ControlUnit;
use App\Enums\MissionStates; use App\Enums\MissionStates;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Validator;
class FinishRequest extends FormRequest class FinishRequest extends FormRequest
{ {
@@ -28,4 +29,25 @@ class FinishRequest extends FormRequest
'end_km' => 'required', 'end_km' => 'required',
]; ];
} }
public function after(): array
{
return [
function (Validator $validator) {
$mission = $this->mission;
if (strtotime($this->time) < strtotime($mission->start_time)) {
$validator->errors()->add(
'time',
'زمان پایان ماموریت باید بعد از زمان شروع ماموریت باشد.'
);
}
if ($this->end_km < $mission->km) {
$validator->errors()->add(
'end_km',
'کیلومتر پایان باید بزرگتر از کیلومتر شروع باشد.'
);
}
}
];
}
} }

View File

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

View File

@@ -0,0 +1,40 @@
<?php
namespace App\Services\Cartables\Mission\Report;
use App\Facades\DataTable\DataTableFacade;
use App\Models\MissionViolation;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class ReportMachineService
{
public function activity(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;
";
return DB::select($sql, [
'from' => $from,
'to' => $to,
'machineCode' => $code,
]);
}
}

View File

@@ -0,0 +1,78 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>گزارش کل تردد های یک ماشین </title>
<style>
table,
th,
td {
border: 1px solid black;
}
</style>
</head>
<body dir="rtl" style="text-align: center;">
@php
// show a dot if key missing or value is 0/empty
function cell($row, $key) {
return array_key_exists($key, $row) ? ($row[$key] ?: '0') : '0';
}
@endphp
<table>
<thead>
<tr>
<th colspan="4"
style="background-color: #DAEEF3;text-align: center;border-right: 1px solid black;font-weight:bolder;">
تاریخ دریافت گزارش: {{ verta()->now()->format('Y/m/d H:i') }}
</th>
</tr>
<tr>
<th colspan="4"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;">
</th>
</tr>
<tr>
<th colspan="4"
style="background-color: #DAEEF3;text-align: center;border-right:1px solid black;font-weight:bolder;font-size: 13px;">
گزارش ماشین های ماموریت رفته
</th>
</tr>
<tr>
<th rowspan="1"
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
استان
</th>
<th rowspan="1"
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
شهر
</th>
<th rowspan="1"
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
تعداد ماموریت </th>
<th rowspan="1"
style="text-align: center;border: 1px solid black;background-color: #EBF1DE;font-weight: bold;">
جمع کارکرد
</th>
</tr>
</thead>
<tbody>
@foreach ($rows as $item)
<tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['missions'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['distance'] ?? '-' }}</td>
</tr>
@endforeach
</tbody>
</table>
</body>
</html>

View File

@@ -93,9 +93,9 @@
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['province_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td>

View File

@@ -93,9 +93,9 @@
<tr> <tr>
<td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['city_name'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['total'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['gps'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['durations'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['khareg_mahdode'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_saeti'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bafarayand_rozaneh'] ?? '-' }}</td>
<td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td> <td style="border: 1px solid black;text-align: center;">{{ $item['bedon_bafarayand_saeti'] ?? '-' }}</td>

View File

@@ -15,6 +15,7 @@ use App\Http\Controllers\V3\Dashboard\Harim\TechnicalDeputyController;
use App\Http\Controllers\V3\Dashboard\ItemsManagementController; use App\Http\Controllers\V3\Dashboard\ItemsManagementController;
use App\Http\Controllers\V3\Dashboard\Mission\ControlUnitController; use App\Http\Controllers\V3\Dashboard\Mission\ControlUnitController;
use App\Http\Controllers\V3\Dashboard\Mission\DetailController; use App\Http\Controllers\V3\Dashboard\Mission\DetailController;
use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportMachineController;
use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportTradodController; use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportTradodController;
use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportViolationController; use App\Http\Controllers\V3\Dashboard\Mission\Report\ReportViolationController;
use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController; use App\Http\Controllers\V3\Dashboard\Mission\RequestPortalController;
@@ -185,7 +186,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 +498,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')
@@ -558,6 +557,14 @@ Route::prefix('missions')
Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity'); Route::get('/country_excel_activity', 'countryExcelActivity')->name('countryExcelActivity');
Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity'); Route::get('/province_excel_activity', 'provinceExcelActivity')->name('provinceExcelActivity');
}); });
Route::prefix('report_machine')
->name('reportsMachine.')
->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::prefix('harim') Route::prefix('harim')