Merge branch 'master' of 10.0.0.83:/usr/local/git/VirtualTask

This commit is contained in:
Marco Audiffredi 2024-03-21 09:06:40 +01:00
commit 78fa7b0286

View File

@ -137,6 +137,17 @@ namespace VirtualTask.Controllers
modelList = JsonConvert.DeserializeObject<List<Rapportini>>(data); modelList = JsonConvert.DeserializeObject<List<Rapportini>>(data);
if (string.IsNullOrEmpty(impianto))
{
impianto = "- Impianto";
}
if (impianto.Equals("System.Collections.Generic.List`1[Microsoft.AspNetCore.Mvc.Rendering.SelectListItem]") || impianto.Equals("- Impianto"))
{
modelList = modelList;
}
else
{
if (impianto != null) if (impianto != null)
{ {
modelList = modelList.Where(x => x.codice_impianto.Equals(impianto)).ToList(); modelList = modelList.Where(x => x.codice_impianto.Equals(impianto)).ToList();
@ -144,12 +155,15 @@ namespace VirtualTask.Controllers
if (!dataFin.ToString().Substring(0, 10).Equals("01/01/0001")) 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(); modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date
&& x.data_rapportino.GetValueOrDefault().Date <= dataFin.Date).ToList();
} }
else else
{ {
modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList(); modelList = modelList.Where(x => x.data_rapportino.GetValueOrDefault().Date >= dataIni.Date).ToList();
} }
}
var workbook = new XLWorkbook(); var workbook = new XLWorkbook();
workbook.AddWorksheet("sheetName"); workbook.AddWorksheet("sheetName");