From 927461043178111c93c1337d7be51ef9edfbe23e Mon Sep 17 00:00:00 2001 From: jnunez Date: Mon, 9 Jul 2018 19:27:23 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C180 --- AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs | 3 ++ AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs | 16 ++++++- .../Catalogos/CatalogosController.cs | 22 +++++----- .../Controllers/HomeController.cs | 8 ++-- .../Controllers/LoginController.cs | 9 ++-- .../PropuestaNormativaController.cs | 6 +-- .../AYA.SlnSynor/Sinort-Scripts/Login.js | 43 +++++++++++++------ .../Sinort/PermisosUsuarioDAL.cs | 2 +- AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs | 2 +- 9 files changed, 72 insertions(+), 39 deletions(-) diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs index 5b62f30fb..ef746f2f3 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs @@ -1,4 +1,5 @@  +using Atesa.Utilitarios; using AYA.SlnSinortModel.Entidades; using AYA.SlnSinortModel.Sinort; using System; @@ -63,6 +64,8 @@ namespace AYA.SlnSinort.WCF [OperationContract] CatalogosPostJSON VerificarUsuarioBD(CatalogosPostJSON model); + [OperationContract] + List ObtenerPermisos(AtesaJSON model); #endregion } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs index 173ebb170..4abf2b622 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs @@ -519,8 +519,20 @@ namespace AYA.SlnSinort.WCF } return model; } - - + + public List ObtenerPermisos(AtesaJSON model) + { + List respuesta = null; + try + { + respuesta = new PermisosUsuarioDAL().ObtenerPermisos(model); + } + catch (Exception ex) + { + log.Error(ex); + } + return respuesta; + } #endregion diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs index 9e065a2d1..5b5ad6a00 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs @@ -7,69 +7,69 @@ using System.Web.Mvc; namespace AYA.SlnSinort.Controllers.Catalogos { + //[LoggingFilter] public class CatalogosController : BaseController { - //[LoggingFilter] + public ActionResult EmisorPN() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Mantenimiento() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Aplicacion() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Rol() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Usuario() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Contenido() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult SubCategoriaContenido() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult GrupoTematico() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult SubCategoriaGrupoTematico() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult DocumentoTecnico() { InitControllers(); return View(); } - //[LoggingFilter] public ActionResult PalabraClave() { InitControllers(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs index 0e21be36f..5a31d8a9e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -6,27 +6,27 @@ using System.Web.Mvc; namespace AYA.SlnSinort.Controllers { + //[LoggingFilter] public class HomeController : BaseController { - //[LoggingFilter] public ActionResult Index() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Normativa_Reglamentacion_Tecnica() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Proyecto_Normativo() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult TareasPendientes() { InitControllers(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs index d28140cbd..13508dc3e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs @@ -20,10 +20,11 @@ namespace AYA.SlnSinort.Controllers.Login { try { - //Session["UserName"] = model.UserName; - //Session["FullName"] = model.UserFullName; - Session["UserName"] = "josnunez"; - Session["FullName"] = "Josue Nuñez Cascante"; + Session["UserName"] = model.UserName; + Session["FullName"] = model.UserFullName; + Session["PermisosUsuario"] = model.PermisosUsuario; + + var a = (List)Session["PermisosUsuario"]; } catch (Exception ex) { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs index b6aa89cb0..4b75d17fe 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs @@ -6,21 +6,21 @@ using System.Web.Mvc; namespace AYA.SlnSinort.Controllers.PropuestaNormativa { + //[LoggingFilter] public class PropuestaNormativaController : BaseController { - //[LoggingFilter] + public ActionResult Index() { InitControllers(); return View(); } - //[LoggingFilter] public ActionResult DetallePropuesta() { InitControllers(); return View(); } - //[LoggingFilter] + public ActionResult Foro() { InitControllers(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js index 718eaf8e4..ada51d539 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js @@ -1,4 +1,6 @@ var model = {}; +var username; +var fullname; jQuery(document).ready(function () { @@ -22,10 +24,8 @@ function validarFormulario() { if (Contador >= 2) { enviado = true; - //ObtenerUsuarioAD(); - url = $("#hiddenHref").val(); - url = url.replace("View", "Index"); - url = url.replace("Controller", "Home"); + ObtenerUsuarioAD(); + } else { toastr.warning('Los campos son obligatorio', Message_Warning); } @@ -61,20 +61,40 @@ this.VerificarUsurarioBD = function (data) { codigo: data.LoginUsuario } - AjaxPostData(uri, model, false, true, IniciarSesion, null, null); + AjaxPostData(uri, model, false, false, ObtenerPermisosUsuarios, null, null); } } -this.IniciarSesion = function (data) { +this.ObtenerPermisosUsuarios = function (data) { if (data.CodigoRespuesta == 'EXITOSO') { + username = data.usuario.UsuarioSistema; + fullname = data.usuario.NombreUsuario; + var uri = SinorLoginWCF + '/api/ObtenerPermisos'; + model = { + UserName : username + } + AjaxPostData(uri, model, false, null, IniciarSesion, null, null); + } +} + +this.IniciarSesion = function (data) { + + var ArrayPermisos = []; + var lista = data; + + $.each(lista, function (key, item) { + + ArrayPermisos.push(item.Descripcion); + }); var uri = server + 'Login/InicioSesion'; model = { - UserName: data.usuario.UsuarioSistema, - UserFullName: data.usuario.NombreUsuario + UserName: username, + UserFullName: fullname, + PermisosUsuario: ArrayPermisos }; url = $("#hiddenHref").val(); url = url.replace("View", "Index"); @@ -94,9 +114,6 @@ this.IniciarSesion = function (data) { }); - //AjaxPostData(uri, model, false, false, null, null, null); + +} - // - - } -} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs index 68043aa4b..bb70bdd50 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs @@ -27,7 +27,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort var opciones = (from p in Conn.Pantallas join rp in Conn.RolesPantallas on p.IdPantalla equals rp.IdPantalla join ru in Conn.RolesUsuario on rp.IdRol equals ru.IdRol - where ru.UsuarioSistema == model.UserName && rp.Estado == true + where ru.UsuarioSistema == "josnunez" && rp.Estado == true select p).ToList(); pantallas = opciones.ToList(); diff --git a/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs b/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs index ca385de0f..8aa759daa 100644 --- a/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs +++ b/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs @@ -10,7 +10,7 @@ namespace Atesa.Utilitarios { public string UserName { get; set; } public string UserFullName { get; set; } - public List PermisosUsuario { get; set; } + public List PermisosUsuario { get; set; } }