CR_Atesa_Software/TFS_ANTIGUO
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
mumana 2018-07-06 14:01:04 +00:00
parent 7a7179f83a
commit 22b0a507e9
13 changed files with 58 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
AYA.SlnSynor/AYA.SlnSynor/Controllers/BaseController.cs
View file

@ -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);
}
}

8
AYA.SlnSynor/AYA.SlnSynor/Controllers/LoginController.cs
View file

@ -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;
}
}
}

9
AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Login.js
View file

@ -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
}

8
AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
View file

@ -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');
})
}

25
AYA.SlnSynor/AYA.SlnSynor/Views/Login/Login.cshtml
View file

@ -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")

4
AYA.SlnSynor/AYA.SlnSynor/Views/PropuestaNormativa/DetallePropuesta.cshtml
View file

@ -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>

2
AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/CalendarioDAL.cs
View file

@ -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();

2
AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ComentariosDAL.cs
View file

@ -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();

4
AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ConvocatoriaDAL.cs
View file

@ -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);

7
AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/ProyectoNormativoDAL.cs
View file

@ -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

1
AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
View file

@ -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; }

1
AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
View file

@ -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; }

6
AYA.SlnSynor/Atesa.Utilitarios/AtesaJSON.cs
View file

@ -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";
}
}