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

MICHELE: risolto problema data timezone + paginazione che da errore

Browse Source
This commit is contained in:
michele 2024-07-09 16:49:13 +02:00
parent 571609cd68
commit fdc8579ff4
3 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Controllers/DestinazioniController.cs
View File

@ -24,14 +24,35 @@ namespace SoftwayWeb.Controllers
apiUrl = key; apiUrl = key;
} }
public IActionResult Index(string id, string? codAutista, DateTime dataGiro, /*Destinazioni_Out giro,*/ string? codMezzo, int? page = 1) public IActionResult Index(string id, string? codAutista, DateTime dataGiro, string? codMezzo, int? page = 1)
{ {
helper = new SessionHelper(this); helper = new SessionHelper(this);
token = helper.GetStringValue("tok"); token = helper.GetStringValue("tok");
ViewBag.CodAutista = codAutista;
//if (codAutista == null)
//{
// //ViewBag.CodAutista = "codAutista";
// codAutista = ViewBag.CodAutista;
//}
//if (!string.IsNullOrEmpty(codAutista))
//{
// //modelList = modelList.Where(x => x.CodAutista.Contains(codAutista)).ToList();
// ViewData["CurrentFilter"] = codAutista;
// ViewBag.Autista = codAutista;
//}
//else
//{
// ViewData = ViewBag.CodAutista;
//}
urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo"; urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo";
//dataGiro = dataGiro.ToUniversalTime(); string dataGi = dataGiro.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'");
//urlBase = urlBase + "autista=" + giro.CodAutista + "datGiro=" /*+ giro.DataGiro*/; urlBase = urlBase + "?autista=" + codAutista.TrimEnd() + "&dataGiro=" + dataGi + "&mezzo=" + codMezzo;
urlBase = urlBase + "?autista=" + codAutista.TrimEnd() + "&dataGiro=2023-05-30T00%3A00%3A00.000Z" + "&mezzo=" + codMezzo /*+ dataGiro*/;
Uri baseAddress = new Uri(urlBase); Uri baseAddress = new Uri(urlBase);
client = new HttpClient(); client = new HttpClient();
client.BaseAddress = baseAddress; client.BaseAddress = baseAddress;
@ -43,20 +64,13 @@ namespace SoftwayWeb.Controllers
{ {
string dato = response.Content.ReadAsStringAsync().Result; string dato = response.Content.ReadAsStringAsync().Result;
modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato); modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato);
modelList = modelList.Where(x => x.serialeGiro == id && x.CodAutista.Contains(codAutista.TrimEnd())).ToList(); modelList = modelList.Where(x => x.serialeGiro == id).ToList();
if (!string.IsNullOrEmpty(codAutista)) //ViewData["codAutista"] = codAutista;
{ //ViewBag.CodAutista = "codAutista";
//modelList = modelList.Where(x => x.CodAutista.Contains(codAutista)).ToList(); //ViewBag.DataGiro = dataGiro;
//ViewBag.CodMezzo = codMezzo;
ViewData["CurrentFilter"] = codAutista;
ViewBag.Autista = codAutista;
}
else
{
ViewData["CurrentFilter"] = null;
}
if (page != null && page < 1) if (page != null && page < 1)
{ {

13
Views/Destinazioni/Index.cshtml
View File

@ -4,6 +4,7 @@
@using X.PagedList; @using X.PagedList;
@using X.PagedList.Mvc.Core; @using X.PagedList.Mvc.Core;
@using X.PagedList; @using X.PagedList;
@{ @{
ViewData["Title"] = "Lista Destinazioni"; ViewData["Title"] = "Lista Destinazioni";
Layout = "~/Views/Shared/_LayoutAreaRis.cshtml"; Layout = "~/Views/Shared/_LayoutAreaRis.cshtml";
@ -11,6 +12,11 @@
<h1>Lista destinazioni</h1> <h1>Lista destinazioni</h1>
<h2>@ViewBag.CodAutista</h2>
@* <p> @* <p>
<a asp-action="Create">Create New</a> <a asp-action="Create">Create New</a>
</p> </p>
@ -144,11 +150,11 @@
@if (item.ConsFatta.consFattaFlagCons.Contains("S")) @if (item.ConsFatta.consFattaFlagCons.Contains("S"))
{ {
<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:50px;height:50px;"> <img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:35px;height:35px">
} }
else else
{ {
<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:50px;height:50px;"> <img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:35px;height:35px;">
} }
</td> </td>
} }
@ -164,7 +170,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<img alt="notyet" src="@Url.Content("~/images/Yellow.png")" style="width:50px;height:50px;"> <img alt="notyet" src="@Url.Content("~/images/Yellow.png")" style="width:35px;height:35px;">
</td> </td>
} }
@ -202,6 +208,7 @@
<td hidden> <td hidden>
@Html.HiddenFor(modelItem => item.ItemList) @Html.HiddenFor(modelItem => item.ItemList)
</td> </td>
@* @if (item.ConsFatta != null){ @* @if (item.ConsFatta != null){
<td> <td>
<img alt="cons" src="@Url.Content("~/images/fatto1.png")" style="width:35px;height:35px;"> <img alt="cons" src="@Url.Content("~/images/fatto1.png")" style="width:35px;height:35px;">

10
Views/Giri/Index.cshtml
View File

@ -87,11 +87,11 @@
@Html.DisplayFor(modelItem => item.parzialeImpRec) @Html.DisplayFor(modelItem => item.parzialeImpRec)
</td> </td>
<td> <td>
<a href="@Url.ActionLink("Index", "Destinazioni", new { id=item.SerialeGiro, codAutista=item.CodAutista, dataGiro=item.DataGiro, codMezzo=item.CodMezzo })" title="Destinazioni" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;"></a> <a href="@Url.ActionLink("Index", "Destinazioni", new { id=item.SerialeGiro, codAutista=item.CodAutista, dataGiro=item.DataGiro, codMezzo=item.CodMezzo })" title="Destinazioni" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;"></a>
<a href="@Url.ActionLink("Bancali", "GiriChiudi", new { id=item.SerialeGiro })" title="Bancali" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-bancale-24.png")" style="width:24px;height:24px;"></a> <a href="@Url.ActionLink("Bancali", "GiriChiudi", new { id=item.SerialeGiro })" title="Bancali" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-bancale-24.png")" style="width:24px;height:24px;"></a>
<a href="@Url.ActionLink("Chiudi", "GiriChiudi", new { id=item.SerialeGiro })" title="Chiudi" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-bandiera-a-scacchi-64.png")" style="width:24px;height:24px;"></a> <a href="@Url.ActionLink("Chiudi", "GiriChiudi", new { id=item.SerialeGiro })" title="Chiudi" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-bandiera-a-scacchi-64.png")" style="width:24px;height:24px;"></a>
<a href="@Url.ActionLink("Riapri", "GiriChiudi", new { id=item.SerialeGiro })" title="Riapri" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-riduzione-32.png")" style="width:24px;height:24px;"></a> <a href="@Url.ActionLink("Riapri", "GiriChiudi", new { id=item.SerialeGiro })" title="Riapri" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-riduzione-32.png")" style="width:24px;height:24px;"></a>
<a href="@Url.ActionLink("Elimina", "GiriElimina", new { id=item.SerialeGiro })" title="Elimina" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-rimuovere-24.png")" style="width:24px;height:24px;"></a> <a href="@Url.ActionLink("Elimina", "GiriElimina", new { id=item.SerialeGiro })" title="Elimina" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-rimuovere-24.png")" style="width:24px;height:24px;"></a>
</td> </td>
</tr> </tr>
} }