Finish v2.2.1(25)

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -170,9 +170,11 @@ public class ManageDataService(
     
     private static List<T>? MergeLists<T, TKey>(List<T>? localList, List<T>? apiList, Func<T, TKey> keySelector)
     {
-        if (localList == null || apiList == null) return null;
+        if (apiList == null && localList != null) return localList;
-        
+        if (apiList != null && localList == null) return apiList;
-        var dictionary = localList.ToDictionary(keySelector);
+        if (apiList == null && localList == null) return null;
+
+        var dictionary = localList!.ToDictionary(keySelector);
 
         foreach (var apiItem in apiList)
         {

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>2.2.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>2.2.1</ApplicationDisplayVersion>
-		<ApplicationVersion>24</ApplicationVersion>
+		<ApplicationVersion>25</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">

salesbook.Shared/Core/Authorization/Enum/KeyGroupEnum.cs

@@ -3,6 +3,11 @@
 public enum KeyGroupEnum
 {
     UtenteAziendale = 2,
+    Cliente = 3,
     Agenti = 5,
-    Tecnico = 22
+    AmministratoreAziendale = 9,
+    Tecnico = 22,
+    ResponsabileDiReparto = 23,
+    ResponsabileAmministrativo = 29,
+    Programmatore = 30
 }

salesbook.Shared/Core/Helpers/KeyGroupHelper.cs

@@ -11,6 +11,11 @@ public static class KeyGroupHelper
             KeyGroupEnum.Agenti => "Agenti",
             KeyGroupEnum.Tecnico => "Tecnico",
             KeyGroupEnum.UtenteAziendale => "Utente Aziendale",
+            KeyGroupEnum.AmministratoreAziendale => "Amministratore Aziendale",
+            KeyGroupEnum.ResponsabileDiReparto => "Responsabile Di Reparto",
+            KeyGroupEnum.Programmatore => "Programmatore",
+            KeyGroupEnum.Cliente => "Cliente",
+            KeyGroupEnum.ResponsabileAmministrativo => "Responsabile Amministrativo",
             _ => throw new ArgumentOutOfRangeException(nameof(keyGroup), keyGroup, null)
         };
     }