From 22b0a507e982c1cf26aa6d3913069f3f3a68f828 Mon Sep 17 00:00:00 2001
From: mumana <mumana@atesa.tfs.local>
Date: Fri, 6 Jul 2018 14:01:04 +0000
Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C172

---
 .../Controllers/BaseController.cs             | 13 +++++++++-
 .../Controllers/LoginController.cs            |  8 +++++-
 .../AYA.SlnSynor/Sinort-Scripts/Login.js      |  9 ++++++-
 .../DetallePropuestaNormativa.js              |  8 ++++--
 .../AYA.SlnSynor/Views/Login/Login.cshtml     | 25 ++++++++-----------
 .../DetallePropuesta.cshtml                   |  4 +--
 .../Sinort/CalendarioDAL.cs                   |  2 +-
 .../Sinort/ComentariosDAL.cs                  |  2 +-
 .../Sinort/ConvocatoriaDAL.cs                 |  4 +--
 .../Sinort/ProyectoNormativoDAL.cs            |  7 +++---
 .../Entidades/CatalogosJSON.cs                |  1 +
 .../AYA.SlnSynorModel/Sinort/SinortContex.cs  |  1 -
 AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs   |  6 ++---
 13 files changed, 58 insertions(+), 32 deletions(-)

diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs
index cd17cd4c7..a9753d3e9 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs
+++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using AYA.SlnSinortModel.Sinort;
 using AYA.SlnSinortModel.DAL.Sinort;
+using System.Web.Routing;
 
 namespace AYA.SlnSinort.Controllers
 {
@@ -39,7 +40,17 @@ namespace AYA.SlnSinort.Controllers
     {
         public override void OnActionExecuting(ActionExecutingContext filterContext)
         {
-           
+            bool inicioSesion = HttpContext.Current.Session["UserName"] != null;
+            
+            if (!inicioSesion)
+            {
+                RouteValueDictionary redirectTargetDictionary = new RouteValueDictionary();
+                redirectTargetDictionary.Add("action", "Login");
+                redirectTargetDictionary.Add("controller", "Login");
+
+                filterContext.Result = new RedirectToRouteResult(redirectTargetDictionary);
+            }
+
             base.OnActionExecuting(filterContext);
         }
     }
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs
index 8329da99f..19b9dff3e 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs
+++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs
@@ -1,4 +1,5 @@
-using System;
+using Atesa.Utilitarios;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -15,5 +16,10 @@ namespace AYA.SlnSinort.Controllers.Login
             return View();
         }
 
+        public void InicioSesion(AtesaJSON model)
+        {
+            Session["UserName"] = model.AtesaUserName;
+            Session["FullName"] = model.AtesaUserFullName;
+        }
     }
 }
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js
index 406bc5642..358223f5d 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js
@@ -81,7 +81,14 @@ this.IniciarSesion = function (data) {
 
     }
    
-   
+    var uri = server + '/Login/InicioSesion'; //MODIFICAR ESTA LINEA
+    model = {
+        UserName: data.LoginUsuario,
+        FullName: null
+    };
 
+    AjaxPostData(uri, model, false, true, null, null, true);
+    
+    //APLICAR REDIRECT A HOME CONTROLLER INDEX
 
 }
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
index 47828d1de..2257db965 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
@@ -1331,8 +1331,6 @@ this.ModalEvento = function (inicio,fin) {
 this.Calendario = function (data) {
 
     $('#modalCalendario').modal('show');
-    $('#calendar').fullCalendar('destroy');
-    $('#calendar').fullCalendar('render');
     $('#calendar').fullCalendar({
         selectable: true,
         eventLimit: true,
@@ -1342,4 +1340,10 @@ this.Calendario = function (data) {
         }
     });
 
+
+    $('#modalCalendario').on('loaded.bs.modal', function (e) {
+        $('#calendar').fullCalendar('render');
+    })
+
+    
 }
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Login/Login.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Login/Login.cshtml
index aaba5c750..08d91e1e9 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Login/Login.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Login/Login.cshtml
@@ -16,10 +16,10 @@
     <link type="text/css" rel="stylesheet" href="~/Content/Customizacion.css" />
     <link type="text/css" rel="stylesheet" href="~/Content/Principal.css" />
 
-    <script src="~/Scripts/modernizr-2.6.2.js"></script>
+    @*<script src="~/Scripts/modernizr-2.6.2.js"></script>
     <script src="~/Scripts/jquery-3.3.1.min.js"></script>
     <script src="~/Scripts/bootstrap.min.js"></script>
-    @*<script src="~/Plugin/sweetalert/sweetalert.min.js"></script>*@
+    <script src="~/Plugin/sweetalert/sweetalert.min.js"></script>*@
     <style>
         body {
             overflow-x: hidden;
@@ -217,23 +217,20 @@
         </footer>
     </div>
 
-   
+
 
 </body>
 </html>
+
 @Styles.Render("~/Content/themes/base/css")
 @Styles.Render("~/Content/sinort-css")
-
-    @Scripts.Render("~/bundles/modernizr")
-    @Scripts.Render("~/bundles/jquery")
-    @Scripts.Render("~/bundles/bootstrap")
-    @Scripts.Render("~/bundles/jqueryui")
-    @Scripts.Render("~/bundles/jqueryval")
-    @Scripts.Render("~/bundles/moment")
-    @Scripts.Render("~/bundles/toastr")
-    @Scripts.Render("~/bundles/jquery-dataTables")
-    @Scripts.Render("~/bundles/jquery-fileupload")
-    @Scripts.Render("~/bundles/jquery-fullCalendar")
+@Scripts.Render("~/bundles/modernizr")
+@Scripts.Render("~/bundles/jquery")
+@Scripts.Render("~/bundles/bootstrap")
+@Scripts.Render("~/bundles/jqueryui")
+@Scripts.Render("~/bundles/jqueryval")
+@Scripts.Render("~/bundles/moment")
+@Scripts.Render("~/bundles/toastr")
 @Scripts.Render("~/Script-Global")
 @Scripts.Render("~/Sinort-Scripts/Login.js")
 
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/PropuestaNormativa/DetallePropuesta.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/PropuestaNormativa/DetallePropuesta.cshtml
index 56ff2fa3b..180cf0a99 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/PropuestaNormativa/DetallePropuesta.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/PropuestaNormativa/DetallePropuesta.cshtml
@@ -726,7 +726,7 @@
 
     @*---------------------Calendario ---------------------------------------------------------*@
     <div class="modal fade" id="modalCalendario" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static" style="display: none;">
-        <div class="modal-dialog modal-lg" style="width:75%;">
+        <div class="modal-dialog modal-lg" style="width:75%; height: 75%;">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -736,7 +736,7 @@
                     <div class="row">
 
                         <div class="col-md-12">
-                            <div id='calendar'></div>
+                            <div id='calendar' style="height: 80%;"></div>
                         </div>
 
                     </div>
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/CalendarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/CalendarioDAL.cs
index 24f4ef460..683e4cead 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/CalendarioDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/CalendarioDAL.cs
@@ -23,7 +23,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                 {
                     int? Next_id = Conn.Calendario.Max(t => (int?)t.IdCalendario);
                     model.Evento.IdCalendario = (Next_id == null) ? 1 : Next_id.Value + 1;
-                    model.Evento.UsuarioCreacion = model.AtesaUser;
+                    model.Evento.UsuarioCreacion = model.AtesaUserName;
                     model.Evento.FechaCreacion = DateTime.Now;
                     Conn.Calendario.Add(model.Evento);
                     Conn.SaveChanges();
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ComentariosDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ComentariosDAL.cs
index bd5433e6b..258863532 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ComentariosDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ComentariosDAL.cs
@@ -23,7 +23,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                 {
                     int? Next_id = Conn.ComentariosProyecto.Max(t => (int?)t.IdComentarioProyecto);
                     model.Comentario.IdComentarioProyecto = (Next_id == null) ? 1 : Next_id.Value + 1;
-                    model.Comentario.UsuarioCreacion = model.AtesaUser;
+                    model.Comentario.UsuarioCreacion = model.AtesaUserName;
                     model.Comentario.FechaCreacion = DateTime.Now;
                     Conn.ComentariosProyecto.Add(model.Comentario);
                     Conn.SaveChanges();
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ConvocatoriaDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ConvocatoriaDAL.cs
index d955b7462..24b204183 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ConvocatoriaDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ConvocatoriaDAL.cs
@@ -26,13 +26,13 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                     if (Actual == null)     
                     {
                         model.Convocado.Participante = false;
-                        model.Convocado.UsuarioCreacion = model.AtesaUser;
+                        model.Convocado.UsuarioCreacion = model.AtesaUserName;
                         model.Convocado.FechaCreacion = DateTime.Now;
                         Conn.Convocatoria.Add(model.Convocado);
                     }
                     else
                     {
-                        model.Convocado.UsuarioModificacion = model.AtesaUser;
+                        model.Convocado.UsuarioModificacion = model.AtesaUserName;
                         model.Convocado.FechaModificacion = DateTime.Now;
                         Conn.Entry(Actual).State = System.Data.Entity.EntityState.Detached;
                         Conn.Convocatoria.Attach(model.Convocado);
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
index 044f1ade4..43726d6f3 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
@@ -29,13 +29,13 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                     {
                         int? Next_id = Conn.ProyectoNormativo.Max(t => (int?)t.IdProyectoNormativo);
                         model.ProyectoNormativo.IdProyectoNormativo = (Next_id == null) ? 1 : Next_id.Value + 1;
-                        model.ProyectoNormativo.UsuarioCreacion = model.AtesaUser;
+                        model.ProyectoNormativo.UsuarioCreacion = model.AtesaUserName;
                         model.ProyectoNormativo.FechaCreacion = DateTime.Now;
                         Conn.ProyectoNormativo.Add(model.ProyectoNormativo);
                     }
                     else
                     {
-                        model.ProyectoNormativo.UsuarioModificacion = model.AtesaUser;
+                        model.ProyectoNormativo.UsuarioModificacion = model.AtesaUserName;
                         model.ProyectoNormativo.FechaModificacion = DateTime.Now;
                         Conn.Entry(model.ProyectoNormativo).State = System.Data.Entity.EntityState.Detached;
                         Conn.ProyectoNormativo.Attach(model.ProyectoNormativo);
@@ -106,7 +106,8 @@ namespace AYA.SlnSinortModel.DAL.Sinort
                     {
                         var json = new EventosJSON()
                         {
-                            allDay = false,
+                            id = evento.IdCalendario.ToString(),
+                            allDay = evento.DiaCompleto.HasValue ? evento.DiaCompleto.Value : false,
                             start = evento.FechaInicio.HasValue ? evento.FechaInicio.Value.ToString() : string.Empty,
                             end = evento.FechaFin.HasValue ? evento.FechaFin.Value.ToString() : string.Empty,
                             title = evento.Titulo
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
index 02343403d..05271f483 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
@@ -46,6 +46,7 @@ namespace AYA.SlnSinortModel.Entidades
 
     public class EventosJSON
     {
+        public string id { get; set; }
         public string title { get; set; }
         public string start { get; set; }
         public string end { get; set; }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
index 0fea602d3..5f49217db 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
@@ -8,7 +8,6 @@ namespace AYA.SlnSinortModel.Sinort
 
     public partial class SinortContex : Contex
     {
-       
 
         public virtual DbSet<Aplicacion> Aplicacion { get; set; }
         public virtual DbSet<Categoria> Categoria { get; set; }
diff --git a/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs b/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs
index b55bd45d8..92adbab41 100644
--- a/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs
+++ b/AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs
@@ -8,11 +8,11 @@ namespace Atesa.Utilitarios
 {
     public class AtesaJSON
     {
-        public string AtesaUser { get; private set; }
-
+        public string AtesaUserName { get; set; }
+        public string AtesaUserFullName { get; set; }
         public AtesaJSON()
         {
-            AtesaUser = "atesa";
+            AtesaUserName = "atesa";
         }
     }