pre passaggio git

Modifcato controller
Index giri - aggiunti parametri a a bottone aggiungi nuova destinazione

Controllers/AddDestinazioneController.cs

@@ -27,9 +27,8 @@ namespace SoftwayWeb.Controllers
             apiUrl = key;
         }
 
-        public IActionResult AddDestinazione(string serialeGiro)
+        public IActionResult AddDestinazione(string serialeGiro, string? codAutista, string? nomeAutista, string? codMezzo, string? desMezzo, DateTime dataGiro)
         {
-
             SessionHelper helper = new SessionHelper(this);
 
             token = helper.GetStringValue("tok");
@@ -43,13 +42,21 @@ namespace SoftwayWeb.Controllers
             ViewBag.serialeGiro = serialeGiro;
             model.Pisergir = serialeGiro;
             ViewBag.Commit = getCommittenti();
-            ViewBag.CodAutista = getAutisti();
-            ViewBag.Mezzi = getMezzi();
+            ViewBag.Mezzi=getMezzi();
+            ViewBag.CodAutista=getAutisti();
+            //ViewBag.CodAutista = codAutista;
+            model.Piautist = codAutista;
+            ViewBag.Autista = nomeAutista;
+            ViewBag.CodMezzo = codMezzo;
+            model.Pitarga = codMezzo;
+            ViewBag.Automezzo = desMezzo;
+            ViewBag.dataGiro = dataGiro.ToString("dd/MM/yyyy");
+            model.Pidata = dataGiro;
 
             return View(model);
         }
 
-        public IActionResult NewDestinazione(Modgir modgir, string? autista, string? mezzo, string id)
+        public IActionResult NewDestinazione(Modgir modgir /*,string? codAutista, string? codMezzo, DateTime dataGiro, string serGiro*/)
         {
             SessionHelper helper = new SessionHelper(this);
 
@@ -63,16 +70,15 @@ namespace SoftwayWeb.Controllers
             //qui metodo post per scrivere su pimodgir
             Modgir mg = new Modgir();
 
-            //mg.Piprogre = modgir.Piprogre;
             mg.Piserial = string.Empty;
             mg.Pidata = modgir.Pidata;
             mg.Picommit = modgir.Picommit;
             mg.Pidesdiv = modgir.Pidesdiv;
-            mg.Pitarga = mezzo.TrimEnd();
-            mg.Piautist = autista.TrimEnd();
+            mg.Pitarga = modgir.Pitarga;
+            mg.Piautist = modgir.Piautist.TrimEnd();
             mg.Pitiprec = "A";
             mg.Pirigele = string.Empty;
-            mg.Pisergir = id;
+            mg.Pisergir = modgir.Pisergir;
             mg.Picasse = modgir.Picasse;
             mg.Pitrasf = modgir.Pitrasf;
             mg.Picolli = modgir.Picolli;
@@ -80,6 +86,7 @@ namespace SoftwayWeb.Controllers
             mg.Piuova = modgir.Piuova;
             mg.Picist = modgir.Picist;
             mg.Piseq = modgir.Piseq;
+            mg.Pinote = modgir.Pinote;
 
             apiUrl = helper.GetStringValue("apiUrl");
 
@@ -102,7 +109,6 @@ namespace SoftwayWeb.Controllers
                 helper.SetStringValue("errMsg", errMes);
                 return RedirectToAction("Error");
             }
-            //return View();
         }
 
         public IActionResult Index()
@@ -249,7 +255,7 @@ namespace SoftwayWeb.Controllers
         }
 
         [HttpPost]
-        public IActionResult Cascading(string Picommit/*ancodice*/)
+        public IActionResult Cascading(string Picommit)
         {
             SessionHelper helper = new SessionHelper(this);
             Cascading model = new Cascading();
@@ -289,11 +295,9 @@ namespace SoftwayWeb.Controllers
                         listItem.Value = sede.Pccodsed;
                         listItem.Text = s;
                         selectItems.Add(listItem);
-                        //model.SediCons.Add(listItem);
                         model.SediCons.Add(listItem);
                     }
-                    //model.SediCons.AddRange(selectItems);
-                   // ViewBag.SediCons = sediCons;
+                    
                 }
             }
             return Json(new SelectList(selectItems, "Value", "Text"));

Controllers/DestinazioniController.cs

@@ -91,7 +91,7 @@ namespace SoftwayWeb.Controllers
                 ViewBag.dataGiro = dataG;
             }
             
-            urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzo";
+            urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzoNonValidate";
             urlBase = urlBase + "?autista=" + codAutista + "&dataGiro=" + dataGi + "&mezzo=" + codMezzo;
             Uri baseAddress = new Uri(urlBase);
             client = new HttpClient();
@@ -104,7 +104,104 @@ namespace SoftwayWeb.Controllers
             {
                 string dato = response.Content.ReadAsStringAsync().Result;
                 modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato);
-                modelList = modelList.Where(x => x.serialeGiro == id).ToList();
+                modelList = modelList.Where(x => x.serialeGiro == id).OrderBy(x=> x.Seq).ThenBy(x => x.Committente).ToList();
+
+                if (page != null && page < 1)
+                {
+                    page = 1;
+                }
+
+                var pageSize = 10;
+
+                var shortList = modelList.ToPagedList(page ?? 1, pageSize);
+
+                return View(shortList);
+            }
+            else
+            {
+                errMes = response.Content.ReadAsStringAsync().Result;
+                helper.SetStringValue("errMsg", errMes);
+                return RedirectToAction("Error");
+            }
+
+        }
+        public IActionResult IndexValidate(string id, string? codAutista, string? nomeAutista, DateTime dataGiro, string? codMezzo, string? desMezzo, int? page = 1)
+        {
+            helper = new SessionHelper(this);
+
+            token = helper.GetStringValue("tok");
+
+            if (string.IsNullOrEmpty(token))
+            {
+                return RedirectToAction("Login", "Login");
+            }
+
+            string autista = string.Empty;
+            string dataGi = string.Empty;
+            string mezzo = string.Empty;
+            string dataGiro2 = string.Empty;
+
+            ViewBag.CodAutista = codAutista;
+            ViewBag.Autista = nomeAutista;
+            ViewBag.CodMezzo = codMezzo;
+            ViewBag.Automezzo = desMezzo;
+            ViewBag.dataGiro = dataGiro.ToString("dd/MM/yyyy");
+
+            if (!string.IsNullOrEmpty(codAutista))
+            {
+                helper.SetStringValue("codAutista", codAutista.TrimEnd());
+                helper.SetStringValue("nomeAutista", nomeAutista.TrimEnd());
+            }
+            else
+            {
+                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/listaDestinazioniByAutistaDataMezzoWeb";
+            urlBase = urlBase + "?autista=" + codAutista + "&dataGiro=" + dataGi + "&mezzo=" + codMezzo;
+            Uri baseAddress = new Uri(urlBase);
+            client = new HttpClient();
+            client.BaseAddress = baseAddress;
+
+            List<Destinazioni_Out> modelList = new List<Destinazioni_Out>();
+            HttpResponseMessage response = client.GetAsync(baseAddress).Result;
+
+            if (response.IsSuccessStatusCode)
+            {
+                string dato = response.Content.ReadAsStringAsync().Result;
+                modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato);
+                modelList = modelList.Where(x => x.serialeGiro == id).OrderBy(x => x.Seq).ThenBy(x => x.Committente).ToList();
 
                 if (page != null && page < 1)
                 {

Controllers/GiriController.cs

@@ -41,8 +41,6 @@ namespace SoftwayWeb.Controllers
             }
 
             urlBase = apiUrl + "Giri/listaGiri?aperto="+ aperto;
-            //string url = apiUrl + "Giri/listaGiri";
-            //urlBase = url + "?token=" + token;
             Uri baseAddress = new Uri(urlBase);
             client = new HttpClient();
             client.BaseAddress = baseAddress;
@@ -155,7 +153,6 @@ namespace SoftwayWeb.Controllers
             {
                 if(g.IsSelected==true)
                 {
-                    //ViewBag.Autisti = getAutisti();
                     apiUrl = helper.GetStringValue("apiUrl");
                     urlBase = apiUrl + "Giri/addGiro2";
 
@@ -226,6 +223,10 @@ namespace SoftwayWeb.Controllers
         [HttpPost]
         public IActionResult Bancali(GiriConsegnaView model)
         {
+            if (model.BancaliCaricati == null)
+            {
+                return View(model);
+            }
             SessionHelper helper = new SessionHelper(this);
             token = helper.GetStringValue("tok");
 
@@ -299,7 +300,7 @@ namespace SoftwayWeb.Controllers
             {
                 string dato = response.Content.ReadAsStringAsync().Result;
                 modelList = JsonConvert.DeserializeObject<List<Destinazioni_Out>>(dato);
-                modelList = modelList.Where(x => x.serialeGiro.Equals(id.TrimEnd())).ToList();
+                modelList = modelList.Where(x => x.serialeGiro.Equals(id.TrimEnd())).OrderBy(x => x.Seq).ThenBy(x => x.Committente).ToList();
 
                 //if (page != null && page < 1)
                 //{
@@ -308,9 +309,10 @@ namespace SoftwayWeb.Controllers
 
                 //var pageSize = 10;
 
-                //var shortList = modelList.ToPagedList(/*page ?? 1, pageSize*/);
+                //var shortList = modelList.ToPagedList(page ?? 1, pageSize);
 
                 return View(modelList);
+                //return View(shortList);
             }
             else
             {
@@ -318,7 +320,6 @@ namespace SoftwayWeb.Controllers
                 helper.SetStringValue("errMsg", errMes);
                 return RedirectToAction("Error");
             }
-            //return View(modelList);
         }
 
         [HttpPost]

Controllers/GiriDaValidareController.cs

@@ -57,19 +57,19 @@ namespace SoftwayWeb.Controllers
 
 
             string _filtro= helper.GetStringValue("filterData");
-            if (data == DateTime.MinValue && string.IsNullOrEmpty(_filtro))
+            if (data == DateTime.MinValue && string.IsNullOrEmpty(_filtro) && modelList.Count()>0)
             {
                 var last = modelList.OrderByDescending(t => t.DataGiro).Take(1).First();
                 modelList = modelList.Where(x => x.DataGiro == last.DataGiro).ToList();
             }
-            if (data == DateTime.MinValue && !string.IsNullOrEmpty(_filtro))
+            if (data == DateTime.MinValue && !string.IsNullOrEmpty(_filtro) && modelList.Count() > 0)
             {
                 DateTime dataFiltro=Convert.ToDateTime(_filtro);
                 ViewBag.Filtro = Convert.ToString(_filtro);
                 modelList = modelList.Where(x => x.DataGiro == dataFiltro).ToList();
             }
 
-            if (data != DateTime.MinValue )
+            if (data != DateTime.MinValue && modelList.Count() > 0)
             {
                 helper.SetStringValue("filterData", Convert.ToString( data));
                 ViewBag.Filtro = data.ToString("dd/MM/yyyy");

Models/GiriConsegnaView.cs

@@ -17,7 +17,7 @@ namespace SoftwayWeb.Models
         [Display(Name = "Autista")]
         public string? Autista { get; set; }
 
-        [Display(Name = "Bancali caricati")]
+        [Display(Name = "Bancali caricati"), Required(ErrorMessage = "Inserire il numero di bancali")]
         public int? BancaliCaricati { get; set; }
 
 

Models/Modgir.cs

@@ -37,5 +37,8 @@ namespace SoftwayWeb.Models
         public decimal? Picist { get; set; }
         [Display(Name = "Sequenza")]
         public int? Piseq { get; set; }
+        [Display(Name = "Note")]
+        public string? Pinote { get; set; }
+
     }
 }

Views/AddDestinazione/AddDestinazione.cshtml

@@ -44,7 +44,7 @@
                     <div class="mb-3" style="width:25%;float:left;">
                         <b><label asp-for="Piautist" class="control-label"></label></b>
                         <div>
-                            @Html.DropDownList("autista",ViewBag.CodAutista, null, new { @class = "agy-form-field require" })
+                                @Html.DropDownList("Piautist",ViewBag.CodAutista, null, new { @class = "agy-form-field require" })
                         </div>
                         <span asp-validation-for="Piautist" class="text-danger"></span>
                     </div>
@@ -52,7 +52,7 @@
                     <div class="mb-3" style="width:40%;float:left;">
                         <b><label asp-for="Pitarga" class="control-label"></label></b>
                         <div>
-                            @Html.DropDownList("mezzo",ViewBag.Mezzi, null, new { @class = "agy-form-field require" })
+                                @Html.DropDownList("Pitarga",ViewBag.Mezzi, null, new { @class = "agy-form-field require" })
                         </div>
                         <span asp-validation-for="Pitarga" class="text-danger"></span>
                     </div>
@@ -105,6 +105,12 @@
                         <input asp-for="Piseq" value="0" class="form-control" />
                         <span asp-validation-for="Piseq" class="text-danger"></span>
                     </div>
+                    <div style="width:2%;float:left;">&nbsp;</div>
+                    <div class="mb-3" style="width:16%;float:left;">
+                        <b><label asp-for="Pinote" class="control-label"></label></b>
+                        <input asp-for="Pinote" class="form-control" />
+                        <span asp-validation-for="Pinote" class="text-danger"></span>
+                    </div>
                     <div style="width:35%;float:left;">&nbsp;</div>
                     <div style="width:10%;float:left;">
                         <input type="submit" asp-action="NewDestinazione" asp-controller="AddDestinazione" asp-route-id="@Model.Pisergir" value="Salva modifiche" class="btn btn-primary" />                         

Views/Consegne/Dettaglio.cshtml

@@ -97,7 +97,7 @@
     </div>
 </div>
 <div>
-    <a asp-action="Index" asp-controller="Destinazioni" asp-route-id="@Model.serialeGiro" value="" class="btn btn-primary">Torna alla Lista</a>
+    <a asp-action="IndexValidate" asp-controller="Destinazioni" asp-route-id="@Model.serialeGiro" value="" class="btn btn-primary">Torna alla Lista</a>
     @* <a href="@Url.ActionLink("Index", "Destinazioni", new { id = Model.serialeGiro, 
         codAutista = Model.CodAutista,
         nomeAutista = Model.Autista,
@@ -158,7 +158,7 @@
             @Html.HiddenFor(model => model.Seq)
             @Html.HiddenFor(model => model.Seq)
             @Html.HiddenFor(model => model.Prog)
-            @Html.DisplayFor(model => model.Prog)
+            @* @Html.DisplayFor(model => model.Prog) *@
             @Html.HiddenFor(model => model.Pisergir)
 
 @section Scripts {

Views/Destinazioni/Index.cshtml

@@ -19,7 +19,7 @@
     <br />
     <b>Automezzo: @ViewBag.CodMezzo - @ViewBag.Automezzo</b>
 </p>
-<a asp-action="Index" asp-controller="Giri" value="Torna alla lista" class="btn btn-primary">Torna alla lista</a>
+<a asp-action="Index" asp-controller="GiriDaValidare" value="Torna alla lista" class="btn btn-primary">Torna alla lista</a>
 <br />
 <br />
 

Views/Destinazioni/IndexValidate.cshtml

@@ -0,0 +1,400 @@
+@* @model IEnumerable<SoftwayWeb.Models.Destinazioni_Out> *@
+@* @model SoftwayWeb.Models.Destinazioni_Out *@
+@model IPagedList<SoftwayWeb.Models.Destinazioni_Out>
+@using X.PagedList;
+@using X.PagedList.Mvc.Core;
+@using X.PagedList;
+
+@{
+    ViewData["Title"] = "Lista Destinazioni";
+    Layout = "~/Views/Shared/_LayoutAreaRis.cshtml";
+}
+
+<h1>Lista destinazioni</h1>
+
+<p>
+    <b>Data giro: @ViewBag.dataGiro</b>
+    <br />
+    <b>Autista: @ViewBag.CodAutista - @ViewBag.Autista</b>
+    <br />
+    <b>Automezzo: @ViewBag.CodMezzo - @ViewBag.Automezzo</b>
+</p>
+<a asp-action="Index" asp-controller="Giri" value="Torna alla lista" class="btn btn-primary">Torna alla lista</a>
+<br />
+<br />
+
+<!-- Striped Rows -->
+<div class="card" >
+    <h5 class="card-header">Lista destinazioni</h5>
+    <div class="table-responsive text-nowrap">
+        <table class="table table-striped">
+            <thead>
+                <tr>
+                    @*<th>&nbsp;</th>*@
+                    <th>S.</th>
+                    <th>Committente</th>
+                    <th>Sede</th>
+                    <th>Indirizzo sede</th>
+                    <th>Ca.</th>
+                    <th>Tr.</th>
+                    <th>Co.</th>
+                    <th>Nr.Co.</th>
+                    <th>Uo</th>
+                    <th>Ci.</th>
+                    <th>Note</th>
+                    <th>Bc - Bs</th>
+                    <th>&nbsp;</th>
+                    <th>&nbsp;</th>
+                </tr>
+            </thead>
+            <tbody class="table-border-bottom-0">
+            @foreach (var item in Model) {
+                int diffBancali = 0;
+                string cl = string.Empty;
+                @if (item.ConsFatta != null)
+                {
+                    @Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
+
+                    @if (item.ConsFatta.consFattaFlagCons != null && item.ConsFatta.consFattaFlagCons.Contains("S"))
+                    {
+                        @*<img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:16px;height:16px">*@
+                        cl = "table-success";
+                    }
+                    else
+                    {
+                        cl = "table-danger";
+                        @*<img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:16px;height:16px;">*@
+                    }
+                }
+                else
+                {
+@*                  <td>
+                        <img alt="notyet" src="@Url.Content("~/images/yellow.png")" style="width:16px;height:16px;">
+                    </td>*@
+                }
+                    
+                <tr class="@cl">
+
+
+@*                        @if (item.ConsFatta != null)
+                        {
+                            <td >
+                                @Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
+
+                                @if (item.ConsFatta.consFattaFlagCons!=null && item.ConsFatta.consFattaFlagCons.Contains("S"))
+                                {
+                                    <img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:16px;height:16px">
+                                }
+                                else
+                                {
+                                    <img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:16px;height:16px;">
+                                }
+                            </td>
+                        }
+                        else
+                        {
+                            <td>
+                                <img alt="notyet" src="@Url.Content("~/images/yellow.png")" style="width:16px;height:16px;">
+                            </td>
+                        }*@
+
+
+                        <td style="font-size:12px;border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i>@Html.DisplayFor(modelItem => item.Seq)</td>
+                        <td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.Committente)</td>
+                        <td style="border-right-width:2px">@*@Html.DisplayFor(modelItem => item.CodSede) - *@@Html.DisplayFor(modelItem => item.Sede)</td>
+                        <td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.IndirizzoSede)</td>
+                        @if (item.Casse != null && item.Casse > 0)
+                        {
+                            int icasse = 0;
+                            icasse = Convert.ToInt32(item.Casse);
+                            <td style="font-size:12px; border-right-width:2px;text-align:center;">
+                                @icasse
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px;text-align:center;">&nbsp;</td>
+                        }
+                        @if (item.Trasf != null && item.Trasf > 0)
+                        {
+                            <td style="font-size:12px; border-right-width:2px;text-align:center;">
+                                @Html.DisplayFor(modelItem => item.Trasf)
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+                        @if (item.Colli != null && item.Colli > 0)
+                        {
+                            int icolli = 0;
+                            icolli = Convert.ToInt32(item.Colli);
+                            <td style="font-size:12px;border-right-width:2px;text-align:center;">
+                                @icolli
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+                        @if (item.num_cons != null && item.num_cons > 0)
+                        {
+                            <td style="font-size:12px;border-right-width:2px;text-align:center;">
+                                @Html.DisplayFor(modelItem => item.num_cons)
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+                        @if (item.Uova != null && item.Uova > 0)
+                        {
+                            <td style="font-size:12px;border-right-width:2px;text-align:center;">
+                                @Html.DisplayFor(modelItem => item.Uova)
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+                        @if (item.Cist != null && item.Cist > 0)
+                        {
+                            <td style="font-size:12px;border-right-width:2px;text-align:center;">
+                                @Html.DisplayFor(modelItem => item.Cist)
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+
+                        <td style="font-size:12px;border-right-width:2px">
+                            @Html.DisplayFor(modelItem => item.Note)
+                        </td>
+
+                        @if (item.ConsFatta != null && item.ConsFatta.consFattaBanCar != null && item.ConsFatta.consFattaBanSca!=null)
+                        {
+                            diffBancali = item.ConsFatta.consFattaBanCar.Value - item.ConsFatta.consFattaBanSca.Value;
+
+                            <td style="text-align:center;border-right-width:2px;text-align:center;">
+                                <a href="@Url.ActionLink("Dettaglio","Consegne", new{id = item.Brserial,
+                                    codAutista = item.CodAutista,
+                                    dataGiro = item.DataCarico,
+                                    codMezzo = item.CodAutomezzo})" class="links"><span class="badge bg-label-primary me-2" style="font-size:16pt;color:black;"> @diffBancali</span></a>
+                            </td>
+                        }
+                        else
+                        {
+                            <td style="border-right-width:2px">&nbsp;</td>
+                        }
+                        @if (item.ConsFatta == null)
+                        {
+                            <td>
+                                @if (!string.IsNullOrEmpty(item.Prog))
+                                {
+                                    <img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:16px;height:16px;">
+                                }
+
+                                <a href="@Url.ActionLink("EliminaDestinazione", "Destinazioni", new { serial=item.Brserial })" title="Elimina Destinazione" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-rimuovere-24.png")" style="width:16px;height:16px;"></a>
+                            </td>
+                            <td>
+                                <a href="@Url.ActionLink("ModificaDestinazione", "Destinazioni", new { serial=item.Brserial })" title="Modifica Destinazione" class="links"><img alt="nocons" src="@Url.Content("~/images/system.png")" style="width:16px;height:16px;"></a>
+                            </td>
+                        }
+                        else
+                        {
+                            <td>&nbsp;</td>
+                            <td>&nbsp;</td>
+                        }
+
+                </tr>
+                }
+            </tbody>
+        </table>
+    </div>
+</div>
+<br />
+<span style=" height: 16px;
+  width: 16px;
+  background-color: #dfc2c4;
+  border-radius: 50%;
+  display: inline-block;"></span>
+<span>&nbsp;Consegna non effettuata</span>
+<span style=" height: 16px;
+  width: 16px;
+  background-color: #c7dbd2;
+  border-radius: 50%;
+  display: inline-block;"></span>
+<span>&nbsp;Consegna completata</span>
+<span style=" height: 16px;
+  width: 16px;
+  background-color: #dee2e6;
+  border-radius: 50%;
+  display: inline-block;"></span>
+<span>&nbsp;Consegna da effettuare</span>
+<span>
+    <img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:16px;height:16px;">
+</span>
+<span>&nbsp;Destinazione modificata</span>
+
+<!--/ Striped Rows -->
+
+@*<table class="table" style="width:100%">
+    <thead>
+        <tr>
+            <th>&nbsp;</th>
+            <th>Seq</th>
+            <th>Committente</th>
+            <th>Sede</th>
+            <th>Indirizzo sede</th>
+            <th>Casse</th>
+            <th>Trasf.</th>
+            <th>Colli</th>          
+            <th>Nr.Cons.</th>
+            <th>Uova</th>
+            <th>Cist</th>
+            <th>Note</th>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+
+        </tr>
+    </thead>
+<tbody>
+@foreach (var item in Model) {
+    <tr>
+        @if (item.ConsFatta != null)
+        {
+            <td>
+                @Html.HiddenFor(modelItem => item.ConsFatta.consFattaFlagCons)
+
+                @if (item.ConsFatta.consFattaFlagCons.Contains("S"))
+                {
+                    <img alt="cons" src="@Url.Content("~/images/Green.png")" style="width:24px;height:24px">
+                }
+                else
+                {
+                    <img alt="nocons" src="@Url.Content("~/images/Red.png")" style="width:24px;height:24px;">
+                }
+            </td>
+        }
+        else
+        {
+            <td>
+                <img alt="notyet" src="@Url.Content("~/images/yellow.png")" style="width:24px;height:24px;">
+            </td>
+        }
+        <td>
+            @Html.DisplayFor(modelItem => item.Seq)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.CodCommittente) - @Html.DisplayFor(modelItem => item.Committente)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.CodSede) - @Html.DisplayFor(modelItem => item.Sede)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.IndirizzoSede)
+        </td>
+        @if (item.Casse != null && item.Casse>0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.Casse)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+        @if (item.Trasf != null && item.Trasf > 0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.Trasf)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+        @if (item.Colli != null && item.Colli > 0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.Colli)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+        @if (item.num_cons != null && item.num_cons > 0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.num_cons)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+        @if (item.Uova != null && item.Uova > 0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.Uova)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+        @if (item.Cist != null && item.Cist > 0)
+        {
+            <td>
+                @Html.DisplayFor(modelItem => item.Cist)
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+        }
+
+        <td>
+            @Html.DisplayFor(modelItem => item.Note)
+        </td>
+
+        @if (item.ConsFatta == null)
+        {
+            <td>
+                @if (!string.IsNullOrEmpty(item.Prog))
+                {
+                    <img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:24px;height:24px;">
+                }
+
+                <a href="@Url.ActionLink("EliminaDestinazione", "Destinazioni", new { serial=item.Brserial })" title="Elimina Destinazione" class="links"><img alt="nocons" src="@Url.Content("~/images/icons8-rimuovere-24.png")" style="width:24px;height:24px;"></a>
+            </td>
+            <td>
+                <a href="@Url.ActionLink("ModificaDestinazione", "Destinazioni", new { serial=item.Brserial })" title="Modifica Destinazione" class="links"><img alt="nocons" src="@Url.Content("~/images/system.png")" style="width:24px;height:24px;"></a>
+            </td>
+        }
+        else
+        {
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+        }
+    </tr>
+}
+</tbody>
+</table>*@
+<br />
+<nav>
+    @Html.PagedListPager(Model, page => Url.Action("indexValidate", new { page = page, Model/* searchString = @ViewData["CurrentFilter"] */ }), new PagedListRenderOptions()
+    {
+        ActiveLiElementClass = "active",
+        PageClasses = new[] { "page-link" },
+        LiElementClasses = new[] { "page-item" },
+        UlElementClasses = new[] { "pagination", "justify-content-center", "mt-3" },
+        LinkToNextPageFormat = "Successiva",
+        LinkToPreviousPageFormat = "Precedente",
+        MaximumPageNumbersToDisplay = 5,
+        DisplayLinkToPreviousPage = PagedListDisplayMode.Always,
+        DisplayLinkToNextPage = PagedListDisplayMode.Always
+    })
+</nav>

Views/Destinazioni/ModificaDestinazione.cshtml

@@ -218,7 +218,7 @@
 </div>*@
 
 <div>
-    <a asp-action="Index" asp-controller="Destinazioni" asp-route-id="@Model.serialeGiro" class="btn btn-primary">Torna alla Lista</a>
+    <a asp-action="IndexValidate" asp-controller="Destinazioni" asp-route-id="@Model.serialeGiro" class="btn btn-primary">Torna alla Lista</a>
 </div>
 
 @section Scripts {

Views/Giri/Bancali.cshtml

@@ -22,7 +22,7 @@
                     
                     <div class="mb-3" style="width:10%;">
                         <label class="form-label" for="basic-default-fullname"><label asp-for="BancaliCaricati" class="agy-client-quote"></label></label>
-                        <input asp-for="BancaliCaricati" class="form-control" />
+                        <input asp-for="BancaliCaricati"  class="form-control" />
                         <span asp-validation-for="BancaliCaricati" class="control"></span>
                     </div>
                     @Html.HiddenFor(x => x.SerialeGiro)
@@ -39,6 +39,11 @@
                     @Html.HiddenFor(x => x.parzialeImpRec)
                     <button type="submit" class="btn btn-primary">Salva</button>
                     <a asp-action="Index" value="Torna alla lista" class="btn btn-primary">Torna alla lista</a>
+
+                    @* @if (Model.BancaliCaricati == null)
+                    {
+                        <p style="color:red;">Inserire il numero di bancali</p>
+                    } *@
                 </form>
             </div>
         </div>

Views/Giri/Index.cshtml

@@ -46,7 +46,7 @@
                     </td>
                     <td>
 
-                            @Html.CheckBox("aperto", new { placeholder ="aperto", @checked = true, })
+                            @Html.CheckBox("aperto", new { placeholder ="aperto" , @checked = true})
                             @Html.Label("aperto", "aperto")
 
                     </td>
@@ -80,67 +80,86 @@
                 </tr>
             </thead>
             <tbody class="table-border-bottom-0">
-        @foreach (var item in Model)
+            @foreach (var item in Model)
+            {
+                string totBancaliCaricati = "-";    
+                if (item.BancaliCaricati!=null)
                 {
-                    string totBancaliCaricati = "-";
-                    if (item.BancaliCaricati!=null)
+                    totBancaliCaricati = Convert.ToString(item.BancaliCaricati.Value);
+                }
+                <tr>
+                    <td style="border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i> <span class="fw-medium">@Html.DisplayFor(modelItem => item.DataGiro)</span></td>
+                    <td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista)</td>
+                    <td style="border-right-width:2px">
+                        @Html.DisplayFor(modelItem => item.CodMezzo) - @Html.DisplayFor(modelItem => item.Automezzo)
+                    </td>
+                    <td style="border-right-width:2px">
+                        @Html.DisplayFor(modelItem => item.DestinazioniFatte)/@Html.DisplayFor(modelItem => item.DestinazioniTutte)
+                    </td>
+                    <td style="border-right-width:2px">
+                        <span style="color:blue;">@totBancaliCaricati</span>/<span style="color:green;">@Html.DisplayFor(modelItem => item.parzialeBanRec)</span>/<span style="color:brown;">@Html.DisplayFor(modelItem => item.parzialeBanSca)</span>
+                    </td>
+                    @if (item.ImportoDaRecuperare != null && item.ImportoDaRecuperare > 0)
                     {
-                        totBancaliCaricati = Convert.ToString(item.BancaliCaricati.Value);
+                        <td style="border-right-width:2px">
+                            @Html.DisplayFor(modelItem => item.ImportoDaRecuperare)/@Html.DisplayFor(modelItem => item.parzialeImpRec)
+                        </td>
                     }
-                    <tr>
-                        <td style="border-right-width:2px"><i class="bx bxl-angular bx-sm text-danger me-3"></i> <span class="fw-medium">@Html.DisplayFor(modelItem => item.DataGiro)</span></td>
-                        <td style="border-right-width:2px">@Html.DisplayFor(modelItem => item.CodAutista) - @Html.DisplayFor(modelItem => item.Autista)</td>
-                        <td style="border-right-width:2px">
-                            @Html.DisplayFor(modelItem => item.CodMezzo) - @Html.DisplayFor(modelItem => item.Automezzo)
-                        </td>
-                        <td style="border-right-width:2px">
-                            @Html.DisplayFor(modelItem => item.DestinazioniFatte)/@Html.DisplayFor(modelItem => item.DestinazioniTutte)
-                        </td>
-                        <td style="border-right-width:2px">
-                            <span style="color:blue;">@totBancaliCaricati</span>/<span style="color:green;">@Html.DisplayFor(modelItem => item.parzialeBanRec)</span>/<span style="color:brown;">@Html.DisplayFor(modelItem => item.parzialeBanSca)</span>
-                        </td>
-                        @if (item.ImportoDaRecuperare != null && item.ImportoDaRecuperare > 0)
+                    else
+                    {
+                        <td style="border-right-width:2px">&nbsp;</td>
+                    }
+
+                    <td>
+                        <a href="@Url.ActionLink("IndexValidate", "Destinazioni", new { id=item.SerialeGiro,
+                            codAutista=item.CodAutista,
+                            nomeAutista=item.Autista,
+                            dataGiro=item.DataGiro,
+                            codMezzo=item.CodMezzo,
+                            desMezzo=item.Automezzo})" title="Destinazioni" class="links" style="text-decoration: none">
+                            <img alt="Destinazioni" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;">
+                        </a>
+                        @if(item.DestinazioniFatte == 0)
                         {
-                            <td style="border-right-width:2px">
-                                @Html.DisplayFor(modelItem => item.ImportoDaRecuperare)/@Html.DisplayFor(modelItem => item.parzialeImpRec)
-                            </td>
+                            <a href="@Url.ActionLink("Bancali", "Giri", new { id=item.SerialeGiro })" title="Bancali" class="links"><img alt="Bancali" src="@Url.Content("~/images/icons8-bancale-24.png")" style="width:24px;height:24px;"></a>
+                        }
+                        <a href="@Url.ActionLink("Chiudi", "GiriChiudi", new { id=item.SerialeGiro,nbanc=item.parzialeBanRec,imp=item.parzialeImpRec })" title="Chiudi" class="links"><img alt="Chiudi" src="@Url.Content("~/images/icons8-bandiera-a-scacchi-64.png")" style="width:24px;height:24px;"></a>
+                        @if (item.DestinazioniFatte == 0)
+                        {
+                            <a href="@Url.ActionLink("ModificaTutteDestinazioni", "Giri", new { id = item.SerialeGiro,
+                            codAutista = item.CodAutista,
+                            nomeAutista = item.Autista,
+                            codMezzo= item.CodMezzo,
+                            nomeMezzo = item.Automezzo,
+                            dataGiroCons = item.DataGiro @* id=item.SerialeGiro,nbanc=item.parzialeBanRec,imp=item.parzialeImpRec *@})" title="Modifica tutte le destinazioni" class="links" style="text-decoration: none">
+                                <img alt="Modifica Tutte" src="@Url.Content("~/images/system.png")" style="width:24px;height:24px;">
+                            </a>
+                        }
+                        @if (item.DestinazioniFatte == 0)
+                        {
+                            <a href="@Url.ActionLink("AddDestinazione", "AddDestinazione", new{serialeGiro = item.SerialeGiro,
+                            codAutista=item.CodAutista,
+                            nomeAutista=item.Autista,
+                            dataGiro=item.DataGiro,
+                            codMezzo=item.CodMezzo,
+                            desMezzo=item.Automezzo})" title="Aggiungi nuova destinazione" class="links" style="text-decoration: none">
+                                <img alt="Aggiungi nuova destinazione" src="@Url.Content("~/images/addBtn.png")" style="width:25px;height:25px;">
+                            </a>
+                        }
+                        @if (item.BancaliCaricati == null)
+                        {
+                            <img alt="noBancali" src="@Url.Content("~/images/alert.png")" style="width:23px;height:23px;">
+                        }
+                        @if (/*item.DestinazioniModificate != null &&*/ item.DestinazioniModificate > 0)
+                        {
+                            <img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:24px;height:24px;">
                         }
                         else
                         {
-                            <td style="border-right-width:2px">&nbsp;</td>
-                        }
-
-                        <td>
-                            <a href="@Url.ActionLink("Index", "Destinazioni", new { id=item.SerialeGiro,
-                        codAutista=item.CodAutista,
-                        nomeAutista=item.Autista,
-                        dataGiro=item.DataGiro,
-                        codMezzo=item.CodMezzo,
-                        desMezzo=item.Automezzo})" title="Destinazioni" class="links"><img alt="Destinazioni" src="@Url.Content("~/images/icons8-oggetti-puntiforme-30.png")" style="width:24px;height:24px;"></a>
-                            <a href="@Url.ActionLink("Bancali", "Giri", new { id=item.SerialeGiro })" title="Bancali" class="links"><img alt="Bancali" src="@Url.Content("~/images/icons8-bancale-24.png")" style="width:24px;height:24px;"></a>
-                            <a href="@Url.ActionLink("Chiudi", "GiriChiudi", new { id=item.SerialeGiro,nbanc=item.parzialeBanRec,imp=item.parzialeImpRec })" title="Chiudi" class="links"><img alt="Chiudi" src="@Url.Content("~/images/icons8-bandiera-a-scacchi-64.png")" style="width:24px;height:24px;"></a>
-                            <a href="@Url.ActionLink("ModificaTutteDestinazioni", "Giri", new { id = item.SerialeGiro,
-                                codAutista = item.CodAutista,
-                                nomeAutista = item.Autista,
-                                codMezzo= item.CodMezzo,
-                                nomeMezzo = item.Automezzo,
-                                dataGiroCons = item.DataGiro@* id=item.SerialeGiro,nbanc=item.parzialeBanRec,imp=item.parzialeImpRec *@ })" title="Modifica tutte le destinazioni" class="links"><img alt="Modifica Tutte" src="@Url.Content("~/images/system.png")" style="width:24px;height:24px;">
-                            </a>
-                            <a href="@Url.ActionLink("AddDestinazione", "AddDestinazione", new{serialeGiro = item.SerialeGiro})" title="Aggiungi nuova destinazione" class="links"><img alt="Aggiungi nuova destinazione" src="@Url.Content("~/images/addBtn.png")" style="width:25px;height:25px;"></a>
-                            @if (item.BancaliCaricati == null)
-                            {
-                                <img alt="noBancali" src="@Url.Content("~/images/alert.png")" style="width:23px;height:23px;">
-                            }
-                            @if (item.DestinazioniModificate != null && item.DestinazioniModificate > 0)
-                            {
-                                <img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:24px;height:24px;">
-                            }
-                            else
-                            {
                                 
-                            }
-                        </td>
-                    </tr>
+                        }
+                    </td>
+                </tr>
                 }
             </tbody>
         </table>
@@ -150,7 +169,9 @@
 <span><img alt="Bancali" src="@Url.Content("~/images/pallet.png")" style="width:24px;height:24px;"></span>
 <span style="color:blue;">Bancali caricati</span> /<span style="color:green;">parziale bancali caricati</span> /<span style="color:brown;">parziale bancali scaricati</span> /
 <span><img alt="nocons" src="@Url.Content("~/images/alert.png")" style="width:16px;height:16px;"></span>
-<span>&nbsp;Giro NON visibile su app (caricare i bancali iniziali)</span>
+<span>&nbsp;Giro NON visibile su app (caricare i bancali iniziali)</span> /
+<span><img alt="nocons" src="@Url.Content("~/images/warning.png")" style="width:16px;height:16px;"></span>
+<span>&nbsp;Destinazioni modificate</span>
 
 <!--/ Striped Rows -->
 

Views/Login/Login.cshtml

@@ -4,7 +4,6 @@
     ViewData["Title"] = "Login";
 }
 
-
 <!-- Basic Layout -->
 <div class="row">
     <div style="float:left;width:25%">&nbsp;</div>
@@ -24,8 +23,9 @@
                         </div>
                         <div class="mb-3">
                             <label class="form-label" for="basic-default-company">Password</label>
-                            <input asp-for="password" class="form-control" placeholder="" />
+                            <input asp-for="password" class="form-control" placeholder="" type="password" />
                             <span asp-validation-for="password" class="text-danger"></span>
+
                         </div>
                         <button type="submit" class="btn btn-primary">Entra</button>
                     </form>

appsettings.json

@@ -7,6 +7,7 @@
   },
   "ApplicationInsights": {
     "rootUrlApi": "https://api.poloinformatico.it:8000/api/"
+    //"rootUrlApi": "https://localhost:7126/api/"
 
   },