export rapportini fix

This commit is contained in:
Marco Audiffredi 2024-04-12 16:08:11 +02:00
parent 99fedbf64f
commit 546d71f360
6 changed files with 44 additions and 11 deletions

View File

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

View File

@ -124,3 +124,9 @@
</div>
</div>
</div>
<div>
@{
@ViewBag.Log
}
</div>

View File

@ -6,15 +6,15 @@
}
},
"ApplicationInsights": {
//PRODUZIONE
"rootUrlApi": "https://api.poloinformatico.it:9000/api/Polo/",
"rootWebLoghi": "C:\\ZAPIPOLO\\api_polo\\wwwroot\\VIRTU\\",
"rootUrlApi2": "https://api.poloinformatico.it:9000/VIRTU/",
//PRODUZIONE
"rootWebLoghi": "C:\\ZAPIPOLO\\api_polo\\wwwroot\\VIRTU\\",
//TEST
//"rootUrlApi": "http://testapi.poloinformatico.it:9001/api/Polo/",
//"rootWebLoghi": "C:\\SORGENTI\\ApiPolo\\ApiPolo\\wwwroot\\VIRTU\\",
//"rootUrlApi2": "http://testapi.poloinformatico.it:9001/VIRTU/",
//"rootWebLoghi": "C:\\Users\\audif\\source\\repos\\VirtualTask\\wwwroot\\VIRTU\\",
"mittenteMail": "info@virtualtask.it",
"nomeMail": "Supporto Virtual Task",
@ -22,6 +22,10 @@
"subjectMail": "Richiesta App di test",
"subjectMailRiepilogo": "Registrazione completata",
"rootUrl": "https://virtualtask.it/"
//"rootUrlApi": "http://testapi.poloinformatico.it:9001/api/Polo/",
//"rootUrlApi2": "http://testapi.poloinformatico.it:9001/VIRTU/",
//"rootUrl": "https://localhost:7140/"
},
"AllowedHosts": "*"

Binary file not shown.

After

Width:  |  Height:  |  Size: 610 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB