diff --git a/Controllers/DestinazioniController.cs b/Controllers/DestinazioniController.cs index 0f632f1..7ee73e4 100644 --- a/Controllers/DestinazioniController.cs +++ b/Controllers/DestinazioniController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; using Newtonsoft.Json; using SoftwayWeb.Models; using X.PagedList; @@ -23,13 +24,13 @@ namespace SoftwayWeb.Controllers apiUrl = key; } - public IActionResult Index(string id, string? codAutista, DateTime dataGiro, string? codMezzo) + public IActionResult Index(string id, string? codAutista, DateTime dataGiro, /*Destinazioni_Out giro,*/ string? codMezzo, int? page = 1) { helper = new SessionHelper(this); token = helper.GetStringValue("tok"); urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo"; //dataGiro = dataGiro.ToUniversalTime(); - //urlBase = urlBase + "autista=" + giro.CodAutista + "datGiro=" + giro.DataGiro; + //urlBase = urlBase + "autista=" + giro.CodAutista + "datGiro=" /*+ giro.DataGiro*/; urlBase = urlBase + "?autista=" + codAutista.Trim() + "&dataGiro=2023-05-30T00%3A00%3A00.000Z" + "&mezzo=" + codMezzo /*+ dataGiro*/; Uri baseAddress = new Uri(urlBase); client = new HttpClient(); @@ -37,15 +38,21 @@ namespace SoftwayWeb.Controllers List modelList = new List(); HttpResponseMessage response = client.GetAsync(baseAddress).Result; - + if (response.IsSuccessStatusCode) { string dato = response.Content.ReadAsStringAsync().Result; modelList = JsonConvert.DeserializeObject>(dato); modelList = modelList.Where(x => x.serialeGiro == id).ToList(); - var shortList = modelList.ToPagedList(); - return View(modelList/*shortList*/); + //if (page != null && page < 1) + //{ + // page = 1; + //} + //var pageSize = 10; + + var shortList = modelList.ToPagedList(/*page ?? 1, pageSize*/); + return View(/*modelList*/shortList); } else { diff --git a/Controllers/GiriController.cs b/Controllers/GiriController.cs index 1a065bd..9547f2a 100644 --- a/Controllers/GiriController.cs +++ b/Controllers/GiriController.cs @@ -1,4 +1,5 @@ using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.Rendering; using Newtonsoft.Json; using SoftwayWeb.Models; @@ -27,7 +28,7 @@ namespace SoftwayWeb.Controllers apiUrl = key; } - public IActionResult Index(string? codAutista, DateTime data, bool aperto = true) + public IActionResult Index(string? codAutista, DateTime data, bool aperto = true, int? page = 1) { helper = new SessionHelper(this); token = helper.GetStringValue("tok"); @@ -66,7 +67,14 @@ namespace SoftwayWeb.Controllers modelList = modelList.Where(x => x.DataGiro.GetValueOrDefault().Date == data.Date).ToList(); } - var shortList = modelList.ToPagedList(); + if (page != null && page < 1) + { + page = 1; + } + + var pageSize = 1/*10*/; + + var shortList = modelList.ToPagedList(page ?? 1, pageSize); return View(shortList/*modelList*/); } else diff --git a/Models/Destinazioni_Out.cs b/Models/Destinazioni_Out.cs index 3748f4a..65903fa 100644 --- a/Models/Destinazioni_Out.cs +++ b/Models/Destinazioni_Out.cs @@ -58,8 +58,11 @@ namespace SoftwayWeb.Models public string? consFattaAut { get; set; } [System.ComponentModel.DataAnnotations.Schema.Column(TypeName = "decimal(18, 5)")] public decimal? consFattaImpor { get; set; } + [Display(Name = "Note 1")] public string? consFattaNotImp { get; set; } + [Display(Name = "Note 2")] public string? consFattaNotBan { get; set; } + [Display(Name = "Consegato")] public string? consFattaFlagCons { get; set; } diff --git a/Views/Destinazioni/Index.cshtml b/Views/Destinazioni/Index.cshtml index 09fca75..1f2519b 100644 --- a/Views/Destinazioni/Index.cshtml +++ b/Views/Destinazioni/Index.cshtml @@ -1,5 +1,6 @@ -@model IEnumerable +@* @model IEnumerable *@ @* @model SoftwayWeb.Models.Destinazioni_Out *@ +@model IPagedList @using X.PagedList; @using X.PagedList.Mvc.Core; @using X.PagedList; @@ -21,16 +22,16 @@ Committente Sede Indirizzo sede - Consegna @* effettuata *@ - Riga + Consegna @* effettuata *@ + Riga Bancali caricati Bancali scaricati - Automezzo - Autista + Automezzo + Autista Importo recuperato - Importo non recuperato - Bancali non recuperati - Flag + Note (importo)@* Importo non recuperato *@ + Note (bancali)@* Bancali non recuperati *@ + Esito consegna @* Consegna fatta *@ @* Seriale giro *@ @* @@ -111,11 +112,11 @@ @if (item.ConsFatta != null) { - - @Html.DisplayFor(modelItem => item.ConsFatta.consFattaSerial) + + @Html.HiddenFor(modelItem => item.ConsFatta.consFattaSerial) - - @Html.DisplayFor(modelItem => item.ConsFatta.consFattaRow) + + @Html.HiddenFor(modelItem => item.ConsFatta.consFattaRow) @Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanCar) @@ -123,11 +124,11 @@ @Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanSca) - - @Html.DisplayFor(modelItem => item.ConsFatta.consFattaMezzo) + + @Html.HiddenFor(modelItem => item.ConsFatta.consFattaMezzo) - - @Html.DisplayFor(modelItem => item.ConsFatta.consFattaAut) + + @Html.HiddenFor(modelItem => item.ConsFatta.consFattaAut) @Html.DisplayFor(modelItem => item.ConsFatta.consFattaImpor) @@ -139,7 +140,16 @@ @Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotBan) - @Html.DisplayFor(modelItem => item.ConsFatta.consFattaFlagCons) + @Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons) + + @if (item.ConsFatta.consFattaFlagCons.Contains("S")) + { + cons + } + else + { + nocons + } } else @@ -153,7 +163,9 @@       -   + + notyet + } @@ -167,7 +179,7 @@ @Html.HiddenFor(modelItem => item.DataCarico) - @Html.HiddenFor(modelItem => item.CodAutista) @* - *@ @Html.HiddenFor(modelItem => item.Autista) + @Html.DisplayFor(modelItem => item.CodAutista) @* - *@ @Html.DisplayFor(modelItem => item.Autista) @Html.HiddenFor(modelItem => item.Brmerce) @@ -190,17 +202,17 @@ @Html.HiddenFor(modelItem => item.ItemList) - @if (item.ConsFatta != null){ + @* @if (item.ConsFatta != null){ cons - } - @if (item.ConsFatta == null) + } *@ + @* @if (item.ConsFatta == null) { - nocons + nocons - } + } *@ @* @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) | @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) | @@ -210,3 +222,18 @@ } +
+@* *@ \ No newline at end of file diff --git a/Views/Giri/Index.cshtml b/Views/Giri/Index.cshtml index c438544..54eff59 100644 --- a/Views/Giri/Index.cshtml +++ b/Views/Giri/Index.cshtml @@ -95,7 +95,7 @@ @Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista) - @Html.DisplayFor(modelItem => item.CodMezzo) - @Html.DisplayFor(modelItem => item.Automezzo) + @Html.HiddenFor(modelItem => item.CodMezzo) - @Html.HiddenFor(modelItem => item.Automezzo) @Html.DisplayFor(modelItem => item.BancaliCaricati) @@ -126,3 +126,18 @@ } +
+ diff --git a/wwwroot/images/Green.png b/wwwroot/images/Green.png new file mode 100644 index 0000000..74efb4e Binary files /dev/null and b/wwwroot/images/Green.png differ diff --git a/wwwroot/images/Red.png b/wwwroot/images/Red.png new file mode 100644 index 0000000..a96e14e Binary files /dev/null and b/wwwroot/images/Red.png differ diff --git a/wwwroot/images/yellow.png b/wwwroot/images/yellow.png new file mode 100644 index 0000000..68b91da Binary files /dev/null and b/wwwroot/images/yellow.png differ