diff --git a/public/version2/js/dashboard_pages/map.js b/public/version2/js/dashboard_pages/map.js
index 779b7b29..a3caea32 100644
--- a/public/version2/js/dashboard_pages/map.js
+++ b/public/version2/js/dashboard_pages/map.js
@@ -42,9 +42,9 @@ var iranLayer = L.tileLayer(
 );
 
 function makeIcon(iconSize, layer) {
-        return L.divIcon({
+    return L.divIcon({
         className: "custom-div-icon",
-        html: "<span style='width: " + iconSize + "px;height: " + iconSize + "px;' class='" + layer._icon.childNodes[0].classList.value +"'></span>",
+        html: "<span style='width: " + iconSize + "px;height: " + iconSize + "px;' class='" + layer._icon.childNodes[0].classList.value + "'></span>",
         iconSize: [0, 0],
     });
 }
@@ -759,7 +759,7 @@ const showInMap = data => {
             break;
     }
 
-    
+
     if (FILTERQUERY.displayType == 1) {
         // clusters
         mapMode = "clusters"
@@ -778,9 +778,9 @@ const showInMap = data => {
             mapMode = "points"
             markersLayer = new L.LayerGroup(markers);
             map.addLayer(markersLayer);
-            map.on('zoomend', function() {
-                if(markersLayer === null){
-                    return 0 ;
+            map.on('zoomend', function () {
+                if (markersLayer === null) {
+                    return 0;
                 }
                 let iconSize;
                 switch (map.getZoom()) {
@@ -814,7 +814,7 @@ const showInMap = data => {
                         break;
                 }
 
-                markersLayer.eachLayer(function(layer) {
+                markersLayer.eachLayer(function (layer) {
                     return layer.setIcon(makeIcon(iconSize, layer));
                 });
             });
@@ -919,7 +919,7 @@ const roadItemsCreateMarkers = (data) => {
                     modal.find('#modal_details_image_before_img').removeAttr('href')
                     modal.find('#modal_details_image_after').removeAttr('src')
                     modal.find('#modal_details_image_after_img').removeAttr('href')
-                    
+
                     showLoaderScreen()
                 },
                 success: function (result) {
@@ -932,10 +932,10 @@ const roadItemsCreateMarkers = (data) => {
                     modal.find('#modal_details_subitem').text(result.items.sub_item_fa)
                     modal.find('#modal_details_status').text(result.items.status_fa)
 
-                    if(result.items.status != 2){
+                    if (result.items.status != 2) {
                         modal.find('#modal_details_supervisor_description_div').addClass('d-none');
                         modal.find('#modal_details_supervisor_description_div').removeClass('d-flex');
-                    }else{
+                    } else {
                         modal.find('#modal_details_supervisor_description').text(result.items.supervisor_description)
                         modal.find('#modal_details_supervisor_description_div').removeClass('d-none');
                         modal.find('#modal_details_supervisor_description_div').addClass('d-flex');
@@ -999,7 +999,7 @@ const roadPatrolsCreateMarkers = (data) => {
                     const plaque = result.officer_plaque.split("-");
                     modal.find('#modal_details_officer_plaque').html(`<div class="d-flex align-items-center justify-content-center" style="direction: ltr;"><div class="mr-1">${plaque[0]}</div><div class="mr-1">${plaque[1] == "*" ? '<i class="fa fa-wheelchair"></i>' : plaque[1]}</div><div class="mr-1">${plaque[2]}</div>-<div class="ml-1 mr-1">ایران</div><div>${plaque[3]}</div></div>`)
                     modal.find('#modal_details_distance').text(`${result.distance} کیلومتر`)
-                    modal.find('#modal_detail_report_link').attr('href',`/v2/road_patrols/operator/report/${data[i].id}`)
+                    modal.find('#modal_detail_report_link').attr('href', `/v2/road_patrols/operator/report/${data[i].id}`)
                     modal.modal('show')
                     hideLoaderScreen()
                 },
@@ -1175,10 +1175,10 @@ const RoadObservationsCreateMarkers = (data) => {
                         modal.find('#modal_details_status').text(result.data.status_fa)
                     }
 
-                    if(result.data.status != 2) {
+                    if (result.data.status != 2) {
                         modal.find('#modal_details_supervisor_description_box').addClass('d-none');
                         modal.find('#modal_details_supervisor_description_box').removeClass('d-flex');
-                    }else {
+                    } else {
                         modal.find('#modal_details_supervisor_description').text(result.data.supervisor_description)
                         modal.find('#modal_details_supervisor_description_box').removeClass('d-none');
                         modal.find('#modal_details_supervisor_description_box').addClass('d-flex');
@@ -1972,7 +1972,7 @@ const SafetyAndPrivacy = {
         $('.fill-step-sap').append(`
             <option value="-1">انتخاب وضعیت</option>
             <option value="1">گام اول (شناسایی)</option>
-            <option value="2">گام دوم (اخطار)</option>
+            <option value="2">گام دوم (مستندات قضایی)</option>
             <option value="3">گام سوم (برخورد)</option>
         `)
 
diff --git a/public/version2/js/dashboard_pages/safety_and_privacy/operation_cartable.js b/public/version2/js/dashboard_pages/safety_and_privacy/operation_cartable.js
index c07aa3f7..c18eb2fe 100644
--- a/public/version2/js/dashboard_pages/safety_and_privacy/operation_cartable.js
+++ b/public/version2/js/dashboard_pages/safety_and_privacy/operation_cartable.js
@@ -300,7 +300,7 @@ const fillFilterBox = () => {
     $('.fill-status').append(`
         <option value="-1">انتخاب وضعیت</option>
         <option value="1">گام اول (شناسایی)</option>
-        <option value="2">گام دوم (اخطار)</option>
+        <option value="2">گام دوم (مستندات قضایی)</option>
         <option value="3">گام سوم (برخورد)</option>
     `)
 }
@@ -569,7 +569,7 @@ $(function () {
                             return `<div class="d-flex flex-column"><button type="button" class="btn-dataTable show-action-picture-btn" data-toggle="tooltip" data-placement="top" title="نمایش"><i class="fa fa-image icon-btnTable"></i></button><span>${moment(data.action_picture_document_upload_date).format("HH:mm:ss | jYYYY/jMM/jDD")}</span></div>`;
                             break;
                     }
-                    
+
                     // if (data.step >= 2)
                     //     return `<div class="d-flex flex-column"><button type="button" class="btn-dataTable show-action-picture-btn" data-toggle="tooltip" data-placement="top" title="نمایش"><i class="fa fa-image icon-btnTable"></i></button><span>${moment(data.action_picture_document_upload_date).format("HH:mm:ss | jYYYY/jMM/jDD")}</span></div>`;
                     // return 
@@ -613,7 +613,7 @@ $(function () {
                 },
                 render: function (data, type, row) {
                     let content = `<div class='d-flex justify-content-center'>`
-                    if ($.inArray("delete-safety-and-privacy", PERMISSIONS) != -1 ) {
+                    if ($.inArray("delete-safety-and-privacy", PERMISSIONS) != -1) {
                         content += `<button type="button" class="btn-dataTable delete-item" data-toggle="tooltip" data-placement="top" title="حذف"><i class="fa fa-trash icon-btnTable"></i></button>`
                     }
                     content += `</div>`
diff --git a/resources/views/version2/dashboard_pages/safety_and_privacy/report.blade.php b/resources/views/version2/dashboard_pages/safety_and_privacy/report.blade.php
index bfd52506..f00dc28e 100644
--- a/resources/views/version2/dashboard_pages/safety_and_privacy/report.blade.php
+++ b/resources/views/version2/dashboard_pages/safety_and_privacy/report.blade.php
@@ -25,131 +25,131 @@
     <nav class="breadcrumb-selfdesign">
         <div class="container d-flex align-items-center justify-content-between">
             <ul class="d-flex align-items-center">
-                <li class="breadcrumb-item-selfdesign"><a href="{{route('v2.dashboard')}}">داشبورد</a></li>
+                <li class="breadcrumb-item-selfdesign"><a href="{{ route('v2.dashboard') }}">داشبورد</a></li>
                 <i class="mr-2 fa fa-angle-left arrow-icon text-dark"></i>
                 <li class="current breadcrumb-item-selfdesign">گزارشات نگهداری حریم راه</li>
             </ul>
-            <a href="{{route('v2.dashboard')}}" class="btn breadcrumb-back">بازگشت</a>
+            <a href="{{ route('v2.dashboard') }}" class="btn breadcrumb-back">بازگشت</a>
         </div>
     </nav>
 @endsection
 @section('content')
 
 
-<div class="container-fluid">
-    <div class="row pt-3 px-4 body-table-style">
-        <div class="card" style="width: 100%;">
-            <div class="card-header">
-                <div id="gozarehtown">
-                    <span style="font-size:13px">تعداد موارد ثبت شده </span>
-                    <div class="card-tools" style="margin-top:11px">
-                        <div class="form-row">
-                            <div class="form-group col-md-3">
-                                <input type="text" class="form-control" placeholder="از تاریخ" id="fromDateshowrizitem"
-                                    autocomplete="off" />
-                            </div>
-                            <div class="form-group col-md-3">
-                                <input type="text" class="form-control" placeholder=" تا تاریخ" id="toDateshowrizitem"
-                                    autocomplete="off" disabled />
-                            </div>
-                            <div class="form-group col-md-2 find-date">
-                                <button class="btn btn-sm" id="sorttestitems"
-                                    style="background-color: #00669f; color: #ffffff;">
-                                    جستجو
-                                </button>
+    <div class="container-fluid">
+        <div class="row pt-3 px-4 body-table-style">
+            <div class="card" style="width: 100%;">
+                <div class="card-header">
+                    <div id="gozarehtown">
+                        <span style="font-size:13px">تعداد موارد ثبت شده </span>
+                        <div class="card-tools" style="margin-top:11px">
+                            <div class="form-row">
+                                <div class="form-group col-md-3">
+                                    <input type="text" class="form-control" placeholder="از تاریخ"
+                                        id="fromDateshowrizitem" autocomplete="off" />
+                                </div>
+                                <div class="form-group col-md-3">
+                                    <input type="text" class="form-control" placeholder=" تا تاریخ"
+                                        id="toDateshowrizitem" autocomplete="off" disabled />
+                                </div>
+                                <div class="form-group col-md-2 find-date">
+                                    <button class="btn btn-sm" id="sorttestitems"
+                                        style="background-color: #00669f; color: #ffffff;">
+                                        جستجو
+                                    </button>
+                                </div>
                             </div>
                         </div>
+                        <table id="gozarehtowntable" dir="rtl" class="table table-striped table-bordered"
+                            style="width: 100%;">
+                            <thead>
+                                <tr class="headercolortable">
+                                    <th rowspan="2" class="text-center th-head"></th>
+
+                                    <th rowspan="2" class="text-center th-head">
+                                        اداره کل
+                                    </th>
+                                    <th rowspan="2" class="text-center th-head">
+                                        تعداد کل
+                                    </th>
+                                    <th colspan="3" class="text-center th-head bluecolor">
+                                        ساخت و ساز در حریم غیر مجاز
+                                    </th>
+                                    <th colspan="3" class="text-center th-head bluecolor">
+                                        راه دسترسی در حریم غیر مجاز
+                                    </th>
+                                    <th colspan="3" class="text-center th-head bluecolor">
+                                        عبور تاسیسات زیربنایی در حریم غیر مجاز
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th class="text-center th-head">گام اول (شناسایی)</th>
+                                    <th class="text-center th-head">گام دوم (مستندات قضایی)</th>
+                                    <th class="text-center th-head">گام سوم (برخورد)</th>
+
+                                    <th class="text-center th-head">گام اول (شناسایی)</th>
+                                    <th class="text-center th-head">گام دوم (مستندات قضایی)</th>
+                                    <th class="text-center th-head">گام سوم (برخورد)</th>
+
+                                    <th class="text-center th-head">گام اول (شناسایی)</th>
+                                    <th class="text-center th-head">گام دوم (مستندات قضایی)</th>
+                                    <th class="text-center th-head">گام سوم (برخورد)</th>
+                                </tr>
+                            </thead>
+                        </table>
+                        {{--  --}}
                     </div>
-                    <table id="gozarehtowntable" dir="rtl" class="table table-striped table-bordered"
-                        style="width: 100%;">
-                        <thead>
-                            <tr class="headercolortable">
-                                <th rowspan="2" class="text-center th-head"></th>
-
-                                <th rowspan="2" class="text-center th-head">
-                                    اداره کل
-                                </th>
-                                <th rowspan="2" class="text-center th-head">
-                                    تعداد کل
-                                </th>
-                                <th colspan="3" class="text-center th-head bluecolor">
-                                    عبور تاسیسات زیربنایی در حریم
-                                </th>
-                                <th colspan="3" class="text-center th-head bluecolor">
-                                    راه دسترسی در حریم
-                                </th>
-                                <th colspan="3" class="text-center th-head bluecolor">
-                                    ساخت و ساز در حریم                               
-                                </th>
-                            </tr>
-                            <tr >
-                                <th class="text-center th-head">گام اول (شناسایی)</th>
-                                <th class="text-center th-head">گام دوم (اخطار)</th>
-                                <th class="text-center th-head">گام سوم (برخورد)</th>
-
-                                <th class="text-center th-head">گام اول (شناسایی)</th>
-                                <th class="text-center th-head">گام دوم (اخطار)</th>
-                                <th class="text-center th-head">گام سوم (برخورد)</th>
-
-                                <th class="text-center th-head">گام اول (شناسایی)</th>
-                                <th class="text-center th-head">گام دوم (اخطار)</th>
-                                <th class="text-center th-head">گام سوم (برخورد)</th>
-                            </tr>
-                        </thead>
-                    </table>
-                    {{--  --}}
                 </div>
             </div>
         </div>
     </div>
-</div>
 
-<div class='parent-excel'>
-    <div class="row mt-2">
-        <div class="col-12 mb-2 mb-2 select-province-box">
-            <select id="select-province-excel-first-table" class="form-control"
-                name="select-province-excel-first-table">
-            </select>
-        </div>
-        <div class="form-group col-12 mb-2 mb-2">
-            <input type="text" id="datapicker-from-excel-first-table" class="form-control datepicker-excel-from"
-                placeholder="از تاریخ" autocomplete="off" />
-        </div>
-        <div class="form-group col-12 mb-2 mb-2">
-            <input type="text" id="datapicker-to-excel-first-table" class="form-control datepicker-excel-to"
-                placeholder=" تا تاریخ" autocomplete="off" disabled />
-        </div>
-        <div class="col-12 text-left"><button id="btn_excel_download"
-                class="btn-set-filter btn-set-excel px-2 py-1">دریافت فایل</button>
+    <div class='parent-excel'>
+        <div class="row mt-2">
+            <div class="col-12 mb-2 mb-2 select-province-box">
+                <select id="select-province-excel-first-table" class="form-control"
+                    name="select-province-excel-first-table">
+                </select>
+            </div>
+            <div class="form-group col-12 mb-2 mb-2">
+                <input type="text" id="datapicker-from-excel-first-table" class="form-control datepicker-excel-from"
+                    placeholder="از تاریخ" autocomplete="off" />
+            </div>
+            <div class="form-group col-12 mb-2 mb-2">
+                <input type="text" id="datapicker-to-excel-first-table" class="form-control datepicker-excel-to"
+                    placeholder=" تا تاریخ" autocomplete="off" disabled />
+            </div>
+            <div class="col-12 text-left"><button id="btn_excel_download"
+                    class="btn-set-filter btn-set-excel px-2 py-1">دریافت فایل</button>
+            </div>
         </div>
     </div>
-</div>
 @endsection
 @section('scripts-body')
 
-{{-- <script src="{{ asset('dist/js/jquery.rollNumber.js') }}"></script> --}}
-{{-- <script src="{{ asset('dist/js/jQuery-Plugin-For-Creating-An-Animated-Counter-kCounter/js/kcounter.js') }}"></script> --}}
+    {{-- <script src="{{ asset('dist/js/jquery.rollNumber.js') }}"></script> --}}
+    {{-- <script src="{{ asset('dist/js/jQuery-Plugin-For-Creating-An-Animated-Counter-kCounter/js/kcounter.js') }}"></script> --}}
 
-<!-- datatables script -->
-<script src="{{ asset('plugins/datatables/jquery.dataTables.min.js') }}"></script>
-<script src="{{ asset('plugins/datatables-bs4/js/dataTables.bootstrap4.js') }}"></script>
-<script src="{{ asset('plugins/datatables-buttons/js/dataTables.buttons.min.js') }}"></script>
-<script src="{{ asset('plugins/datatables-buttons/js/buttons.html5.min.js') }}"></script>
-<script src="{{ asset('dist/js/jszip.min.js') }}"></script>
-<script src="{{ asset('plugins/datatables-buttons/js/buttons.print.min.js') }}"></script>
-<!-- map script -->
-<script src="{{ asset('dist/js/leaflet.js') }}"></script>
-<script src="{{ asset('dist/js/leaflet.markercluster.js') }}"></script>
-<script src="{{ asset('dist/js/leaflet-routing-machine.js') }}"></script>
-<!-- input mask -->
-<script src="{{ asset('plugins/inputmask/min/jquery.inputmask.bundle.min.js') }}"></script>
-<!-- select2 script -->
-<script src="{{ asset('plugins/select2/js/select2.full.min.js') }}"></script>
-<!-- date picker script -->
-<script src="{{ asset('dist/js/persian-datepicker.min.js') }}"></script>
-<script src="{{ asset('dist/js/persian-date.min.js') }}"></script>
-<script src="{{ asset('plugins/moment/moment.min.js') }}"></script>
-<script src="{{ asset('dist/js/jalali-moment.browser.js') }}"></script>
-<!-- page script -->
-<script src="{{ asset('version2/js/dashboard_pages/safety_and_privacy/report.js?_=') }}"></script>
-@endsection
\ No newline at end of file
+    <!-- datatables script -->
+    <script src="{{ asset('plugins/datatables/jquery.dataTables.min.js') }}"></script>
+    <script src="{{ asset('plugins/datatables-bs4/js/dataTables.bootstrap4.js') }}"></script>
+    <script src="{{ asset('plugins/datatables-buttons/js/dataTables.buttons.min.js') }}"></script>
+    <script src="{{ asset('plugins/datatables-buttons/js/buttons.html5.min.js') }}"></script>
+    <script src="{{ asset('dist/js/jszip.min.js') }}"></script>
+    <script src="{{ asset('plugins/datatables-buttons/js/buttons.print.min.js') }}"></script>
+    <!-- map script -->
+    <script src="{{ asset('dist/js/leaflet.js') }}"></script>
+    <script src="{{ asset('dist/js/leaflet.markercluster.js') }}"></script>
+    <script src="{{ asset('dist/js/leaflet-routing-machine.js') }}"></script>
+    <!-- input mask -->
+    <script src="{{ asset('plugins/inputmask/min/jquery.inputmask.bundle.min.js') }}"></script>
+    <!-- select2 script -->
+    <script src="{{ asset('plugins/select2/js/select2.full.min.js') }}"></script>
+    <!-- date picker script -->
+    <script src="{{ asset('dist/js/persian-datepicker.min.js') }}"></script>
+    <script src="{{ asset('dist/js/persian-date.min.js') }}"></script>
+    <script src="{{ asset('plugins/moment/moment.min.js') }}"></script>
+    <script src="{{ asset('dist/js/jalali-moment.browser.js') }}"></script>
+    <!-- page script -->
+    <script src="{{ asset('version2/js/dashboard_pages/safety_and_privacy/report.js?_=') }}"></script>
+@endsection