From 300383c3a8b887a8bc0ba4e5c0b421eb7b97efe8 Mon Sep 17 00:00:00 2001
From: jnunez <jnunez@atesa.tfs.local>
Date: Fri, 15 Jun 2018 22:58:00 +0000
Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C65

---
 .../AYA.SlnSynor/Sinort-Scripts/Rol.js        | 99 +++++++++++++++++--
 .../AYA.SlnSynor/Views/Catalogos/Rol.cshtml   |  3 +-
 .../Sinort/UsuarioDAL.cs                      |  2 +-
 3 files changed, 95 insertions(+), 9 deletions(-)

diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
index 3f6b97cb5..b4a425655 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
@@ -305,8 +305,9 @@ this.GuardarRolesPantallas = function () {
 }
 
 this.AbrirRolesUsuario = function (id) {
-    $('#hiddenIdRol').val(id)
+
     $("#modalRolesUsuario").modal('show');
+    CargarUsuarios(id);
 }
 
 this.BuscarUsuario = function (data) {
@@ -320,19 +321,103 @@ this.BuscarUsuario = function (data) {
 }
 this.MostarUsuario = function (data) {
     GridRolesUsuarios = $('#GridRolesUsuarios').DataTable();
-  
-    GridRolesUsuarios.column(0).visible(false);
-    GridRolesUsuarios.row.add([data.IdUsuario,
+    var repetido = false;
+    
+    var data1 = GridRolesUsuarios
+        .rows()
+        .data();
+
+    $.each(data1, function (key, item) {
+
+
+        if (item[2] == data.UsuarioSistema) {
+            repetido = true;
+        }
+   
+    });
+
+    if (repetido == false) {
+     
+        GridRolesUsuarios.row.add([0,
+                            data.IdUsuario,
                             data.UsuarioSistema,
                             data.NombreUsuario]).draw();
 
-
+    }
     ENDREQUEST();
     $('#txtUsuario').val('');
 }
+this.CargarUsuarios = function (id) {
+
+    $('#hiddenIdRol').val(id)
+    var uri = CatalogosWCF + '/api/ObtenerUsuariosRol';
+    model = {
+        codigo: id
+    };
+
+    AjaxPostData(uri, model, true, false, CargarTablaUsuarios, null, null);
+
+}
+
+this.CargarTablaUsuarios = function (data) {
+
+    var TableItems = $('#GridRolesUsuarios').DataTable();
+    TableItems.clear().draw();
+    var lista = data;
+
+    $.each(lista, function (key, item) {
+
+        TableItems.column(0).visible(false);
+        TableItems.column(1).visible(false);
+        TableItems.row.add([item.IdRolesUsuario,
+                            item.IdUsuario,
+                            item.Usuario.UsuarioSistema,
+                            item.Usuario.NombreUsuario]).draw();
+
+    });
+
+    ENDREQUEST();
+
+}
+
+this.GuardarRolesUsuarios = function () {
+
+    if (!confirm("Va registrar los usuarios asociadas.\n ¿Desea continuar?"))
+    { return; }
+
+    TableUsuarios = $('#GridRolesUsuarios').DataTable();
+    var IdRoles = $('#hiddenIdRol').val();
+    var ArrayRolesUsuarios = [];
+    var data = TableUsuarios
+        .rows()
+        .data();
+
+    $.each(data, function (key, item) {
+
+        RolesUsuarios = {
+
+            IdRolesUsuario: item[0],
+            IdRol: IdRoles,
+            IdUsuario: item[1],
+            Estado: true
+
+        }
+        ArrayRolesUsuarios.push(RolesUsuarios);
+    });
+
+    var uri = CatalogosWCF + '/api/InsertarActualizarRolesUsuario';
+    var model = {
+        ListaRolesUsuarios: ArrayRolesUsuarios
+    };
+
+    AjaxPostData(uri, model, true, true, null, null, null);
+
+
+
+    ENDREQUEST();
+
+}
 
 
 
 
-
-
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
index cee38432c..c0527b4f9 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
@@ -168,6 +168,7 @@
                 <table id="GridRolesUsuarios" class="table table-condensed dataTable no-footer">
                     <thead>
                         <tr>
+                            <th class="col-sm-1">IDROLES</th>
                             <th class="col-sm-1">ID</th>
                             <th class="col-sm-4">Usuario</th>
                             <th class="col-sm-4">Nombre</th>
@@ -177,7 +178,7 @@
             </div>
 
             <div class="modal-footer">
-                <button type="button" class="btn btn-success btn-sm" onclick="javascript: GuardarRolesPantallas()">Guardar</button>
+                <button type="button" class="btn btn-success btn-sm" onclick="javascript: GuardarRolesUsuarios()">Guardar</button>
                 <button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">Cerrar</button>
             </div>
         </div>
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
index 7d609f362..ef7fd7b11 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
@@ -50,7 +50,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                     if (model != null && !string.IsNullOrWhiteSpace(model.codigo))
                     {
 
-                        registros = db.RolesUsuario.Where(r => r.IdRol.ToString() == model.codigo).Include(u => u.Usuario).OrderBy(r => r.IdUsuario).AsNoTracking().ToList();
+                        registros = db.RolesUsuario.Where(r => r.IdRol.ToString() == model.codigo).Include(u => u.Usuario).OrderBy(u => u.IdRolesUsuario).AsNoTracking().ToList();
                     }
 
                 }