diff --git a/Controllers/ConsegneController.cs b/Controllers/ConsegneController.cs new file mode 100644 index 0000000..26e2983 --- /dev/null +++ b/Controllers/ConsegneController.cs @@ -0,0 +1,59 @@ +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using SoftwayWeb.Models; +using X.PagedList; + +namespace SoftwayWeb.Controllers +{ + public class ConsegneController : Controller + { + string apiUrl = string.Empty; + string urlBase = string.Empty; + string token = string.Empty; + string errMes = string.Empty; + private readonly IConfiguration _configuration; + HttpClient client; + SessionHelper helper; + + public ConsegneController(IConfiguration configuration) + { + _configuration = configuration; + client = new HttpClient(); + var key = _configuration["ApplicationInsights:rootUrlApi"]; + apiUrl = key; + } + + public IActionResult Index(string id/*, string? codAutista, DateTime dataGiro, string? codMezzo*/) + { + //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=" + codAutista.Trim() + "&dataGiro=2023-05-30T00%3A00%3A00.000Z" + "&mezzo=" + codMezzo /*+ dataGiro*/; + //Uri baseAddress = new Uri(urlBase); + //client = new HttpClient(); + //client.BaseAddress = baseAddress; + + //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.consFattaSerial == id).ToList(); + + // var shortList = modelList.ToPagedList(); + // return View(modelList/*shortList*/); + //} + //else + //{ + // errMes = response.Content.ReadAsStringAsync().Result; + // helper.SetStringValue("errMsg", errMes); + // return RedirectToAction("Error"); + //} + return View(); + } + } +} diff --git a/Controllers/DestinazioniController.cs b/Controllers/DestinazioniController.cs index 6a344f9..0f632f1 100644 --- a/Controllers/DestinazioniController.cs +++ b/Controllers/DestinazioniController.cs @@ -43,6 +43,9 @@ namespace SoftwayWeb.Controllers 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*/); } else { @@ -52,7 +55,7 @@ namespace SoftwayWeb.Controllers } //var shortList = modelList.ToPagedList(); - return View(modelList); + //return View(shortList); } } } diff --git a/Views/Consegne/Index.cshtml b/Views/Consegne/Index.cshtml new file mode 100644 index 0000000..97dd535 --- /dev/null +++ b/Views/Consegne/Index.cshtml @@ -0,0 +1,137 @@ +@model IEnumerable + +@{ + ViewData["Title"] = "Index"; +} + +

Index

+ +

+ Create New +

+ + + + + + + + + + + + + + @* + + + + + + + *@ + + + + +@foreach (var item in Model) { + + + + + + + + + + + + @* + + + + + + + + *@ + +} + +
+ @Html.DisplayNameFor(model => model.consFattaSerial) + + @Html.DisplayNameFor(model => model.consFattaRow) + + @Html.DisplayNameFor(model => model.consFattaBanCar) + + @Html.DisplayNameFor(model => model.consFattaBanSca) + + @Html.DisplayNameFor(model => model.consFattaMezzo) + + @Html.DisplayNameFor(model => model.consFattaAut) + + @Html.DisplayNameFor(model => model.consFattaImpor) + + @Html.DisplayNameFor(model => model.consFattaNotImp) + + @Html.DisplayNameFor(model => model.consFattaNotBan) + + @Html.DisplayNameFor(model => model.consFattaFlagCons) + + @Html.DisplayNameFor(model => model.IndirizzoSede) + + @Html.DisplayNameFor(model => model.Cproword) + + @Html.DisplayNameFor(model => model.Cprownum) + + @Html.DisplayNameFor(model => model.Brmerce) + + @Html.DisplayNameFor(model => model.Brnote) + + @Html.DisplayNameFor(model => model.ImportoDaRitirare) + + @Html.DisplayNameFor(model => model.ItemList) + + @Html.DisplayNameFor(model => model.serialeGiro) +
+ @Html.DisplayFor(modelItem => item.consFattaSerial) + + @Html.DisplayFor(modelItem => item.consFattaRow) + + @Html.DisplayFor(modelItem => item.consFattaBanCar) + + @Html.DisplayFor(modelItem => item.consFattaBanSca) + + @Html.DisplayFor(modelItem => item.consFattaMezzo) + + @Html.DisplayFor(modelItem => item.consFattaAut) + + @Html.DisplayFor(modelItem => item.consFattaImpor) + + @Html.DisplayFor(modelItem => item.consFattaNotImp) + + @Html.DisplayFor(modelItem => item.consFattaNotBan) + + @Html.DisplayFor(modelItem => item.consFattaFlagCons) + + @Html.DisplayFor(modelItem => item.IndirizzoSede) + + @Html.DisplayFor(modelItem => item.Cproword) + + @Html.DisplayFor(modelItem => item.Cprownum) + + @Html.DisplayFor(modelItem => item.Brmerce) + + @Html.DisplayFor(modelItem => item.Brnote) + + @Html.DisplayFor(modelItem => item.ImportoDaRitirare) + + @Html.DisplayFor(modelItem => item.ItemList) + + @Html.DisplayFor(modelItem => item.serialeGiro) + + @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) | + @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) | + @Html.ActionLink("Delete", "Delete", new { /* id=item.PrimaryKey */ }) +
diff --git a/Views/Destinazioni/Index.cshtml b/Views/Destinazioni/Index.cshtml index a385066..6167e36 100644 --- a/Views/Destinazioni/Index.cshtml +++ b/Views/Destinazioni/Index.cshtml @@ -4,7 +4,8 @@ @using X.PagedList.Mvc.Core; @using X.PagedList; @{ - ViewData["Title"] = "Index"; + ViewData["Title"] = "Lista Destinazioni"; + Layout = "~/Views/Shared/_LayoutAreaRis.cshtml"; }

Lista destinazioni

@@ -14,25 +15,24 @@

*@ - +
- - - - - @* - *@ - - - + + + + + + + + + + @* *@ - - - + @* *@ @* @@ -93,50 +93,95 @@ @foreach (var item in Model) { - - - - - + @* @if (item.ConsFatta != null) + { + + } *@ + + + + + + + + + + + + + + - - - + @if (item.ConsFatta != null){ + + } + @if (item.ConsFatta == null) + { + + } @* - -@* *@ - @@ -114,16 +109,18 @@ - - } diff --git a/wwwroot/images/fatto.png b/wwwroot/images/fatto.png new file mode 100644 index 0000000..c0c85d5 Binary files /dev/null and b/wwwroot/images/fatto.png differ diff --git a/wwwroot/images/fatto1.png b/wwwroot/images/fatto1.png new file mode 100644 index 0000000..3470f17 Binary files /dev/null and b/wwwroot/images/fatto1.png differ diff --git a/wwwroot/images/noFatto.png b/wwwroot/images/noFatto.png new file mode 100644 index 0000000..b9e49ec Binary files /dev/null and b/wwwroot/images/noFatto.png differ diff --git a/wwwroot/images/noFatto2.png b/wwwroot/images/noFatto2.png new file mode 100644 index 0000000..848cad6 Binary files /dev/null and b/wwwroot/images/noFatto2.png differ diff --git a/wwwroot/images/nofatto1.jpg b/wwwroot/images/nofatto1.jpg new file mode 100644 index 0000000..4030652 Binary files /dev/null and b/wwwroot/images/nofatto1.jpg differ
AutomezzoSerialeData carico CommittenteAutista Sede Indirizzo sedeNum RigaOrd rigaMerceNoteImporto da ritirareConsegna @* effettuata *@RigaBancali caricatiBancali scaricatiAutomezzoAutistaImporto recuperatoImporto non recuperatoBancali non recuperatiFlagConsegna fattaSeriale giroSeriale giro @Html.DisplayNameFor(model => model.CodAutomezzo)
- @Html.DisplayFor(modelItem => item.CodAutomezzo) - @Html.DisplayFor(modelItem => item.DescAutomezzo) - - @Html.DisplayFor(modelItem => item.Brserial) - - @Html.DisplayFor(modelItem => item.DataCarico) - @Html.DisplayFor(modelItem => item.CodCommittente) - @Html.DisplayFor(modelItem => item.Committente) - @Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista) - @Html.DisplayFor(modelItem => item.CodSede) - @Html.DisplayFor(modelItem => item.Sede) @Html.DisplayFor(modelItem => item.IndirizzoSede) + Dettaglio consegna + - @Html.DisplayFor(modelItem => item.Brmerce) + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaSerial) - @Html.DisplayFor(modelItem => item.Brnote) + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaRow) - @Html.DisplayFor(modelItem => item.ImportoDaRitirare) + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanCar) - @Html.DisplayFor(modelItem => item.serialeGiro) + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaBanSca) + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaMezzo) + + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaAut) + + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaImpor) + + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotImp) + + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaNotBan) + + @Html.DisplayFor(modelItem => item.ConsFatta.consFattaFlagCons) + + @Html.HiddenFor(modelItem => item.Brmerce) + + + + cons + + nocons + @Html.ActionLink("Edit", "Edit", new { /* id=item.PrimaryKey */ }) | @Html.ActionLink("Details", "Details", new { /* id=item.PrimaryKey */ }) | diff --git a/Views/Giri/Index.cshtml b/Views/Giri/Index.cshtml index e46bdd9..c438544 100644 --- a/Views/Giri/Index.cshtml +++ b/Views/Giri/Index.cshtml @@ -97,11 +97,6 @@ @Html.DisplayFor(modelItem => item.CodMezzo) - @Html.DisplayFor(modelItem => item.Automezzo) - @Html.DisplayFor(modelItem => item.Autista) - @Html.DisplayFor(modelItem => item.BancaliCaricati) @Html.DisplayFor(modelItem => item.ImportoRecuperato) + + - Destinazioni - Chiudi - Elimina + Destinazioni + Modifica bancali + Chiudi + Riapri + Elimina