diff --git a/Controllers/DestinazioniController.cs b/Controllers/DestinazioniController.cs index 7afccd6..246335a 100644 --- a/Controllers/DestinazioniController.cs +++ b/Controllers/DestinazioniController.cs @@ -42,6 +42,7 @@ namespace SoftwayWeb.Controllers string autista = string.Empty; string dataGi = string.Empty; string mezzo = string.Empty; + string dataGiro2 = string.Empty; ViewBag.CodAutista = codAutista; ViewBag.Autista = nomeAutista; @@ -52,31 +53,42 @@ namespace SoftwayWeb.Controllers if (!string.IsNullOrEmpty(codAutista)) { helper.SetStringValue("codAutista", codAutista.TrimEnd()); + helper.SetStringValue("nomeAutista", nomeAutista.TrimEnd()); } else { - string aut = helper.GetStringValue("codAutista"); - codAutista = aut.TrimEnd(); + string codAut = helper.GetStringValue("codAutista"); + codAutista = codAut.TrimEnd(); + ViewBag.CodAutista = codAutista; + string nomeAut = helper.GetStringValue("nomeAutista"); + ViewBag.Autista = nomeAut; } if (!string.IsNullOrEmpty(codMezzo)) { helper.SetStringValue("codMezzo", codMezzo.TrimEnd()); + helper.SetStringValue("desMezzo", desMezzo.TrimEnd()); } else { string mez = helper.GetStringValue("codMezzo").TrimEnd(); codMezzo = mez; + ViewBag.CodMezzo = codMezzo; + string nomeMezzo = helper.GetStringValue("desMezzo"); + ViewBag.Automezzo = nomeMezzo; } if (dataGiro.Date != DateTime.MinValue) { helper.SetStringValue("dataGiro", dataGiro.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'")); dataGi = dataGiro.ToString("yyyy-MM-dd'T'HH:mm:ss.fff'Z'"); + helper.SetStringValue("dataGiro2", dataGiro.ToString("dd/MM/yyyy")); } else { dataGi = helper.GetStringValue("dataGiro"); + string dataG = helper.GetStringValue("dataGiro2"); + ViewBag.dataGiro = dataG; } urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo"; diff --git a/Views/Destinazioni/Index.cshtml b/Views/Destinazioni/Index.cshtml index 7d0878d..5f88a35 100644 --- a/Views/Destinazioni/Index.cshtml +++ b/Views/Destinazioni/Index.cshtml @@ -48,134 +48,131 @@
@foreach (var item in Model) { -