diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj index f60bc6065..8e5557fa3 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj @@ -63,15 +63,20 @@ - + + - - Service1.svc + + + Sinort.svc - + + + SinortCatalogos.svc + @@ -84,6 +89,16 @@ Web.config + + + {6188d201-ec99-47f0-bcd5-5c48ec354cd5} + AYA.SlnSynorModel.DAL + + + {9ecd985b-2354-4156-ad6a-3ebd888c0241} + AYA.SlnSynorModel + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/IService1.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/IService1.cs deleted file mode 100644 index 6c6caed99..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/IService1.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.ServiceModel; -using System.ServiceModel.Web; -using System.Text; - -namespace AYA.SlnSynor.WCF -{ - // NOTA: puede usar el comando "Rename" del menú "Refactorizar" para cambiar el nombre de interfaz "IService1" en el código y en el archivo de configuración a la vez. - [ServiceContract] - public interface IService1 - { - - [OperationContract] - string GetData(int value); - - [OperationContract] - CompositeType GetDataUsingDataContract(CompositeType composite); - - // TODO: agregue aquí sus operaciones de servicio - } - - - // Utilice un contrato de datos, como se ilustra en el ejemplo siguiente, para agregar tipos compuestos a las operaciones de servicio. - [DataContract] - public class CompositeType - { - bool boolValue = true; - string stringValue = "Hello "; - - [DataMember] - public bool BoolValue - { - get { return boolValue; } - set { boolValue = value; } - } - - [DataMember] - public string StringValue - { - get { return stringValue; } - set { stringValue = value; } - } - } -} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs new file mode 100644 index 000000000..d4076ea3a --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinort.cs @@ -0,0 +1,20 @@ +using AYA.SlnSynorModel.BD; +using AYA.SlnSynorModel.Entidades; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.ServiceModel; +using System.ServiceModel.Web; +using System.Text; + +namespace AYA.SlnSynor.WCF +{ + // NOTA: puede usar el comando "Rename" del menú "Refactorizar" para cambiar el nombre de interfaz "ISinort" en el código y en el archivo de configuración a la vez. + [ServiceContract] + public interface ISinort + { + + + } +} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs new file mode 100644 index 000000000..267d1fb42 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs @@ -0,0 +1,22 @@ +using AYA.SlnSynorModel.BD; +using AYA.SlnSynorModel.Constantes; +using AYA.SlnSynorModel.DAL.Catalogos; +using AYA.SlnSynorModel.Entidades; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.ServiceModel; +using System.Text; + +namespace AYA.SlnSynor.WCF +{ + [ServiceContract] + public interface ISinortCatalogos + { + + [OperationContract] + EmisorPNJSON ObtenerEmisoresPN(EmisorPN model); + + } +} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc.cs deleted file mode 100644 index fe7eb3a5f..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.Serialization; -using System.ServiceModel; -using System.ServiceModel.Web; -using System.Text; - -namespace AYA.SlnSynor.WCF -{ - // NOTA: puede usar el comando "Rename" del menú "Refactorizar" para cambiar el nombre de clase "Service1" en el código, en svc y en el archivo de configuración. - // NOTE: para iniciar el Cliente de prueba WCF para probar este servicio, seleccione Service1.svc o Service1.svc.cs en el Explorador de soluciones e inicie la depuración. - public class Service1 : IService1 - { - public string GetData(int value) - { - return string.Format("You entered: {0}", value); - } - - public CompositeType GetDataUsingDataContract(CompositeType composite) - { - if (composite == null) - { - throw new ArgumentNullException("composite"); - } - if (composite.BoolValue) - { - composite.StringValue += "Suffix"; - } - return composite; - } - } -} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc similarity index 56% rename from AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc rename to AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc index b8aba42f6..b0bc9872a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Service1.svc +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc @@ -1 +1 @@ -<%@ ServiceHost Language="C#" Debug="true" Service="AYA.SlnSynor.WCF.Service1" CodeBehind="Service1.svc.cs" %> \ No newline at end of file +<%@ ServiceHost Language="C#" Debug="true" Service="AYA.SlnSynor.WCF.Sinort" CodeBehind="Sinort.svc.cs" %> \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs new file mode 100644 index 000000000..fadb761ea --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Sinort.svc.cs @@ -0,0 +1,19 @@ +using AYA.SlnSynorModel.BD; +using AYA.SlnSynorModel.Constantes; +using AYA.SlnSynorModel.Entidades; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.ServiceModel; +using System.ServiceModel.Web; +using System.Text; + +namespace AYA.SlnSynor.WCF +{ + + public class Sinort : ISinort + { + + } +} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc new file mode 100644 index 000000000..84a5b7983 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc @@ -0,0 +1 @@ +<%@ ServiceHost Language="C#" Debug="true" Service="AYA.SlnSynor.WCF.SinortCatalogos" CodeBehind="SinortCatalogos.svc.cs" %> diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs new file mode 100644 index 000000000..612857279 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -0,0 +1,65 @@ +using AYA.SlnSynorModel.BD; +using AYA.SlnSynorModel.Constantes; +using AYA.SlnSynorModel.DAL.Catalogos; +using AYA.SlnSynorModel.Entidades; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.ServiceModel; +using System.Text; + +namespace AYA.SlnSynor.WCF +{ + public class SinortCatalogos : ISinortCatalogos + { + public EmisorPNJSON ObtenerEmisoresPN(EmisorPN model) + { + EmisorPNJSON respuesta = new EmisorPNJSON(); + + try + { + using (CatalogosDAL DAL = new CatalogosDAL()) + { + respuesta.ListaEmisores = DAL.ObtnerEmisorPN(model); + respuesta.CodigoRespuesta = EnumRespuesta.EXITOSO; + } + + } + catch (Exception ex) + { + respuesta.CodigoRespuesta = EnumRespuesta.FALLIDO; + } + + + return respuesta; + } + + public EmisorPNJSON InsertarEmisorPN(EmisorPN model) + { + EmisorPNJSON respuesta = new EmisorPNJSON(); + try + { + using (CatalogosDAL DAL = new CatalogosDAL()) + { + DAL.InsertarActualizarEmisorPN(model); + respuesta.CodigoRespuesta = EnumRespuesta.EXITOSO; + } + + } + catch (Exception ex) + { + respuesta.CodigoRespuesta = EnumRespuesta.FALLIDO; + } + + + return respuesta; + + + + + + + } + } +} diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config index 1bb6424f0..20554f1cd 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config @@ -11,17 +11,58 @@ + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSynor.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSynor.csproj index 129a81ece..d8d46e99a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSynor.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSynor.csproj @@ -16,7 +16,7 @@ AYA.SlnSynor v4.5 false - true + false @@ -182,6 +182,7 @@ + @@ -8087,6 +8088,7 @@ + @@ -8127,7 +8129,7 @@ True 7944 / - http://localhost:7944/ + http://localhost/AYA.SlnSynor False False diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs new file mode 100644 index 000000000..58aed9e15 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using System.Configuration; + +namespace AYA.SlnSynor.Controllers +{ + public class BaseController : Controller + { + public void InitControllers() + { + var SinortWCF = ConfigurationManager.AppSettings["SinortWCF"]; + var SinortCatalogosWCF = ConfigurationManager.AppSettings["SinortCatalogosWCF"]; + + ViewBag.SinortWCF = SinortWCF; + ViewBag.SinortCatalogosWCF = SinortCatalogosWCF; + } + } +} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs index 07fa574d5..7ff2242c5 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs @@ -1,7 +1,4 @@ using AYA.SlnSynorModel.BD; -using AYA.SlnSynorModel.Constantes; -using AYA.SlnSynorModel.Entidades; -using AYA.SlnSynorModel.DAL.Normativa; using System; using System.Collections.Generic; using System.Linq; @@ -10,38 +7,13 @@ using System.Web.Mvc; namespace AYA.SlnSynor.Controllers.Catalogos { - public class CatalogosController : Controller + public class CatalogosController : BaseController { - // GET: Catalogos public ActionResult EmisorPN() { + InitControllers(); return View(); } - - CatalogosDAL DAL = new CatalogosDAL(); - - public ActionResult InsertarEmisorPN(EmisorPN model) - { - DAL.InsertarActualizarEmisorPN(model); - return Json(EnumRespuesta.EXITOSO, JsonRequestBehavior.AllowGet); - } - - public JsonResult ObtenerEmisorPN(EmisorPN model) - { - EmisorPNJSON respuesta = new EmisorPNJSON(); - - try - { - respuesta.ListaEmisores = DAL.ObtnerEmisorPN(model); - respuesta.CodigoRespuesta = EnumRespuesta.EXITOSO; - } - catch (Exception ex) - { - respuesta.CodigoRespuesta = EnumRespuesta.FALLIDO; - } - - - return Json(respuesta, JsonRequestBehavior.AllowGet); - } + } } \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs index 66f71f73a..3eae7b43d 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -6,10 +6,11 @@ using System.Web.Mvc; namespace AYA.SlnSynor.Controllers { - public class HomeController : Controller + public class HomeController : BaseController { public ActionResult Index() { + InitControllers(); return View(); } diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js index afdd2bb2e..5f5160d7f 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js @@ -140,7 +140,7 @@ function IniciarGridEmisoresPN(data) { } function ObtenerEmisoresPN(filtro) { - var uri = '/Catalogos/ObtenerEmisorPN'; + var uri = CatalogosWCF + '/api/ObtenerEmisoresPN'; var DTO = JSON.stringify(filtro); $.ajax({ type: 'POST', diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index 45cc38718..79a3f37a0 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -1,4 +1,7 @@ -function Mensajes(mensaje) { +var CatalogosWCF = $("#hiddenSinortCatalogosWCF").val(); +var SinortWCF = $("#hiddenSinortWCF").val(); + +function Mensajes(mensaje) { if (mensaje.CodigoRespuesta === "1") { toastr.options = { "closeButton": true, diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml index 795f39433..61c152c7b 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml @@ -221,7 +221,7 @@
  • Compra de
    documento técnico
  • Modificación de
    documento técnico
  • Solicitudes de
    compras abiertas
    • -
  • Configuración de la
    aplicación
    • +
  • Configuración de la
    aplicación
  • Encuestas
    • @@ -393,6 +393,8 @@
    + + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Web.config b/AYA.SlnSynor/AYA.SlnSynor/Web.config index f2fd0d18f..abac9c87e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor/Web.config @@ -19,6 +19,8 @@ + + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj index 599a1dd2b..ee4becbf1 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj @@ -52,7 +52,7 @@     - + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs new file mode 100644 index 000000000..193fee440 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs @@ -0,0 +1,43 @@ +using AYA.SlnSynorModel.BD; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AYA.SlnSynorModel.DAL.Catalogos +{ + public class CatalogosDAL : IDisposable + { + public string InsertarActualizarEmisorPN(EmisorPN model) + { + using (SinortContext db = new SinortContext()) + { + model.fecha_creacion = System.DateTime.Now; + model.usuario_creacion = "prueba"; + db.EmisorPN.Add(model); + db.SaveChanges(); + db.Commit(); + } + + return null; + } + + public List ObtnerEmisorPN(EmisorPN model) + { + List ListaEmisores = new List(); + using (SinortContext db = new SinortContext()) + { + ListaEmisores = db.EmisorPN.ToList(); + } + + return ListaEmisores; + } + + public void Dispose() + { + throw new NotImplementedException(); + } + } + +} diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Normativa/CatalogosDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Normativa/CatalogosDAL.cs deleted file mode 100644 index c0b39f023..000000000 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Normativa/CatalogosDAL.cs +++ /dev/null @@ -1,41 +0,0 @@ -using AYA.SlnSynorModel.BD; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AYA.SlnSynorModel.DAL.Normativa -{ - public class CatalogosDAL - { - public string InsertarActualizarEmisorPN(EmisorPN model) - { - using (SinortContext db = new SinortContext()) - { - model.fecha_creacion = System.DateTime.Now; - model.usuario_creacion = "prueba"; - db.EmisorPN.Add(model); - db.SaveChanges(); - db.Commit(); - } - - return null; - } - - public List ObtnerEmisorPN(EmisorPN model) - { - List ListaEmisores = new List(); - using (SinortContext db = new SinortContext()) - { - - ListaEmisores = db.EmisorPN.ToList(); - - - } - - return ListaEmisores; - } - } - -}