From d0ef2af55766cecaa28ff61d14e3fd48668f3e6a Mon Sep 17 00:00:00 2001 From: mumana Date: Wed, 13 Jun 2018 16:26:15 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C43 --- .../AYA.SlnSynor.WCF/SinortCatalogos.svc.cs | 8 + .../AYA.SlnSynor/AYA.SlnSinort.csproj | 6 +- .../Controllers/BaseController.cs | 6 + .../Controllers/HomeController.cs | 14 - .../Matenimimento/AplicacionAPIController.cs | 51 - .../Matenimimento/EmisorAPIController.cs | 52 - .../MantenimientoAPIController.cs | 35 - .../AYA.SlnSynor/Views/Shared/_Layout.cshtml | 168 +- .../AYA.SlnSinortModel.DAL.csproj | 1 + .../Sinort/PantallasDAL.cs | 31 + .../AYA.SlnSinortModel.csproj | 1 + .../AYA.SlnSynorModel/Sinort/Pantallas.cs | 36 + .../AYA.SlnSynorModel/Sinort/SinortContex.cs | 375 + .../Atesa.Utilitarios.csproj | 4 + .../Atesa.Utilitarios/packages.config | 1 + .../log4net.2.0.8/lib/net20-full/log4net.dll | Bin 0 -> 278528 bytes .../log4net.2.0.8/lib/net20-full/log4net.xml | 31421 +++++++++++++++ .../lib/net35-client/log4net.dll | Bin 0 -> 282624 bytes .../lib/net35-client/log4net.xml | 32259 +++++++++++++++ .../log4net.2.0.8/lib/net35-full/log4net.dll | Bin 0 -> 286720 bytes .../log4net.2.0.8/lib/net35-full/log4net.xml | 32464 ++++++++++++++++ .../lib/net40-client/log4net.dll | Bin 0 -> 274944 bytes .../lib/net40-client/log4net.xml | 32259 +++++++++++++++ .../log4net.2.0.8/lib/net40-full/log4net.dll | Bin 0 -> 275968 bytes .../log4net.2.0.8/lib/net40-full/log4net.xml | 32464 ++++++++++++++++ .../log4net.2.0.8/lib/net45-full/log4net.dll | Bin 0 -> 276480 bytes .../log4net.2.0.8/lib/net45-full/log4net.xml | 32464 ++++++++++++++++ .../lib/netstandard1.3/log4net.dll | Bin 0 -> 221184 bytes .../log4net.2.0.8/log4net.2.0.8.nupkg | Bin 0 -> 1750988 bytes 29 files changed, 193884 insertions(+), 236 deletions(-) delete mode 100644 AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/AplicacionAPIController.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/EmisorAPIController.cs delete mode 100644 AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/MantenimientoAPIController.cs create mode 100644 AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs create mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs create mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net20-full/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net20-full/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net35-client/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net35-client/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net35-full/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net35-full/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net40-client/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net40-client/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net40-full/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net40-full/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net45-full/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/net45-full/log4net.xml create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/lib/netstandard1.3/log4net.dll create mode 100644 AYA.SlnSynor/packages/log4net.2.0.8/log4net.2.0.8.nupkg diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs index 7cc9da1f9..8835d3dd6 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -128,5 +128,13 @@ namespace AYA.SlnSinort.WCF return respuesta; } #endregion + + #region Pantallas + public List ObtenerPantallas(Usuario model) + { + return new PantallasDAL().ObtenerPantallas(model); + } + #endregion + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj index 77cd05d54..bf0fc7b3b 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj @@ -182,9 +182,6 @@ - - - @@ -7734,6 +7731,9 @@ AYA.SlnSinortModel + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs index 0c6ca4056..4797565f0 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs @@ -4,6 +4,8 @@ using System.Linq; using System.Web; using System.Web.Mvc; using System.Configuration; +using AYA.SlnSinortModel.Sinort; +using AYA.SlnSinortModel.DAL.Sinort; namespace AYA.SlnSinort.Controllers { @@ -17,6 +19,10 @@ namespace AYA.SlnSinort.Controllers ViewBag.SinortWCF = SinortWCF; ViewBag.SinortCatalogosWCF = SinortCatalogosWCF; + + var ListaPantallas = new PantallasDAL().ObtenerPantallas(null); + + ViewBag.ListaPantallas = ListaPantallas; } } } \ 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 218f4f27f..8d4a96d07 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -14,20 +14,6 @@ namespace AYA.SlnSinort.Controllers return View(); } - public ActionResult About() - { - ViewBag.Message = "Your application description page."; - - return View(); - } - - public ActionResult Contact() - { - ViewBag.Message = "Your contact page."; - - return View(); - } - public ActionResult Normativa_Reglamentacion_Tecnica() { return View(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/AplicacionAPIController.cs b/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/AplicacionAPIController.cs deleted file mode 100644 index 7e223a3a6..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/AplicacionAPIController.cs +++ /dev/null @@ -1,51 +0,0 @@ -using AYA.SlnSinortModel.DAL.Sinort; -using AYA.SlnSinortModel.Entidades; -using AYA.SlnSinortModel.Sinort; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Http; - - -namespace AYA.SlnSinort.ControllersWebApi.Matenimimento -{ - public class AplicacionAPIController : ApiController - { - #region Aplicacion - [HttpGet] - public List ObtenerAplicacion() - { - List respuesta = null; - try - { - respuesta = new AplicacionDAL().ObtenerAplicacion(); - - } - catch (Exception ex) - { - throw; - } - return respuesta; - } - - [HttpPost] - public BaseJson InsertarActualizarAplicacion(Aplicacion model) - { - BaseJson respuesta = new BaseJson(); - try - { - respuesta = new AplicacionDAL().InsertarActualizarAplicacion(model); - } - catch (Exception ex) - { - - throw; - } - return respuesta; - } - - - #endregion - } -} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/EmisorAPIController.cs b/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/EmisorAPIController.cs deleted file mode 100644 index b5163c004..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/EmisorAPIController.cs +++ /dev/null @@ -1,52 +0,0 @@ -using AYA.SlnSinortModel.DAL.Sinort; -using AYA.SlnSinortModel.Entidades; -using AYA.SlnSinortModel.Sinort; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Http; - -namespace AYA.SlnSinort.ControllersWebApi.Matenimimento -{ - public class EmisorAPIController : ApiController - { - #region Emisor - [HttpGet] - public List ObtenerEmisor() - { - List respuesta = null; - try - { - respuesta = new EmisorDAL().ObtenerEmisor(); - - } - catch (Exception ex) - { - throw; - } - return respuesta; - } - - [HttpPost] - public BaseJson InsertarActualizarEmisor(Emisor model) - { - BaseJson respuesta = new BaseJson(); - try - { - respuesta = new EmisorDAL().InsertarActualizarEmisor(model); - } - catch (Exception ex) - { - - throw; - } - return respuesta; - } - - - #endregion - - - } -} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/MantenimientoAPIController.cs b/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/MantenimientoAPIController.cs deleted file mode 100644 index 724645a96..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/ControllersWebApi/Matenimimento/MantenimientoAPIController.cs +++ /dev/null @@ -1,35 +0,0 @@ -using AYA.SlnSinortModel.DAL.Sinort; -using AYA.SlnSinortModel.Entidades; -using AYA.SlnSinortModel.Sinort; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Http; - - -namespace AYA.SlnSinort.ControllersWebApi.Matenimimento -{ - public class MantenimientoAPIController : ApiController - { - - [HttpGet] - public List ObtenerMantenimientoCatalogos() - { - List respuesta = null; - try - { - respuesta = new MantenimientoDAL().ObtenerMantenimientoCatalogos(); - - } - catch (Exception ex) - { - throw; - } - return respuesta; - } - - - - } -} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml index c69e1c7b8..950d37e8a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - + AYA | SINORT @@ -24,13 +24,13 @@ - + @*@Styles.Render("~/Content/dashboard")*@ - @Scripts.Render("~/bundles/modernizr") + @Scripts.Render("~/bundles/modernizr") @Scripts.Render("~/bundles/jquery") @Scripts.Render("~/bundles/jquery-dataTables"); @Styles.Render("~/Content/sinort-css") - + @* Seccion futuros scripts *@ @@ -49,30 +49,8 @@ logo - - - - - - - - - - - - - - - - - -