RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/findServerErrorByAmir' into 'develop'

Browse Source 
uncomment the vital routes

See merge request witelgroup/rms_v2!2
This commit is contained in:
Hamidreza Ranjbarpour
2024-02-27 10:53:05 +00:00
parent 25e38007c8 5e41e9f47a
commit 815751b15d
8 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/CMMSController.php
View File

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

2
public/dist/js/mashinalat_create.js vendored
View File

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

2
public/dist/js/mashinalat_index.js vendored
View File

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

2
public/dist/js/mashinalat_update.js vendored
View File

@@ -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 () {

2
public/version2/js/dashboard_pages/winter_camp/map.js
View File

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

2
resources/views/layouts/dashboard/_header.blade.php
View File

@@ -78,7 +78,7 @@
@endcan
</ul>
</li>
<a href="https://rms.rmto.ir/cmms-audit">
<a href="/cmms-audit">
<li class="header-sub-item mb-1 mr-1 d-flex align-items-center">ممیزی ماشین آلات راهداری
کشور</li>
</a>

8
routes/api.php
View File

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

40
routes/web.php
View File

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