From 032eb10e7c99f62b3cfc118271df6855a073b2ff Mon Sep 17 00:00:00 2001 From: michele Date: Fri, 26 Jul 2024 17:57:38 +0200 Subject: [PATCH] Michele: dettaglio consegne (controller + view) --- Controllers/ConsegneController.cs | 45 ++++++++- Views/Consegne/Dettaglio.cshtml | 148 ++++++++++++++++++++++++++++++ Views/Consegne/Index.cshtml | 65 ------------- Views/Destinazioni/Index.cshtml | 2 +- 4 files changed, 189 insertions(+), 71 deletions(-) create mode 100644 Views/Consegne/Dettaglio.cshtml delete mode 100644 Views/Consegne/Index.cshtml diff --git a/Controllers/ConsegneController.cs b/Controllers/ConsegneController.cs index 7441874..221096e 100644 --- a/Controllers/ConsegneController.cs +++ b/Controllers/ConsegneController.cs @@ -23,19 +23,19 @@ namespace SoftwayWeb.Controllers apiUrl = key; } - public IActionResult Index(string id, string? codAutista, DateTime dataGiro, string? codMezzo) + public IActionResult Dettaglio(string id, string? codAutista, DateTime dataGiro, string? codMezzo) { helper = new SessionHelper(this); token = helper.GetStringValue("tok"); urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo"; var dataGiroFormattata = dataGiro.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'"); - urlBase = urlBase + "?autista=" + codAutista + "&dataGiro="+ dataGiroFormattata + "&mezzo=" + codMezzo; + urlBase = urlBase + "?autista=" + codAutista + "&dataGiro=" + dataGiroFormattata + "&mezzo=" + codMezzo; Uri baseAddress = new Uri(urlBase); client = new HttpClient(); client.BaseAddress = baseAddress; List modelList = new List(); - Destinazioni_Out model = new Destinazioni_Out(); + Destinazioni_Out model = new Destinazioni_Out(); Destinazioni_Out.ConsegnaFatta modelCons = new Destinazioni_Out.ConsegnaFatta(); HttpResponseMessage response = client.GetAsync(baseAddress).Result; @@ -47,7 +47,7 @@ namespace SoftwayWeb.Controllers model = modelList.Where(x => x.Brserial == id).First(); modelCons = model.ConsFatta; - return View(modelCons); + return View("Dettaglio",model); } else { @@ -55,7 +55,42 @@ namespace SoftwayWeb.Controllers helper.SetStringValue("errMsg", errMes); return RedirectToAction("Error"); } - + } + + //public IActionResult Index(string id, string? codAutista, DateTime dataGiro, string? codMezzo) + //{ + // helper = new SessionHelper(this); + // token = helper.GetStringValue("tok"); + // urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo"; + // var dataGiroFormattata = dataGiro.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'"); + // urlBase = urlBase + "?autista=" + codAutista + "&dataGiro="+ dataGiroFormattata + "&mezzo=" + codMezzo; + // Uri baseAddress = new Uri(urlBase); + // client = new HttpClient(); + // client.BaseAddress = baseAddress; + + // List modelList = new List(); + // Destinazioni_Out model = new Destinazioni_Out(); + // Destinazioni_Out.ConsegnaFatta modelCons = new Destinazioni_Out.ConsegnaFatta(); + + // HttpResponseMessage response = client.GetAsync(baseAddress).Result; + + // if (response.IsSuccessStatusCode) + // { + // string dato = response.Content.ReadAsStringAsync().Result; + // modelList = JsonConvert.DeserializeObject>(dato); + // model = modelList.Where(x => x.Brserial == id).First(); + // modelCons = model.ConsFatta; + + // return View(modelCons); + // } + // else + // { + // errMes = response.Content.ReadAsStringAsync().Result; + // helper.SetStringValue("errMsg", errMes); + // return RedirectToAction("Error"); + // } + + //} } } diff --git a/Views/Consegne/Dettaglio.cshtml b/Views/Consegne/Dettaglio.cshtml new file mode 100644 index 0000000..5287f4e --- /dev/null +++ b/Views/Consegne/Dettaglio.cshtml @@ -0,0 +1,148 @@ +@model SoftwayWeb.Models.Destinazioni_Out + +@{ + ViewData["Title"] = "Dettaglio"; + Layout = "~/Views/Shared/_LayoutAreaRis.cshtml"; +} + +
+
+
+
+
Destinazione
+
+
+
+
+
+ +
@Html.DisplayFor(model => model.DataCarico)
+
+
+ +
@Html.DisplayFor(model => model.CodCommittente) - @Html.DisplayFor(model => model.Committente)
+
+
+ +
@Html.DisplayFor(model => model.CodSede) - @Html.DisplayFor(model => model.Sede)
+
+
+ +
@Html.DisplayFor(model => model.IndirizzoSede)
+
+
+ +
@Html.DisplayFor(model => model.CodAutista) - @Html.DisplayFor(model => model.Autista)
+
+
+ +
@Html.DisplayFor(model => model.CodAutomezzo) - @Html.DisplayFor(model => model.DescAutomezzo)
+
+
+
+
+
+
+
+
+
Dettaglio consegna
+
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaBanCar)
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaBanSca)
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaImpor)
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaNotImp)
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaNotBan)
+
+
+ +
@Html.DisplayFor(model => model.ConsFatta.consFattaFlagCons)
+
+
+
+
+
+ + + @Html.HiddenFor(model => model.CodAutomezzo) + @Html.HiddenFor(model => model.CodAutomezzo) + @Html.HiddenFor(model => model.DescAutomezzo) + @Html.HiddenFor(model => model.DescAutomezzo) + @Html.HiddenFor(model => model.Brserial) + @Html.HiddenFor(model => model.DataCarico) + @Html.HiddenFor(model => model.DataCarico) + @Html.HiddenFor(model => model.CodCommittente) + @Html.HiddenFor(model => model.CodCommittente) + @Html.HiddenFor(model => model.Committente) + @Html.HiddenFor(model => model.Committente) + @Html.HiddenFor(model => model.CodAutista) + @Html.HiddenFor(model => model.CodAutista) + @Html.HiddenFor(model => model.Autista) + @Html.HiddenFor(model => model.Autista) + @Html.HiddenFor(model => model.CodSede) + @Html.HiddenFor(model => model.CodSede) + @Html.HiddenFor(model => model.Sede) + @Html.HiddenFor(model => model.Sede) + @Html.HiddenFor(model => model.IndirizzoSede) + @Html.HiddenFor(model => model.IndirizzoSede) + @Html.HiddenFor(model => model.Cproword) + @Html.HiddenFor(model => model.Cproword) + @Html.HiddenFor(model => model.Cprownum) + @Html.HiddenFor(model => model.Cprownum) + @Html.HiddenFor(model => model.Brmerce) + @Html.HiddenFor(model => model.Brmerce) + @Html.HiddenFor(model => model.Brnote) + @Html.HiddenFor(model => model.Brnote) + @Html.HiddenFor(model => model.ImportoDaRitirare) + @Html.HiddenFor(model => model.ImportoDaRitirare) + @Html.HiddenFor(model => model.ItemList) + @Html.HiddenFor(model => model.ItemList) + @Html.HiddenFor(model => model.serialeGiro) + @Html.HiddenFor(model => model.serialeGiro) + @Html.HiddenFor(model => model.Casse) + @Html.HiddenFor(model => model.Casse) + @Html.HiddenFor(model => model.Trasf) + @Html.HiddenFor(model => model.Trasf) + @Html.HiddenFor(model => model.Colli) + @Html.HiddenFor(model => model.Colli) + @Html.HiddenFor(model => model.num_cons) + @Html.HiddenFor(model => model.num_cons) + @Html.HiddenFor(model => model.Uova) + @Html.HiddenFor(model => model.Uova) + @Html.HiddenFor(model => model.Cist) + @Html.HiddenFor(model => model.Cist) + @Html.HiddenFor(model => model.Note) + @Html.HiddenFor(model => model.Note) + @Html.HiddenFor(model => model.Seq) + @Html.HiddenFor(model => model.Seq) + @Html.HiddenFor(model => model.Prog) + @Html.DisplayFor(model => model.Prog) + @Html.HiddenFor(model => model.Pisergir) + +@section Scripts { + @{ + await Html.RenderPartialAsync("_ValidationScriptsPartial"); + } +} diff --git a/Views/Consegne/Index.cshtml b/Views/Consegne/Index.cshtml deleted file mode 100644 index 8834259..0000000 --- a/Views/Consegne/Index.cshtml +++ /dev/null @@ -1,65 +0,0 @@ -@* @model IEnumerable *@ - @model SoftwayWeb.Models.Destinazioni_Out.ConsegnaFatta -@{ - ViewData["Title"] = "Index"; - Layout = "~/Views/Shared/_LayoutAreaRis.cshtml"; -} -@* Torna alla lista *@ -
-
-
-
Dettaglio consegna
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Seriale consegnaRigaBancali caricatiBancali scaricatiAutomezzoAutistaImportoNote 1Note 2Consegato
- @Html.DisplayFor(modelItem => modelItem.consFattaSerial) - - @Html.DisplayFor(modelItem => modelItem.consFattaRow) - - @Html.DisplayFor(modelItem => modelItem.consFattaBanCar) - - @Html.DisplayFor(modelItem => modelItem.consFattaBanSca) - - @Html.DisplayFor(modelItem => modelItem.consFattaMezzo) - - @Html.DisplayFor(modelItem => modelItem.consFattaAut) - - @Html.DisplayFor(modelItem => modelItem.consFattaImpor) - - @Html.DisplayFor(modelItem => modelItem.consFattaNotImp) - - @Html.DisplayFor(modelItem => modelItem.consFattaNotBan) - - @Html.DisplayFor(modelItem => modelItem.consFattaFlagCons) -
-
-
- diff --git a/Views/Destinazioni/Index.cshtml b/Views/Destinazioni/Index.cshtml index 8153c46..71c4402 100644 --- a/Views/Destinazioni/Index.cshtml +++ b/Views/Destinazioni/Index.cshtml @@ -177,7 +177,7 @@ diffBancali = item.ConsFatta.consFattaBanCar.Value - item.ConsFatta.consFattaBanSca.Value; - @diffBancali