From 5e41e9f47a76037f258e9e5045fa2f56792c6d91 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Tue, 27 Feb 2024 10:42:23 +0000 Subject: [PATCH] uncomment the vital routes --- app/Http/Controllers/Api/CMMSController.php | 5 ++- public/dist/js/mashinalat_create.js | 2 +- public/dist/js/mashinalat_index.js | 2 +- public/dist/js/mashinalat_update.js | 2 +- .../js/dashboard_pages/winter_camp/map.js | 2 +- .../views/layouts/dashboard/_header.blade.php | 2 +- routes/api.php | 8 ++-- routes/web.php | 40 +++++++++---------- 8 files changed, 32 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/Api/CMMSController.php b/app/Http/Controllers/Api/CMMSController.php index 32850f9c..0d4ce917 100644 --- a/app/Http/Controllers/Api/CMMSController.php +++ b/app/Http/Controllers/Api/CMMSController.php @@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Hekmatinasser\Verta\Verta; use App\Models\User; +use Illuminate\Support\Str; use Illuminate\Support\Facades\Http; @@ -199,7 +200,7 @@ class CMMSController extends Controller public function store(Request $request) { - $uuid = \Uuid::generate(); + $uuid = Str::uuid(); foreach (CMMS_Province::where('province_id', $request->only('province_id'))->get() as $prov_item) { $province_fa = $prov_item->province_fa; @@ -394,7 +395,7 @@ class CMMSController extends Controller public function update(Request $request, $id) { - $uuid = \Uuid::generate(); + $uuid = Str::uuid(); foreach (CMMS_Province::where('province_id', $request->only('province_id'))->get() as $prov_item) { $province_fa = $prov_item->province_fa; diff --git a/public/dist/js/mashinalat_create.js b/public/dist/js/mashinalat_create.js index 2a38ad69..858cdea4 100644 --- a/public/dist/js/mashinalat_create.js +++ b/public/dist/js/mashinalat_create.js @@ -2,7 +2,7 @@ var isValidProvider = false; var isValidCity = false; var isNationalCode = false; var isSend = false; -var url = 'https://rms.rmto.ir/'; +var url = '/'; $(function () { // create toast diff --git a/public/dist/js/mashinalat_index.js b/public/dist/js/mashinalat_index.js index 7527c608..16ec9199 100644 --- a/public/dist/js/mashinalat_index.js +++ b/public/dist/js/mashinalat_index.js @@ -1,5 +1,5 @@ var mashinalatTable; -var url = "https://rms.rmto.ir/"; +var url = "/"; const MAP_ENDPOINT = "https://testmap.141.ir"; const MAP_MIN_ZOOM = 5; diff --git a/public/dist/js/mashinalat_update.js b/public/dist/js/mashinalat_update.js index db930c0f..25a4ae75 100644 --- a/public/dist/js/mashinalat_update.js +++ b/public/dist/js/mashinalat_update.js @@ -2,7 +2,7 @@ var isValidProvider = false; var isValidCity = false; var isNationalCode = false; var isSend = false; -var url = 'https://rms.rmto.ir/'; +var url = '/'; let id; $(function () { diff --git a/public/version2/js/dashboard_pages/winter_camp/map.js b/public/version2/js/dashboard_pages/winter_camp/map.js index 49eccf78..01e9a497 100644 --- a/public/version2/js/dashboard_pages/winter_camp/map.js +++ b/public/version2/js/dashboard_pages/winter_camp/map.js @@ -96,7 +96,7 @@ $(document).ready(function () { let formData = new FormData(); formData.append("id", idAsli); $.ajax({ - url: "https://rms.rmto.ir/camp/get", + url: "/camp/get", type: "POST", headers: { "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr("content"), diff --git a/resources/views/layouts/dashboard/_header.blade.php b/resources/views/layouts/dashboard/_header.blade.php index 89ffd94e..519ae348 100644 --- a/resources/views/layouts/dashboard/_header.blade.php +++ b/resources/views/layouts/dashboard/_header.blade.php @@ -78,7 +78,7 @@ @endcan - +
  • ممیزی ماشین آلات راهداری کشور
    •  diff --git a/routes/api.php b/routes/api.php index a6faf33a..0e11d877 100644 --- a/routes/api.php +++ b/routes/api.php @@ -341,18 +341,18 @@ Route::middleware('cors:api')->get('/get-items-and-subs', 'TotalRahdariProjectsR // Route::middleware('cors:api')->get('cmms/all', 'Api\CMMSController@index'); // Route::middleware('cors:api')->get('cmms/public/all', 'Api\CMMSController@publicIndex'); // Route::middleware('cors:api')->get('cmms/getVehicleData', 'Api\CMMSController@getVehicleData'); -// Route::middleware('cors:api')->get('cmms/getVehicleActivity', 'Api\CMMSController@getVehicleActivity'); +Route::middleware('cors:api')->get('cmms/getVehicleActivity', 'Api\CMMSController@getVehicleActivity'); // Route::middleware('cors:api')->get('cmms/getVehicleLastPoints', 'Api\CMMSController@getVehicleLastPoints'); -// Route::middleware('cors:api')->get('cmms/getVehicleActivitySummary', 'Api\CMMSController@getVehicleActivitySummary'); +Route::middleware('cors:api')->get('cmms/getVehicleActivitySummary', 'Api\CMMSController@getVehicleActivitySummary'); // Route::middleware('cors:api')->post('cmms/create', 'Api\CMMSController@store'); // Route::middleware('cors:api')->post('cmms/machine', 'Api\CMMSController@getByMachineCode'); // Route::middleware('cors:api')->get('cmms/provinces/all', 'Api\CMMSController@getProvinces'); // Route::middleware('cors:api')->post('cmms/search', 'Api\CMMSController@search'); -// Route::middleware('cors:api')->get('cmms/{id}/show', 'Api\CMMSController@edit'); +Route::middleware('cors:api')->get('cmms/{id}/show', 'Api\CMMSController@edit'); // /// milad | cmms cities -// Route::middleware('cors:api')->get('cmms/cities', 'Api\CMMSController@get_cities'); +Route::middleware('cors:api')->get('cmms/cities', 'Api\CMMSController@get_cities'); // // road items // Route::post('road-items-amir', 'RoadItemsProjectController@store'); diff --git a/routes/web.php b/routes/web.php index f67ba5d4..dec6290c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -183,23 +183,23 @@ Route::get('rmtologin', function () { // /* cmms's view */ -// Route::get('cmms-audit', function () { -// return view('cmms.audit_index'); -// }); // view -// Route::get('cmms-audit/add', function () { -// return view('cmms.audit_create'); -// }); // view + Route::get('cmms-audit', function () { + return view('cmms.audit_index'); + }); // view + Route::get('cmms-audit/add', function () { + return view('cmms.audit_create'); + }); // view -// Route::get('cmms-audit/{id}/edit', function (Illuminate\Http\Request $request) { -// $id = $request->id; + Route::get('cmms-audit/{id}/edit', function (Illuminate\Http\Request $request) { + $id = $request->id; -// return view('cmms.audit_update', compact('id')); -// }); // view + return view('cmms.audit_update', compact('id')); + }); // view -// Route::get('cmms/all', 'Api\CMMSController@index'); // api + Route::get('cmms/all', 'Api\CMMSController@index'); // api // Route::post('cmms/create', 'Api\CMMSController@store'); // api // Route::get('cmms/provinces/all', 'Api\CMMSController@getProvinces'); // api -// Route::post('cmms/{id}/edit', 'Api\CMMSController@update'); // api + Route::post('cmms/{id}/edit', 'Api\CMMSController@update'); // api // Route::resource('road-items', 'RoadItemsProjectController')->except([ @@ -259,7 +259,7 @@ Route::post('users/delete', 'UserController@destroy'); // Route::get('public/projects/ristat', 'UserController@getRoadItemsProjectsStat'); // Route::get('public/projects/getrirpadmin/{id}', 'UserController@getAdminProvinceProjectsItem'); -// Route::get('/karbarlist_old', 'View\UserController@showKarbarlist')->middleware(['auth', 'confirmUser'])->name('show.usermanagement'); + Route::get('/karbarlist_old', 'View\UserController@showKarbarlist')->middleware(['auth', 'confirmUser'])->name('show.usermanagement'); // // Route::get('/profile-getinfo', 'UserController@profile'); @@ -570,7 +570,7 @@ Route::get('camp/all', 'CampController@index'); // Route::post('webapi/camp/edit', 'CampController@edit'); Route::post('camp/update', 'CampController@update'); // Route::post('camp/delete', 'CampController@destroy'); -// Route::post('camp/get', 'CampController@show'); +Route::post('camp/get', 'CampController@show'); // Route::get('camp/map/{id}', 'CampController@show_on_map'); // /// new template @@ -782,8 +782,8 @@ Route::get('webapi/getuser/province-perm', 'Api\UserDataController@getUserProvin // Route::get('webapi/cmms/all', 'Api\CMMSController@index'); // Route::post('webapi/cmms/create', 'Api\CMMSController@store'); // Route::post('webapi/cmms/machine', 'Api\CMMSController@getByMachineCode'); -// Route::get('webapi/cmms/provinces/all', 'Api\CMMSController@getProvinces'); -// Route::post('webapi/cmms/search', 'Api\CMMSController@search'); +Route::get('webapi/cmms/provinces/all', 'Api\CMMSController@getProvinces'); +Route::post('webapi/cmms/search', 'Api\CMMSController@search'); // Route::middleware('cors:api')->get('webapi/resdevlp/all', 'ResearchDevController@index'); // Route::middleware('cors:api')->post('webapi/resdevlp/add', 'ResearchDevController@store'); @@ -827,7 +827,7 @@ Route::get('webapi/getuser/province-perm', 'Api\UserDataController@getUserProvin // Route::get('webapi/cmms/public/all', 'Api\CMMSController@publicIndex'); // Route::get('webapi/cmms/cities', 'Api\CMMSController@get_cities'); -// Route::middleware('cors:api')->get('webapi/cmms/getVehicleData', 'Api\CMMSController@getVehicleData'); +Route::middleware('cors:api')->get('webapi/cmms/getVehicleData', 'Api\CMMSController@getVehicleData'); @@ -1456,9 +1456,9 @@ Route::get('get_all_accident_for_data_mining', 'DailyAccidentController@getAllAc // Route::get('/rahdari-points-table', function () { // return redirect(route('v2.dashboard')); // }); -// // Route::get('/cmms-audit', function () { -// // return redirect(route('v2.dashboard')); -// // }); +// Route::get('/cmms-audit', function () { +// return redirect(route('v2.dashboard')); +// }); // Route::get('/AxisReport', function () { // return redirect(route('v2.dashboard')); // });