From 8e79305eac075400a5923fe46da736f99e537498 Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Wed, 18 Jan 2023 09:39:28 +0100
Subject: [PATCH] fix navigazione

---
 GPW.CORE.SMART/Components/Calendario.razor    | 22 +++++++++----
 GPW.CORE.SMART/Components/Calendario.razor.cs | 31 ++++++++-----------
 GPW.CORE.SMART/Components/CompProj.razor      |  3 +-
 GPW.CORE.SMART/Components/CompTimbra.razor    |  6 ++--
 GPW.CORE.SMART/Components/CompTimbra.razor.cs |  4 +--
 GPW.CORE.SMART/Data/CalendarModeEnum.cs       | 16 ++++++++++
 GPW.CORE.SMART/Data/MessageService.cs         | 10 +++---
 7 files changed, 57 insertions(+), 35 deletions(-)
 create mode 100644 GPW.CORE.SMART/Data/CalendarModeEnum.cs

diff --git a/GPW.CORE.SMART/Components/Calendario.razor b/GPW.CORE.SMART/Components/Calendario.razor
index 5bacfe0..b8e2684 100644
--- a/GPW.CORE.SMART/Components/Calendario.razor
+++ b/GPW.CORE.SMART/Components/Calendario.razor
@@ -1,4 +1,7 @@
-@if (ListRecords == null)
+@using GPW.CORE.Smart.Data
+
+
+@if (ListRecords == null)
 {
     <LoadingData></LoadingData>
 }
@@ -15,7 +18,7 @@ else
                     {
                         @if (datiGiorno.TimbrExpl != null)
                         {
-                            @if (currMode == modoControllo.showGauge)
+                            @if (currMode == CalendarModeEnum.modoControllo.showGauge)
                             {
                                 <div>
                                     <div type="button" class="d-flex justify-content-between text-center bg-transparent text-light border-0">
@@ -146,7 +149,7 @@ else
                 </div>
                 @if (datiGiorno != null)
                 {
-                    @if (currMode == modoControllo.showGauge)
+                    @if (currMode == CalendarModeEnum.modoControllo.showGauge)
                     {
                         <div class="d-flex justify-content-between">
                             <div @onclick="()=>setModeProgetti()">
@@ -157,7 +160,7 @@ else
                             </div>
                         </div>
                     }
-                    else if (currMode == modoControllo.showTimbr)
+                    else if (currMode == CalendarModeEnum.modoControllo.showTimbr)
                     {
                         <div class="p-2 text-center text-light">
                             <div>
@@ -168,7 +171,7 @@ else
                             <TimbUser IdxDipCurr="IdxDipendente" ListTimbRich="listTimb"></TimbUser>
                         </div>
                     }
-                    else if (currMode == modoControllo.showProj)
+                    else if (currMode == CalendarModeEnum.modoControllo.showProj)
                     {
                         <div class="p-1 text-center text-light">
                             <div>
@@ -185,7 +188,14 @@ else
                 }
                 <div class="row p-2 pt-3">
                     <div class="col-6 d-grid gap-2">
-                        <button class="btnReset" @onclick="()=>resetCal()"><i class="fa-regular fa-circle-xmark"></i> Chiudi</button>
+                        @if ((currMode == CalendarModeEnum.modoControllo.showTimbr || currMode == CalendarModeEnum.modoControllo.showProj))
+                        {
+                            <button class="btnReset" @onclick="()=> backToGauge()"><i class="fa-solid fa-circle-chevron-left"></i> Torna a statistiche</button>
+                        }
+                        else if (currMode == CalendarModeEnum.modoControllo.showGauge){
+
+                            <button class="btnReset" @onclick="()=>resetCal()"><i class="fa-regular fa-circle-xmark"></i> Chiudi</button>
+                        }
                     </div>
                     <div class="col-6 d-grid gap-2">
                         <button class="btnTemp" @onclick="ShowTemp"><i class="fa-solid fa-temperature-low"></i> Temperatura</button>
diff --git a/GPW.CORE.SMART/Components/Calendario.razor.cs b/GPW.CORE.SMART/Components/Calendario.razor.cs
index c6b52ac..a45b8c0 100644
--- a/GPW.CORE.SMART/Components/Calendario.razor.cs
+++ b/GPW.CORE.SMART/Components/Calendario.razor.cs
@@ -11,10 +11,10 @@ namespace GPW.CORE.Smart.Components
         #region Public Properties
 
         [Parameter]
-        public int IdxDipendente { get; set; } = -1;
-        [Parameter]
-        public modoControllo currMode { get; set; } = modoControllo.showCalendar;
+        public CalendarModeEnum.modoControllo currMode { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
 
+        [Parameter]
+        public int IdxDipendente { get; set; } = -1;
         [Parameter]
         public List<DailyDataDTO>? ListRecords
         {
@@ -30,9 +30,8 @@ namespace GPW.CORE.Smart.Components
 
         #region Protected Fields
 
-        protected string emptyTime = "--/--";
         protected DailyDataDTO? datiGiorno = null;
-
+        protected string emptyTime = "--/--";
         #endregion Protected Fields
 
         #region Protected Properties
@@ -48,9 +47,9 @@ namespace GPW.CORE.Smart.Components
 
         private Dictionary<DateTime, string> DateCheck = new Dictionary<DateTime, string>();
 
-        private List<TimbratureModel>? listTimb = null;
-        private List<List<RegAttivitaModel>?> listRA = null!;
         private List<RegAttivitaModel>? listaP = new List<RegAttivitaModel>();
+        private List<List<RegAttivitaModel>?> listRA = null!;
+        private List<TimbratureModel>? listTimb = null;
         private TimbratureModel? Timb = null;
 
         #endregion Private Fields
@@ -107,7 +106,7 @@ namespace GPW.CORE.Smart.Components
             MService.targetDateMancTimb = dtCurr;
             showDetail = true;
             // se sono in calendario --> mostro dettagli...
-            if (currMode == modoControllo.showCalendar)
+            if (currMode == CalendarModeEnum.modoControllo.showCalendar)
             {
                 setModeDetail();
             }
@@ -159,6 +158,11 @@ namespace GPW.CORE.Smart.Components
             MService.setModeCalendar();
             await Task.Delay(1);
         }
+        private async Task backToGauge()
+        {
+            setModeDetail();
+            await Task.Delay(1);
+        }
 
         /// <summary>
         /// Imposta modalità dettaglio (mostra i gauge)
@@ -244,15 +248,6 @@ namespace GPW.CORE.Smart.Components
         #endregion Private Methods
 
 
-        /// <summary>
-        /// Modalità del controllo
-        /// </summary>
-        public enum modoControllo
-        {
-            showCalendar = 0,
-            showGauge,
-            showProj,
-            showTimbr
-        }
+
     }
 }
\ No newline at end of file
diff --git a/GPW.CORE.SMART/Components/CompProj.razor b/GPW.CORE.SMART/Components/CompProj.razor
index a8b1ca0..8a0ae47 100644
--- a/GPW.CORE.SMART/Components/CompProj.razor
+++ b/GPW.CORE.SMART/Components/CompProj.razor
@@ -1,5 +1,4 @@
-
-<ProjectsList ListRA="ListProgetti" EnableAdmin="false" EnableEdit="true" ReqUpdate="DoUpdate" TextCss="text-light" ItemCloned="getCloned"></ProjectsList>
+<ProjectsList ListRA="ListProgetti" EnableAdmin="false" EnableEdit="true" ReqUpdate="DoUpdate" TextCss="text-light" ItemCloned="getCloned"></ProjectsList>
 
 <div class="toast-container py-2 top-0 start-50 translate-middle-x">
     <div class="toast bg-warning fade @toastCss" id="LiveToast2" role="alert">
diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor b/GPW.CORE.SMART/Components/CompTimbra.razor
index 97a6d3f..0e8128d 100644
--- a/GPW.CORE.SMART/Components/CompTimbra.razor
+++ b/GPW.CORE.SMART/Components/CompTimbra.razor
@@ -1,11 +1,13 @@
-@if (isLoading)
+@using GPW.CORE.Smart.Data
+
+@if (isLoading)
 {
     <LoadingData></LoadingData>
 }
 else
 {
     <div>
-        @if (!(modoCal == Calendario.modoControllo.showProj))
+        @if (!(modoCal == CalendarModeEnum.modoControllo.showProj))
         {
             <DtCard NextIsExtrata="@nextIsEntrata" IsLoading=@isLoading IsRicTimb="isRicTimb"></DtCard>
             <div class="row m-3">
diff --git a/GPW.CORE.SMART/Components/CompTimbra.razor.cs b/GPW.CORE.SMART/Components/CompTimbra.razor.cs
index e3fe1c5..e31b627 100644
--- a/GPW.CORE.SMART/Components/CompTimbra.razor.cs
+++ b/GPW.CORE.SMART/Components/CompTimbra.razor.cs
@@ -33,7 +33,7 @@ namespace GPW.CORE.Smart.Components
             nextIsEntrata = MService.NextIsEntrata;
         }
 
-        private Calendario.modoControllo modoCal { get; set; } = Calendario.modoControllo.showCalendar;
+        private CalendarModeEnum.modoControllo modoCal { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
 
         protected override async Task OnParametersSetAsync()
         {
@@ -114,7 +114,7 @@ namespace GPW.CORE.Smart.Components
             if (IdxDipCurr > 0)
             {
                 var lastMode = modoCal;
-                modoCal = Calendario.modoControllo.showCalendar;
+                modoCal = CalendarModeEnum.modoControllo.showCalendar;
                 listRecords = null;
                 await Task.Delay(25);
                 // calcolo mese corrente e recupero dati
diff --git a/GPW.CORE.SMART/Data/CalendarModeEnum.cs b/GPW.CORE.SMART/Data/CalendarModeEnum.cs
new file mode 100644
index 0000000..dcfc2d8
--- /dev/null
+++ b/GPW.CORE.SMART/Data/CalendarModeEnum.cs
@@ -0,0 +1,16 @@
+namespace GPW.CORE.Smart.Data
+{
+    public class CalendarModeEnum
+    {
+        /// <summary>
+        /// Modalità del controllo
+        /// </summary>
+        public enum modoControllo
+        {
+            showCalendar = 0,
+            showGauge,
+            showProj,
+            showTimbr
+        }
+    }
+}
diff --git a/GPW.CORE.SMART/Data/MessageService.cs b/GPW.CORE.SMART/Data/MessageService.cs
index dcc377b..9c624a5 100644
--- a/GPW.CORE.SMART/Data/MessageService.cs
+++ b/GPW.CORE.SMART/Data/MessageService.cs
@@ -86,7 +86,7 @@ namespace GPW.CORE.Smart.Data
 
         public bool isRicTimb { get; set; } = false;
 
-        public Calendario.modoControllo modoCal { get; set; } = Calendario.modoControllo.showCalendar;
+        public CalendarModeEnum.modoControllo modoCal { get; set; } = CalendarModeEnum.modoControllo.showCalendar;
 
         /// <summary>
         /// Indica ultima azione compiuta
@@ -240,7 +240,7 @@ namespace GPW.CORE.Smart.Data
 
         public void setModeCalendar()
         {
-            modoCal = Calendario.modoControllo.showCalendar;
+            modoCal = CalendarModeEnum.modoControllo.showCalendar;
             if (EA_CalModeChanged != null)
             {
                 EA_CalModeChanged?.Invoke();
@@ -248,7 +248,7 @@ namespace GPW.CORE.Smart.Data
         }
         public void setModeGauge()
         {
-            modoCal = Calendario.modoControllo.showGauge;
+            modoCal = CalendarModeEnum.modoControllo.showGauge;
             if (EA_CalModeChanged != null)
             {
                 EA_CalModeChanged?.Invoke();
@@ -256,7 +256,7 @@ namespace GPW.CORE.Smart.Data
         }
         public void setModeProj()
         {
-            modoCal = Calendario.modoControllo.showProj;
+            modoCal = CalendarModeEnum.modoControllo.showProj;
             if (EA_CalModeChanged != null)
             {
                 EA_CalModeChanged?.Invoke();
@@ -264,7 +264,7 @@ namespace GPW.CORE.Smart.Data
         }
         public void setModeRichTimb()
         {
-            modoCal = Calendario.modoControllo.showTimbr;
+            modoCal = CalendarModeEnum.modoControllo.showTimbr;
             if (EA_CalModeChanged != null)
             {
                 EA_CalModeChanged?.Invoke();