diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs index b1877eb36..66a83cd69 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs @@ -32,6 +32,7 @@ namespace AYA.SlnSinort.Controllers ViewBag.RepositorioLocal = RepositorioLocal; ViewBag.UsuarioSistema = Usuario; ViewBag.NombreUsuario = FullName; + ViewBag.ListaOpciones = (List)Session["PermisosUsuario"]; } } diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs index 13508dc3e..8b52c8194 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs @@ -24,7 +24,7 @@ namespace AYA.SlnSinort.Controllers.Login Session["FullName"] = model.UserFullName; Session["PermisosUsuario"] = model.PermisosUsuario; - var a = (List)Session["PermisosUsuario"]; + } catch (Exception ex) { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index af95777c8..d2ebab7bb 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -5,6 +5,7 @@ var RepositorioVirtual = $("#hiddenRepositorioVirtual").val(); var RepositorioLocal = $("#hiddenRepositorioLocal").val(); var UsuarioSistema = $("#hiddenUsuarioSistema").val(); var NombreUsuario = $("#hiddenNombreUsuario").val(); + var server = window.location.protocol + "//" + window.location.hostname + "/" + (window.location.pathname.split('/')[1]) + "/"; var SinorLoginWCF = "http://localhost/AYA.SlnSinort.WCF/Sinort.svc"; var string_empty = ""; diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js index 6639a7e5c..ddfe4556e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Mantenimientos.js @@ -1,11 +1,28 @@  var Item = {}; jQuery(document).ready(function () { - CargarMantenimiento(); + + //var opcion = $.grep(, function (data) { + // return data.Descripcion == "Ingreso y actualización de mantenimientos"; + //}); + + //if (opcion != null) { + CargarMantenimiento(); + //} else { + // toastr.warning('No tiene permisos para ejecutar esta opción', Message_Warning); + //} + }); this.CargarMantenimiento = function () { + //var variable1 = ListaOpciones; + //var ArrayPermisos = []; + //$.each(ListaOpciones, function (key, item) { + + // ArrayPermisos.push(item.Descripcion); + //}); + var uri = CatalogosWCF + '/api/ObtenerMantenimientoCatalogos'; AjaxPostData(uri, Item, true, false, CargarTablaMantenimiento, null, null); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Mantenimiento.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Mantenimiento.cshtml index f3aac9504..de716e1f9 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Mantenimiento.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Mantenimiento.cshtml @@ -14,6 +14,12 @@

+
    + @foreach (var person in ViewBag.data) + { +
  • @person.FirstName
  • + } +
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs index e69001778..45ef91af6 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs @@ -49,7 +49,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort if (model != null && !string.IsNullOrWhiteSpace(model.codigo)) { - registros = db.RolesPantallas.Where(r => r.IdRol.ToString() == model.codigo).Include(u => u.Pantallas).OrderBy(u => u.IdRolesPantallas).AsNoTracking().ToList(); + registros = db.RolesPantallas.Where(r => r.IdRol.ToString() == model.codigo).Include(u => u.Pantallas).OrderBy(u => u.Pantallas.Descripcion).AsNoTracking().ToList(); } }