diff --git a/Controllers/RapportiniController.cs b/Controllers/RapportiniController.cs index e189cda..e11c1b8 100644 --- a/Controllers/RapportiniController.cs +++ b/Controllers/RapportiniController.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.Office.Interop.Excel; using Newtonsoft.Json; using System.Diagnostics; - +using System.Text; using VirtualTask.Models; using X.PagedList; @@ -38,6 +38,14 @@ namespace VirtualTask.Controllers public IActionResult Index(string impianto, DateTime dataIni, DateTime dataFin, int? page = 1) { + string _log=string.Empty; + StringBuilder sb =new StringBuilder(); + sb.AppendLine("DATAIN: "+dataIni.ToString()); + sb.AppendLine(" DATAFIN: " + dataFin.ToString()); + sb.AppendLine(" IMP: " + impianto); + _log=sb.ToString(); + ViewBag.Log = _log; + SessionHelper helper = new SessionHelper(this); token = helper.GetStringValue("tok"); if (string.IsNullOrEmpty(token)) @@ -75,14 +83,29 @@ namespace VirtualTask.Controllers else ViewData["CurrentFilter"] = null; - if (!dataFin.ToString().Substring(0, 10).Equals("01/01/0001")) - { - modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date && x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList(); - } - else + + + if (dataIni.Date != DateTime.MinValue) { modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList(); } + if (dataFin.Date != DateTime.MinValue) + { + modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList(); + } + + + //if (!dataFin.ToString().Substring(0, 10).Equals("01/01/0001")) + //{ + // modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date && x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList(); + //} + //else + //{ + // modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList(); + //} + + + if (page != null && page < 1) { diff --git a/Views/Rapportini/Index.cshtml b/Views/Rapportini/Index.cshtml index 9f910d0..7b5a3c0 100644 --- a/Views/Rapportini/Index.cshtml +++ b/Views/Rapportini/Index.cshtml @@ -124,3 +124,9 @@ +