From a8016807af75c521d98614bb00dc942a2bfba622 Mon Sep 17 00:00:00 2001 From: jnunez Date: Wed, 6 Jun 2018 15:26:51 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C5 --- AYA.SlnSynor/AYA.SlnSynor.sln | 2 +- .../AYA.SlnSynor/App_Start/BundleConfig.cs | 1 + .../Controllers/HomeController.cs | 6 + .../Sinort-Scripts/AdministrarCatalogos.js | 2 + .../AYA.SlnSynor/Sinort-Scripts/Global.js | 2 +- .../Views/Catalogos/EmisorPN.cshtml | 1 + .../Normativa_Reglamentacion_Tecnica.cshtml | 416 +----------------- .../AYA.SlnSynorModel.DAL.csproj | 1 - AYA.SlnSynor/AYA.SlnSynorModel.DAL/Class1.cs | 12 - 9 files changed, 18 insertions(+), 425 deletions(-) delete mode 100644 AYA.SlnSynor/AYA.SlnSynorModel.DAL/Class1.cs diff --git a/AYA.SlnSynor/AYA.SlnSynor.sln b/AYA.SlnSynor/AYA.SlnSynor.sln index e8659928b..66271d125 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.sln +++ b/AYA.SlnSynor/AYA.SlnSynor.sln @@ -22,7 +22,7 @@ Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 6 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://svr-desarrollo:8080/tfs/aya + SccTeamFoundationServer = http://192.168.1.10:8080/tfs/aya SccLocalPath0 = . SccProjectUniqueName1 = AYA.SlnSynor.Mantenimientos\\AYA.SlnSynor.Mantenimientos.csproj SccProjectName1 = AYA.SlnSynor.Mantenimientos diff --git a/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs b/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs index 352234bd4..cca76494c 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs @@ -48,6 +48,7 @@ namespace AYA.SlnSynor bundles.Add(new ScriptBundle("~/Script-Global") .Include("~/Sinort-Scripts/Global.js") + .Include("~/Scripts/toastr.min.js") .Include("~/Scripts/jquery.easyui.min.js") .Include("~/Scripts/locale/easyui-lang-es.js")); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs index cb5c1b09f..66f71f73a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -26,5 +26,11 @@ namespace AYA.SlnSynor.Controllers return View(); } + + public ActionResult Normativa_Reglamentacion_Tecnica() + { + return View(); + } + } } \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js index 049845633..afdd2bb2e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js @@ -19,6 +19,8 @@ function IniciarForm() { ObtenerEmisoresPN(filtro); }); + + ObtenerEmisoresPN(filtro); } function NuevoEmisorPN(e) { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index 71aab73a6..45cc38718 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -113,7 +113,7 @@ function STARTREQUEST (Message) { stringHtml += "
"; stringHtml += ""; stringHtml += ""; - stringHtml += ""; + stringHtml += ""; //stringHtml += ""; stringHtml += ""; stringHtml += "
\"loading\"\"loading\"  "; diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml index 2f4381af8..5f3411f44 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml @@ -11,6 +11,7 @@

diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Normativa_Reglamentacion_Tecnica.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Normativa_Reglamentacion_Tecnica.cshtml index 80b1baeb7..f495a80e4 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Normativa_Reglamentacion_Tecnica.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Normativa_Reglamentacion_Tecnica.cshtml @@ -1,421 +1,17 @@ @{ ViewBag.Title = "Normativa_Reglamentacion_Tecnica"; + Layout = "~/Views/Shared/_Layout.cshtml"; } + +
+
+
- -
- - -
- - - - - - -
- - - - -
- -
- - -
- -
- -
- - - - Derechos Reservados AYA © 2018. AyA -
- - - -
+ - - diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj index 1bc8826d9..599a1dd2b 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSynorModel.DAL.csproj @@ -52,7 +52,6 @@ - diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Class1.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Class1.cs deleted file mode 100644 index 92eb705b5..000000000 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AYA.SlnSynorModel.DAL -{ - public class Class1 - { - } -}