git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C7

2018-06-06 20:57:34 +00:00 · 2018-06-06 20:57:34 +00:00 · 36b399047c
commit 36b399047c
parent 234836db75
12 changed files with 66 additions and 32 deletions
--- a/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/AYA.SlnSynor.WCF.csproj
@ -44,6 +44,10 @@
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
    <Reference Include="System.Web.DynamicData" />
    <Reference Include="System.Web.Entity" />
    <Reference Include="System.Web.ApplicationServices" />
@ -82,6 +86,7 @@
    <Folder Include="App_Data\" />
  </ItemGroup>
  <ItemGroup>
+    <Content Include="packages.config" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
--- 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)
--- a/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config
+++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/Web.config
@ -43,7 +43,7 @@
        </binding>
      </wsHttpBinding>
      <webHttpBinding>
-        <binding name="JSONBinding" closeTimeout="00:50:00" openTimeout="00:50:00" receiveTimeout="00:50:00" sendTimeout="00:50:00" allowCookies="false" bypassProxyOnLocal="false" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" useDefaultWebProxy="true" contentTypeMapper="">
+        <binding name="JSONBinding" closeTimeout="00:50:00" openTimeout="00:50:00" receiveTimeout="00:50:00" sendTimeout="00:50:00" allowCookies="false" bypassProxyOnLocal="false" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647" useDefaultWebProxy="true" contentTypeMapper="NewtonsoftJsonContentTypeMapper">
          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
          <security mode="None">
            <transport clientCredentialType="None" />
@ -64,6 +64,13 @@
    </services>

    <serviceHostingEnvironment aspNetCompatibilityEnabled="true" multipleSiteBindingsEnabled="true" />
+
+    <extensions>
+      <behaviorExtensions>
+        <add name="newtonsoftJsonBehavior" type="NewtonsoftJsonBehaviorExtension" />
+      </behaviorExtensions>
+    </extensions>
+
  </system.serviceModel>
  <system.webServer>
    <modules runAllManagedModulesForAllRequests="true"/>
--- a/AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config
+++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/packages.config
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
+</packages>
--- 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;
--- 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 = '<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-edit" plain="true" onClick="EditarEmisorPN(this)" >Editar</a>';
                    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();
--- 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 += "<div id=\"loadingGif\" class=\"toast toast-default\"  style=\"font-size:14px;\">";
    stringHtml += "<table>";
    stringHtml += "<tr>";
-    stringHtml += "<td><img src=\"/dist/img/ajax-loader.gif\" alt=\"loading\" height=\"50\" width=\"50\"></td>";
+    stringHtml += "<td><img src=\"/AYA.SlnSynor/dist/img/ajax-loader.gif\" alt=\"loading\" height=\"50\" width=\"50\"></td>";
    //stringHtml += "<td><i class=\"fa fa-spinner fa-spin fa-4x\"></i></td>";
    stringHtml += "<td>&nbsp;&nbsp;</td>";
    stringHtml += "<td>";
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/EmisorPN.cshtml
@ -11,7 +11,7 @@
        <div>
            <br />
            <div style="margin-bottom:10px">
-                
+               
                <input id="buscar_titulo" class="easyui-textbox" label="Título:" style="width: 30%;" prompt="INGRESAR TÍTULO">
                <a id="btnBuscar" href="javascript:void(0)" class="easyui-linkbutton" iconcls="icon-search" plain="true">Buscar Emisor PN</a>
            </div>
@ -46,6 +46,23 @@
    </div>

    @*---------------------- FIN NUEVO USUARIO ----------------------*@
+
+
+    <div id="dlgEdit" class="easyui-dialog" style="width:50%;"
+         closed="true" buttons="#dlg-buttons-edit">
+        <form id="fmEdit" method="post" novalidate style="margin:0;padding:20px 50px">
+            <div style="margin-bottom:20px;font-size:20px;border-bottom:1px solid #ccc">Información General</div>
+
+            <div style="margin-bottom:10px">
+                <input id="titulo" name="titulo" class="easyui-textbox" label="Título:" style="width:75%" prompt="INGRESAR TÍTULO">
+            </div>
+        </form>
+    </div>
+
+    <div id="dlg-buttons-edit">
+        <a href="javascript:void(0)" class="easyui-linkbutton c6" iconcls="icon-ok" onclick="AplicarCambios(false)" style="width:20%">Aceptar</a>
+        <a href="javascript:void(0)" class="easyui-linkbutton" iconcls="icon-cancel" onclick="javascript: $('#dlgEdit').dialog('close')" style="width:20%">Cancelar</a>
+    </div>
 </body>


--- a/AYA.SlnSynor/AYA.SlnSynor/Web.config
+++ b/AYA.SlnSynor/AYA.SlnSynor/Web.config
@ -11,8 +11,11 @@
 			<section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
 			<section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
 		<section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" /><section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" /></sectionGroup></configSections>
-  <connectionStrings>
+  <!--<connectionStrings>
    <add name="DefaultConnection" connectionString="Data Source=(LocalDb)\v11.0;AttachDbFilename=|DataDirectory|\aspnet-AYA.SlnSynor-20180604035805.mdf;Initial Catalog=aspnet-AYA.SlnSynor-20180604035805;Integrated Security=True" providerName="System.Data.SqlClient" />
+  </connectionStrings>-->
+  <connectionStrings>
+    <add name="sinortdb" connectionString="data source=192.168.1.37;initial catalog=PruebaAyA;user id=sinort;password=sinort2018;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
  </connectionStrings>
  <appSettings>
    <add key="webpages:Version" value="3.0.0.0" />
--- 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();
-        }
    }

 }
--- 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<SinortContext>(null);
            Configuration.ProxyCreationEnabled = false;
            Configuration.LazyLoadingEnabled = true;

@ -64,5 +65,5 @@ namespace AYA.SlnSynorModel.BD
        }

    }
-    
+
 }
--- a/AYA.SlnSynor/packages/repositories.config
+++ b/AYA.SlnSynor/packages/repositories.config
@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <repositories>
  <repository path="..\AYA.SlnSynor.Mantenimientos\packages.config" />
+  <repository path="..\AYA.SlnSynor.WCF\packages.config" />
  <repository path="..\AYA.SlnSynor\packages.config" />
  <repository path="..\AYA.SlnSynorModel.DAL\packages.config" />
  <repository path="..\AYA.SlnSynorModel\packages.config" />