From 36b399047cc5cede76f10f41b6e4ab7e47937c61 Mon Sep 17 00:00:00 2001 From: jnunez Date: Wed, 6 Jun 2018 20:57:34 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C7 --- .../AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj | 5 +++++ .../AYA.SlnSynor.WCF/SinortCatalogos.svc.cs | 12 ++++++------ AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config | 9 ++++++++- AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config | 4 ++++ .../easyui/themes/bootstrap/easyui.css | 16 ++++++++-------- .../Sinort-Scripts/AdministrarCatalogos.js | 12 ++++++------ .../AYA.SlnSynor/Sinort-Scripts/Global.js | 2 +- .../Views/Catalogos/EmisorPN.cshtml | 19 ++++++++++++++++++- AYA.SlnSynor/AYA.SlnSynor/Web.config | 5 ++++- .../Catalogos/CatalogosDAL.cs | 6 +----- .../BD/Partial/SinortContext.cs | 7 ++++--- AYA.SlnSynor/packages/repositories.config | 1 + 12 files changed, 66 insertions(+), 32 deletions(-) create mode 100644 AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj index 8e5557fa3..3b779c0d1 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj @@ -44,6 +44,10 @@ + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + True + @@ -82,6 +86,7 @@ + Web.config diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs index 612857279..4d4f547b2 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs @@ -19,11 +19,11 @@ namespace AYA.SlnSynor.WCF try { - using (CatalogosDAL DAL = new CatalogosDAL()) - { + CatalogosDAL DAL = new CatalogosDAL(); + respuesta.ListaEmisores = DAL.ObtnerEmisorPN(model); respuesta.CodigoRespuesta = EnumRespuesta.EXITOSO; - } + } catch (Exception ex) @@ -40,11 +40,11 @@ namespace AYA.SlnSynor.WCF EmisorPNJSON respuesta = new EmisorPNJSON(); try { - using (CatalogosDAL DAL = new CatalogosDAL()) - { + CatalogosDAL DAL = new CatalogosDAL(); + DAL.InsertarActualizarEmisorPN(model); respuesta.CodigoRespuesta = EnumRespuesta.EXITOSO; - } + } catch (Exception ex) diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config index 20554f1cd..f83ee8e7d 100644 --- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config @@ -43,7 +43,7 @@ - + @@ -64,6 +64,13 @@ + + + + + + + diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config b/AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config new file mode 100644 index 000000000..ea50f8628 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/Content/easyui/themes/bootstrap/easyui.css b/AYA.SlnSynor/AYA.SlnSynor/Content/easyui/themes/bootstrap/easyui.css index 47105ffca..3d06d4060 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Content/easyui/themes/bootstrap/easyui.css +++ b/AYA.SlnSynor/AYA.SlnSynor/Content/easyui/themes/bootstrap/easyui.css @@ -126,7 +126,7 @@ font-size: 12px; } .panel-title { - font-size: 12px; + font-size: 15px; font-weight: bold; color: #777; height: 20px; @@ -807,7 +807,7 @@ border-radius: 5px 5px 5px 5px; } .textbox .textbox-text { - font-size: 12px; + font-size: 18px; border: 0; margin: 0; padding: 0 4px; @@ -832,7 +832,7 @@ white-space: pre-wrap; } .textbox .textbox-prompt { - font-size: 12px; + font-size: 18px; color: #aaa; } .textbox .textbox-bgicon { @@ -1377,7 +1377,7 @@ margin-top: -8px; } .tabs-title { - font-size: 12px; + font-size: 18px; } .tabs-closable { padding-right: 8px; @@ -1753,13 +1753,13 @@ overflow: hidden; height: 18px; line-height: 18px; - font-size: 12px; + font-size: 150%; } .datagrid-header .datagrid-cell { height: auto; } .datagrid-header .datagrid-cell span { - font-size: 12px; + font-size: 100%; } .datagrid-cell-group { text-align: center; @@ -1837,7 +1837,7 @@ margin: 0; padding: 2px 4px; border: 1px solid #D4D4D4; - font-size: 12px; + font-size: 100%; outline-style: none; -moz-border-radius: 0 0 0 0; -webkit-border-radius: 0 0 0 0; @@ -2083,7 +2083,7 @@ width: 3em; height: auto; text-align: center; - font-size: 12px; + font-size: 100%; } .pagination-page-list { margin: 0px 6px; diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js index 5f5160d7f..fee8c770f 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/AdministrarCatalogos.js @@ -115,9 +115,9 @@ function IniciarGridEmisoresPN(data) { data: data, columns: [[ //{ field: 'id_emisor', title: 'ID EMISOR', auto: true }, - { field: 'titulo', title: 'TITULO', auto: true }, + { field: 'titulo', title: 'TITULO', auto: true, width: 300 }, { - field: 'action', title: 'ACCIONES', align: 'center', haling: 'center', width: 300, + field: 'action', title: 'ACCIONES', align: 'center', haling: 'center', formatter: function (value, row, index) { var editar = 'Editar'; return editar; @@ -127,7 +127,7 @@ function IniciarGridEmisoresPN(data) { ]], pagination: true, singleSelect: true, - fitColumns: true, + //fitColumns: true, rowNumbers: true, toolbar: "#toolbar" @@ -153,13 +153,13 @@ function ObtenerEmisoresPN(filtro) { STARTREQUEST(); }, success: function (response, data) { - if (response.CodigoRespuesta !== "OK") { - Mensajes(response); + if (response.d.CodigoRespuesta !== "1") { + Mensajes(response.d); gridEmisorPN.datagrid('options').pageNumber = 0; gridEmisorPN.datagrid('loadData', []); } else { - IniciarGridEmisoresPN(response.ListaEmisores); + IniciarGridEmisoresPN(response.d.ListaEmisores); } ENDREQUEST(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index 79a3f37a0..050990432 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -116,7 +116,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 5f3411f44..f41b4be9a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml @@ -11,7 +11,7 @@

@@ -46,6 +46,23 @@
@*---------------------- FIN NUEVO USUARIO ----------------------*@ + + +
+
+
Información General
+ +
+ +
+
+
+ + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Web.config b/AYA.SlnSynor/AYA.SlnSynor/Web.config index abac9c87e..da3350d98 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor/Web.config @@ -11,8 +11,11 @@
- + + + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs index 193fee440..9658565c0 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Catalogos/CatalogosDAL.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace AYA.SlnSynorModel.DAL.Catalogos { - public class CatalogosDAL : IDisposable + public class CatalogosDAL { public string InsertarActualizarEmisorPN(EmisorPN model) { @@ -34,10 +34,6 @@ namespace AYA.SlnSynorModel.DAL.Catalogos return ListaEmisores; } - public void Dispose() - { - throw new NotImplementedException(); - } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/BD/Partial/SinortContext.cs b/AYA.SlnSynor/AYA.SlnSynorModel/BD/Partial/SinortContext.cs index 3a154f10e..b2fd29b3f 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/BD/Partial/SinortContext.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/BD/Partial/SinortContext.cs @@ -10,14 +10,15 @@ namespace AYA.SlnSynorModel.BD { public partial class SinortContext : DbContext { - private DbContextTransaction DatabaseTransaction { get; set; } + private DbContextTransaction DatabaseTransaction { get; set; } private bool WasCommitted = false; private bool disposed = false; public SinortContext() - : base(ConfigurationManager.ConnectionStrings["sinortdb"].ConnectionString) + : base("data source=192.168.1.37;initial catalog=PruebaAyA;user id=sinort;password=sinort2018;MultipleActiveResultSets=True;App=EntityFramework") { + Database.SetInitializer(null); Configuration.ProxyCreationEnabled = false; Configuration.LazyLoadingEnabled = true; @@ -64,5 +65,5 @@ namespace AYA.SlnSynorModel.BD } } - + } diff --git a/AYA.SlnSynor/packages/repositories.config b/AYA.SlnSynor/packages/repositories.config index a23792abc..a0ac63ce6 100644 --- a/AYA.SlnSynor/packages/repositories.config +++ b/AYA.SlnSynor/packages/repositories.config @@ -1,6 +1,7 @@  +