From c32c7dd998d48d17967dc84c83421021bacc72ae Mon Sep 17 00:00:00 2001
From: "zaccaria.majid" <zaccaria.majid@egalware.com>
Date: Tue, 7 Nov 2023 11:01:52 +0100
Subject: [PATCH] ok gestione preferenze per inserimento tempo ciclo

---
 MP-TAB-SERV/Components/SelTempoMSMC.razor    |  6 +-
 MP-TAB-SERV/Components/SelTempoMSMC.razor.cs | 23 +++---
 MP-TAB-SERV/MP-TAB-SERV.csproj               |  2 +-
 MP-TAB-SERV/Pages/User.razor                 | 73 ++++++++++++++++++++
 MP-TAB-SERV/Resources/ChangeLog.html         |  2 +-
 MP-TAB-SERV/Resources/VersNum.txt            |  2 +-
 MP-TAB-SERV/Resources/manifest.xml           |  2 +-
 MP.Data/Services/MessageService.cs           |  2 +-
 8 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/MP-TAB-SERV/Components/SelTempoMSMC.razor b/MP-TAB-SERV/Components/SelTempoMSMC.razor
index d9cf2a1a..3dc5f765 100644
--- a/MP-TAB-SERV/Components/SelTempoMSMC.razor
+++ b/MP-TAB-SERV/Components/SelTempoMSMC.razor
@@ -1,13 +1,13 @@
 
 <div class="row">
-    <div class="col-12 text-end">
+    @*<div class="col-12 text-end">
         <div class="form-check form-switch fs-3">
             <input class="form-check-input" type="checkbox" @bind="@ShowMS">
             <label class="form-check-label">@txtSelMS</label>
         </div>
-    </div>
+    </div>*@
     <div class="col-8">
-        @if (modoControllo == timeControlMode.testo)
+        @if (tcMode == "mc")
         {
             <div class="input-group">
                 <span class="input-group-text">Tempo</span>
diff --git a/MP-TAB-SERV/Components/SelTempoMSMC.razor.cs b/MP-TAB-SERV/Components/SelTempoMSMC.razor.cs
index 0514eb86..c1efc09e 100644
--- a/MP-TAB-SERV/Components/SelTempoMSMC.razor.cs
+++ b/MP-TAB-SERV/Components/SelTempoMSMC.razor.cs
@@ -85,10 +85,10 @@ namespace MP_TAB_SERV.Components
         /// </summary>
         protected double _tempoMC { get; set; } = 0;
 
-        protected timeMode modoTempo
-        {
-            get => ShowMS ? timeMode.MS : timeMode.MC;
-        }
+        //protected timeMode modoTempo
+        //{
+        //    get => ShowMS ? timeMode.MS : timeMode.MC;
+        //}
 
         /// <summary>
         /// tempo selezionato in formato Minuti Secondi
@@ -107,6 +107,13 @@ namespace MP_TAB_SERV.Components
 
         [Inject]
         protected SharedMemService SMServ { get; set; } = null!;
+        [Inject]
+        protected MessageService MsgServ { get; set; } = null!; 
+
+        protected string tcMode
+        {
+            get => MsgServ.UserPrefGet("TcMode");
+        }
 
         /// <summary>
         /// tempo selezionato in formato Minuti Secondi
@@ -193,7 +200,7 @@ namespace MP_TAB_SERV.Components
             get
             {
                 string answ = "";
-                if (modoTempo == timeMode.MC)
+                if (tcMode == "mc")
                 {
                     answ = "min.cent";
                 }
@@ -209,7 +216,7 @@ namespace MP_TAB_SERV.Components
         {
             get
             {
-                string answ = modoTempo == timeMode.MC ? $"--> {TempoMS.TotalMinutes:N0}:{TempoMS:ss} (min:sec)" : $"--> {TempoMC:0.000} (min.cent)";
+                string answ = tcMode == "ms" ? $"--> {TempoMS.TotalMinutes:N0}:{TempoMS:ss} (min:sec)" : $"--> {TempoMC:0.000} (min.cent)";
                 return answ;
             }
         }
@@ -218,12 +225,12 @@ namespace MP_TAB_SERV.Components
         {
             get
             {
-                string answ = modoTempo == timeMode.MC ? $"{TempoMC:0.000}" : $"{TempoMS.TotalMinutes:N0}:{TempoMS:ss}";
+                string answ = tcMode == "mc" ? $"{TempoMC:0.000}" : $"{TempoMS.TotalMinutes:N0}:{TempoMS:ss}";
                 return answ;
             }
             set
             {
-                if (modoTempo == timeMode.MC)
+                if (tcMode == "mc")
                 {
                     double tMC = 1;
                     double.TryParse(value, out tMC);
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index f13534b2..2447ad39 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2311.709</Version>
+      <Version>6.16.2311.711</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Pages/User.razor b/MP-TAB-SERV/Pages/User.razor
index 69c0122d..9926fb98 100644
--- a/MP-TAB-SERV/Pages/User.razor
+++ b/MP-TAB-SERV/Pages/User.razor
@@ -43,6 +43,17 @@
                     </li>
                 </ul>
             </div>
+            <div>
+                <ul class="list-group">
+                    <li class="list-group-item">
+                        <div class="text-center mb-1 fw-bold">Modalità di inserimento del tempo ciclo</div>
+                        <div class="d-flex justify-content-between">
+                            <button class="btn btn-sm @btnMsStyle" @onclick='()=>setTcMode("ms")'>min:sec</button>
+                            <button class="btn btn-sm @btnMcStyle" @onclick='()=>setTcMode("mc")'>min.cent</button>
+                        </div>
+                    </li>
+                </ul>
+            </div>
         </div>
         <div class="card-footer">
             <button class="w-100 btn btn-success">
@@ -61,6 +72,63 @@
 </div>
 
 @code {
+    [Inject]
+    private MessageService MsgServ { get; set; } = null!;
+
+    protected async Task setTcMode(string tcMode)
+    {
+        await Task.Delay(1);
+        tcModIns = tcMode;
+    }
+
+    protected string btnMsStyle
+    {
+        get
+        {
+            string answ = "";
+            if(tcModIns == "ms")
+            {
+                answ = "btn-primary";
+            }
+            else
+            {
+                answ = "btn-secondary";
+            }
+            return answ;
+        }
+    }
+    protected string btnMcStyle
+    {
+        get
+        {
+            string answ = "";
+            if(tcModIns == "mc")
+            {
+                answ = "btn-primary";
+            }
+            else
+            {
+                answ = "btn-secondary";
+            }
+            return answ;
+        }
+    }
+
+    protected string _tcModIns { get; set; } = "";
+
+    protected string tcModIns
+    {
+        get => _tcModIns;
+        set
+        {
+            if(_tcModIns != value)
+            {
+                _tcModIns = value;
+                MsgServ.UserPrefSave("TcMode", value);
+            }
+        }
+    }
+
     public int Height { get; set; } = 0;
     public int Width { get; set; } = 0;
     public string currIpv4 { get; set; } = "";
@@ -82,6 +150,11 @@
     }
     protected async override Task OnInitializedAsync()
     {
+        var tcPrefItem = MsgServ.UserPrefGet("TcMode");
+        if(tcPrefItem != null)
+        {
+            tcModIns = tcPrefItem;
+        }
         await Task.Delay(1);
         if (string.IsNullOrEmpty(currIpv4))
         {
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index 23b7c068..8d5cf9ca 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2311.709</h4>
+    <h4>Versione: 6.16.2311.711</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index 51da60c0..665d4358 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2311.709
+6.16.2311.711
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index bd7451d8..e62f83c9 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2311.709</version>
+  <version>6.16.2311.711</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index b1b6fb55..6d751191 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -372,8 +372,8 @@ namespace MP.Data.Services
             else
             {
                 currDict.Add(chiave, valore);
-                UsersPrefDict = currDict;
             }
+            UsersPrefDict = currDict;
             return done;
         }