diff --git a/app/Facades/Sms/SmsClass.php b/app/Facades/Sms/SmsClass.php index d0d62e1f..537a07e3 100644 --- a/app/Facades/Sms/SmsClass.php +++ b/app/Facades/Sms/SmsClass.php @@ -13,6 +13,7 @@ class SmsClass public function sendSms($mobile, $msg) { if (App::environment('production')) { + $client = new SoapClient("http://sms1000.ir/webservice/sms.asmx?WSDL"); $date = date('d-m-y h:i:s'); diff --git a/app/Http/Controllers/NewRandDCtrl.php b/app/Http/Controllers/NewRandDCtrl.php index aafdc533..8eaf210b 100644 --- a/app/Http/Controllers/NewRandDCtrl.php +++ b/app/Http/Controllers/NewRandDCtrl.php @@ -15,6 +15,7 @@ use Webpatser\Uuid\Uuid; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Auth; use App\Models\RandDVoting; +use Illuminate\Support\Str; use App\Models\RandDVotingPaperAnswer; class NewRandDCtrl extends Controller @@ -204,7 +205,7 @@ class NewRandDCtrl extends Controller } } // Make Unique Code - $uuid = Uuid::generate(); + $uuid = Str::uuid(); // Upload Final report 1 if ($request->has('proj_rfp_file')) { @@ -308,7 +309,7 @@ class NewRandDCtrl extends Controller } // Make Unique Code - $uuid = Uuid::generate(); + $uuid = Str::uuid(); // Upload Final report 1 $rfp_file = $newRandD->rfp_file; diff --git a/app/Http/Controllers/ResearchDevController.php b/app/Http/Controllers/ResearchDevController.php index c8ee087f..a1096f91 100644 --- a/app/Http/Controllers/ResearchDevController.php +++ b/app/Http/Controllers/ResearchDevController.php @@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Auth; use App\Models\SetadProvince; use phpDocumentor\Reflection\Utils; use Webpatser\Uuid\Uuid; +use Illuminate\Support\Str; use Illuminate\Support\Facades\Storage; class ResearchDevController extends Controller @@ -370,7 +371,7 @@ class ResearchDevController extends Controller } // Make Unique Code - $uuid = Uuid::generate(); + $uuid = Str::uuid(); switch ($request->domain_id) { diff --git a/public/dist/js/RandD.js b/public/dist/js/RandD.js index 443c8534..2d631113 100644 --- a/public/dist/js/RandD.js +++ b/public/dist/js/RandD.js @@ -12,13 +12,13 @@ $(document).ready(function () { activeTab = $("#darhaleejra").data('active') $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/research_members", + url: "/RandD/research_members", success: function (res) { var people = res.data; for (let i = 0; i < people.length; i++) { showpeople = showpeople + - '
  • \
    \ @@ -95,7 +95,7 @@ $(document).ready(function () { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/interface_members", + url: "/RandD/interface_members", success: function (res) { append_interface(res) }, @@ -106,7 +106,7 @@ $(document).ready(function () { function all_RandDCounter() { $.ajax({ - url: "https://rms.rmto.ir/RandD/statics", + url: "/RandD/statics", type: "GET", beforeSend: function () { showLoaderScreen(); @@ -197,7 +197,7 @@ $("#darhaleejra").on("click", function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/homepage", + url: "/RandD/homepage", success: function (data) { ejra = data.data; $("#body_khateme").empty(); @@ -226,7 +226,7 @@ $("#darhaleejra").on("click", function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=1", + url: "/RandD/search?search=" + search + "&type=1", success: function (data) { ejra = data.data; $("#body_khateme").empty(); @@ -265,7 +265,7 @@ $("#khatemeyafte").on("click", function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/homepage", + url: "/RandD/homepage", success: function (data) { khateme = data.data; console.log("all", khateme[0]); @@ -274,10 +274,10 @@ $("#khatemeyafte").on("click", function () { if (khateme[index].contract_status == 2) { function returnkhateme() { var btnFiles = ''; - if (khateme[index].final_report_one) btnFiles += `` - if (khateme[index].final_report_two) btnFiles += `` - if (khateme[index].final_report_three) btnFiles += `` - if (khateme[index].final_report_four) btnFiles += `` + if (khateme[index].final_report_one) btnFiles += `` + if (khateme[index].final_report_two) btnFiles += `` + if (khateme[index].final_report_three) btnFiles += `` + if (khateme[index].final_report_four) btnFiles += `` return ( '\
    \ @@ -300,7 +300,7 @@ $("#khatemeyafte").on("click", function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=2", + url: "/RandD/search?search=" + search + "&type=2", success: function (data) { khateme = data.data; console.log("all", khateme[0]); @@ -308,10 +308,10 @@ $("#khatemeyafte").on("click", function () { for (let index = 0; index < khateme.length; index++) { function returnkhateme() { var btnFiles = ''; - if (khateme[index].final_report_one) btnFiles += `` - if (khateme[index].final_report_two) btnFiles += `` - if (khateme[index].final_report_three) btnFiles += `` - if (khateme[index].final_report_four) btnFiles += `` + if (khateme[index].final_report_one) btnFiles += `` + if (khateme[index].final_report_two) btnFiles += `` + if (khateme[index].final_report_three) btnFiles += `` + if (khateme[index].final_report_four) btnFiles += `` return ( '\
    \ @@ -345,7 +345,7 @@ $("#tahtebaresi").on("click", function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/committee_projects", + url: "/RandD/committee_projects", success: function (data) { baresi = data.data; console.log("all", baresi[0]); @@ -371,7 +371,7 @@ $("#tahtebaresi").on("click", function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=3", + url: "/RandD/search?search=" + search + "&type=3", success: function (data) { baresi = data.data; console.log("all", baresi[0]); @@ -401,7 +401,7 @@ $(".shakhsi").on("click", function () { $("#modalCenter").modal("show"); $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/statics", + url: "/RandD/statics", success: function (data) { komite = data.data.aazaye_comite; console.log("all", komite[0]); @@ -427,7 +427,7 @@ $(".shakhsi").on("click", function () { }); $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/setad-province/all", + url: "/RandD/setad-province/all", success: function (data) { allpro = data.data; // console.log("all", ); @@ -489,7 +489,7 @@ $('#input-search').on('input', function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/homepage", + url: "/RandD/homepage", success: function (data) { ejra = data.data; $("#body_khateme").empty(); @@ -518,7 +518,7 @@ $('#input-search').on('input', function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=1", + url: "/RandD/search?search=" + search + "&type=1", success: function (data) { ejra = data.data; $("#body_khateme").empty(); @@ -548,7 +548,7 @@ $('#input-search').on('input', function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/homepage", + url: "/RandD/homepage", success: function (data) { khateme = data.data; console.log("all", khateme[0]); @@ -557,10 +557,10 @@ $('#input-search').on('input', function () { if (khateme[index].contract_status == 2) { function returnkhateme() { var btnFiles = ''; - if (khateme[index].final_report_one) btnFiles += `` - if (khateme[index].final_report_two) btnFiles += `` - if (khateme[index].final_report_three) btnFiles += `` - if (khateme[index].final_report_four) btnFiles += `` + if (khateme[index].final_report_one) btnFiles += `` + if (khateme[index].final_report_two) btnFiles += `` + if (khateme[index].final_report_three) btnFiles += `` + if (khateme[index].final_report_four) btnFiles += `` return ( '\
    \ @@ -583,7 +583,7 @@ $('#input-search').on('input', function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=2", + url: "/RandD/search?search=" + search + "&type=2", success: function (data) { khateme = data.data; console.log("all", khateme[0]); @@ -591,10 +591,10 @@ $('#input-search').on('input', function () { for (let index = 0; index < khateme.length; index++) { function returnkhateme() { var btnFiles = ''; - if (khateme[index].final_report_one) btnFiles += `` - if (khateme[index].final_report_two) btnFiles += `` - if (khateme[index].final_report_three) btnFiles += `` - if (khateme[index].final_report_four) btnFiles += `` + if (khateme[index].final_report_one) btnFiles += `` + if (khateme[index].final_report_two) btnFiles += `` + if (khateme[index].final_report_three) btnFiles += `` + if (khateme[index].final_report_four) btnFiles += `` return ( '\
    \ @@ -619,7 +619,7 @@ $('#input-search').on('input', function () { if (search == '') { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/committee_projects", + url: "/RandD/committee_projects", success: function (data) { baresi = data.data; console.log("all", baresi[0]); @@ -645,7 +645,7 @@ $('#input-search').on('input', function () { } else { $.ajax({ type: "GET", - url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=3", + url: "/RandD/search?search=" + search + "&type=3", success: function (data) { baresi = data.data; console.log("all", baresi[0]); @@ -693,7 +693,7 @@ function append_interface(res) { // `
    ${i}
    ` // } for (let i = 0; i < data_inter.length; i++) { - test = test + `
    ${data_inter[i].member_name}${data_inter[i].member_duty}
    ` + test = test + `
    ${data_inter[i].member_name}${data_inter[i].member_duty}
    ` } $(".owl-carousel").append(test) diff --git a/public/dist/js/RandFirst.js b/public/dist/js/RandFirst.js index feff5102..f0136f5a 100644 --- a/public/dist/js/RandFirst.js +++ b/public/dist/js/RandFirst.js @@ -4,10 +4,10 @@ var edit; var idEdit; var provinces = []; var myfile = ""; -var RandD_table = "https://rms.rmto.ir/RandD/projects/all"; -var RandD_table_update = "https://rms.rmto.ir/RandD/projects/update"; -var RandD_table_delete = "https://rms.rmto.ir/RandD/projects/delete"; -var RandD_table_add = "https://rms.rmto.ir/RandD/projects/add"; +var RandD_table = "/RandD/projects/all"; +var RandD_table_update = "/RandD/projects/update"; +var RandD_table_delete = "/RandD/projects/delete"; +var RandD_table_add = "/RandD/projects/add"; var isAdmin = false; var completepic = 0; var RandDAgents = 0; @@ -18,12 +18,12 @@ var maxagent = 2; var currAgentcnt = 1; var tableOnWork; var CanSubmit; -var serverUp = "https://rms.rmto.ir/public/uploads/"; -var newplan_all_url = "https://rms.rmto.ir/RandD/proposed_projects/all"; -var newplan_add_url = "https://rms.rmto.ir/RandD/proposed_projects/add"; -var newplan_del_url = "https://rms.rmto.ir/RandD/proposed_projects/delete"; -var api_url = "https://rms.rmto.ir/RandD"; -var webapi_url = "https://rms.rmto.ir/RandD"; +var serverUp = "/public/uploads/"; +var newplan_all_url = "/RandD/proposed_projects/all"; +var newplan_add_url = "/RandD/proposed_projects/add"; +var newplan_del_url = "/RandD/proposed_projects/delete"; +var api_url = "/RandD"; +var webapi_url = "/RandD"; $.fn.dataTable.ext.errMode = "none"; @@ -1196,7 +1196,7 @@ $("#RandD").on("click", "button.downloadpdf", function () { var row = table.row(tr); var final_report_one = row.data().final_report_one; console.log("final_report_one", final_report_one); - window.open("https://rms.rmto.ir/" + final_report_one, '_blank') + window.open("/" + final_report_one, '_blank') }); $("#RandD").on("click", "button.downloadpdf2", function () { window.location @@ -1205,7 +1205,7 @@ $("#RandD").on("click", "button.downloadpdf2", function () { var row = table.row(tr); var final_report_two = row.data().final_report_two; console.log("final_report_two", final_report_two); - window.open("https://rms.rmto.ir/" + final_report_two, '_blank') + window.open("/" + final_report_two, '_blank') }); $("#RandD").on("click", "button.downloadpdf3", function () { window.location @@ -1214,7 +1214,7 @@ $("#RandD").on("click", "button.downloadpdf3", function () { var row = table.row(tr); var final_report_three = row.data().final_report_three; console.log("final_report_three", final_report_three); - window.open("https://rms.rmto.ir/" + final_report_three, '_blank') + window.open("/" + final_report_three, '_blank') }); $("#RandD").on("click", "button.downloadpdf4", function () { window.location @@ -1223,7 +1223,7 @@ $("#RandD").on("click", "button.downloadpdf4", function () { var row = table.row(tr); var final_report_four = row.data().final_report_four; console.log("final_report_four", final_report_four); - window.open("https://rms.rmto.ir/" + final_report_four, '_blank') + window.open("/" + final_report_four, '_blank') }); $("#RandD").on("click", "button.details-control", function () { //new add after upload @@ -1604,7 +1604,7 @@ $("#submitNewRow_new").on("click", function () { } else { showLoaderScreen(); $.ajax({ - url: "https://rms.rmto.ir/RandD/projects/add", + url: "/RandD/projects/add", type: "POST", data: formData, headers: { @@ -1803,7 +1803,7 @@ $("#submitNewRow").on("click", function () { }); } $.ajax({ - url: "https://rms.rmto.ir/RandD/projects/update/" + idEdit, + url: "/RandD/projects/update/" + idEdit, type: "POST", headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') diff --git a/public/dist/js/RandSecond.js b/public/dist/js/RandSecond.js index bfe71cb2..2b3ecd45 100644 --- a/public/dist/js/RandSecond.js +++ b/public/dist/js/RandSecond.js @@ -4,10 +4,10 @@ var edit; var idEdit; var provinces = []; var myfile = ""; -var RandD_table = "https://rms.rmto.ir/RandD/projects/all"; -var RandD_table_update = "https://rms.rmto.ir/RandD/projects/update"; -var RandD_table_delete = "https://rms.rmto.ir/RandD/projects/delete"; -var RandD_table_add = "https://rms.rmto.ir/RandD/projects/add"; +var RandD_table = "/RandD/projects/all"; +var RandD_table_update = "/RandD/projects/update"; +var RandD_table_delete = "/RandD/projects/delete"; +var RandD_table_add = "/RandD/projects/add"; var isAdmin = false; var completepic = 0; var RandDAgents = 0; @@ -18,11 +18,11 @@ var maxagent = 2; var currAgentcnt = 1; var tableOnWork; var CanSubmit; -var serverUp = "https://rms.rmto.ir/public/uploads/"; -var newplan_all_url = "https://rms.rmto.ir/RandD/proposed_projects/all"; -var newplan_add_url = "https://rms.rmto.ir/RandD/proposed_projects/add"; -var newplan_del_url = "https://rms.rmto.ir/RandD/proposed_projects/delete"; -var api_url = "https://rms.rmto.ir/RandD"; +var serverUp = "/public/uploads/"; +var newplan_all_url = "/RandD/proposed_projects/all"; +var newplan_add_url = "/RandD/proposed_projects/add"; +var newplan_del_url = "/RandD/proposed_projects/delete"; +var api_url = "/RandD"; var tableParticipants; var tableAnswerForm; var ideditcol @@ -818,7 +818,7 @@ $(document).on('click', '#btn_reject_send', function () { let formData = new FormData(); formData.append("reject_description", desc); $.ajax({ - url: 'https://rms.rmto.ir/RandD/proposed_projects/reject/' + id, + url: '/RandD/proposed_projects/reject/' + id, type: "POST", data: formData, headers: { @@ -2139,7 +2139,7 @@ $("#submitEditProject").on("click", function () { console.log(pair[0] + ', ' + pair[1]); } $.ajax({ - url: "https://rms.rmto.ir/RandD/proposed_projects/edit/" + ideditcol, + url: "/RandD/proposed_projects/edit/" + ideditcol, type: "POST", headers: { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') @@ -2173,7 +2173,7 @@ $("#RandDnew").on("click", "button.downloadpdf", function () { var row = newtable.row(tr); var rfp_file = row.data().rfp_file; // console.log("rfp_file", rfp_file); - window.open("https://rms.rmto.ir/" + rfp_file, '_blank') + window.open("/" + rfp_file, '_blank') }); $("#RandDnew").on("click", "button.creditor_data", function () { $("#showregbyfamily").modal("show"); @@ -2245,7 +2245,7 @@ $(document).on('click', '.btn-vote-start', function () { var id = row.data().id; $.ajax({ async: false, - url: "https://rms.rmto.ir/RandD/proposed_projects/voting/start/" + id, + url: "/RandD/proposed_projects/voting/start/" + id, type: "POST", headers: { accept: "application/json", @@ -2290,7 +2290,7 @@ $(document).on('click', '.btn-vote-finish', function () { var id = row.data().id; $.ajax({ async: false, - url: "https://rms.rmto.ir/RandD/proposed_projects/voting/end/" + id, + url: "/RandD/proposed_projects/voting/end/" + id, type: "POST", headers: { accept: "application/json", @@ -2325,7 +2325,7 @@ $(document).on('click', '.btn-vote-result', function () { var id = row.data().id; $.ajax({ async: false, - url: "https://rms.rmto.ir/RandD/proposed_projects/voting/result/" + id, + url: "/RandD/proposed_projects/voting/result/" + id, type: "GET", headers: { accept: "application/json", @@ -2420,7 +2420,7 @@ $(document).on('click', '.btn-answer-form', function () { var id = row.data().id; $.ajax({ async: false, - url: `https://rms.rmto.ir/RandD/proposed_projects/voting/result?user=${row.data().user_id}&vote=${row.data().vote_id}`, + url: `/RandD/proposed_projects/voting/result?user=${row.data().user_id}&vote=${row.data().vote_id}`, type: "GET", headers: { accept: "application/json", diff --git a/public/dist/js/bi.js b/public/dist/js/bi.js index 1506300a..7a461a1d 100644 --- a/public/dist/js/bi.js +++ b/public/dist/js/bi.js @@ -2,7 +2,7 @@ DEFAULT_ACTION_ID = 1; DEFALUT_YEAR = moment().format('jYYYY'); DEFAULT_TIMER = 300; -DEFAULT_URL = "https://rms.rmto.ir/"; +DEFAULT_URL = "/"; DEFAULT_API = "api/bi/"; DEFAULT_WEB = "bi/"; diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php index 115d3247..30265223 100644 --- a/resources/views/errors/minimal.blade.php +++ b/resources/views/errors/minimal.blade.php @@ -100,7 +100,7 @@
    - +
    diff --git a/resources/views/layouts/dashboard/_header.blade.php b/resources/views/layouts/dashboard/_header.blade.php index e190f332..89ffd94e 100644 --- a/resources/views/layouts/dashboard/_header.blade.php +++ b/resources/views/layouts/dashboard/_header.blade.php @@ -25,7 +25,7 @@

    سامانه جامع راهداری

    - rms.rmto.ir + rms.rmto.ir
    @@ -55,7 +55,7 @@
  • گزارش محوری
    • - +
  • هوش تجاری (BI)
    •  @@ -88,7 +88,7 @@
  • سامانه های راهداری
    • - {{-- + {{--
  • هوش تجاری (BI)
    •  --}} diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php index c8581c67..c30fd181 100644 --- a/resources/views/layouts/header.blade.php +++ b/resources/views/layouts/header.blade.php @@ -800,7 +800,7 @@
  • - +
    - +
    diff --git a/resources/views/rmto-preview/pages/RandD.blade.php b/resources/views/rmto-preview/pages/RandD.blade.php index db5be5e3..4a83b39b 100644 --- a/resources/views/rmto-preview/pages/RandD.blade.php +++ b/resources/views/rmto-preview/pages/RandD.blade.php @@ -692,7 +692,7 @@
    - ثبت پروژه در @@ -707,7 +707,7 @@
    - ثبت پروژه diff --git a/routes/api.php b/routes/api.php index 2f510a6d..a6faf33a 100644 --- a/routes/api.php +++ b/routes/api.php @@ -382,22 +382,22 @@ Route::middleware('cors:api')->get('/get-items-and-subs', 'TotalRahdariProjectsR // /// Bi APIs | Amirreza // Route::middleware('cors:api')->get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts'); -// Route::middleware('cors:api')->get('bi/status-diagram', 'Api\BiController@getDiagram'); -// Route::middleware('cors:api')->get('bi/status-diagram-tile', 'Api\BiController@getDiagramForTile'); -// Route::middleware('cors:api')->get('bi/rahdari-activity', 'Api\BiController@getItems'); -// Route::middleware('cors:api')->get('bi/road-infrastructure', 'Api\BiController@TollhousesCount'); -// Route::middleware('cors:api')->get('bi/average-progress-rahdari-projects', 'Api\BiController@averagePhysicalProgressRahdariProjects'); -// Route::middleware('cors:api')->get('bi/separation-project-type-rahdari-projects', 'Api\BiController@separationProjectTypeRahdariProjects'); -// Route::middleware('cors:api')->get('bi/separation-last-status-rahdari-projects', 'Api\BiController@separationLastStatusRahdariProjects'); -// Route::middleware('cors:api')->get('bi/separation-axis-type-rahdari-projects', 'Api\BiController@separationAxisTypeRahdariProjects'); -// Route::middleware('cors:api')->get('bi/percent-complaints-handled', 'Api\BiController@percentComplaintsHandled'); -// Route::middleware('cors:api')->get('bi/count-numbers-accident-points', 'Api\BiController@CountByNumbersAccidentPoints'); -// Route::middleware('cors:api')->get('bi/count-accident-points', 'Api\BiController@CountAccidentPoints'); -// Route::middleware('cors:api')->get('bi/road-item-project-item', 'Api\BiController@roadItemProjectItemChart'); -// Route::middleware('cors:api')->get('bi/separation-activity-type-rahdari-activities', 'Api\BiController@separationActivityTypeRahdariActivities'); -// Route::middleware('cors:api')->get('bi/separation-complain-type-rahdari-complains', 'Api\BiController@separationComplainTypeRahdariComplains'); -// Route::middleware('cors:api')->get('bi/primary-estimates-damages', 'Api\BiController@primaryEstimatesDamages'); -// Route::middleware('cors:api')->get('bi/total-length-damaged-axes', 'Api\BiController@totalLengthDamagedAxes'); +Route::middleware('cors:api')->get('bi/status-diagram', 'Api\BiController@getDiagram'); +Route::middleware('cors:api')->get('bi/status-diagram-tile', 'Api\BiController@getDiagramForTile'); +Route::middleware('cors:api')->get('bi/rahdari-activity', 'Api\BiController@getItems'); +Route::middleware('cors:api')->get('bi/road-infrastructure', 'Api\BiController@TollhousesCount'); +Route::middleware('cors:api')->get('bi/average-progress-rahdari-projects', 'Api\BiController@averagePhysicalProgressRahdariProjects'); +Route::middleware('cors:api')->get('bi/separation-project-type-rahdari-projects', 'Api\BiController@separationProjectTypeRahdariProjects'); +Route::middleware('cors:api')->get('bi/separation-last-status-rahdari-projects', 'Api\BiController@separationLastStatusRahdariProjects'); +Route::middleware('cors:api')->get('bi/separation-axis-type-rahdari-projects', 'Api\BiController@separationAxisTypeRahdariProjects'); +Route::middleware('cors:api')->get('bi/percent-complaints-handled', 'Api\BiController@percentComplaintsHandled'); +Route::middleware('cors:api')->get('bi/count-numbers-accident-points', 'Api\BiController@CountByNumbersAccidentPoints'); +Route::middleware('cors:api')->get('bi/count-accident-points', 'Api\BiController@CountAccidentPoints'); +Route::middleware('cors:api')->get('bi/road-item-project-item', 'Api\BiController@roadItemProjectItemChart'); +Route::middleware('cors:api')->get('bi/separation-activity-type-rahdari-activities', 'Api\BiController@separationActivityTypeRahdariActivities'); +Route::middleware('cors:api')->get('bi/separation-complain-type-rahdari-complains', 'Api\BiController@separationComplainTypeRahdariComplains'); +Route::middleware('cors:api')->get('bi/primary-estimates-damages', 'Api\BiController@primaryEstimatesDamages'); +Route::middleware('cors:api')->get('bi/total-length-damaged-axes', 'Api\BiController@totalLengthDamagedAxes'); // /// bama begin // // Route::get('bama', 'BamaController@showList'); diff --git a/routes/web.php b/routes/web.php index 24dc9281..f67ba5d4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -210,7 +210,7 @@ Route::get('rmtologin', function () { // 'show', 'update', 'destroy' // ]); -// Route::get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts'); + Route::get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts'); // Route::view('rmtobi', 'rmto-preview.BI'); // Route::get('project_list', 'RoadConstructionProjectController@index'); @@ -608,17 +608,17 @@ Route::post('camp/update', 'CampController@update'); // })->middleware(['auth', 'confirmUser']); // // xxx -// Route::get('/RandD', function () { -// return view('rmto-preview.pages.RandD'); -// })->middleware(['auth', 'confirmUser']); +Route::get('/RandD', function () { + return view('rmto-preview.pages.RandD'); +})->middleware(['auth', 'confirmUser']); -// Route::get('/RandDFirst', function () { -// return view('rmto-preview.pages.RandFirst'); -// })->middleware(['auth', 'confirmUser']); +Route::get('/RandDFirst', function () { + return view('rmto-preview.pages.RandFirst'); +})->middleware(['auth', 'confirmUser']); -// Route::get('/RandDSecond', function () { -// return view('rmto-preview.pages.RandSecond '); -// })->middleware(['auth', 'confirmUser']); +Route::get('/RandDSecond', function () { + return view('rmto-preview.pages.RandSecond '); +})->middleware(['auth', 'confirmUser']); // Route::get('/fastnewReact', function () { // return view('rmto-preview.pages.fastnewReact'); @@ -701,7 +701,7 @@ Route::get('/profile', function () { // Route::get('/winter-camp', 'View\WinterCampController@view')->middleware(['auth', 'confirmUser']); // Route::get('/randd/voting/{id}', 'View\RandDController@showVoteSinglePage'); -// Route::get('bi', 'View\BiController@show'); +Route::get('bi', 'View\BiController@show'); // Route::get('reports', function () { // return view('rmto-preview.excel-report');