From 1ebaaaa96f1f0c949a4357ce777f0002994a8d5d Mon Sep 17 00:00:00 2001
From: jnunez <jnunez@atesa.tfs.local>
Date: Fri, 6 Jul 2018 22:28:49 +0000
Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C175

---
 .../AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs   | 9 ++++++++-
 .../AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs | 5 ++++-
 AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs  | 5 ++++-
 .../AYA.SlnSynorModel/Entidades/CatalogosJSON.cs         | 9 +++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs
index 872445b59..de16d8ab2 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/PermisosUsuarioDAL.cs
@@ -1,14 +1,21 @@
-using Atesa.Utilitarios;
+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;
+using Atesa.Utilitarios;
+using AYA.SlnSinortModel.Constantes;
 
 namespace AYA.SlnSinortModel.DAL.Sinort
 {
     public class PermisosUsuarioDAL
     {
         Log log = new Log("PermisosUsuarioDAL");
+
+      
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
index 25950e0c8..bc50cb159 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
@@ -22,7 +22,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
             {
                 using (SinortContex Conn = new SinortContex())
                 {
-
+                    
                     model.ProyectoNormativo.ClearProperties();
 
                     if (!Conn.ProyectoNormativo.Any(x => x.IdProyectoNormativo == model.ProyectoNormativo.IdProyectoNormativo))
@@ -131,5 +131,8 @@ namespace AYA.SlnSinortModel.DAL.Sinort
 
             return model;
         }
+
+
+      
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
index ef4361958..41f1c5011 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
@@ -116,6 +116,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                     }
                     else
                     {
+                    
                         model.FechaModificacion = DateTime.Now;
                         model.FechaCreacion = Actual.FechaCreacion;
                         model.UsuarioCreacion = Actual.UsuarioCreacion;
@@ -146,7 +147,6 @@ namespace AYA.SlnSinortModel.DAL.Sinort
             }
             return Respuesta;
         }
-       
 
         #endregion
 
@@ -186,5 +186,8 @@ namespace AYA.SlnSinortModel.DAL.Sinort
         }
 
         #endregion
+
+
+       
     }
 }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
index 05271f483..4976548d7 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
@@ -52,4 +52,13 @@ namespace AYA.SlnSinortModel.Entidades
         public string end { get; set; }
         public bool allDay { get; set; }
     }
+
+    public class PermisosJSON : BaseJson
+    {
+       public List<Pantallas> Pantallas { get; set; }
+       public RolesPantallas RolesPantallas { get; set; }
+       public RolesUsuario RolesUsuario { get; set; }
+       public Roles Rol { get; set; }
+
+    }
 }