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

uncomment the routes

Browse Source
This commit is contained in:
Witel Group
2024-02-24 10:40:20 +00:00
parent 5459c77829
commit 56d5a433b4
13 changed files with 110 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Facades/Sms/SmsClass.php
View File

@@ -14,6 +14,7 @@ class SmsClass
{ {
if (App::environment('production')) { if (App::environment('production')) {
$client = new SoapClient("http://sms1000.ir/webservice/sms.asmx?WSDL"); $client = new SoapClient("http://sms1000.ir/webservice/sms.asmx?WSDL");
$date = date('d-m-y h:i:s'); $date = date('d-m-y h:i:s');
$date = str_replace(" ", "T", $date); $date = str_replace(" ", "T", $date);

5
app/Http/Controllers/NewRandDCtrl.php
View File

@@ -15,6 +15,7 @@ use Webpatser\Uuid\Uuid;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use App\Models\RandDVoting; use App\Models\RandDVoting;
use Illuminate\Support\Str;
use App\Models\RandDVotingPaperAnswer; use App\Models\RandDVotingPaperAnswer;
class NewRandDCtrl extends Controller class NewRandDCtrl extends Controller
@@ -204,7 +205,7 @@ class NewRandDCtrl extends Controller
} }
} }
// Make Unique Code // Make Unique Code
$uuid = Uuid::generate(); $uuid = Str::uuid();
// Upload Final report 1 // Upload Final report 1
if ($request->has('proj_rfp_file')) { if ($request->has('proj_rfp_file')) {
@@ -308,7 +309,7 @@ class NewRandDCtrl extends Controller
} }
// Make Unique Code // Make Unique Code
$uuid = Uuid::generate(); $uuid = Str::uuid();
// Upload Final report 1 // Upload Final report 1
$rfp_file = $newRandD->rfp_file; $rfp_file = $newRandD->rfp_file;

3
app/Http/Controllers/ResearchDevController.php
View File

@@ -11,6 +11,7 @@ use Illuminate\Support\Facades\Auth;
use App\Models\SetadProvince; use App\Models\SetadProvince;
use phpDocumentor\Reflection\Utils; use phpDocumentor\Reflection\Utils;
use Webpatser\Uuid\Uuid; use Webpatser\Uuid\Uuid;
use Illuminate\Support\Str;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
class ResearchDevController extends Controller class ResearchDevController extends Controller
@@ -370,7 +371,7 @@ class ResearchDevController extends Controller
} }
// Make Unique Code // Make Unique Code
$uuid = Uuid::generate(); $uuid = Str::uuid();
switch ($request->domain_id) { switch ($request->domain_id) {

70
public/dist/js/RandD.js vendored
View File

@@ -12,13 +12,13 @@ $(document).ready(function () {
activeTab = $("#darhaleejra").data('active') activeTab = $("#darhaleejra").data('active')
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/research_members", url: "/RandD/research_members",
success: function (res) { success: function (res) {
var people = res.data; var people = res.data;
for (let i = 0; i < people.length; i++) { for (let i = 0; i < people.length; i++) {
showpeople = showpeople =
showpeople + showpeople +
'<li class="splide__slide"><div class="splide__slide__container"><img src="https://rms.rmto.ir/' + '<li class="splide__slide"><div class="splide__slide__container"><img src="/' +
people[i].member_url + people[i].member_url +
'" alt=""></div>\ '" alt=""></div>\
<div class="showmember">\ <div class="showmember">\
@@ -95,7 +95,7 @@ $(document).ready(function () {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/interface_members", url: "/RandD/interface_members",
success: function (res) { success: function (res) {
append_interface(res) append_interface(res)
}, },
@@ -106,7 +106,7 @@ $(document).ready(function () {
function all_RandDCounter() { function all_RandDCounter() {
$.ajax({ $.ajax({
url: "https://rms.rmto.ir/RandD/statics", url: "/RandD/statics",
type: "GET", type: "GET",
beforeSend: function () { beforeSend: function () {
showLoaderScreen(); showLoaderScreen();
@@ -197,7 +197,7 @@ $("#darhaleejra").on("click", function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/homepage", url: "/RandD/homepage",
success: function (data) { success: function (data) {
ejra = data.data; ejra = data.data;
$("#body_khateme").empty(); $("#body_khateme").empty();
@@ -226,7 +226,7 @@ $("#darhaleejra").on("click", function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=1", url: "/RandD/search?search=" + search + "&type=1",
success: function (data) { success: function (data) {
ejra = data.data; ejra = data.data;
$("#body_khateme").empty(); $("#body_khateme").empty();
@@ -265,7 +265,7 @@ $("#khatemeyafte").on("click", function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/homepage", url: "/RandD/homepage",
success: function (data) { success: function (data) {
khateme = data.data; khateme = data.data;
console.log("all", khateme[0]); console.log("all", khateme[0]);
@@ -274,10 +274,10 @@ $("#khatemeyafte").on("click", function () {
if (khateme[index].contract_status == 2) { if (khateme[index].contract_status == 2) {
function returnkhateme() { function returnkhateme() {
var btnFiles = ''; var btnFiles = '';
if (khateme[index].final_report_one) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_one) btnFiles += `<a href="/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_two) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_two) btnFiles += `<a href="/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_three) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_three) btnFiles += `<a href="/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_four) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_four) btnFiles += `<a href="/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
return ( return (
'\ '\
<div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\ <div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\
@@ -300,7 +300,7 @@ $("#khatemeyafte").on("click", function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=2", url: "/RandD/search?search=" + search + "&type=2",
success: function (data) { success: function (data) {
khateme = data.data; khateme = data.data;
console.log("all", khateme[0]); console.log("all", khateme[0]);
@@ -308,10 +308,10 @@ $("#khatemeyafte").on("click", function () {
for (let index = 0; index < khateme.length; index++) { for (let index = 0; index < khateme.length; index++) {
function returnkhateme() { function returnkhateme() {
var btnFiles = ''; var btnFiles = '';
if (khateme[index].final_report_one) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_one) btnFiles += `<a href="/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_two) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_two) btnFiles += `<a href="/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_three) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_three) btnFiles += `<a href="/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_four) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_four) btnFiles += `<a href="/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
return ( return (
'\ '\
<div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\ <div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\
@@ -345,7 +345,7 @@ $("#tahtebaresi").on("click", function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/committee_projects", url: "/RandD/committee_projects",
success: function (data) { success: function (data) {
baresi = data.data; baresi = data.data;
console.log("all", baresi[0]); console.log("all", baresi[0]);
@@ -371,7 +371,7 @@ $("#tahtebaresi").on("click", function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=3", url: "/RandD/search?search=" + search + "&type=3",
success: function (data) { success: function (data) {
baresi = data.data; baresi = data.data;
console.log("all", baresi[0]); console.log("all", baresi[0]);
@@ -401,7 +401,7 @@ $(".shakhsi").on("click", function () {
$("#modalCenter").modal("show"); $("#modalCenter").modal("show");
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/statics", url: "/RandD/statics",
success: function (data) { success: function (data) {
komite = data.data.aazaye_comite; komite = data.data.aazaye_comite;
console.log("all", komite[0]); console.log("all", komite[0]);
@@ -427,7 +427,7 @@ $(".shakhsi").on("click", function () {
}); });
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/setad-province/all", url: "/RandD/setad-province/all",
success: function (data) { success: function (data) {
allpro = data.data; allpro = data.data;
// console.log("all", ); // console.log("all", );
@@ -489,7 +489,7 @@ $('#input-search').on('input', function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/homepage", url: "/RandD/homepage",
success: function (data) { success: function (data) {
ejra = data.data; ejra = data.data;
$("#body_khateme").empty(); $("#body_khateme").empty();
@@ -518,7 +518,7 @@ $('#input-search').on('input', function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=1", url: "/RandD/search?search=" + search + "&type=1",
success: function (data) { success: function (data) {
ejra = data.data; ejra = data.data;
$("#body_khateme").empty(); $("#body_khateme").empty();
@@ -548,7 +548,7 @@ $('#input-search').on('input', function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/homepage", url: "/RandD/homepage",
success: function (data) { success: function (data) {
khateme = data.data; khateme = data.data;
console.log("all", khateme[0]); console.log("all", khateme[0]);
@@ -557,10 +557,10 @@ $('#input-search').on('input', function () {
if (khateme[index].contract_status == 2) { if (khateme[index].contract_status == 2) {
function returnkhateme() { function returnkhateme() {
var btnFiles = ''; var btnFiles = '';
if (khateme[index].final_report_one) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_one) btnFiles += `<a href="/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_two) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_two) btnFiles += `<a href="/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_three) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_three) btnFiles += `<a href="/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_four) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_four) btnFiles += `<a href="/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
return ( return (
'\ '\
<div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\ <div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\
@@ -583,7 +583,7 @@ $('#input-search').on('input', function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=2", url: "/RandD/search?search=" + search + "&type=2",
success: function (data) { success: function (data) {
khateme = data.data; khateme = data.data;
console.log("all", khateme[0]); console.log("all", khateme[0]);
@@ -591,10 +591,10 @@ $('#input-search').on('input', function () {
for (let index = 0; index < khateme.length; index++) { for (let index = 0; index < khateme.length; index++) {
function returnkhateme() { function returnkhateme() {
var btnFiles = ''; var btnFiles = '';
if (khateme[index].final_report_one) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_one) btnFiles += `<a href="/${khateme[index].final_report_one}" title="قرارداد و شرح خدمات" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_two) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_two) btnFiles += `<a href="/${khateme[index].final_report_two}" title="صورتجلسه تحویل قطعی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_three) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_three) btnFiles += `<a href="/${khateme[index].final_report_three}" title="مدارک تکمیلی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
if (khateme[index].final_report_four) btnFiles += `<a href="https://rms.rmto.ir/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>` if (khateme[index].final_report_four) btnFiles += `<a href="/${khateme[index].final_report_four}" title="گزارش نهایی" class="btn btn-default btn-sm mx-1"><i class="fas fa-download"></i></a>`
return ( return (
'\ '\
<div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\ <div style="border-bottom: 2px solid #ff5c0f; padding-bottom: 10px; padding-top: 10px;">\
@@ -619,7 +619,7 @@ $('#input-search').on('input', function () {
if (search == '') { if (search == '') {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/committee_projects", url: "/RandD/committee_projects",
success: function (data) { success: function (data) {
baresi = data.data; baresi = data.data;
console.log("all", baresi[0]); console.log("all", baresi[0]);
@@ -645,7 +645,7 @@ $('#input-search').on('input', function () {
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "https://rms.rmto.ir/RandD/search?search=" + search + "&type=3", url: "/RandD/search?search=" + search + "&type=3",
success: function (data) { success: function (data) {
baresi = data.data; baresi = data.data;
console.log("all", baresi[0]); console.log("all", baresi[0]);
@@ -693,7 +693,7 @@ function append_interface(res) {
// `<div class="slide" data-slide-index="${i}">${i}</div>` // `<div class="slide" data-slide-index="${i}">${i}</div>`
// } // }
for (let i = 0; i < data_inter.length; i++) { for (let i = 0; i < data_inter.length; i++) {
test = test + `<div class="slide" data-slide-index="${i}"><div class="interface_imge"><img src="https://rms.rmto.ir/${data_inter[i].member_url}"><div class="member-style mt-1"><span>${data_inter[i].member_name}</span><span>${data_inter[i].member_duty}</span></div></div></div>` test = test + `<div class="slide" data-slide-index="${i}"><div class="interface_imge"><img src="/${data_inter[i].member_url}"><div class="member-style mt-1"><span>${data_inter[i].member_name}</span><span>${data_inter[i].member_duty}</span></div></div></div>`
} }
$(".owl-carousel").append(test) $(".owl-carousel").append(test)

32
public/dist/js/RandFirst.js vendored
View File

@@ -4,10 +4,10 @@ var edit;
var idEdit; var idEdit;
var provinces = []; var provinces = [];
var myfile = ""; var myfile = "";
var RandD_table = "https://rms.rmto.ir/RandD/projects/all"; var RandD_table = "/RandD/projects/all";
var RandD_table_update = "https://rms.rmto.ir/RandD/projects/update"; var RandD_table_update = "/RandD/projects/update";
var RandD_table_delete = "https://rms.rmto.ir/RandD/projects/delete"; var RandD_table_delete = "/RandD/projects/delete";
var RandD_table_add = "https://rms.rmto.ir/RandD/projects/add"; var RandD_table_add = "/RandD/projects/add";
var isAdmin = false; var isAdmin = false;
var completepic = 0; var completepic = 0;
var RandDAgents = 0; var RandDAgents = 0;
@@ -18,12 +18,12 @@ var maxagent = 2;
var currAgentcnt = 1; var currAgentcnt = 1;
var tableOnWork; var tableOnWork;
var CanSubmit; var CanSubmit;
var serverUp = "https://rms.rmto.ir/public/uploads/"; var serverUp = "/public/uploads/";
var newplan_all_url = "https://rms.rmto.ir/RandD/proposed_projects/all"; var newplan_all_url = "/RandD/proposed_projects/all";
var newplan_add_url = "https://rms.rmto.ir/RandD/proposed_projects/add"; var newplan_add_url = "/RandD/proposed_projects/add";
var newplan_del_url = "https://rms.rmto.ir/RandD/proposed_projects/delete"; var newplan_del_url = "/RandD/proposed_projects/delete";
var api_url = "https://rms.rmto.ir/RandD"; var api_url = "/RandD";
var webapi_url = "https://rms.rmto.ir/RandD"; var webapi_url = "/RandD";
$.fn.dataTable.ext.errMode = "none"; $.fn.dataTable.ext.errMode = "none";
@@ -1196,7 +1196,7 @@ $("#RandD").on("click", "button.downloadpdf", function () {
var row = table.row(tr); var row = table.row(tr);
var final_report_one = row.data().final_report_one; var final_report_one = row.data().final_report_one;
console.log("final_report_one", 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 () { $("#RandD").on("click", "button.downloadpdf2", function () {
window.location window.location
@@ -1205,7 +1205,7 @@ $("#RandD").on("click", "button.downloadpdf2", function () {
var row = table.row(tr); var row = table.row(tr);
var final_report_two = row.data().final_report_two; var final_report_two = row.data().final_report_two;
console.log("final_report_two", 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 () { $("#RandD").on("click", "button.downloadpdf3", function () {
window.location window.location
@@ -1214,7 +1214,7 @@ $("#RandD").on("click", "button.downloadpdf3", function () {
var row = table.row(tr); var row = table.row(tr);
var final_report_three = row.data().final_report_three; var final_report_three = row.data().final_report_three;
console.log("final_report_three", 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 () { $("#RandD").on("click", "button.downloadpdf4", function () {
window.location window.location
@@ -1223,7 +1223,7 @@ $("#RandD").on("click", "button.downloadpdf4", function () {
var row = table.row(tr); var row = table.row(tr);
var final_report_four = row.data().final_report_four; var final_report_four = row.data().final_report_four;
console.log("final_report_four", 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 () { $("#RandD").on("click", "button.details-control", function () {
//new add after upload //new add after upload
@@ -1604,7 +1604,7 @@ $("#submitNewRow_new").on("click", function () {
} else { } else {
showLoaderScreen(); showLoaderScreen();
$.ajax({ $.ajax({
url: "https://rms.rmto.ir/RandD/projects/add", url: "/RandD/projects/add",
type: "POST", type: "POST",
data: formData, data: formData,
headers: { headers: {
@@ -1803,7 +1803,7 @@ $("#submitNewRow").on("click", function () {
}); });
} }
$.ajax({ $.ajax({
url: "https://rms.rmto.ir/RandD/projects/update/" + idEdit, url: "/RandD/projects/update/" + idEdit,
type: "POST", type: "POST",
headers: { headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')

32
public/dist/js/RandSecond.js vendored
View File

@@ -4,10 +4,10 @@ var edit;
var idEdit; var idEdit;
var provinces = []; var provinces = [];
var myfile = ""; var myfile = "";
var RandD_table = "https://rms.rmto.ir/RandD/projects/all"; var RandD_table = "/RandD/projects/all";
var RandD_table_update = "https://rms.rmto.ir/RandD/projects/update"; var RandD_table_update = "/RandD/projects/update";
var RandD_table_delete = "https://rms.rmto.ir/RandD/projects/delete"; var RandD_table_delete = "/RandD/projects/delete";
var RandD_table_add = "https://rms.rmto.ir/RandD/projects/add"; var RandD_table_add = "/RandD/projects/add";
var isAdmin = false; var isAdmin = false;
var completepic = 0; var completepic = 0;
var RandDAgents = 0; var RandDAgents = 0;
@@ -18,11 +18,11 @@ var maxagent = 2;
var currAgentcnt = 1; var currAgentcnt = 1;
var tableOnWork; var tableOnWork;
var CanSubmit; var CanSubmit;
var serverUp = "https://rms.rmto.ir/public/uploads/"; var serverUp = "/public/uploads/";
var newplan_all_url = "https://rms.rmto.ir/RandD/proposed_projects/all"; var newplan_all_url = "/RandD/proposed_projects/all";
var newplan_add_url = "https://rms.rmto.ir/RandD/proposed_projects/add"; var newplan_add_url = "/RandD/proposed_projects/add";
var newplan_del_url = "https://rms.rmto.ir/RandD/proposed_projects/delete"; var newplan_del_url = "/RandD/proposed_projects/delete";
var api_url = "https://rms.rmto.ir/RandD"; var api_url = "/RandD";
var tableParticipants; var tableParticipants;
var tableAnswerForm; var tableAnswerForm;
var ideditcol var ideditcol
@@ -818,7 +818,7 @@ $(document).on('click', '#btn_reject_send', function () {
let formData = new FormData(); let formData = new FormData();
formData.append("reject_description", desc); formData.append("reject_description", desc);
$.ajax({ $.ajax({
url: 'https://rms.rmto.ir/RandD/proposed_projects/reject/' + id, url: '/RandD/proposed_projects/reject/' + id,
type: "POST", type: "POST",
data: formData, data: formData,
headers: { headers: {
@@ -2139,7 +2139,7 @@ $("#submitEditProject").on("click", function () {
console.log(pair[0] + ', ' + pair[1]); console.log(pair[0] + ', ' + pair[1]);
} }
$.ajax({ $.ajax({
url: "https://rms.rmto.ir/RandD/proposed_projects/edit/" + ideditcol, url: "/RandD/proposed_projects/edit/" + ideditcol,
type: "POST", type: "POST",
headers: { headers: {
'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') '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 row = newtable.row(tr);
var rfp_file = row.data().rfp_file; var rfp_file = row.data().rfp_file;
// console.log("rfp_file", 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 () { $("#RandDnew").on("click", "button.creditor_data", function () {
$("#showregbyfamily").modal("show"); $("#showregbyfamily").modal("show");
@@ -2245,7 +2245,7 @@ $(document).on('click', '.btn-vote-start', function () {
var id = row.data().id; var id = row.data().id;
$.ajax({ $.ajax({
async: false, async: false,
url: "https://rms.rmto.ir/RandD/proposed_projects/voting/start/" + id, url: "/RandD/proposed_projects/voting/start/" + id,
type: "POST", type: "POST",
headers: { headers: {
accept: "application/json", accept: "application/json",
@@ -2290,7 +2290,7 @@ $(document).on('click', '.btn-vote-finish', function () {
var id = row.data().id; var id = row.data().id;
$.ajax({ $.ajax({
async: false, async: false,
url: "https://rms.rmto.ir/RandD/proposed_projects/voting/end/" + id, url: "/RandD/proposed_projects/voting/end/" + id,
type: "POST", type: "POST",
headers: { headers: {
accept: "application/json", accept: "application/json",
@@ -2325,7 +2325,7 @@ $(document).on('click', '.btn-vote-result', function () {
var id = row.data().id; var id = row.data().id;
$.ajax({ $.ajax({
async: false, async: false,
url: "https://rms.rmto.ir/RandD/proposed_projects/voting/result/" + id, url: "/RandD/proposed_projects/voting/result/" + id,
type: "GET", type: "GET",
headers: { headers: {
accept: "application/json", accept: "application/json",
@@ -2420,7 +2420,7 @@ $(document).on('click', '.btn-answer-form', function () {
var id = row.data().id; var id = row.data().id;
$.ajax({ $.ajax({
async: false, 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", type: "GET",
headers: { headers: {
accept: "application/json", accept: "application/json",

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

@@ -2,7 +2,7 @@
DEFAULT_ACTION_ID = 1; DEFAULT_ACTION_ID = 1;
DEFALUT_YEAR = moment().format('jYYYY'); DEFALUT_YEAR = moment().format('jYYYY');
DEFAULT_TIMER = 300; DEFAULT_TIMER = 300;
DEFAULT_URL = "https://rms.rmto.ir/"; DEFAULT_URL = "/";
DEFAULT_API = "api/bi/"; DEFAULT_API = "api/bi/";
DEFAULT_WEB = "bi/"; DEFAULT_WEB = "bi/";

2
resources/views/errors/minimal.blade.php
View File

@@ -100,7 +100,7 @@
</div> </div>
</div> </div>
<div class="mt-3"> <div class="mt-3">
<button class="home-btn btn"><a href="https://rms.rmto.ir">بازگشت به صفحه اصلی</a></button> <button class="home-btn btn"><a href="/">بازگشت به صفحه اصلی</a></button>
</div> </div>
</div> </div>
</body> </body>

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

@@ -25,7 +25,7 @@
</div> </div>
<div class="mx-2 my-2 d-flex flex-column justify-content-center text-center"> <div class="mx-2 my-2 d-flex flex-column justify-content-center text-center">
<p class="p-1">سامانه جامع راهداری</p> <p class="p-1">سامانه جامع راهداری</p>
<a class="p-1" href="https://rms.rmto.ir/" target="_blank"><small>rms.rmto.ir</small></a> <a class="p-1" href="/" target="_blank"><small>rms.rmto.ir</small></a>
</div> </div>
</div> </div>
</div> </div>
@@ -55,7 +55,7 @@
<li class="d-flex align-items-center header-item">گزارش محوری</li> <li class="d-flex align-items-center header-item">گزارش محوری</li>
</a> </a>
<a href="https://rms.rmto.ir/bi"> <a href="/bi">
<li class="d-flex align-items-center header-item">هوش تجاری (BI)</li> <li class="d-flex align-items-center header-item">هوش تجاری (BI)</li>
</a> </a>
@@ -88,7 +88,7 @@
<li class="d-flex align-items-center header-item"> <li class="d-flex align-items-center header-item">
سامانه های راهداری <i class="mr-2 fa fa-angle-left arrow-icon"></i> سامانه های راهداری <i class="mr-2 fa fa-angle-left arrow-icon"></i>
<ul class="header-sub-items d-none"> <ul class="header-sub-items d-none">
<a href="https://rms.rmto.ir/RandD"> <a href="/RandD">
<li class="d-flex align-items-center header-item">تحقیق و توسعه</li> <li class="d-flex align-items-center header-item">تحقیق و توسعه</li>
</a> </a>
<a href="http://roadams.rmto.ir/"> <a href="http://roadams.rmto.ir/">
@@ -109,7 +109,7 @@
</a> </a>
</ul> </ul>
</li> </li>
{{-- <a href="https://rms.rmto.ir/bi"> {{-- <a href="/bi">
<li class="d-flex align-items-center header-item">هوش تجاری (BI)</li> <li class="d-flex align-items-center header-item">هوش تجاری (BI)</li>
</a> --}} </a> --}}

4
resources/views/layouts/header.blade.php
View File

@@ -800,7 +800,7 @@
<li class="nav-item navbar-it"> <li class="nav-item navbar-it">
<div class="dropdown"> <div class="dropdown">
<a class="" href="https://rms.rmto.ir/bi" target="_blank"> <a class="" href="/bi" target="_blank">
<div class="havig"> <div class="havig">
<div> <div>
<img src="{{ asset('dist/images/new-design/projectBI.svg') }}" width="30" <img src="{{ asset('dist/images/new-design/projectBI.svg') }}" width="30"
@@ -819,7 +819,7 @@
<li class="nav-item navbar-it"> <li class="nav-item navbar-it">
<div class="dropdown"> <div class="dropdown">
<a class="" href="https://rms.rmto.ir/RandD" target="_blank"> <a class="" href="/RandD" target="_blank">
<div class="havig"> <div class="havig">
<div> <div>

4
resources/views/rmto-preview/pages/RandD.blade.php
View File

@@ -692,7 +692,7 @@
<div class="container check-res-header2"> <div class="container check-res-header2">
<div class="row"> <div class="row">
<div class="col-sm-4 col-xl-3 p-0 button_res_checker1"> <div class="col-sm-4 col-xl-3 p-0 button_res_checker1">
<a href="https://rms.rmto.ir/RandDFirst" target="_blank" <a href="/RandDFirst" target="_blank"
class="btn btn-light rounded-0 btn-block border"> class="btn btn-light rounded-0 btn-block border">
<span class="pl-2"> <span class="pl-2">
ثبت پروژه در ثبت پروژه در
@@ -707,7 +707,7 @@
<div class="col-sm-5 col-xl-4 p-0 button_res_checker2"> <div class="col-sm-5 col-xl-4 p-0 button_res_checker2">
<a href="https://rms.rmto.ir/RandDSecond" target="_blank" <a href="/RandDSecond" target="_blank"
class="btn btn-light rounded-0 btn-block border"> class="btn btn-light rounded-0 btn-block border">
<span class="pl-2"> <span class="pl-2">
ثبت پروژه ثبت پروژه

32
routes/api.php
View File

@@ -382,22 +382,22 @@ Route::middleware('cors:api')->get('/get-items-and-subs', 'TotalRahdariProjectsR
// /// Bi APIs | Amirreza // /// Bi APIs | Amirreza
// Route::middleware('cors:api')->get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts'); // 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', 'Api\BiController@getDiagram');
// Route::middleware('cors:api')->get('bi/status-diagram-tile', 'Api\BiController@getDiagramForTile'); 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/rahdari-activity', 'Api\BiController@getItems');
// Route::middleware('cors:api')->get('bi/road-infrastructure', 'Api\BiController@TollhousesCount'); 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/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-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-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/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/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-numbers-accident-points', 'Api\BiController@CountByNumbersAccidentPoints');
// Route::middleware('cors:api')->get('bi/count-accident-points', 'Api\BiController@CountAccidentPoints'); 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/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-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/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/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/total-length-damaged-axes', 'Api\BiController@totalLengthDamagedAxes');
// /// bama begin // /// bama begin
// // Route::get('bama', 'BamaController@showList'); // // Route::get('bama', 'BamaController@showList');

22
routes/web.php
View File

@@ -210,7 +210,7 @@ Route::get('rmtologin', function () {
// 'show', 'update', 'destroy' // 'show', 'update', 'destroy'
// ]); // ]);
// Route::get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts'); Route::get('bi/subtitleCounts', 'Api\BiController@getSubtitleCounts');
// Route::view('rmtobi', 'rmto-preview.BI'); // Route::view('rmtobi', 'rmto-preview.BI');
// Route::get('project_list', 'RoadConstructionProjectController@index'); // Route::get('project_list', 'RoadConstructionProjectController@index');
@@ -608,17 +608,17 @@ Route::post('camp/update', 'CampController@update');
// })->middleware(['auth', 'confirmUser']); // })->middleware(['auth', 'confirmUser']);
// // xxx // // xxx
// Route::get('/RandD', function () { Route::get('/RandD', function () {
// return view('rmto-preview.pages.RandD'); return view('rmto-preview.pages.RandD');
// })->middleware(['auth', 'confirmUser']); })->middleware(['auth', 'confirmUser']);
// Route::get('/RandDFirst', function () { Route::get('/RandDFirst', function () {
// return view('rmto-preview.pages.RandFirst'); return view('rmto-preview.pages.RandFirst');
// })->middleware(['auth', 'confirmUser']); })->middleware(['auth', 'confirmUser']);
// Route::get('/RandDSecond', function () { Route::get('/RandDSecond', function () {
// return view('rmto-preview.pages.RandSecond '); return view('rmto-preview.pages.RandSecond ');
// })->middleware(['auth', 'confirmUser']); })->middleware(['auth', 'confirmUser']);
// Route::get('/fastnewReact', function () { // Route::get('/fastnewReact', function () {
// return view('rmto-preview.pages.fastnewReact'); // 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('/winter-camp', 'View\WinterCampController@view')->middleware(['auth', 'confirmUser']);
// Route::get('/randd/voting/{id}', 'View\RandDController@showVoteSinglePage'); // Route::get('/randd/voting/{id}', 'View\RandDController@showVoteSinglePage');
// Route::get('bi', 'View\BiController@show'); Route::get('bi', 'View\BiController@show');
// Route::get('reports', function () { // Route::get('reports', function () {
// return view('rmto-preview.excel-report'); // return view('rmto-preview.excel-report');