From e7ed8d2d33f999c411c3c3efdda4c8c6bc59411d Mon Sep 17 00:00:00 2001 From: jnunez Date: Mon, 18 Jun 2018 22:03:20 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C68 --- .../AYA.SlnSynor.WCF/AYA.SlnSinort.WCF.csproj | 22 +- AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs | 3 +- .../AYA.SlnSynor.WCF/ISinortCatalogos.cs | 3 + .../AyAWCF/ServicioUsuarios.disco | 4 - .../AyAWCF/configuration.svcinfo | 10 - .../Reference.cs | 16 +- .../Reference.svcmap | 16 +- .../ServicioUsuarios.disco | 4 + .../ServicioUsuarios.wsdl | 12 +- .../ServicioUsuarios.xsd} | 2 +- .../ServicioUsuarios1.xsd} | 0 .../ServicioUsuarios2.xsd} | 0 .../ServicioUsuarios3.xsd} | 0 .../configuration.svcinfo | 10 + .../configuration91.svcinfo | 8 +- AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs | 4 +- .../AYA.SlnSynor.WCF/SinortCatalogos.svc.cs | 15 + AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config | 4 +- .../AYA.SlnSynor/AYA.SlnSinort.csproj | 1 + .../Controllers/HomeController.cs | 5 +- .../PropuestaNormativaController.cs | 5 + .../AYA.SlnSynor/Scripts/_references.js | Bin 587766 -> 587908 bytes .../Sinort-Scripts/PropuestaNormativa/Foro.js | 1 + .../AYA.SlnSynor/Sinort-Scripts/Rol.js | 24 +- .../AYA.SlnSynor/Sinort-Scripts/Usuario.js | 28 +- .../Views/Catalogos/Aplicacion.cshtml | 4 +- .../Views/Catalogos/EmisorPN.cshtml | 6 +- .../AYA.SlnSynor/Views/Catalogos/Rol.cshtml | 14 +- .../Views/Catalogos/Usuario.cshtml | 9 +- .../AYA.SlnSynor/Views/Home/Index.cshtml | 4 +- .../Views/PropuestaNormativa/Foro.cshtml | 134 +++++- .../AYA.SlnSynor/Views/Shared/_Layout.cshtml | 5 +- AYA.SlnSynor/AYA.SlnSynor/Web.config | 2 +- AYA.SlnSynor/AYA.SlnSynorModel.DAL/App.config | 3 + .../AYA.SlnSinortModel.csproj | 2 +- AYA.SlnSynor/AYA.SlnSynorModel/App.config | 37 +- .../AYA.SlnSynorModel/Sinort/AllDocStreams.cs | 26 -- .../Sinort/AllDocVersions.cs | 32 -- .../AYA.SlnSynorModel/Sinort/AllDocs.cs | 43 -- .../AYA.SlnSynorModel/Sinort/AllLinks.cs | 45 -- .../AYA.SlnSynorModel/Sinort/AllLists.cs | 44 -- .../AYA.SlnSynorModel/Sinort/Aplicacion.cs | 44 -- .../Sinort/AplicacionNyRT.cs | 39 -- .../AYA.SlnSynorModel/Sinort/AplicacionPN.cs | 39 -- .../AYA.SlnSynorModel/Sinort/AsignacionRol.cs | 35 -- .../Sinort/BitacoraDocumentos.cs | 45 -- .../AYA.SlnSynorModel/Sinort/Categoria.cs | 31 -- .../Sinort/ComentariosForo.cs | 43 -- .../Sinort/ComentariosMatriz.cs | 53 --- .../AYA.SlnSynorModel/Sinort/ContenidoNyRT.cs | 43 -- .../Sinort/ConvocadosPropuestaNormativa.cs | 43 -- .../AYA.SlnSynorModel/Sinort/Convocatoria.cs | 36 -- .../Sinort/DocumentoTecnicoNyRT.cs | 30 -- .../AYA.SlnSynorModel/Sinort/Documentos.cs | 50 --- .../Sinort/DocumentosAdjuntos.cs | 49 --- .../AYA.SlnSynorModel/Sinort/Emisor.cs | 44 -- .../AYA.SlnSynorModel/Sinort/EmisorNyRT.cs | 39 -- .../AYA.SlnSynorModel/Sinort/EmisorPN.cs | 39 -- .../AYA.SlnSynorModel/Sinort/Estado.cs | 36 -- .../Sinort/EstadoFichaTecnica.cs | 37 -- .../Sinort/Estado_PropuestaNormativa.cs | 26 -- .../AYA.SlnSynorModel/Sinort/EventLog.cs | 50 --- .../AYA.SlnSynorModel/Sinort/Features.cs | 29 -- .../AYA.SlnSynorModel/Sinort/FichaTecnica.cs | 79 ---- AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Foro.cs | 47 --- .../AYA.SlnSynorModel/Sinort/Groups.cs | 27 -- .../Sinort/GrupoTematicoNyRT.cs | 43 -- .../AYA.SlnSynorModel/Sinort/Mantenimiento.cs | 34 -- .../AYA.SlnSynorModel/Sinort/Matriz.cs | 43 -- .../Sinort/PalabraClaveNyRT.cs | 39 -- .../AYA.SlnSynorModel/Sinort/Pantallas.cs | 45 -- .../Sinort/Partial/Contex.cs | 63 --- .../Sinort/PermisosUsuario.cs | 36 -- .../Sinort/PlantillaEmail.cs | 36 -- .../Sinort/PropuestaNormativa.cs | 58 --- .../Sinort/ProyectoNormativo.cs | 53 --- AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Rol.cs | 42 -- .../AYA.SlnSynorModel/Sinort/Roles.cs | 44 -- .../Sinort/RolesPantallas.cs | 36 -- .../AYA.SlnSynorModel/Sinort/RolesUsuario.cs | 36 -- .../AYA.SlnSynorModel/Sinort/SinortContex.cs | 396 ------------------ .../Sinort/SubCatContenidoNyRT.cs | 43 -- .../Sinort/SubCatGrupoTematicoNyRT.cs | 43 -- .../Sinort/TipoAplicacion.cs | 40 -- .../AYA.SlnSynorModel/Sinort/TipoDocumento.cs | 40 -- .../AYA.SlnSynorModel/Sinort/TipoEmisor.cs | 40 -- .../AYA.SlnSynorModel/Sinort/TipoEstado.cs | 40 -- .../AYA.SlnSynorModel/Sinort/TipoForo.cs | 38 -- .../AYA.SlnSynorModel/Sinort/TipoMatriz.cs | 38 -- .../AYA.SlnSynorModel/Sinort/Usuario.cs | 58 --- 90 files changed, 291 insertions(+), 2733 deletions(-) delete mode 100644 AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.disco delete mode 100644 AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration.svcinfo rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF => ServiciosUsuariosWCF}/Reference.cs (90%) rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF => ServiciosUsuariosWCF}/Reference.svcmap (56%) create mode 100644 AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.disco rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF => ServiciosUsuariosWCF}/ServicioUsuarios.wsdl (78%) rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF/ServicioUsuarios3.xsd => ServiciosUsuariosWCF/ServicioUsuarios.xsd} (88%) rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF/ServicioUsuarios2.xsd => ServiciosUsuariosWCF/ServicioUsuarios1.xsd} (100%) rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF/ServicioUsuarios.xsd => ServiciosUsuariosWCF/ServicioUsuarios2.xsd} (100%) rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF/ServicioUsuarios1.xsd => ServiciosUsuariosWCF/ServicioUsuarios3.xsd} (100%) create mode 100644 AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration.svcinfo rename AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/{AyAWCF => ServiciosUsuariosWCF}/configuration91.svcinfo (96%) create mode 100644 AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/Foro.js delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AllDocStreams.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AllDocVersions.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AllDocs.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AllLinks.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AllLists.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Aplicacion.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AplicacionNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AplicacionPN.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AsignacionRol.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/BitacoraDocumentos.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Categoria.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosForo.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosMatriz.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ContenidoNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ConvocadosPropuestaNormativa.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Convocatoria.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentoTecnicoNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Documentos.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentosAdjuntos.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Emisor.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EmisorNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EmisorPN.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EstadoFichaTecnica.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado_PropuestaNormativa.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EventLog.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Features.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/FichaTecnica.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Foro.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Groups.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GrupoTematicoNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Mantenimiento.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Matriz.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PalabraClaveNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Partial/Contex.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PermisosUsuario.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PlantillaEmail.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PropuestaNormativa.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ProyectoNormativo.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Rol.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Roles.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesPantallas.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCatContenidoNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCatGrupoTematicoNyRT.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoAplicacion.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoDocumento.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEmisor.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEstado.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoForo.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoMatriz.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSinort.WCF.csproj b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSinort.WCF.csproj index f1a5defdd..3dbb02615 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSinort.WCF.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSinort.WCF.csproj @@ -75,10 +75,10 @@ - - - - + + + + WCF Proxy Generator Reference.cs @@ -88,7 +88,7 @@ - + True True Reference.svcmap @@ -107,17 +107,17 @@ - - + + Designer - + Designer - + Designer - + Designer @@ -142,7 +142,7 @@ - + 10.0 diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs index f7068ff2f..c5a190fd0 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs @@ -1,5 +1,6 @@  using AYA.SlnSinortModel.Entidades; +using AYA.SlnSinortModel.Sinort; using System; using System.Collections.Generic; using System.Linq; @@ -14,7 +15,7 @@ namespace AYA.SlnSinort.WCF [ServiceContract] public interface ISinort { - + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs index b280de94b..aa1343596 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs @@ -79,5 +79,8 @@ namespace AYA.SlnSinort.WCF #endregion + [OperationContract] + List ObtenerUsuariosAyA(); + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.disco b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.disco deleted file mode 100644 index d55b00305..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.disco +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration.svcinfo b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration.svcinfo deleted file mode 100644 index ef67d0a74..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration.svcinfo +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.cs similarity index 90% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.cs rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.cs index aa8daf1cf..83dd9ef37 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace AYA.SlnSinort.WCF.AyAWCF { +namespace AYA.SlnSinort.WCF.ServiciosUsuariosWCF { using System.Runtime.Serialization; using System; @@ -139,7 +139,7 @@ namespace AYA.SlnSinort.WCF.AyAWCF { } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="AyAWCF.IServicioUsuarios")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="ServiciosUsuariosWCF.IServicioUsuarios")] public interface IServicioUsuarios { [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IServicioUsuarios/obtenerUsuariosActiveDirectory", ReplyAction="http://tempuri.org/IServicioUsuarios/obtenerUsuariosActiveDirectoryResponse")] @@ -149,19 +149,19 @@ namespace AYA.SlnSinort.WCF.AyAWCF { System.Threading.Tasks.Task obtenerUsuariosActiveDirectoryAsync(); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IServicioUsuarios/enviarCorreo", ReplyAction="http://tempuri.org/IServicioUsuarios/enviarCorreoResponse")] - int enviarCorreo(AYA.SlnSinort.WCF.AyAWCF.correoEL objCorreo); + int enviarCorreo(AYA.SlnSinort.WCF.ServiciosUsuariosWCF.correoEL objCorreo); [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IServicioUsuarios/enviarCorreo", ReplyAction="http://tempuri.org/IServicioUsuarios/enviarCorreoResponse")] - System.Threading.Tasks.Task enviarCorreoAsync(AYA.SlnSinort.WCF.AyAWCF.correoEL objCorreo); + System.Threading.Tasks.Task enviarCorreoAsync(AYA.SlnSinort.WCF.ServiciosUsuariosWCF.correoEL objCorreo); } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public interface IServicioUsuariosChannel : AYA.SlnSinort.WCF.AyAWCF.IServicioUsuarios, System.ServiceModel.IClientChannel { + public interface IServicioUsuariosChannel : AYA.SlnSinort.WCF.ServiciosUsuariosWCF.IServicioUsuarios, System.ServiceModel.IClientChannel { } [System.Diagnostics.DebuggerStepThroughAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - public partial class ServicioUsuariosClient : System.ServiceModel.ClientBase, AYA.SlnSinort.WCF.AyAWCF.IServicioUsuarios { + public partial class ServicioUsuariosClient : System.ServiceModel.ClientBase, AYA.SlnSinort.WCF.ServiciosUsuariosWCF.IServicioUsuarios { public ServicioUsuariosClient() { } @@ -190,11 +190,11 @@ namespace AYA.SlnSinort.WCF.AyAWCF { return base.Channel.obtenerUsuariosActiveDirectoryAsync(); } - public int enviarCorreo(AYA.SlnSinort.WCF.AyAWCF.correoEL objCorreo) { + public int enviarCorreo(AYA.SlnSinort.WCF.ServiciosUsuariosWCF.correoEL objCorreo) { return base.Channel.enviarCorreo(objCorreo); } - public System.Threading.Tasks.Task enviarCorreoAsync(AYA.SlnSinort.WCF.AyAWCF.correoEL objCorreo) { + public System.Threading.Tasks.Task enviarCorreoAsync(AYA.SlnSinort.WCF.ServiciosUsuariosWCF.correoEL objCorreo) { return base.Channel.enviarCorreoAsync(objCorreo); } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.svcmap b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.svcmap similarity index 56% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.svcmap rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.svcmap index 4221440f9..d10565162 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/Reference.svcmap +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/Reference.svcmap @@ -1,5 +1,5 @@ - + false true @@ -19,15 +19,15 @@ - + - - - - - - + + + + + + diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.disco b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.disco new file mode 100644 index 000000000..2d458978e --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.disco @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.wsdl b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.wsdl similarity index 78% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.wsdl rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.wsdl index 1e3a621ef..288814079 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.wsdl +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.wsdl @@ -1,11 +1,11 @@ - + - - - - + + + + @@ -53,7 +53,7 @@ - + \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios3.xsd b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.xsd similarity index 88% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios3.xsd rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.xsd index e3d37d6a9..1572cf06f 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios3.xsd +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios.xsd @@ -1,6 +1,6 @@ - + diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios2.xsd b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios1.xsd similarity index 100% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios2.xsd rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios1.xsd diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.xsd b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios2.xsd similarity index 100% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios.xsd rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios2.xsd diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios1.xsd b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios3.xsd similarity index 100% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/ServicioUsuarios1.xsd rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/ServicioUsuarios3.xsd diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration.svcinfo b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration.svcinfo new file mode 100644 index 000000000..92758b1c8 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration.svcinfo @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration91.svcinfo b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration91.svcinfo similarity index 96% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration91.svcinfo rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration91.svcinfo index 346b47433..48becf39e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/AyAWCF/configuration91.svcinfo +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service References/ServiciosUsuariosWCF/configuration91.svcinfo @@ -1,5 +1,5 @@ - + @@ -112,10 +112,10 @@ - + - http://localhost/AyA.SlnSinort.WCF.Usuarios/ServicioUsuarios.svc + http://10.50.1.123:2075/ServicioUsuarios.svc @@ -127,7 +127,7 @@ BasicHttpBinding_IServicioUsuarios - AyAWCF.IServicioUsuarios + ServiciosUsuariosWCF.IServicioUsuarios System.ServiceModel.Configuration.AddressHeaderCollectionElement diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs index 3d146a7ee..0589cce6f 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs @@ -6,11 +6,13 @@ using AYA.SlnSinortModel.Entidades; using AYA.SlnSinortModel.Sinort; using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Runtime.Serialization; using System.ServiceModel; using System.ServiceModel.Web; using System.Text; +////using AYA.SlnSinort.WCF.ServiciosUsuariosWCF; namespace AYA.SlnSinort.WCF { @@ -35,6 +37,6 @@ namespace AYA.SlnSinort.WCF //} #endregion - + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs index dcc972fab..3f586e28f 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -5,6 +5,7 @@ using AYA.SlnSinortModel.Entidades; using AYA.SlnSinortModel.Sinort; using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Runtime.Serialization; using System.ServiceModel; @@ -252,6 +253,20 @@ namespace AYA.SlnSinort.WCF } #endregion + + #region WCFAYA + public List ObtenerUsuariosAyA() + { + List respuesta = null; + DataSet ds = new DataSet(); + ServiciosUsuariosWCF.ServicioUsuariosClient respuestaAyA = new ServiciosUsuariosWCF.ServicioUsuariosClient(); + ds = respuestaAyA.obtenerUsuariosActiveDirectory(); + + return respuesta; + } + + + #endregion } } diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config index 0a7433496..41f54deba 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config @@ -10,9 +10,9 @@ - + contract="ServiciosUsuariosWCF.IServicioUsuarios" name="BasicHttpBinding_IServicioUsuarios" /> diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj index d83e8be30..60c159cd4 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj @@ -7679,6 +7679,7 @@ + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs index 8d4a96d07..2823cf4aa 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -18,6 +18,9 @@ namespace AYA.SlnSinort.Controllers { return View(); } - + public ActionResult Proyecto_Normativo() + { + return View(); + } } } \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs index 3de998717..528c54bd0 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/PropuestaNormativaController.cs @@ -19,5 +19,10 @@ namespace AYA.SlnSinort.Controllers.PropuestaNormativa InitControllers(); return View(); } + public ActionResult Foro() + { + 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 3632c904fec6359a25d01661df25b24ea2206086..c09327923572bb03e244a850f69e118d43c3d352 100644 GIT binary patch delta 48 zcmezNUb*F?azhJa3sVbo3rh=Y3tJ2O7LIS @Scripts.Render("~/Sinort-Scripts/Aplicacion.js") diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml index 2f33c3b2a..564be786b 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml @@ -7,9 +7,11 @@