From 870a6759692f4d8dd830c0814d8d0856a4ed3c89 Mon Sep 17 00:00:00 2001 From: jnunez Date: Tue, 19 Jun 2018 17:56:38 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C74 --- AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs | 4 ++-- AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js | 8 ++++---- AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml | 1 - AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs | 1 + AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs | 3 ++- AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs | 2 -- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs index ff5b3eeeb..d280b501c 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -317,11 +317,11 @@ namespace AYA.SlnSinort.WCF var usuarioDAL = new UsuarioDAL(); try { - + string dominio = "@aya.go.cr"; DataSet ds = new DataSet(); ServiciosUsuariosWCF.ServicioUsuariosClient respuestaAyA = new ServiciosUsuariosWCF.ServicioUsuariosClient(); ds = respuestaAyA.obtenerUsuariosActiveDirectory(); - model.ListaUsuariosAyA = ds.Tables[0].AsEnumerable().Select(dataRow => new Usuario { UsuarioSistema = dataRow.Field("Login"), NombreUsuario = dataRow.Field("Nombre"),Estado= true}).ToList(); + model.ListaUsuariosAyA = ds.Tables[0].AsEnumerable().Select(dataRow => new Usuario { UsuarioSistema = dataRow.Field("Login"), NombreUsuario = dataRow.Field("Nombre"),EmailUsuario =dataRow.Field("Login") + dominio, Estado = true, FechaCreacion = System.DateTime.Now }).ToList(); await usuarioDAL.ActualizarUsuarios(model); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js index abb30866b..a102514e5 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Usuario.js @@ -6,8 +6,8 @@ jQuery(document).ready(function () { this.ActualizarUsuarios= function () { var uri = CatalogosWCF + '/api/ActualizarUsuarios'; - AjaxPostData(uri, Item, true, false, null, null, null); - + AjaxPostData(uri, Item, false, true, CargarUsuario, null, null); + } @@ -22,12 +22,12 @@ this.CargarUsuario = function () { this.CargarTablaUsuario = function (data) { $('#tableUsuario').TableInit(0, false, true, true, false, null, null); var TableItems = $('#tableUsuario').DataTable(); + TableItems.clear().draw(); var lista = data; $.each(lista, function (key, item) { - TableItems.row.add([item.IdUsuario, - item.UsuarioSistema, + TableItems.row.add([item.UsuarioSistema, item.NombreUsuario, item.EmailUsuario]).draw(); TableItems.column(0).visible(false); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml index 85254ec6b..a8d018133 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Usuario.cshtml @@ -29,7 +29,6 @@ - diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs index 759134b2f..c8d5345c9 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs @@ -161,6 +161,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort Conn.Usuario.AddRange(model.ListaUsuariosAyA); await Conn.SaveChangesAsync(); Conn.Commit(); + model.CodigoRespuesta = EnumTipoCodigoRespuesta.EXITOSO.ToString(); } } catch (DbEntityValidationException ex) diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs index f64ec3d8a..530062621 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs @@ -8,7 +8,8 @@ namespace AYA.SlnSinortModel.Sinort public partial class SinortContex : Contex { - + + public virtual DbSet Aplicacion { get; set; } public virtual DbSet Categoria { get; set; } public virtual DbSet Emisor { get; set; } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs index c0bf67595..b6822fe20 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs @@ -15,8 +15,6 @@ namespace AYA.SlnSinortModel.Sinort RolesUsuario = new HashSet(); } - public int? IdUsuario { get; set; } - [Key] [StringLength(200)] public string UsuarioSistema { get; set; }