fix list and crate update machine and change state for mission

Reviewed-on: #8

app/Http/Controllers/V3/CMMSMachinesController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\V3;
 
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\CMMSMachine\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\CMMSMachine;
 use Illuminate\Http\JsonResponse;
@@ -48,4 +49,16 @@ class CMMSMachinesController extends Controller
             ->distinct()
             ->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();
+    }
 }

app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php

@@ -33,11 +33,11 @@ class ControlUnitController extends Controller
     public function start(StartRequest $request, Mission $mission): JsonResponse
     {
         DB::transaction(function () use ($mission, $request) {
-            $mission->histories()->create([
-                'user_id' => auth()->user()->id,
-                'previous_state_id' => $mission->state_id,
-                'previous_state_name' => $mission->state_name,
-            ]);
+//            $mission->histories()->create([
+//                'user_id' => auth()->user()->id,
+//                'previous_state_id' => $mission->state_id,
+//                'previous_state_name' => $mission->state_name,
+//            ]);
 
             $state = MissionStates::START_MISSION->value;
             $mission->update([
@@ -57,11 +57,11 @@ class ControlUnitController extends Controller
     public function finish(FinishRequest $request, Mission $mission, GetErrorRateService $getErrorRateService): JsonResponse
     {
         DB::transaction(function () use ($mission, $getErrorRateService, $request) {
-            $mission->histories()->create([
-                'user_id' => auth()->user()->id,
-                'previous_state_id' => $mission->state_id,
-                'previous_state_name' => $mission->state_name,
-            ]);
+//            $mission->histories()->create([
+//                'user_id' => auth()->user()->id,
+//                'previous_state_id' => $mission->state_id,
+//                'previous_state_name' => $mission->state_name,
+//            ]);
 
             $state = MissionStates::END_MISSION->value;
 

app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php

@@ -9,6 +9,7 @@ use App\Enums\MissionTypes;
 use App\Enums\MissionZones;
 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\ContinueMissionRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
 use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
@@ -273,4 +274,14 @@ 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);
+    }
 }

app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php

@@ -33,11 +33,11 @@ class TransportationUnitController extends Controller
         DB::transaction(function () use ($request, $mission) {
             $mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
 
-            $mission->histories()->create([
-                'user_id' => auth()->user()->id,
-                'previous_state_id' => $mission->state_id,
-                'previous_state_name' => $mission->state_name,
-            ]);
+//            $mission->histories()->create([
+//                'user_id' => auth()->user()->id,
+//                'previous_state_id' => $mission->state_id,
+//                'previous_state_name' => $mission->state_name,
+//            ]);
 
             $state = MissionStates::PENDING_CONFIRMATION->value;
             $machine = CMMSMachine::query()->find($request->machine_id);
@@ -61,12 +61,12 @@ class TransportationUnitController extends Controller
         DB::transaction(function () use ($request, $mission) {
             $mission->rahdaran()->wherePivot('is_driver', '=',  true)->detach();
 
-            $mission->histories()->create([
-                'user_id' => auth()->user()->id,
-                'previous_state_id' => $mission->state_id,
-                'previous_state_name' => $mission->state_name,
-                'user_description' => $request->description,
-            ]);
+//            $mission->histories()->create([
+//                'user_id' => auth()->user()->id,
+//                'previous_state_id' => $mission->state_id,
+//                'previous_state_name' => $mission->state_name,
+//                'user_description' => $request->description,
+//            ]);
 
             $state = MissionStates::REJECT_BY_TRANSPORTATION->value;
 

app/Http/Controllers/V3/Dashboard/Mission/ViolationManagementController.php

@@ -63,19 +63,19 @@ class ViolationManagementController extends Controller
                 'zone_fa' => MissionZones::name($zone),
                 'type' => $type,
                 'type_fa' => MissionTypes::name($type),
-                'start_date' => $request->start_date,//
-                'end_date' => $request->end_date,//
+                '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,//
+                '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,//
+                '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,

app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php

@@ -42,7 +42,7 @@ class RoadMaintenanceStationController extends Controller
     {
         $stations = RahdariPoint::query()
             ->where('city_id', $request->query('city_id'))
-            ->get();
+            ->get(['id', 'name']);
 
         return $this->successResponse($stations);
     }

app/Http/Requests/V3/CMMSMachine/UpdateRequest.php

@@ -0,0 +1,33 @@
+<?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',
+        ];
+    }
+}

app/Http/Requests/V3/Mission/RequestPortal/ChangeStateRequest.php

@@ -0,0 +1,30 @@
+<?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',
+        ];
+    }
+}

app/Services/Cartables/Mission/Report/ReportTradodService.php

@@ -27,7 +27,7 @@ class ReportTradodService
     public function countryActivity(Request $request): array
     {
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*
@@ -88,7 +88,7 @@ class ReportTradodService
     {
         $provinceId = $request->province_id ?? auth()->user()->province_id;
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*

app/Services/Cartables/Mission/Report/ReportViolationService.php

@@ -27,7 +27,7 @@ class ReportViolationService
     public function countryActivity(Request $request): array
     {
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*
@@ -81,7 +81,7 @@ class ReportViolationService
     {
         $provinceId = $request->province_id ?? auth()->user()->province_id;
         $from = $request->from_date ?? today()->startOfDay();
-        $to = $request->to_date ? Carbon::parse($request->to_date)->endOfDay() : today()->endOfDay();
+        $to = $request->date_to ? Carbon::parse($request->date_to)->endOfDay() : today()->endOfDay();
 
         $sql = "
         SELECT*

public/version2/js/dashboard_pages/user_management/list.js

@@ -61,9 +61,6 @@ function errorHandler(error) {
             break;
 
         default:
-            console.error("Error trace object");
-            console.log("Error object:");
-            console.log(error);
             Swal.fire({
                 icon: "error",
                 title: "خطا",
@@ -417,6 +414,43 @@ function getCityByProvince(province_id, dom_id, selected_id = 0) {
 
 }
 
+
+function getTollhouseByCity(city_id, dom_id, selected_id = 0) {$.ajax({
+        url: `/api/v3/road_maintenance_station/search_by_city?city_id=${city_id}`,
+        type: "GET",
+        async: false,
+        beforeSend: function () {
+            $(`#${dom_id}`).empty();
+            showLoaderScreen()
+        },
+        success: function (result) {
+            $(`#${dom_id}`).append('<option value="0"></option>');
+            cities = result.data;
+
+            for (let index = 0; index < cities.length; index++) {
+
+                $(`#${dom_id}`).append(
+                    `<option value=${cities[index].id}>${cities[index].name}</option>`
+                );
+            }
+
+            if (selected_id == null) {
+                disableDOM(dom_id);
+            } else if (selected_id != 0) {
+                enableDOM(dom_id);
+                $(`#${dom_id} option[value="${selected_id}"]`).attr("selected", true);
+            }
+
+            hideLoaderScreen();
+        },
+        error: function (error) {
+            errorHandler(error);
+            hideLoaderScreen();
+        },
+    });
+
+}
+
 function getCityOfficeByCity(city_id, dom_id, selected_id = 0) {
     $.ajax({
         url: "/public/contents/edarateShahri/" + city_id,
@@ -923,7 +957,6 @@ $(document).on('click', '#report_btn', function () {
     var tr = $(this).closest("tr");
     var row = table.row(tr);
     $("#report_modal").modal('show');
-    console.log(row.data().id);
     $("#selected_user_for_report").val(row.data().id);
 
 })
@@ -1003,7 +1036,6 @@ $(document).on('click', '#activity_report', function () {
             showLoaderScreen()
         },
         success: function (result) {
-            console.log(result);
 
             $("#activity_time").text(result.activity_time);
             $("#average_activity_time").text(result.average_activity_time);
@@ -1042,9 +1074,6 @@ $(document).on('click', '.permission-control', function () {
     modal.find('.permission-label').removeClass('text-muted')
     modal.find('.all-permission-by-type').prop('checked', false)
     modal.find('#user_id').val(row.data().id)
-
-    console.log(row.data().province_id);
-    console.log(row.data().edarate_shahri_id);
     modal.find('.permission-input').each((index, element) => {
         if ($(element).data('needProvince') == 1) {
             if (row.data().province_id == null) {
@@ -1625,7 +1654,6 @@ $("table").on("click", "tbody tr", function () {
 
 
 $('#user_data_table').on('change', ".user-finder-all", function () {
-    console.log(checkedItemsId);
 
     var thiz = $(this);
     if (thiz.is(':checked')) {
@@ -1642,7 +1670,6 @@ $('#user_data_table').on('change', ".user-finder-all", function () {
 });
 
 $('#user_data_table').on('change', ".user-finder", function () {
-    console.log(checkedItemsId);
 
     const checkedItemId = $(this).data("idUser");
 
@@ -2104,7 +2131,6 @@ $("#edit_province_office").change(function () {
 
 
 $("#edit_city_office").change(function () {
-    console.log("this is ok");
     setUserName("edit");
 })
 
@@ -2386,6 +2412,19 @@ $("#add_province_office").change(function () {
     setUserName();
 })
 
+$("#add_simple_city").change(function () {
+    
+    if ($("#add_simple_city").val() == -1) {
+        
+        disableDOM("add_simple_tollhouse")
+        $("#add_simple_tollhouse").empty();
+    } else {
+        
+        enableDOM("add_simple_tollhouse")
+        getTollhouseByCity($("#add_simple_city").val(), "add_simple_tollhouse")
+    }
+})
+
 // $("#edit_city").change(function () {
 
 //     if ($(this).val() == 0) {
@@ -2396,15 +2435,6 @@ $("#add_province_office").change(function () {
 //     setUserName("edit");
 // })
 
-// $("#add_simple_city").change(function () {
-
-//     if ($(this).val() == 0) {
-//         $("#add_simple_city_office").empty();
-//     } else {
-//         getCityOfficeByCity($(this).val(), "add_simple_city_office")
-//     }
-//     setUserName();
-// })
 
 // $("#add_city").change(function () {
 
@@ -2581,6 +2611,9 @@ $('#add_simple_user_show_modal').on('click', function () {
     enableDOM("add_simple_city")
     $("#add_simple_city").empty();
     $("#add_simple_city").append('<option value="0" selected disabled>ابتدا استان را انتخاب کنید</option>');
+    enableDOM("add_simple_tollhouse")
+    $("#add_simple_tollhouse").empty();
+    $("#add_simple_tollhouse").append('<option value="0" selected disabled>ابتدا شهر را انتخاب کنید</option>');
     enableDOM("add_simple_city_office")
     $("#add_simple_city_office").empty();
     $("#add_simple_city_office").append('<option value="0" selected disabled></option>');
@@ -2594,8 +2627,10 @@ $("#add_simple_province").change(function () {
 
         disableDOM("add_simple_city")
         disableDOM("add_simple_city_office")
+        disableDOM("add_simple_tollhouse")
         $("#add_simple_city").empty();
         $("#add_simple_city_office").empty();
+        $("#add_simple_tollhouse").empty();
 
     } else {
         if ($("#add_simple_province_office").val() == 0) {
@@ -2622,8 +2657,10 @@ $("#add_simple_province_office").change(function () {
 
         disableDOM("add_simple_city")
         disableDOM("add_simple_city_office")
+        disableDOM("add_simple_tollhouse")
         $("#add_simple_city").empty();
         $("#add_simple_city_office").empty();
+        $("#add_simple_tollhouse").empty();
 
     } else {
         if ($("#add_simple_province").val() == 0 || $("#add_simple_province").val() == -1) {
@@ -2657,6 +2694,7 @@ $("#add_simple_submit_form").on("click", function () {
     var edarate_shahri_id = $("#add_simple_city_office").children("option:selected").val();
     var national_code = $("#add_simple_national_code").val();
     var city_id = $("#add_simple_city").children("option:selected").val();
+    var tollhouse_id = $("#add_simple_tollhouse").children("option:selected").val();
 
 
     if (edarate_ostani_id <= 0 && edarate_shahri_id <= 0) {
@@ -2695,6 +2733,12 @@ $("#add_simple_submit_form").on("click", function () {
     } else {
         $("#add_simple_city").removeClass("validity-checker");
     }
+    if (tollhouse_id == 0) {
+        $("#add_simple_tollhouse").addClass("validity-checker");
+        form_validation_status = false;
+    } else {
+        $("#add_simple_tollhouse").removeClass("validity-checker");
+    }
 
     if (province_id < 0) {
         $("#add_simple_province").addClass("validity-checker");
@@ -2734,6 +2778,10 @@ $("#add_simple_submit_form").on("click", function () {
             formData.append("city_id", city_id);
         }
 
+        if (tollhouse_id != undefined) {
+            formData.append("station_id", tollhouse_id);
+        }
+
         formData.append("password_confirmation", repass);
         if (edarate_ostani_id != 0) {
             formData.append("edarate_ostani_id", edarate_ostani_id);

resources/views/version2/dashboard_pages/user_management/list.blade.php

@@ -675,6 +675,11 @@
                                         id="add_simple_city_office">
                                     </select>
                                 </div>
+                                <div class="form-group col-md-12">
+                                    <label>راهدارخانه</label>
+                                    <select class="form-control tollhouse" name="add_simple_tollhouse" id="add_simple_tollhouse">
+                                    </select>
+                                </div>
                                 <div class="form-group col-md-6">
                                     <label> نام کاربری</label>
                                     <span style="color: crimson">*</span>

routes/v3.php

@@ -185,6 +185,7 @@ Route::prefix('cmms_machines')
         Route::get('/list', 'list')->name('list');
         Route::get('/search', 'search')->name('search');
         Route::get('/car_types', 'carTypes')->name('carTypes');
+        Route::post('/{machine}', 'update')->name('update')->middleware('permission:update-machine');
     });
 
 Route::prefix('rahdaran')
@@ -497,6 +498,7 @@ Route::prefix('missions')
                 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::name('transportationUnit.')
             ->prefix('transportation_unit')
@@ -538,7 +540,7 @@ Route::prefix('missions')
             });
         Route::prefix('report_violation')
             ->name('reportsViolation.')
-            ->middleware(['permission:mission-report-province|permission:mission-report-country'])
+            ->middleware(['permission:mission-report-province|mission-report-country'])
             ->controller(ReportViolationController::class)
             ->group(function () {
                 Route::get('/country_activity', 'countryActivity')->name('countryActivity');
@@ -548,7 +550,7 @@ Route::prefix('missions')
             });
         Route::prefix('report_taradod')
             ->name('reportsTaradod.')
-            ->middleware(['permission:mission-report-province|permission:mission-report-country'])
+            ->middleware(['permission:mission-report-province|mission-report-country'])
             ->controller(ReportTradodController::class)
             ->group(function () {
                 Route::get('/country_activity', 'countryActivity')->name('countryActivity');