From 5855d179d05099a52aa51de0ae65674c21d1b6e4 Mon Sep 17 00:00:00 2001 From: jnunez Date: Tue, 10 Jul 2018 21:35:15 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C197 --- .../AYA.SlnSynor/AYA.SlnSinort.csproj | 1 + ...ormativaReglamentacionTecnicaController.cs | 17 +++++++++++ .../AYA.SlnSynor/Sinort-Scripts/Aplicacion.js | 11 +------ .../AYA.SlnSynor/Sinort-Scripts/EmisorPN.js | 8 +---- .../AYA.SlnSynor/Sinort-Scripts/Global.js | 29 ++++++++++++------- .../Sinort-Scripts/Mantenimientos.js | 12 ++++---- .../FichaTecnica.cshtml | 3 +- .../AYA.SlnSynor/Views/Shared/_Layout.cshtml | 8 ++--- 8 files changed, 51 insertions(+), 38 deletions(-) create mode 100644 AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj index dd1c04865..97d8d4067 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj @@ -196,6 +196,7 @@ + FileUploadHandler.ashx diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs new file mode 100644 index 000000000..914e1555b --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace AYA.SlnSinort.Controllers.NormativaReglamentacionTecnica +{ + public class NormativaReglamentacionTecnicaController : BaseController + { + public ActionResult FichaTecnica() + { + InitControllers(); + return View(); + } + } +} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js index 09f34c227..385486d12 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js @@ -124,18 +124,9 @@ this.VerDescripcionLarga = function (DescripcionLarga) { this.ObtenerAplicaciones = function (data) { - - if (ValidarPermisos('Ver catálogos').length > 0) { + var uri = CatalogosWCF + '/api/ObtenerAplicacion'; AjaxPostData(uri, null, false, false, CargarGridAplicaciones, null, null); - } - else { - alert('No tiene permisos para ejecutar esta opción.'); - } - - - - } this.EditarItem = function (id) { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js index 135358a23..931cd1a88 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js @@ -80,15 +80,9 @@ this.CargarGridEmisores = function (data) { this.ObtenerEmisores = function () { - if (ValidarPermisos('Ver catálogos').length > 0) { + var uri = CatalogosWCF + '/api/ObtenerEmisor'; AjaxPostData(uri, null, false, false, CargarGridEmisores, null, null); - } - else { - alert('No tiene permisos para ejecutar esta opción.'); - } - - } diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index ecc1c6f46..91bd698dd 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -1692,11 +1692,15 @@ this.DibujarTareasPendientes = function (data) { } this.ValidarPermisos = function (opcion) { - - var validar = $.grep(localStorage['ListaOpciones'].split(","), function (data) { - return data == opcion; + var validar; + validar = $.grep(localStorage['ListaOpciones'].split(","), function (data) { + return data == 'Super Usuario'; }); - + if (validar.length == 0) { + validar = $.grep(localStorage['ListaOpciones'].split(","), function (data) { + return data == opcion; + }); + } return validar; } ObtenerPantallas = function () { @@ -1767,10 +1771,15 @@ this.AsignarUsuario = function (model) { return model; } -this.ValidarAcceder = function (vista,controlador) { - url = $("#hiddenHref").val(); - url = url.replace("View", vista); - url = url.replace("Controller", controlador); - - document.location.href = url; +this.ValidarAcceder = function (vista, controlador,opcion) { + + if (ValidarPermisos(opcion).length > 0) { + url = $("#hiddenHref").val(); + url = url.replace("View", vista); + url = url.replace("Controller", controlador); + + document.location.href = url; + } else { + toastr.warning('No tiene permisos para ejecutar esta opción', Message_Warning); + } } \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js index a766f954a..0b684cf42 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js @@ -1,12 +1,9 @@  var Item = {}; jQuery(document).ready(function () { - if (ValidarPermisos('Ingreso y actualización de mantenimientos').length > 0) { + CargarMantenimiento(); - } - else { - alert('No tiene permisos para ejecutar esta opción.'); - } + }); @@ -40,6 +37,7 @@ this.CargarTablaMantenimiento = function (data) { $('#tableMantenimiento').on('click', 'button', function () { + if (ValidarPermisos('Ver catálogos').length > 0) { var data = $('#tableMantenimiento').DataTable().row($(this).parents('tr')).data(); var mtzView = data.Vista.split('/') @@ -49,5 +47,7 @@ $('#tableMantenimiento').on('click', 'button', function () { url = url.replace("Controller", mtzView[0]); document.location.href = url; - + } else { + toastr.warning('No tiene permisos para ejecutar esta opción', Message_Warning); + } }); \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml index c8b593402..b83d4a998 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml @@ -1,7 +1,8 @@  @{ ViewBag.Title = "FichaTecnica"; + Layout = "~/Views/Shared/_Layout.cshtml"; } -

FichaTecnica

+ diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml index 09237908a..b59607b33 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml @@ -166,8 +166,8 @@ @@ -179,8 +179,8 @@