From f1626a9d674846cf7ac44a97af44d7f3001fc939 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Sun, 18 Aug 2024 10:53:02 +0000 Subject: [PATCH] change the inside texts of frontend files --- public/version2/js/dashboard_pages/map.js | 28 +-- .../safety_and_privacy/operation_cartable.js | 6 +- .../safety_and_privacy/report.blade.php | 210 +++++++++--------- 3 files changed, 122 insertions(+), 122 deletions(-) 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: "", + html: "", 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(`
${plaque[0]}
${plaque[1] == "*" ? '' : plaque[1]}
${plaque[2]}
-
ایران
${plaque[3]}
`) 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(` - + `) 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(` - + `) } @@ -569,7 +569,7 @@ $(function () { return `
${moment(data.action_picture_document_upload_date).format("HH:mm:ss | jYYYY/jMM/jDD")}
`; break; } - + // if (data.step >= 2) // return `
${moment(data.action_picture_document_upload_date).format("HH:mm:ss | jYYYY/jMM/jDD")}
`; // return @@ -613,7 +613,7 @@ $(function () { }, render: function (data, type, row) { let content = `
` - if ($.inArray("delete-safety-and-privacy", PERMISSIONS) != -1 ) { + if ($.inArray("delete-safety-and-privacy", PERMISSIONS) != -1) { content += `` } content += `
` 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 @@ @endsection @section('content') -
-
-
-
-
- تعداد موارد ثبت شده -
-
-
- -
-
- -
-
- +
+
+
+
+
+ تعداد موارد ثبت شده +
+
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ اداره کل + + تعداد کل + + ساخت و ساز در حریم غیر مجاز + + راه دسترسی در حریم غیر مجاز + + عبور تاسیسات زیربنایی در حریم غیر مجاز +
گام اول (شناسایی)گام دوم (مستندات قضایی)گام سوم (برخورد)گام اول (شناسایی)گام دوم (مستندات قضایی)گام سوم (برخورد)گام اول (شناسایی)گام دوم (مستندات قضایی)گام سوم (برخورد)
+ {{-- --}}
- - - - - - - - - - - - - - - - - - - - - - - - - -
- اداره کل - - تعداد کل - - عبور تاسیسات زیربنایی در حریم - - راه دسترسی در حریم - - ساخت و ساز در حریم -
گام اول (شناسایی)گام دوم (اخطار)گام سوم (برخورد)گام اول (شناسایی)گام دوم (اخطار)گام سوم (برخورد)گام اول (شناسایی)گام دوم (اخطار)گام سوم (برخورد)
- {{-- --}}
-
-
-
-
- -
-
- -
-
- -
-
+
+
+
+ +
+
+ +
+
+ +
+
+
-
@endsection @section('scripts-body') -{{-- --}} -{{-- --}} + {{-- --}} + {{-- --}} - - - - - - - - - - - - - - - - - - - - - - -@endsection \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + +@endsection