From e6cac49bed097a608e4f209c038cb025ac3c50de Mon Sep 17 00:00:00 2001
From: jnunez <jnunez@atesa.tfs.local>
Date: Thu, 14 Jun 2018 21:05:04 +0000
Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C49

---
 .../AYA.SlnSynor.WCF/ISinortCatalogos.cs      |  11 ++-
 .../AYA.SlnSynor.WCF/SinortCatalogos.svc.cs   |  29 +++++-
 .../AYA.SlnSynor/AYA.SlnSinort.csproj         |   2 -
 AYA.SlnSynor/AYA.SlnSynor/Content/toastr.css  |   1 +
 .../AYA.SlnSynor/Scripts/_references.js       | Bin 587620 -> 587496 bytes
 .../AYA.SlnSynor/Sinort-Scripts/Rol.js        |  91 ++++++++++++++----
 .../Sinort-Scripts/RolesPantallas.js          |  46 ---------
 .../AYA.SlnSynor/Views/Catalogos/Rol.cshtml   |  27 +++---
 .../Views/Catalogos/RolesPantallas.cshtml     |  40 --------
 .../AYA.SlnSynor/Views/Shared/_Layout.cshtml  |   8 +-
 .../AYA.SlnSinortModel.DAL.csproj             |   8 +-
 .../Sinort/AplicacionDAL.cs                   |   6 +-
 .../AYA.SlnSynorModel.DAL/Sinort/EmisorDAL.cs |   6 +-
 .../Sinort/PantallasDAL.cs                    |  32 +++++-
 .../AYA.SlnSynorModel.DAL/Sinort/RolesDAL.cs  |  63 +++++++++++-
 .../AYA.SlnSynorModel.DAL/packages.config     |   1 +
 .../AYA.SlnSinortModel.csproj                 |   1 +
 .../Entidades/CatalogosJSON.cs                |  15 ++-
 .../AYA.SlnSynorModel/Sinort/Pantallas.cs     |   9 ++
 .../AYA.SlnSynorModel/Sinort/SinortContex.cs  |  16 +--
 .../AYA.SlnSynorModel/Sinort/sysdiagrams.cs   |  24 +++++
 .../NewtonsoftJsonDispatchFormatter.cs        |  38 +++++---
 22 files changed, 314 insertions(+), 160 deletions(-)
 delete mode 100644 AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/RolesPantallas.js
 delete mode 100644 AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/RolesPantallas.cshtml
 create mode 100644 AYA.SlnSynor/AYA.SlnSynorModel/Sinort/sysdiagrams.cs

diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs
index 46e43ead0..760ec3ef5 100644
--- a/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs
+++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/ISinortCatalogos.cs
@@ -48,8 +48,17 @@ namespace AYA.SlnSinort.WCF
 
         #region Pantallas
          [OperationContract]
-        List<Pantallas> ObtenerPantallas(Usuario model);
+        List<Pantallas> ObtenerPantallas(CatalogosPostJSON model);
+
+         [OperationContract]
+         List<RolesPantallas> ObtenerPantallasRol(CatalogosPostJSON model);
+
         #endregion
 
+         #region RolesPantallas
+         [OperationContract]
+         RolesPantallasJSON InsertarActualizarRolesPantallas(RolesPantallasJSON model);
+         #endregion
+
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs
index fed42f71b..7eb5695d5 100644
--- a/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs
+++ b/AYA.SlnSynor/AYA.SlnSynor.WCF/SinortCatalogos.svc.cs
@@ -132,7 +132,7 @@ namespace AYA.SlnSinort.WCF
         #endregion
 
         #region Pantallas
-        public List<Pantallas> ObtenerPantallas(Usuario model)
+        public List<Pantallas> ObtenerPantallas(CatalogosPostJSON model)
         {
           List<Pantallas> respuesta = new List<Pantallas>();
             try
@@ -146,6 +146,33 @@ namespace AYA.SlnSinort.WCF
             }
            return  respuesta;
         }
+
+        public List<RolesPantallas> ObtenerPantallasRol(CatalogosPostJSON model)
+        {
+            return new PantallasDAL().ObtenerPantallasRol(model);
+        }
+        #endregion
+
+        #region RolesPantallas
+
+        public RolesPantallasJSON InsertarActualizarRolesPantallas(RolesPantallasJSON model)
+        {
+            var rolesDAL = new RolesDAL();
+            try
+            {
+                foreach(var rolPantalla in model.ListaRolesPantallas)
+                    rolesDAL.InsertarActualizarRolesPantallas(rolPantalla);
+
+                model.CodigoRespuesta = EnumTipoCodigoRespuesta.EXITOSO;
+            }
+            catch (Exception ex)
+            {
+                model.CodigoRespuesta = EnumTipoCodigoRespuesta.ERROR;
+                throw;
+            }
+
+            return model;
+        }
         #endregion
     
     }
diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
index 4e3aaac17..e181f82f9 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
@@ -7680,7 +7680,6 @@
     <Content Include="Sinort-Scripts\Mantenimientos.js" />
     <Content Include="Sinort-Scripts\ProyectoNormativo.js" />
     <Content Include="Sinort-Scripts\Rol.js" />
-    <Content Include="Sinort-Scripts\RolesPantallas.js" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
@@ -7712,7 +7711,6 @@
     <Content Include="Views\Catalogos\Aplicacion.cshtml" />
     <Content Include="Views\Home\Proyecto_Normativo.cshtml" />
     <Content Include="Views\Catalogos\Rol.cshtml" />
-    <Content Include="Views\Catalogos\RolesPantallas.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Content/toastr.css b/AYA.SlnSynor/AYA.SlnSynor/Content/toastr.css
index f5bf1ebfd..1fe4b8baf 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Content/toastr.css
+++ b/AYA.SlnSynor/AYA.SlnSynor/Content/toastr.css
@@ -27,6 +27,7 @@
   -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
   filter: alpha(opacity=80);
 }
+
 .toast-close-button:hover,
 .toast-close-button:focus {
   color: #000000;
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Scripts/_references.js b/AYA.SlnSynor/AYA.SlnSynor/Scripts/_references.js
index 6ec38e4279b175630e3c74f0c36fe8e503cb50e7..27444dbe2151ce9d42596a706768b21d5bc1598d 100644
GIT binary patch
delta 25
hcmaFzPWi=K<%Sl<7N!>F7M2#)7Pc1lEgUbt0RWY03cvsW

delta 63
zcmaFyR{6<0<%Sl<7N!>F7M2#)7Pc1lEgUbtO`afbFx}uAhuriF-#FNWQyGdG3K$X@
R@)$~hWDXD}PJYNE3IHUB7DWI6

diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
index 90f2e52da..271360696 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Rol.js
@@ -1,7 +1,7 @@
 //$("#formCatalogo").EnableValidationToolTip();
 var DataCatalogo;
 var id_column = 1;
-var Item = {};
+var model = {};
 
 
 //#region READY
@@ -40,8 +40,9 @@ this.getDataModel = function () {
     });
 
     $('#TableItems').TableInit(0, false, true, true, false, null, null);
+    $('#GridRolesPantallas').TableInit(0, false, true, true, false, null, null);
     ObtenerRoles();
-  
+
 
 }
 this.CargarGridRoles = function (data) {
@@ -56,6 +57,7 @@ this.CargarGridRoles = function (data) {
         var pantallas = $("#ucbtnVistaPantallas").html();
         var usuarios = $("#ucbtnVistaUsuarios").html();
         option = replaceAll("[$CodItem]", item.IdRol, option);
+        pantallas = replaceAll("[$CodItem]", item.IdRol, pantallas);
 
         var stateIcon = $("#ucItemsIcon").html();
 
@@ -216,33 +218,82 @@ this.LimpiarControles = function () {
     $('#lbTituloAccion').append('Ingresar Nuevo Rol');
 }
 
-this.AbrirRolesPantallas = function () {
+this.AbrirRolesPantallas = function (id) {
     $("#modalRolesPantallas").modal('show');
-    CargarPantallas();
+    CargarPantallas(id);
 }
 
-this.CargarPantallas = function () {
+this.CargarPantallas = function (id) {
+
+    $('#hiddenIdRol').val(id)
+    var uri = CatalogosWCF + '/api/ObtenerPantallasRol';
+    model = {
+        codigo: id
+    };
+
+    AjaxPostData(uri, model, true, false, CargarTablaPantallas, null, null);
 
-    var uri = CatalogosWCF + '/api/ObtenerPantallas';
-    AjaxPostData(uri, Item, true, false, CargarTablaPantallas, null, null);
 }
 
 this.CargarTablaPantallas = function (data) {
 
-    if (data != null) {
-        lista = data;
-        var Seleccionar = $("#ucbtnCheck").html();
-        var columnDefinition = [
-            { "data": "Descripcion" },
-            { "data": null, className: "center", defaultContent: Seleccionar }
-        ];
+    var TableItems = $('#GridRolesPantallas').DataTable();
+    TableItems.clear().draw();
+    var lista = data;
+
+    $.each(lista, function (key, item) {
+
+        var pantallas = $("#ucbtnCheck").html();
+        var id = item.IdPantalla;
+
+        TableItems.row.add([id,
+                            item.Descripcion,
+                            '<input type="checkbox"  id="chkSeleccionar_' + id + '"  >']).draw();
+    });
+
+    ENDREQUEST();
+
+}
+
+this.GuardarRolesPantallas = function () {
+
+    if (!confirm("Va registrar las pantallas.\n ¿Desea continuar?"))
+    { return; }
+
+    TablePantallas = $('#GridRolesPantallas').DataTable();
+    var IdRoles = $('#hiddenIdRol').val();
+    var ArrayRolesPantallas = [];
+    var data = TablePantallas
+        .rows()
+        .data();
+
+    $.each(data, function (key, item) {
+
+
+        var cheched = $("#chkSeleccionar_" + item[0]).prop("checked") ? true : false
+
+
+        RolesPantallas = {
+            IdRol: IdRoles,
+            IdPantalla: item[0],
+            Estado: cheched
+
+        }
+        ArrayRolesPantallas.push(RolesPantallas);
+    });
+
+    var uri = CatalogosWCF + '/api/InsertarActualizarRolesPantallas';
+    var model = {
+        ListaRolesPantallas: ArrayRolesPantallas
+    };
+
+    AjaxPostData(uri, model, true, true, null, null, null);
+
+
+
+    ENDREQUEST();
+
 
-        $('#GridRolesPantallas').TableInit(1, true, true, true, true, columnDefinition, lista);
 
-        if ($.fn.DataTable.isDataTable('#GridRolesPantallas')) {
 
-            $('#GridRolesPantallas').DataTable().search('').draw();
-            ENDREQUEST();
-        }
-    }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/RolesPantallas.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/RolesPantallas.js
deleted file mode 100644
index 989961ec7..000000000
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/RolesPantallas.js
+++ /dev/null
@@ -1,46 +0,0 @@
-
-var Item = {};
-jQuery(document).ready(function () {
-    CargarPantallas();
-});
-
-
-this.CargarPantallas = function () {
-
-    var uri = CatalogosWCF + '/api/ObtenerPantallas';
-    AjaxPostData(uri, Item, true, false, CargarTablaPantallas, null, null);
-}
-
-this.CargarTablaPantallas = function (data) {
-
-    if (data != null) {
-        lista = data;
-        var Seleccionar = $("#ucbtnVista").html();
-        var columnDefinition = [
-            { "data": "Descripcion" },
-            { "data": null, className: "center", defaultContent: Seleccionar }
-        ];
-
-        $('#tablePantallas').TableInit(1, true, true, true, true, columnDefinition, lista);
-
-        if ($.fn.DataTable.isDataTable('#tablePantallas')) {
-
-            $('#tablePantallas').DataTable().search('').draw();
-            ENDREQUEST();
-        }
-    }
-}
-
-$('#tablePantallas').on('click', 'button', function () {
-
-    var data = $('#tablePantallas').DataTable().row($(this).parents('tr')).data();
-
-    var mtzView = data.Vista.split('/')
-
-    url = $("#hiddenHref").val();
-    url = url.replace("View", mtzView[1]);
-    url = url.replace("Controller", mtzView[0]);
-
-    document.location.href = url;
-
-});
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
index a0e08420b..5e0a973f6 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/Rol.cshtml
@@ -7,11 +7,13 @@
 <br />
 
 <input type="hidden" id="hiddenId" value="true">
+<input type="hidden" id="hiddenIdRol" value="true">
 <form id="formCatalogo" class="form-horizontal" role="form">
     <h3>&nbsp;<i class="fa fa-briefcase"></i>&nbsp; Roles</h3>
     <br />
+    
     <div class="panel panel-success">
-
+      
         <div class="panel-body">
             <div class="row">
                 <div class="col-md-8">
@@ -50,7 +52,7 @@
                     </div>
 
                     <div id="ucbtnVistaPantallas" style=" display:none;">
-                        <button type="button" id="btnseleccionar" class="btn btn-default btn-xs" onclick="AbrirRolesPantallas()">
+                        <button type="button" id="btnseleccionar" class="btn btn-default btn-xs" onclick="AbrirRolesPantallas([$CodItem])">
                             <i class="fa fa-check"></i>&nbsp;&nbsp;Seleccionar
                         </button>
                     </div>
@@ -109,7 +111,7 @@
 
 
 <div class="modal fade" id="modalRolesPantallas" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" style="display: none;">
-    <div class="modal-dialog modal-lg" style="width:80%;">
+    <div class="modal-dialog modal-lg" style="width:40%;">
         <div class="modal-content">
             <div class="modal-header">
                 <h4><i class="fa fa-bars"></i>&nbsp;&nbsp;Pantallas</h4>
@@ -119,21 +121,24 @@
                 <table id="GridRolesPantallas" class="table table-condensed dataTable no-footer">
                     <thead>
                         <tr>
+                            <th class="col-sm-1">ID</th>
                             <th class="col-sm-4">Descripción</th>
-                            <th>Seleccionar</th>
+                            <th></th>
                         </tr>
                     </thead>
                 </table>
             </div>
-            <div id="ucbtnCheck" style=" display:none;">
-                <input type="radio">
-         
-            </div>
+            @*<div id="ucbtnCheck" style="display:none;" class="checkbox">
+                <input type="checkbox" id="chkSeleccionar" value="true">
 
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">Cerrar</button>
+            </div>*@
+            
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-success btn-sm" onclick="javascript: GuardarRolesPantallas()">Guardar</button>
+                    <button type="button" class="btn btn-danger btn-sm" data-dismiss="modal">Cerrar</button>
+                </div>
             </div>
-        </div>
+           
     </div>
 </div>
 
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/RolesPantallas.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/RolesPantallas.cshtml
deleted file mode 100644
index 760091223..000000000
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Catalogos/RolesPantallas.cshtml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-@{
-    ViewBag.Title = "RolesPantallas";
-   
-}
-
-
-<input type="hidden" id="hiddenHref" value="@string.Concat(Url.Action("View", "Controller", null), ViewBag.QueryEncripted)">
-<form id="formCatalogo" class="form-horizontal" role="form">
-    <div class="panel-body">
-        <h3>&nbsp;<i class="fa fa-list-ul"></i> Selección de Pantallas </h3>
-        <br />
-        <br />
-        <div>
-            <table id="tablePantallas" class="table table-condensed dataTable no-footer">
-                <thead>
-                    <tr>
-                        <th class="col-sm-4">Descripción</th>
-                        <th>Acción</th>
-                    </tr>
-                </thead>
-            </table>
-
-        </div>
-
-
-
-        <div id="ucbtnVista" style=" display:none;">
-          
-                <input type="checkbox" checked="checked">
-              
-          
-          
-        </div>
-    </div>
-
-</form>
-
-
-@Scripts.Render("~/Sinort-Scripts/RolesPantallas.js")
\ 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 133211b16..bc86be9b8 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
@@ -25,7 +25,7 @@
     <!-- Google Font -->
     <link rel="stylesheet"
           href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
-    <link rel="stylesheet" href="~/Content/Principal.css">
+
     @*@Styles.Render("~/Content/dashboard")*@
      @Scripts.Render("~/bundles/modernizr")
     @Scripts.Render("~/bundles/jquery")
@@ -34,6 +34,12 @@
     @Styles.Render("~/Content/sinort-css")
   
     @* Seccion futuros scripts *@
+    <style>
+        input[type=checkbox]
+{
+  -webkit-appearance:checkbox;
+}
+    </style>
 </head>
 
 <body class="hold-transition skin-blue sidebar-mini">
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
index 2cea1b6f9..b2f7d0ff8 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
@@ -46,6 +46,10 @@
       <HintPath>..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <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" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -99,7 +103,9 @@
   <ItemGroup />
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/AplicacionDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/AplicacionDAL.cs
index 482e6a662..50f2a6799 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/AplicacionDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/AplicacionDAL.cs
@@ -18,14 +18,16 @@ namespace AYA.SlnSinortModel.DAL.Sinort
        Log log = new Log("AplicacionDAL");
        #region ObtenerAplicacion
 
-       public List<CatalogosJSON> ObtenerAplicacion(string filtro = null)
+       public List<CatalogosJSON> ObtenerAplicacion(CatalogosPostJSON model)
        {
            List<CatalogosJSON> registros = null;
+           string filtro = model != null ? model.filtro : null;
+
            try
            {
                using (SinortContex db = new SinortContex())
                {
-                   registros = (string.IsNullOrWhiteSpace(filtro) ? db.Aplicacion.Where(t => t.Estado == true) : db.Aplicacion.Where(t => t.Estado == true && t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower()) == true))
+                   registros = db.Aplicacion.Where(t => t.Estado == true && (string.IsNullOrEmpty(filtro) || t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower())))
                        .Select(t => new CatalogosJSON()
                        {
                            codigo = t.IdAplicacion.ToString(),
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/EmisorDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/EmisorDAL.cs
index 293cdc865..25b77a5a0 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/EmisorDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/EmisorDAL.cs
@@ -17,14 +17,16 @@ namespace AYA.SlnSinortModel.DAL.Sinort
         Log log = new Log("EmisorDAL");
         #region ObtenerEmisor
 
-        public List<CatalogosJSON> ObtenerEmisor(string filtro = null)
+        public List<CatalogosJSON> ObtenerEmisor(CatalogosPostJSON model)
         {
             List<CatalogosJSON> registros = null;
+            string filtro = model != null ? model.filtro : null;
+
             try
             {
                 using (SinortContex db = new SinortContex())
                 {
-                    registros = (string.IsNullOrWhiteSpace(filtro) ? db.Emisor.Where(t => t.Estado == true) : db.Emisor.Where(t => t.Estado == true && t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower()) == true))
+                    registros = db.Emisor.Where(t => t.Estado == true && (string.IsNullOrEmpty(filtro) || t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower())))
                         .Select(t => new CatalogosJSON()
                         {
                             codigo = t.IdEmisor.ToString(),
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs
index d0fcf1ff6..2bbe91f2c 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PantallasDAL.cs
@@ -1,27 +1,49 @@
-using Atesa.Utilitarios;
-using AYA.SlnSinortModel.Sinort;
+using AYA.SlnSinortModel.Sinort;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Data.Entity;
+using System.Data.Entity.Validation;
+using AYA.SlnSinortModel.Entidades;
 
 namespace AYA.SlnSinortModel.DAL.Sinort
 {
     public class PantallasDAL
     {
-        Log log = new Log("MatrizDAL");
-        public List<Pantallas> ObtenerPantallas(Usuario model)
+        public List<Pantallas> ObtenerPantallas(CatalogosPostJSON model)
         {
            
 
             List<Pantallas> registros = null;
+            string filtro = model != null ? model.filtro : null;
+
             try
             {
                 using (SinortContex db = new SinortContex())
                 {
-                    registros = db.Pantallas.Where(t => t.Estado == true).OrderBy(q => q.IdPantalla).ToList();
+                    registros = db.Pantallas.Where(t => t.Estado == true && (string.IsNullOrEmpty(filtro) || t.Descripcion.Trim().ToLower() == filtro.Trim().ToLower())).OrderBy(q => q.IdPantalla).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                //log.Error(ex);
+            }
 
+            return registros;
+        }
+
+        public List<RolesPantallas> ObtenerPantallasRol(CatalogosPostJSON model)
+        {
+            List<RolesPantallas> registros = null;
+            string filtro = model != null ? model.filtro : null;
+
+            try
+            {
+                using (SinortContex db = new SinortContex())
+                {
+                    registros = db.RolesPantallas.Where(r => r.IdRol.ToString() == model.codigo).Include(p => p.Pantallas).AsNoTracking().ToList();
                 }
             }
             catch (Exception ex)
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/RolesDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/RolesDAL.cs
index f0c000c3e..5abefb254 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/RolesDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/RolesDAL.cs
@@ -18,14 +18,16 @@ namespace AYA.SlnSinortModel.DAL.Sinort
 
         #region ObtenerRol
 
-        public List<CatalogosJSON> ObtenerRol(string filtro = null)
+        public List<CatalogosJSON> ObtenerRol(CatalogosPostJSON model)
         {
             List<CatalogosJSON> registros = null;
+            string filtro = model != null ? model.filtro : null;
+
             try
             {
                 using (SinortContex db = new SinortContex())
                 {
-                    registros = (string.IsNullOrWhiteSpace(filtro) ? db.Roles.Where(t => t.Estado == true) : db.Roles.Where(t => t.Estado == true && t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower()) == true))
+                    registros = db.Roles.Where(t => t.Estado == true && (string.IsNullOrEmpty(filtro) || t.Descripcion.Trim().ToLower().Contains(filtro.Trim().ToLower())))
                         .Select(t => new CatalogosJSON()
                         {
                             codigo = t.IdRol.ToString(),
@@ -117,6 +119,63 @@ namespace AYA.SlnSinortModel.DAL.Sinort
 
 
 
+        #endregion
+
+
+        #region InsertarActualizarRolesPantallas
+
+        public BaseJson InsertarActualizarRolesPantallas(RolesPantallas model)
+        {
+            RolesPantallas Actual = new RolesPantallas();
+            BaseJson Respuesta = new BaseJson();
+            try
+            {
+                model.ClearProperties();
+
+                using (SinortContex Conn = new SinortContex())
+                {
+                    Actual = Conn.RolesPantallas.Where(x => x.IdRol == model.IdRol && x.IdPantalla == model.IdPantalla ).FirstOrDefault();
+                    if (Actual == null)
+                    {
+                        int? Next_id = Conn.RolesPantallas.Max(t => (int?)t.IdRolesPantallas);
+                        model.IdRolesPantallas = (Next_id == null) ? 1 : Next_id.Value + 1;
+                        model.FechaCreacion = DateTime.Now;
+                        Conn.RolesPantallas.Add(model);
+                    }
+                    else
+                    {
+                        //model.FechaModificacion = DateTime.Now;
+                        //model.FechaCreacion = Actual.FechaCreacion;
+                        //model.UsuarioCreacion = Actual.UsuarioCreacion;
+                        //model.Descripcion = string.IsNullOrEmpty(model.Descripcion) ? Actual.Descripcion : model.Descripcion;
+                        //Conn.Entry(Actual).State = System.Data.Entity.EntityState.Detached;
+                        //Conn.Roles.Attach(model);
+                        //Conn.Entry(model).State = System.Data.Entity.EntityState.Modified;
+                    }
+                    Conn.SaveChanges();
+                    Conn.Commit();
+                    Respuesta.CodigoRespuesta = EnumTipoCodigoRespuesta.EXITOSO.ToString();
+                }
+            }
+            catch (DbEntityValidationException ex)
+            {
+                //logger.Error(exs);
+                Respuesta.CodigoRespuesta = EnumTipoCodigoRespuesta.ERROR.ToString();
+            }
+            catch (Exception ex)
+            {
+                //logger.Error(ex);
+                Respuesta.CodigoRespuesta = EnumTipoCodigoRespuesta.ERROR.ToString();
+            }
+            finally
+            {
+                Actual = null;
+            }
+            return Respuesta;
+        }
+
+
+
         #endregion
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/packages.config b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/packages.config
index f773e4819..552b627cb 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/packages.config
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.2.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="NLog" version="4.5.6" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj
index d43505b65..e84e21164 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Sinort\RolesPantallas.cs" />
     <Compile Include="Sinort\RolesUsuario.cs" />
     <Compile Include="Sinort\SinortContex.cs" />
+    <Compile Include="Sinort\sysdiagrams.cs" />
     <Compile Include="Sinort\TipoAplicacion.cs" />
     <Compile Include="Sinort\TipoDocumento.cs" />
     <Compile Include="Sinort\TipoEmisor.cs" />
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
index 80b8fc5e8..4c1584d66 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
@@ -1,4 +1,5 @@
 
+using AYA.SlnSinortModel.Sinort;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,5 +12,17 @@ namespace AYA.SlnSinortModel.Entidades
     {
         public string codigo { get; set; }
         public string descripcion { get; set; }
-    }   
+    }
+
+    public class CatalogosPostJSON
+    {
+        public object dataModel { get; set; }
+        public string codigo { get; set; }
+        public string filtro { get; set; }
+    }
+
+    public class RolesPantallasJSON : BaseJson
+    {
+        public List<RolesPantallas> ListaRolesPantallas { get; set; }
+    }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs
index 2bab47f14..e91f64adc 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Pantallas.cs
@@ -9,6 +9,12 @@ namespace AYA.SlnSinortModel.Sinort
     [Table("Catalogos.Pantallas")]
     public partial class Pantallas
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
+        public Pantallas()
+        {
+            RolesPantallas = new HashSet<RolesPantallas>();
+        }
+
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public int IdPantalla { get; set; }
@@ -32,5 +38,8 @@ namespace AYA.SlnSinortModel.Sinort
 
         [StringLength(200)]
         public string UsuarioModificacion { get; set; }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<RolesPantallas> RolesPantallas { get; set; }
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
index ad86b435a..4eec55907 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
@@ -1,14 +1,15 @@
+namespace AYA.SlnSinortModel.Sinort
+{
     using System;
     using System.Data.Entity;
     using System.ComponentModel.DataAnnotations.Schema;
     using System.Linq;
     using AYA.SlnSinortModel.Sinort.Partial;
 
-namespace AYA.SlnSinortModel.Sinort
-    {
-       
     public partial class SinortContex : Contex
     {
+ 
+
         public virtual DbSet<Aplicacion> Aplicacion { get; set; }
         public virtual DbSet<Categoria> Categoria { get; set; }
         public virtual DbSet<Emisor> Emisor { get; set; }
@@ -26,6 +27,7 @@ namespace AYA.SlnSinortModel.Sinort
         public virtual DbSet<TipoForo> TipoForo { get; set; }
         public virtual DbSet<TipoMatriz> TipoMatriz { get; set; }
         public virtual DbSet<Usuario> Usuario { get; set; }
+        public virtual DbSet<sysdiagrams> sysdiagrams { get; set; }
         public virtual DbSet<BitacoraDocumentos> BitacoraDocumentos { get; set; }
         public virtual DbSet<Documentos> Documentos { get; set; }
         public virtual DbSet<DocumentosAdjuntos> DocumentosAdjuntos { get; set; }
@@ -117,14 +119,6 @@ namespace AYA.SlnSinortModel.Sinort
                 .Property(e => e.UsuarioModificacion)
                 .IsUnicode(false);
 
-            modelBuilder.Entity<PermisosUsuario>()
-                .Property(e => e.UsuarioCreacion)
-                .IsUnicode(false);
-
-            modelBuilder.Entity<Pantallas>()
-                .Property(e => e.UsuarioModificacion)
-                .IsUnicode(false);
-
             modelBuilder.Entity<PlantillaEmail>()
                 .Property(e => e.NombrePlatilla)
                 .IsUnicode(false);
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/sysdiagrams.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/sysdiagrams.cs
new file mode 100644
index 000000000..6966c7270
--- /dev/null
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/sysdiagrams.cs
@@ -0,0 +1,24 @@
+namespace AYA.SlnSinortModel.Sinort
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel.DataAnnotations;
+    using System.ComponentModel.DataAnnotations.Schema;
+    using System.Data.Entity.Spatial;
+
+    public partial class sysdiagrams
+    {
+        [Required]
+        [StringLength(128)]
+        public string name { get; set; }
+
+        public int principal_id { get; set; }
+
+        [Key]
+        public int diagram_id { get; set; }
+
+        public int? version { get; set; }
+
+        public byte[] definition { get; set; }
+    }
+}
diff --git a/AYA.SlnSynor/Atesa.Utilitarios/NewtonsoftJsonDispatchFormatter.cs b/AYA.SlnSynor/Atesa.Utilitarios/NewtonsoftJsonDispatchFormatter.cs
index fb1a4781d..7ef203fde 100644
--- a/AYA.SlnSynor/Atesa.Utilitarios/NewtonsoftJsonDispatchFormatter.cs
+++ b/AYA.SlnSynor/Atesa.Utilitarios/NewtonsoftJsonDispatchFormatter.cs
@@ -109,27 +109,37 @@ namespace Atesa.Utilitarios
             byte[] body;
             var serializer = new JsonSerializer();
             serializer.Converters.Add(new StringEnumConverter { AllowIntegerValues = false, CamelCaseText = false });
-
-            using (var ms = new MemoryStream())
+            Message replyMessage = null;
+            try
             {
-                using (var sw = new StreamWriter(ms, Encoding.UTF8))
+                using (var ms = new MemoryStream())
                 {
-                    using (JsonWriter writer = new Newtonsoft.Json.JsonTextWriter(sw))
+                    using (var sw = new StreamWriter(ms, Encoding.UTF8))
                     {
-                        //writer.Formatting = Newtonsoft.Json.Formatting.Indented;
-                        serializer.Serialize(writer, obj);
-                        sw.Flush();
-                        body = ms.ToArray();
+                        using (JsonWriter writer = new Newtonsoft.Json.JsonTextWriter(sw))
+                        {
+                            //writer.Formatting = Newtonsoft.Json.Formatting.Indented;
+                            serializer.Serialize(writer, obj);
+                            sw.Flush();
+                            body = ms.ToArray();
+                        }
                     }
                 }
+
+                replyMessage = Message.CreateMessage(messageVersion, action, new RawBodyWriter(body));
+                replyMessage.Properties.Add(WebBodyFormatMessageProperty.Name, new WebBodyFormatMessageProperty(WebContentFormat.Raw));
+                var respProp = new HttpResponseMessageProperty();
+                respProp.Headers[HttpResponseHeader.ContentType] = "application/json";
+                respProp.StatusCode = statusCode;
+                replyMessage.Properties.Add(HttpResponseMessageProperty.Name, respProp);
+            }
+            catch (Exception ex)
+            {
+                
+                throw ex;
             }
 
-            Message replyMessage = Message.CreateMessage(messageVersion, action, new RawBodyWriter(body));
-            replyMessage.Properties.Add(WebBodyFormatMessageProperty.Name, new WebBodyFormatMessageProperty(WebContentFormat.Raw));
-            var respProp = new HttpResponseMessageProperty();
-            respProp.Headers[HttpResponseHeader.ContentType] = "application/json";
-            respProp.StatusCode = statusCode;
-            replyMessage.Properties.Add(HttpResponseMessageProperty.Name, respProp);
+         
             return replyMessage;
         }
     }