From 5a3916660956620e1e76542b6b2bef233b56689e Mon Sep 17 00:00:00 2001
From: michele <utente@MICHELE>
Date: Fri, 25 Oct 2024 14:49:52 +0200
Subject: [PATCH] Modifica chiamate: aggiunta valorizzazione data appuntamento
 in create, edit e detail. modifcata view e controller

---
 Controllers/ChiamateController.cs | 33 ++++++++++++++++++++++---------
 Models/Chiamate.cs                |  4 ++--
 Views/Chiamate/Create.cshtml      | 20 ++++++-------------
 Views/Chiamate/Details.cshtml     |  7 +++----
 Views/Chiamate/Edit.cshtml        | 11 +++++++----
 Views/Chiamate/Index.cshtml       |  5 +++--
 6 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/Controllers/ChiamateController.cs b/Controllers/ChiamateController.cs
index fb2dbac..e078c20 100644
--- a/Controllers/ChiamateController.cs
+++ b/Controllers/ChiamateController.cs
@@ -201,7 +201,7 @@ namespace VirtualTask.Controllers
             {
                 model.chdata = DateTime.Now;
             }
-            model.chdtapp = model.chdata;
+            //model.chdtapp = model.chdata;
             model.chdtass = model.chdata;
             model.chtipo = "A";//X=creato da app, A creato da adhoc. DEVO METTERE A perche altrimenti l'app lo tratta come una chiamata da commessa
             model.chmodrac = "EMAIL";
@@ -214,9 +214,16 @@ namespace VirtualTask.Controllers
             //model.chmin = min;
             //model.chminapi = min;
             //model.chminass = min;
-            int year = model.chdata.Value.Year;
-            int hour = model.chdata.Value.Hour;
-            int minute = model.chdata.Value.Minute;
+
+            //MF 25/10/2024 Anno, ore e minuti prendono data appuntamento e non più data apertura chiamata 
+            //int year = model.chdata.Value.Year;
+            //int hour = model.chdata.Value.Hour;
+            //int minute = model.chdata.Value.Minute;
+
+            int year = model.chdtapp.Value.Year;
+            int hour = model.chdtapp.Value.Hour;
+            int minute = model.chdtapp.Value.Minute;
+
             model.chora = hour;
             model.chmin = minute;
             model.choraapi = hour;
@@ -361,11 +368,19 @@ namespace VirtualTask.Controllers
             client = new HttpClient();
             client.BaseAddress = baseAddress;
 
-            model.chdtapp = model.chdata;
-            model.chdtass = model.chdata;
-            int year = model.chdata.Value.Year;
-            int hour = model.chdata.Value.Hour;
-            int minute = model.chdata.Value.Minute;
+            //model.chdtapp = model.chdata;
+            
+            //model.chdtass = model.chdata;
+            model.chdtass = model.chdtapp;
+
+            //int year = model.chdata.Value.Year;
+            //int hour = model.chdata.Value.Hour;
+            //int minute = model.chdata.Value.Minute;
+
+            int year = model.chdtapp.Value.Year;
+            int hour = model.chdtapp.Value.Hour;
+            int minute = model.chdtapp.Value.Minute;
+
             model.chora = hour;
             model.chmin = minute;
             model.choraapi = hour;
diff --git a/Models/Chiamate.cs b/Models/Chiamate.cs
index b2cdaab..a7ace42 100644
--- a/Models/Chiamate.cs
+++ b/Models/Chiamate.cs
@@ -24,7 +24,7 @@ namespace VirtualTask.Models
         [Column(TypeName = "decimal(10, 0)")]
         public decimal? chnumero { get; set; }
 
-        [Display(Name = "Data Appuntamento")]
+        [Display(Name = "Data apertura chiamata")]
         [DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}")]
         public DateTime? chdata { get; set; }
 
@@ -68,7 +68,7 @@ namespace VirtualTask.Models
         public int? chopchi { get; set; }
         public string? chaziimp { get; set; }
         public string? chtmanut { get; set; }
-        [Display(Name = "Data")]
+        [Display(Name = "Data appuntamento")]
         public DateTime? chdtapp { get; set; }
         public int? choraapi { get; set; }
         public int? chminapi { get; set; }
diff --git a/Views/Chiamate/Create.cshtml b/Views/Chiamate/Create.cshtml
index 60fe6cc..67ac278 100644
--- a/Views/Chiamate/Create.cshtml
+++ b/Views/Chiamate/Create.cshtml
@@ -32,20 +32,12 @@
                             <span asp-validation-for="chstato" class="text-danger"></span>
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
-                        <div class="form-group" style="width: 100%;">
-                            <table>
-                                <tr>
-                                    <th style="width: 40%;">
-                                        <h5><label asp-for="chdata" class="agy-client-quote"></label></h5>
-                                        <input asp-for="chdata" class="agy-form-field require" placeholder="Data" />
-                                        @* <input asp-for="chrifer" class="form-control" /> *@
-                                        <span asp-validation-for="chrifer" class="text-danger"></span>
-                                    </th>
-                                    <th>
-                                        <p>Se la data dell'appuntamento non è specificata verrà valorizzata con la data sistema (data del giorno).</p>
-                                    </th>
-                                </tr>
-                            </table>
+                        <div class="form-group" style="width: 40%;">
+                            <h5><label asp-for="chdtapp" class="agy-client-quote"></label></h5>
+                            <input asp-for="chdtapp" class="agy-form-field require" placeholder="Data" />
+                            @* <input asp-for="chrifer" class="form-control" /> *@
+                            <span asp-validation-for="chrifer" class="text-danger"></span>
+                            
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
                         <div class="form-group" style="width: 40%;">
diff --git a/Views/Chiamate/Details.cshtml b/Views/Chiamate/Details.cshtml
index df5f3b9..6cdd186 100644
--- a/Views/Chiamate/Details.cshtml
+++ b/Views/Chiamate/Details.cshtml
@@ -30,10 +30,9 @@
                     <div class="col-md-10">
                         <b>@Html.DisplayNameFor(model => model.chdata)</b> @Html.DisplayFor(model => model.chdata)
                     </div>
-
-
-
-
+                    <div class="col-md-10">
+                        <b>@Html.DisplayNameFor(model => model.chdtapp)</b> @Html.DisplayFor(model => model.chdtapp)
+                    </div>
                     <div class="col-md-10">
                         <b>@Html.DisplayNameFor(model => model.chcodimp)</b> @Html.DisplayFor(model => model.chcodimp)
                     </div>
diff --git a/Views/Chiamate/Edit.cshtml b/Views/Chiamate/Edit.cshtml
index c8fa560..312efdd 100644
--- a/Views/Chiamate/Edit.cshtml
+++ b/Views/Chiamate/Edit.cshtml
@@ -40,10 +40,12 @@
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
                         <div class="form-group">
-                            <h5><label asp-for="chdata" class="agy-client-quote"></label></h5>
+                            <h5><label asp-for="chdtapp" class="agy-client-quote"></label></h5>
+                            <input asp-for="chdtapp" class="agy-form-field require" placeholder="Data" />
+                            <span asp-validation-for="chdtapp" class="text-danger"></span>
+                            @* <h5><label asp-for="chdata" class="agy-client-quote"></label></h5>
                             <input asp-for="chdata" class="agy-form-field require" placeholder="Data"  />
-
-                            <span asp-validation-for="chdata" class="text-danger"></span>
+                            <span asp-validation-for="chdata" class="text-danger"></span> *@
                         </div>
                         <div class="col-lg-6 col-md-6 col-sm-12 col-12">&nbsp;</div>
                         <div class="form-group">
@@ -101,7 +103,8 @@
                         @Html.HiddenFor(x => x.chopchi)
                         @Html.HiddenFor(x => x.chaziimp)
                         @Html.HiddenFor(x => x.chtmanut)
-                        @Html.HiddenFor(x => x.chdtapp)
+                        @* @Html.HiddenFor(x => x.chdtapp) *@
+                        @Html.HiddenFor(x => x.chdata)
                         @Html.HiddenFor(x => x.choraapi)
                         @Html.HiddenFor(x => x.chminapi)
                         @Html.HiddenFor(x => x.choraapf)
diff --git a/Views/Chiamate/Index.cshtml b/Views/Chiamate/Index.cshtml
index 223068b..688a60f 100644
--- a/Views/Chiamate/Index.cshtml
+++ b/Views/Chiamate/Index.cshtml
@@ -130,7 +130,7 @@
                             <tr>
 
                                 <th>#</th>
-                                <th>Data</th>
+                                <th>Data appuntamento</th>
                                 <th>Impianto</th>
                                 <th>Cliente</th>
                                 <th>Tecnico</th>
@@ -152,7 +152,8 @@
                                         @Html.DisplayFor(modelItem => item.numIntero)
                                     </td>
                                     <td>
-                                        @Html.DisplayFor(modelItem => item.chdata)
+                                        @* @Html.DisplayFor(modelItem => item.chdata) *@
+                                        @Html.DisplayFor(modelItem => item.chdtapp)
                                     </td>
                                     <td>
                                         @Html.DisplayFor(modelItem => item.chcodimp) - @Html.DisplayFor(modelItem => item.indirizzoBreve)