diff --git a/Controllers/GiriController.cs b/Controllers/GiriController.cs index e6f5dd9..ce9f890 100644 --- a/Controllers/GiriController.cs +++ b/Controllers/GiriController.cs @@ -145,31 +145,34 @@ namespace SoftwayWeb.Controllers } return RedirectToAction("Index", "Giri"); } - [HttpPost] - public IActionResult Create(GiriConsegnaView model) - { - SessionHelper helper = new SessionHelper(this); - ViewBag.Autisti = getAutisti(); - apiUrl = helper.GetStringValue("apiUrl"); - urlBase = apiUrl + "Giri/addGiro2"; - Uri baseAddress = new Uri(urlBase); - client = new HttpClient(); - client.BaseAddress = baseAddress; - string data = JsonConvert.SerializeObject(model); - StringContent content = new StringContent(data, Encoding.UTF8, "application/json"); - HttpResponseMessage response = client.PostAsync(baseAddress, content).Result; - if (response.IsSuccessStatusCode) - { - return RedirectToAction("Index", "Giri"); - } - else - { - errMes = response.Content.ReadAsStringAsync().Result; - helper.SetStringValue("errMsg", errMes); - return RedirectToAction("Error"); - } - } + //[HttpPost] + //public IActionResult Create(GiriConsegnaView model) + //{ + // SessionHelper helper = new SessionHelper(this); + // ViewBag.Autisti = getAutisti(); + // apiUrl = helper.GetStringValue("apiUrl"); + // urlBase = apiUrl + "Giri/addGiro2"; + + // Uri baseAddress = new Uri(urlBase); + // client = new HttpClient(); + // client.BaseAddress = baseAddress; + // string data = JsonConvert.SerializeObject(model); + // StringContent content = new StringContent(data, Encoding.UTF8, "application/json"); + // HttpResponseMessage response = client.PostAsync(baseAddress, content).Result; + // if (response.IsSuccessStatusCode) + // { + // return RedirectToAction("Index", "Giri"); + // } + // else + // { + // errMes = response.Content.ReadAsStringAsync().Result; + // helper.SetStringValue("errMsg", errMes); + // return RedirectToAction("Error"); + // } + //} + + [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { diff --git a/Models/GiriConsegnaView.cs b/Models/GiriConsegnaView.cs index 4bef0f3..2f9217f 100644 --- a/Models/GiriConsegnaView.cs +++ b/Models/GiriConsegnaView.cs @@ -36,5 +36,10 @@ namespace SoftwayWeb.Models public string? CodMezzo { get; set; } public string? Automezzo { get; set; } + + public int? parzialeBanRec { get; set; } + + [System.ComponentModel.DataAnnotations.Schema.Column(TypeName = "decimal(18, 5)")] + public decimal? parzialeImpRec { get; set; } } } diff --git a/Views/Giri/Create.cshtml b/Views/Giri/Create.cshtml index e38305b..ca5459e 100644 --- a/Views/Giri/Create.cshtml +++ b/Views/Giri/Create.cshtml @@ -8,47 +8,7 @@
-@*
-
-
-
-
- @Html.DropDownListFor(x => x.CodAutista, (IEnumerable)ViewBag.Autisti, new { @class = "agy-form-field require" }) - -
-
 
-
-
- @Html.TextBox("DataGiro", null, new { type = "date", @class = "agy-form-field require" }) - -
-
 
-
-
- - -
-
 
-
-
- - -
- -
 
-
- -
- - @Html.HiddenFor(x => x.SerialeGiro) - @Html.HiddenFor(x => x.Autista) - @Html.HiddenFor(x => x.BancaliRecuperati) - @Html.HiddenFor(x => x.ImportoRecuperato) - @Html.HiddenFor(x => x.DataChiusura) -
-
-
*@
@@ -61,6 +21,7 @@ Data Autista Automezzo +   @@ -88,6 +49,9 @@ @Html.HiddenFor(a=>lst[i].Automezzo) @Html.HiddenFor(a=>lst[i].Autista) + + Destinazioni + } diff --git a/Views/Giri/Index.cshtml b/Views/Giri/Index.cshtml index 3900836..88c3dae 100644 --- a/Views/Giri/Index.cshtml +++ b/Views/Giri/Index.cshtml @@ -43,45 +43,16 @@ - @* *@ - @**@ - - - - - @* *@ - - @* - - - - - - - - - *@ + + + + + + + @@ -101,26 +72,26 @@ @Html.DisplayFor(modelItem => item.BancaliCaricati) - - + } diff --git a/wwwroot/images/icons8-bancale-24.png b/wwwroot/images/icons8-bancale-24.png new file mode 100644 index 0000000..a6fa1d6 Binary files /dev/null and b/wwwroot/images/icons8-bancale-24.png differ diff --git a/wwwroot/images/icons8-bandiera-a-scacchi-64.png b/wwwroot/images/icons8-bandiera-a-scacchi-64.png new file mode 100644 index 0000000..49e4126 Binary files /dev/null and b/wwwroot/images/icons8-bandiera-a-scacchi-64.png differ diff --git a/wwwroot/images/icons8-eliminare-30.png b/wwwroot/images/icons8-eliminare-30.png new file mode 100644 index 0000000..4681a16 Binary files /dev/null and b/wwwroot/images/icons8-eliminare-30.png differ diff --git a/wwwroot/images/icons8-oggetti-puntiforme-30.png b/wwwroot/images/icons8-oggetti-puntiforme-30.png new file mode 100644 index 0000000..8462285 Binary files /dev/null and b/wwwroot/images/icons8-oggetti-puntiforme-30.png differ diff --git a/wwwroot/images/icons8-riduzione-32.png b/wwwroot/images/icons8-riduzione-32.png new file mode 100644 index 0000000..aa6a261 Binary files /dev/null and b/wwwroot/images/icons8-riduzione-32.png differ diff --git a/wwwroot/images/icons8-rimuovere-24.png b/wwwroot/images/icons8-rimuovere-24.png new file mode 100644 index 0000000..8db73d9 Binary files /dev/null and b/wwwroot/images/icons8-rimuovere-24.png differ diff --git a/wwwroot/images/pallet.png b/wwwroot/images/pallet.png new file mode 100644 index 0000000..457707c Binary files /dev/null and b/wwwroot/images/pallet.png differ
Seriale giroDataCod. AutistaAutista AutomezzoBancali caricatiBancali recuperatiImporto da recuperareImporto recuperatoData chiusura - @Html.DisplayNameFor(model => model.DataGiro) - - @Html.DisplayNameFor(model => model.CodAutista) - - @Html.DisplayNameFor(model => model.Autista) - - @Html.DisplayNameFor(model => model.BancaliCaricati) - - @Html.DisplayNameFor(model => model.BancaliRecuperati) - - @Html.DisplayNameFor(model => model.ImportoDaRecuperare) - - @Html.DisplayNameFor(model => model.ImportoRecuperato) - - @Html.DisplayNameFor(model => model.DataChiusura) - noconsPar€ ParnoconsRit€ RitnoconsTemp€ Temp 
- @Html.DisplayFor(modelItem => item.BancaliRecuperati) + @Html.DisplayFor(modelItem => item.ImportoDaRecuperare) - @Html.DisplayFor(modelItem => item.ImportoDaRecuperare) + @Html.DisplayFor(modelItem => item.BancaliRecuperati) @Html.DisplayFor(modelItem => item.ImportoRecuperato) + @Html.DisplayFor(modelItem => item.parzialeBanRec) - Destinazioni - Modifica bancali - Chiudi - Riapri - Elimina + @Html.DisplayFor(modelItem => item.parzialeImpRec) + + nocons + nocons + nocons + nocons + nocons