From c336084152fe335272d356aaa6bb1ad1edcb6d2e Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 18 Dec 2025 11:53:51 +0100 Subject: [PATCH 1/2] Fix sync --- salesbook.Maui/Core/Services/ManageDataService.cs | 8 +++++--- salesbook.Shared/Core/Authorization/Enum/KeyGroupEnum.cs | 7 ++++++- salesbook.Shared/Core/Helpers/KeyGroupHelper.cs | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/salesbook.Maui/Core/Services/ManageDataService.cs b/salesbook.Maui/Core/Services/ManageDataService.cs index a9c240e..44c5c83 100644 --- a/salesbook.Maui/Core/Services/ManageDataService.cs +++ b/salesbook.Maui/Core/Services/ManageDataService.cs @@ -170,9 +170,11 @@ public class ManageDataService( private static List? MergeLists(List? localList, List? apiList, Func keySelector) { - if (localList == null || apiList == null) return null; - - var dictionary = localList.ToDictionary(keySelector); + if (apiList == null && localList != null) return localList; + if (apiList != null && localList == null) return apiList; + if (apiList == null && localList == null) return null; + + var dictionary = localList!.ToDictionary(keySelector); foreach (var apiItem in apiList) { diff --git a/salesbook.Shared/Core/Authorization/Enum/KeyGroupEnum.cs b/salesbook.Shared/Core/Authorization/Enum/KeyGroupEnum.cs index de76cd9..7ac316e 100644 --- a/salesbook.Shared/Core/Authorization/Enum/KeyGroupEnum.cs +++ b/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 } \ No newline at end of file diff --git a/salesbook.Shared/Core/Helpers/KeyGroupHelper.cs b/salesbook.Shared/Core/Helpers/KeyGroupHelper.cs index 4e0af1f..1c1cdb7 100644 --- a/salesbook.Shared/Core/Helpers/KeyGroupHelper.cs +++ b/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) }; } From 99cd67fd5ec7eefeb7920176af0af0b6ab1f71c8 Mon Sep 17 00:00:00 2001 From: MarcoE Date: Thu, 18 Dec 2025 11:54:49 +0100 Subject: [PATCH 2/2] -> v2.2.1 (25) --- salesbook.Maui/salesbook.Maui.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salesbook.Maui/salesbook.Maui.csproj b/salesbook.Maui/salesbook.Maui.csproj index aeadbe4..1644777 100644 --- a/salesbook.Maui/salesbook.Maui.csproj +++ b/salesbook.Maui/salesbook.Maui.csproj @@ -29,8 +29,8 @@ it.integry.salesbook - 2.2.0 - 24 + 2.2.1 + 25 14.2