POLO-WEBAPP/SoftwayWeb
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Michele: icone consegne fatte

Browse Source
This commit is contained in:
michele 2024-07-09 10:39:08 +02:00
parent 9bd0f76740
commit d2d5c751c2
3 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Controllers/DestinazioniController.cs
View File

@ -31,7 +31,7 @@ namespace SoftwayWeb.Controllers
urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo";
//dataGiro = dataGiro.ToUniversalTime();
//urlBase = urlBase + "autista=" + giro.CodAutista + "datGiro=" /*+ giro.DataGiro*/;
urlBase = urlBase + "?autista=" + codAutista.Trim() + "&dataGiro=2023-05-30T00%3A00%3A00.000Z" + "&mezzo=" + codMezzo /*+ dataGiro*/;
urlBase = urlBase + "?autista=" + codAutista.TrimEnd() + "&dataGiro=2023-05-30T00%3A00%3A00.000Z" + "&mezzo=" + codMezzo /*+ dataGiro*/;
Uri baseAddress = new Uri(urlBase);
client = new HttpClient();
client.BaseAddress = baseAddress;
@ -43,15 +43,28 @@ namespace SoftwayWeb.Controllers
{
string dato = response.Content.ReadAsStringAsync().Result;
modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato);
modelList = modelList.Where(x => x.serialeGiro == id).ToList();
modelList = modelList.Where(x => x.serialeGiro == id && x.CodAutista.Contains(codAutista.TrimEnd())).ToList();
//if (page != null && page < 1)
//{
// page = 1;
//}
//var pageSize = 10;
if (!string.IsNullOrEmpty(codAutista))
{
//modelList = modelList.Where(x => x.CodAutista.Contains(codAutista)).ToList();
var shortList = modelList.ToPagedList(/*page ?? 1, pageSize*/);
ViewData["CurrentFilter"] = codAutista;
ViewBag.Autista = codAutista;
}
else
{
ViewData["CurrentFilter"] = null;
}
if (page != null && page < 1)
{
page = 1;
}
var pageSize = 10;
var shortList = modelList.ToPagedList(page ?? 1, pageSize);
return View(/*modelList*/shortList);
}
else

4
Controllers/GiriController.cs
View File

@ -55,7 +55,7 @@ namespace SoftwayWeb.Controllers
ViewData["CurrentFilter"] = codAutista;
//ViewBag.Autista = codAutista;
ViewBag.Autista = codAutista;
}
else
{
@ -72,7 +72,7 @@ namespace SoftwayWeb.Controllers
page = 1;
}
var pageSize = 1/*10*/;
var pageSize = 10;
var shortList = modelList.ToPagedList(page ?? 1, pageSize);
return View(shortList/*modelList*/);

94
Views/Destinazioni/Index.cshtml
View File

@ -27,7 +27,7 @@
<th>Bancali caricati</th>
<th>Bancali scaricati</th>
<th hidden>Automezzo</th>
<th @* hidden *@>Autista</th>
<th hidden>Autista</th>
<th>Importo recuperato</th>
<th>Note (importo)@* Importo non recuperato *@</th>
<th>Note (bancali)@* Bancali non recuperati *@</th>
@ -112,54 +112,54 @@
@if (item.ConsFatta != null)
{
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaSerial)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaRow)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanCar)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanSca)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaMezzo)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaAut)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaImpor)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotImp)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotBan)
</td>
<td>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaSerial)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaRow)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanCar)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanSca)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaMezzo)
</td>
<td hidden>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaAut)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaImpor)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotImp)
</td>
<td>
@Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotBan)
</td>
<td>
@Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
@if (item.ConsFatta.consFattaFlagCons.Contains("S"))
{
<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:50px;height:50px;">
}
else
{
<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:50px;height:50px;">
}
</td>
@if (item.ConsFatta.consFattaFlagCons.Contains("S"))
{
<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:50px;height:50px;">
}
else
{
<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:50px;height:50px;">
}
</td>
}
else
{
<td hidden>&nbsp;</td>
<td hidden>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td hidden>&nbsp;</td>
<td hidden>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
@ -179,7 +179,7 @@
@Html.HiddenFor(modelItem => item.DataCarico)
</td>
<td hidden>
@Html.DisplayFor(modelItem => item.CodAutista) @* - *@ @Html.DisplayFor(modelItem => item.Autista)
@Html.HiddenFor(modelItem => item.CodAutista) @* - *@ @Html.HiddenFor(modelItem => item.Autista)
</td>
<td>
@Html.HiddenFor(modelItem => item.Brmerce)
@ -223,8 +223,8 @@
</tbody>
</table>
<br />
@* <nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, Model/* , searchString = @ViewData["CurrentFilter"] */ }), new PagedListRenderOptions()
<nav>
@Html.PagedListPager(Model, page => Url.Action("index", new { page = page, searchString = @ViewData["CurrentFilter"] }), new PagedListRenderOptions()
{
ActiveLiElementClass = "active",
PageClasses = new[] { "page-link" },
@ -236,4 +236,4 @@
DisplayLinkToPreviousPage = PagedListDisplayMode.Always,
DisplayLinkToNextPage = PagedListDisplayMode.Always
})
</nav> *@
</nav>