note consegna

Controllers/DestinazioniController.cs

@@ -135,8 +135,9 @@ namespace SoftwayWeb.Controllers
             }
 
         }
-        public IActionResult IndexValidate(string id, string? codAutista, string? nomeAutista, DateTime dataGiro, string? codMezzo, string? desMezzo, int? page = 1)
+        
-        {
+         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");
@@ -199,7 +200,7 @@ namespace SoftwayWeb.Controllers
             }
 
             urlBase = apiUrl + "Giri/listaDestinazioniByAutistaDataMezzoWeb";
-            urlBase = urlBase + "?autista=" + codAutista + "&dataGiro=" + dataGi + "&mezzo=" + codMezzo;
+            urlBase = urlBase + "?autista=" + codAutista.Trim() + "&dataGiro=" + dataGi.Trim() + "&mezzo=" + codMezzo.Trim();
             Uri baseAddress = new Uri(urlBase);
             client = new HttpClient();
             client.BaseAddress = baseAddress;
@@ -231,7 +232,7 @@ namespace SoftwayWeb.Controllers
                 return RedirectToAction("Error");
             }
 
-        }
+         }
 
         public IActionResult EliminaDestinazione(string serial)
         {
@@ -565,6 +566,7 @@ namespace SoftwayWeb.Controllers
             }
 
         }
+
         private List<SelectListItem> getAutisti()
         {
             SessionHelper helper = new SessionHelper(this);

Controllers/GiriController.cs

@@ -485,9 +485,6 @@ namespace SoftwayWeb.Controllers
             return RedirectToAction("Index", "Giri");
         }
 
-
-
-
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public IActionResult Error()
         {

Models/Destinazioni_Out.cs

@@ -55,6 +55,8 @@ namespace SoftwayWeb.Models
         public int? Uova { get; set; }
         public int? Cist { get; set; }
         public string? Note { get; set; }
+        [Display(Name = "Note cons.")]
+        public string? noteConsegna { get; set; }
         public int? Seq { get; set; }
         public string? Prog { get; set; }
         public string? Pisergir {  get; set; }

Views/Consegne/Dettaglio.cshtml

@@ -154,7 +154,7 @@
             @Html.HiddenFor(model => model.Cist)
             @Html.HiddenFor(model => model.Cist)
             @Html.HiddenFor(model => model.Note)
-            @Html.HiddenFor(model => model.Note)
+            @Html.HiddenFor(model => model.noteConsegna)
             @Html.HiddenFor(model => model.Seq)
             @Html.HiddenFor(model => model.Seq)
             @Html.HiddenFor(model => model.Prog)

Views/Destinazioni/Index.cshtml

@@ -172,6 +172,10 @@
                             @Html.DisplayFor(modelItem => item.Note)
                         </td>
 
+                        <td style="font-size:12px;border-right-width:2px">
+                            @Html.DisplayFor(modelItem => item.noteConsegna)
+                        </td>
+
                         @if (item.ConsFatta != null && item.ConsFatta.consFattaBanCar != null && item.ConsFatta.consFattaBanSca!=null)
                         {
                             diffBancali = item.ConsFatta.consFattaBanCar.Value - item.ConsFatta.consFattaBanSca.Value;

Views/Destinazioni/IndexValidate.cshtml

@@ -42,6 +42,7 @@
                     <th>Uo</th>
                     <th>Ci.</th>
                     <th>Note</th>
+                    <th>Note Consegna</th>
                     <th>Bc - Bs</th>
                     <th>&nbsp;</th>
                     <th>&nbsp;</th>
@@ -172,6 +173,10 @@
                             @Html.DisplayFor(modelItem => item.Note)
                         </td>
 
+                        <td style="font-size:12px;border-right-width:2px">
+                            @Html.DisplayFor(modelItem => item.noteConsegna)
+                        </td>
+
                         @if (item.ConsFatta != null && item.ConsFatta.consFattaBanCar != null && item.ConsFatta.consFattaBanSca!=null)
                         {
                             diffBancali = item.ConsFatta.consFattaBanCar.Value - item.ConsFatta.consFattaBanSca.Value;

Views/Destinazioni/ModificaDestinazione.cshtml

@@ -82,6 +82,7 @@
                     @Html.HiddenFor(model => model.Uova)
                     @Html.HiddenFor(model => model.Cist)
                     @Html.HiddenFor(model => model.Note)
+                    @Html.HiddenFor(model => model.noteConsegna)
                     @Html.HiddenFor(model => model.Seq)
                     @Html.HiddenFor(model => model.Prog)
 

Views/Destinazioni/ModificaDestinazioneStep1.cshtml

@@ -68,6 +68,7 @@
                     @Html.HiddenFor(model => model.Uova)
                     @Html.HiddenFor(model => model.Cist)
                     @Html.HiddenFor(model => model.Note)
+                    @Html.HiddenFor(model => model.noteConsegna)
                     @Html.HiddenFor(model => model.Seq)
                     @Html.HiddenFor(model => model.Prog)
 

Views/Giri/ModificaTutteDestinazioni.cshtml

@@ -179,6 +179,11 @@
                                 <td style="font-size:12px; border-right-width:2px">
                                     @Html.DisplayFor(modelItem => modelList[i].Note)
                                 </td>
+
+                                <td style="font-size:12px; border-right-width:2px">
+                                    @Html.DisplayFor(modelItem => modelList[i].noteConsegna)
+                                </td>
+
                                 <td style="border-right-width:2px">&nbsp;</td>
                                 <td style="border-right-width:2px">&nbsp;</td>
                                @*  @if (modelList[i].ConsFatta == null)

Views/Giri/ModificaTutteDestinazioniStep1.cshtml

@@ -70,6 +70,7 @@
                         @Html.HiddenFor(modelItem => modelList[i].Uova)
                         @Html.HiddenFor(modelItem => modelList[i].Cist)
                         @Html.HiddenFor(modelItem => modelList[i].Note)
+                        @Html.HiddenFor(modelItem => modelList[i].noteConsegna)
                         @Html.HiddenFor(modelItem => modelList[i].Seq)
                         @Html.HiddenFor(modelItem => modelList[i].Prog)
                     }
@@ -179,6 +180,12 @@
                                 <td style="font-size:12px; border-right-width:2px">
                                     @Html.DisplayFor(modelItem => modelList[i].Note)
                                 </td>
+
+                                <td style="font-size:12px; border-right-width:2px">
+                                    @Html.DisplayFor(modelItem => modelList[i].noteConsegna)
+                                </td>
+
+
                                 <td style="border-right-width:2px">&nbsp;</td>
                                 <td style="border-right-width:2px">&nbsp;</td>
                             </tr>