From cbb397e139cf14b472b92b354447cbb1ca4caf16 Mon Sep 17 00:00:00 2001 From: jnunez Date: Fri, 15 Jun 2018 20:34:45 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C60 --- .../AYA.SlnSynor.WCF/ISinortCatalogos.cs | 7 +- .../AYA.SlnSynor.WCF/SinortCatalogos.svc.cs | 17 ++++ .../AYA.SlnSynor/AYA.SlnSinort.csproj | 2 + .../Catalogos/CatalogosController.cs | 4 +- .../AYA.SlnSynor/Scripts/_references.js | Bin 587666 -> 587776 bytes .../AYA.SlnSynor/Sinort-Scripts/Aplicacion.js | 3 +- .../AYA.SlnSynor/Sinort-Scripts/EmisorPN.js | 4 +- .../AYA.SlnSynor/Sinort-Scripts/Rol.js | 16 ++-- .../AYA.SlnSynor/Sinort-Scripts/Usuario.js | 51 ++++++++++++ .../AYA.SlnSynor/Views/Catalogos/Rol.cshtml | 65 ++++++--------- .../Views/Catalogos/Usuario.cshtml | 52 ++++++++++++ .../Sinort/UsuarioDAL.cs | 74 ++++++++++++++++++ 12 files changed, 242 insertions(+), 53 deletions(-) create mode 100644 AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js create mode 100644 AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs index 760ec3ef5..33ad2e58a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs @@ -55,10 +55,15 @@ namespace AYA.SlnSinort.WCF #endregion - #region RolesPantallas + #region RolesPantallas [OperationContract] RolesPantallasJSON InsertarActualizarRolesPantallas(RolesPantallasJSON model); #endregion + #region Usuario + [OperationContract] + List ObtenerUsuario(); + #endregion + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs index 7eb5695d5..2c9061de3 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -174,6 +174,23 @@ namespace AYA.SlnSinort.WCF return model; } #endregion + + #region Usuario + public List ObtenerUsuario() + { + List respuesta = null; + try + { + respuesta = new UsuarioDAL().ObtenerUsuario(); + + } + catch (Exception ex) + { + log.Error(ex); + } + return respuesta; + } + #endregion } } diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj index 49a1d2598..2b2a764fe 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj @@ -7683,6 +7683,7 @@ + Web.config @@ -7716,6 +7717,7 @@ + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs index a0417392d..3c29cb140 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs @@ -30,12 +30,12 @@ namespace AYA.SlnSinort.Controllers.Catalogos InitControllers(); return View(); } - - public ActionResult RolesPantallas() + public ActionResult Usuario() { InitControllers(); return View(); } + } } \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Scripts/_references.js b/AYA.SlnSynor/AYA.SlnSynor/Scripts/_references.js index 7107d51503bf1d083577e26e003ec12b2d769006..49c8f4fa6772efcc4b1613120cf0ec967106a604 100644 GIT binary patch delta 50 zcmbRAUb*3eazhJa3sVbo3rh=Y3tJ2O7LG~ZCr=PJm~QZmLyo(Yp_rkRA(5eoA#?IY GR#5=mxe+7) delta 25 gcmZqppgiflazhJa3sVbo3rh=Y3tJ2O7LG~Z0fX=fwEzGB diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js index 6d5ba0643..46a24d357 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Aplicacion.js @@ -74,11 +74,12 @@ this.CargarGridAplicaciones = function (data) { option = replaceAll("[$icon]", "fa-times", option); option = replaceAll("[$value]", "0", option); } - + TableItems.column(1).visible(false); TableItems.row.add([stateIcon, item.IdAplicacion, item.Descripcion, option]).draw(); + }); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js index d357399db..4f2a32d69 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/EmisorPN.js @@ -67,12 +67,12 @@ this.CargarGridEmisores = function (data) { option = replaceAll("[$icon]", "fa-times", option); option = replaceAll("[$value]", "0", option); } - + TableItems.column(1).visible(false); TableItems.row.add([stateIcon, item.IdEmisor, item.Descripcion, option]).draw(); - + }); ENDREQUEST(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js index 7b1e44ae1..b8b73bef1 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js @@ -77,14 +77,14 @@ this.CargarGridRoles = function (data) { option = replaceAll("[$icon]", "fa-times", option); option = replaceAll("[$value]", "0", option); } - + TableItems.column(1).visible(false); TableItems.row.add([stateIcon, item.IdRol, item.Descripcion, pantallas, usuarios, option]).draw(); - + }); ENDREQUEST(); @@ -247,11 +247,14 @@ this.CargarTablaPantallas = function (data) { checkbox = replaceAll("[$id]", item.IdPantalla, checkbox); checkbox = replaceAll("[$check]", item.Estado != true ? "" : "checked", checkbox); + + TableItems.column(0).visible(false); + TableItems.column(1).visible(false); TableItems.row.add([item.IdRolesPantallas, item.IdPantalla, item.Pantallas.Descripcion, checkbox]).draw(); - TableItems.column(0).visible(false); + }); ENDREQUEST(); @@ -300,7 +303,6 @@ this.GuardarRolesPantallas = function () { } -//this.AbrirRolesUsuario = function (id) { -// $("#modalRolesUsuario").modal('show'); - -//} \ No newline at end of file +this.AbrirRolesUsuario = function (id) { + $("#modalRolesUsuario").modal('show'); +} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js new file mode 100644 index 000000000..367780a74 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js @@ -0,0 +1,51 @@ + +var Item = {}; +jQuery(document).ready(function () { + CargarUsuario(); +}); + + +this.CargarUsuario = function () { + + var uri = CatalogosWCF + '/api/ObtenerUsuario'; + AjaxPostData(uri, Item, true, false, CargarTablaUsuario, null, null); +} + +this.CargarTablaUsuario = function (data) { + $('#tableUsuario').TableInit(0, false, true, true, false, null, null); + var TableItems = $('#tableUsuario').DataTable(); + var lista = data; + + $.each(lista, function (key, item) { + + TableItems.row.add([item.IdUsuario, + item.UsuarioSistema, + item.NombreUsuario, + item.EmailUsuario]).draw(); + TableItems.column(0).visible(false); + }); + + ENDREQUEST(); + + //if (data != null) { + // lista = data; + + // var columnDefinition = [ + // { "data": "IdUsuario" }, + // { "data": "UsuarioSistema" }, + // { "data": "NombreUsuario" }, + // { "data": "EmailUsuario" } + + // ]; + + // $('#tableUsuario').TableInit(1, true, true, true, true, columnDefinition, lista); + + // if ($.fn.DataTable.isDataTable('#tableUsuario')) { + + // $('#tableUsuario').DataTable().search('').draw(); + + // ENDREQUEST(); + // } + //} +} + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml index 16ce86f70..27e570381 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml @@ -6,7 +6,7 @@