Finish v2.2.0(24)

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -90,14 +90,22 @@ public class ManageDataService(
 
     public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond, DateTime? lastSync)
     {
-        List<AnagClie>? contactList;
-        List<PtbPros>? prospectList;
         whereCond ??= new WhereCondContact();
 
+        // Ottengo liste locali
+        var contactList = await localDb.Get<AnagClie>(x =>
+            (whereCond.FlagStato != null && x.FlagStato == whereCond.FlagStato) ||
+            (whereCond.PartIva != null && x.PartIva == whereCond.PartIva) ||
+            (whereCond.PartIva == null && whereCond.FlagStato == null)
+        );
+
+        var prospectList = await localDb.Get<PtbPros>(x =>
+            (whereCond.PartIva != null && x.PartIva == whereCond.PartIva) ||
+            (whereCond.PartIva == null)
+        );
+
         if (networkService.ConnectionAvailable)
         {
-            var response = new UsersSyncResponseDTO();
-            
             var clienti = await integryApiService.RetrieveAnagClie(
                 new CRMAnagRequestDTO
                 {
@@ -109,10 +117,6 @@ public class ManageDataService(
                 }
             );
 
-            response.AnagClie = clienti.AnagClie;
-            response.VtbDest = clienti.VtbDest;
-            response.VtbCliePersRif = clienti.VtbCliePersRif;
-
             var prospect = await integryApiService.RetrieveProspect(
                 new CRMProspectRequestDTO
                 {
@@ -123,31 +127,40 @@ public class ManageDataService(
                 }
             );
             
-            response.PtbPros = prospect.PtbPros;
+            _ = UpdateDbUsers(new UsersSyncResponseDTO
-            response.PtbProsRif = prospect.PtbProsRif;
+            {
+                AnagClie = clienti.AnagClie,
+                VtbDest = clienti.VtbDest,
+                VtbCliePersRif = clienti.VtbCliePersRif,
+                PtbPros = prospect.PtbPros,
+                PtbProsRif = prospect.PtbProsRif
+            });
 
-            _ = UpdateDbUsers(response);
+            if (lastSync != null)
+            {
+                contactList = MergeLists(
+                    contactList,
+                    clienti.AnagClie,
+                    x => x.CodAnag
+                );
 
-            contactList = clienti.AnagClie;
+                prospectList = MergeLists(
-            prospectList = prospect.PtbPros;
+                    prospectList,
+                    prospect.PtbPros,
+                    x => x.CodPpro
+                );
             }
             else
             {
-            contactList = await localDb.Get<AnagClie>(x =>
+                contactList = clienti.AnagClie;
-                (whereCond.FlagStato != null && x.FlagStato.Equals(whereCond.FlagStato)) ||
+                prospectList = prospect.PtbPros;
-                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
+            }
-                (whereCond.PartIva == null && whereCond.FlagStato == null)
-            );
-            prospectList = await localDb.Get<PtbPros>(x =>
-                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
-                (whereCond.PartIva == null)
-            );
         }
 
         // Mappa i contatti
         var contactMapper = mapper.Map<List<ContactDTO>>(contactList);
 
-        // Mappa i prospects
+        // Mappa i prospect
         var prospectMapper = mapper.Map<List<ContactDTO>>(prospectList);
 
         contactMapper.AddRange(prospectMapper);
@@ -155,6 +168,21 @@ public class ManageDataService(
         return contactMapper;
     }
     
+    private static List<T>? MergeLists<T, TKey>(List<T>? localList, List<T>? apiList, Func<T, TKey> keySelector)
+    {
+        if (localList == null || apiList == null) return null;
+        
+        var dictionary = localList.ToDictionary(keySelector);
+
+        foreach (var apiItem in apiList)
+        {
+            var key = keySelector(apiItem);
+            dictionary[key] = apiItem;
+        }
+
+        return dictionary.Values.ToList();
+    }
+
     public async Task<ContactDTO?> GetSpecificContact(string codAnag, bool isContact)
     {
         if (isContact)
@@ -175,9 +203,7 @@ public class ManageDataService(
 
     public async Task<List<ActivityDTO>> GetActivityTryLocalDb(WhereCondActivity whereCond)
     {
-        List<StbActivity>? activities;
+        var activities = await localDb.Get<StbActivity>(x =>
-
-        activities = await localDb.Get<StbActivity>(x =>
             (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
             (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
              x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
@@ -198,6 +224,7 @@ public class ManageDataService(
 
             _ = UpdateDb(activities);
         }
+        else return [];
 
         return await MapActivity(activities);
     }
@@ -219,16 +246,7 @@ public class ManageDataService(
 
             _ = UpdateDb(activities);
         }
-        else
+        else return await GetActivityTryLocalDb(whereCond);
-        {
-            activities = await localDb.Get<StbActivity>(x =>
-                (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-                (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
-                 x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
-                (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
-                (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
-            );
-        }
 
         return await MapActivity(activities);
     }
@@ -261,7 +279,8 @@ public class ManageDataService(
         var returnDto = activities
             .Select(activity =>
             {
-                if (activity.CodJcom is "0000" && userSession.ProfileDb != null && userSession.ProfileDb.Equals("smetar", StringComparison.OrdinalIgnoreCase))
+                if (activity.CodJcom is "0000" && userSession.ProfileDb != null &&
+                    userSession.ProfileDb.Equals("smetar", StringComparison.OrdinalIgnoreCase))
                 {
                     activity.CodJcom = null;
                 }
@@ -273,8 +292,7 @@ public class ManageDataService(
                     var minuteBefore = activity.EstimatedTime.Value - activity.AlarmTime.Value;
                     dto.MinuteBefore = (int)Math.Abs(minuteBefore.TotalMinutes);
 
-                    dto.NotificationDate = dto.MinuteBefore == 0 ?
+                    dto.NotificationDate = dto.MinuteBefore == 0 ? activity.EstimatedTime : activity.AlarmTime;
-                        activity.EstimatedTime : activity.AlarmTime;
                 }
 
                 if (activity.CodJcom != null)

salesbook.Maui/Core/System/GenericSystemService.cs

@@ -0,0 +1,8 @@
+using salesbook.Shared.Core.Interface.System;
+
+namespace salesbook.Maui.Core.System;
+
+public class GenericSystemService : IGenericSystemService
+{
+    public string GetCurrentAppVersion() => AppInfo.VersionString;
+}

salesbook.Maui/MauiProgram.cs

@@ -7,6 +7,7 @@ using MudBlazor.Services;
 using MudExtensions.Services;
 using salesbook.Maui.Core.RestClient.IntegryApi;
 using salesbook.Maui.Core.Services;
+using salesbook.Maui.Core.System;
 using salesbook.Maui.Core.System.Network;
 using salesbook.Maui.Core.System.Notification;
 using salesbook.Maui.Core.System.Notification.Push;
@@ -16,6 +17,7 @@ using salesbook.Shared.Core.Dto.PageState;
 using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Interface;
 using salesbook.Shared.Core.Interface.IntegryApi;
+using salesbook.Shared.Core.Interface.System;
 using salesbook.Shared.Core.Interface.System.Network;
 using salesbook.Shared.Core.Interface.System.Notification;
 using salesbook.Shared.Core.Messages.Activity.Copy;
@@ -102,6 +104,7 @@ namespace salesbook.Maui
             builder.Services.AddSingleton<IFormFactor, FormFactor>();
             builder.Services.AddSingleton<IAttachedService, AttachedService>();
             builder.Services.AddSingleton<INetworkService, NetworkService>();
+            builder.Services.AddSingleton<IGenericSystemService, GenericSystemService>();
             builder.Services.AddSingleton<LocalDbService>();
 
             _ = typeof(System.Runtime.InteropServices.SafeHandle);

salesbook.Maui/Platforms/iOS/Info.plist

@@ -51,6 +51,9 @@
     <key>NSPhotoLibraryAddUsageDescription</key>
     <string>Permette all'app di salvare file o immagini nella tua libreria fotografica se necessario.</string>
 
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>Alcune librerie di sistema potrebbero accedere al Bluetooth. L’app non utilizza direttamente il Bluetooth.</string>
+
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>remote-notification</string>

salesbook.Maui/Platforms/iOS/PrivacyInfo.xcprivacy

@@ -2,47 +2,108 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 	<dict>
-		<!-- Elenco dei dati raccolti -->
-		<key>NSPrivacyCollectedDataTypes</key>
-		<array>
-			<dict>
-				<key>NSPrivacyCollectedDataType</key>
-				<string>NSPrivacyCollectedDataTypeUserID</string>
-				<key>NSPrivacyCollectedDataTypeLinkedToUser</key>
-				<true/>
-				<key>NSPrivacyCollectedDataTypeTracking</key>
-				<false/>
-			</dict>
-		</array>
-
-		<!-- API che accedono a dati sensibili -->
 		<key>NSPrivacyAccessedAPITypes</key>
 		<array>
 			<dict>
 				<key>NSPrivacyAccessedAPIType</key>
-				<string>NSPrivacyAccessedAPITypeCamera</string>
+				<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
 				<key>NSPrivacyAccessedAPITypeReasons</key>
 				<array>
-					<string>CAMeraCapture</string>
+					<string>CA92.1</string>
 				</array>
 			</dict>
 			<dict>
 				<key>NSPrivacyAccessedAPIType</key>
-				<string>NSPrivacyAccessedAPITypePhotoLibrary</string>
+				<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
 				<key>NSPrivacyAccessedAPITypeReasons</key>
 				<array>
-					<string>PHOTOLibraryAdd</string>
+					<string>35F9.1</string>
-					<string>PHOTOLibraryRead</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>C617.1</string>
 				</array>
 			</dict>
 		</array>
 		
-		<!-- Versione e autore -->
+		<key>NSPrivacyCollectedDataTypes</key>
-		<key>NSPrivacyTracking</key>
+		<array>
-		<false/>
+			<dict>
-		<key>NSPrivacyTrackingDomains</key>
+				<key>NSPrivacyCollectedDataType</key>
-		<array/>
+				<string>NSPrivacyCollectedDataTypeCrashData</string>
-		<key>NSPrivacyCustomPurposeDescription</key>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
-		<dict/>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypePerformanceData</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypePreciseLocation</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypeCoarseLocation</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypePhotosorVideos</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false />
+				<key>NSPrivacyCollectedDataTypePurposes</key>
+				<array>
+					<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+				</array>
+			</dict>
+		</array>
 	</dict>
 </plist>

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>2.1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>2.2.0</ApplicationDisplayVersion>
-		<ApplicationVersion>14</ApplicationVersion>
+		<ApplicationVersion>24</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -120,6 +120,7 @@
 		<PublishTrimmed>true</PublishTrimmed>
 		<PublishAot>true</PublishAot>
 		<MonoAotMode>Hybrid</MonoAotMode>
+		<MtouchLink>None</MtouchLink>
 	</PropertyGroup>
 
 	<ItemGroup>

salesbook.Shared/Components/Pages/Calendar.razor

@@ -492,6 +492,8 @@
     // Selezione giorno in settimana
     private async Task SelezionaData(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
 
         var cacheInternalMonth = _internalMonth;
@@ -513,6 +515,8 @@
     // Selezione giorno dal mese (chiude la vista mese!)
     private async Task SelezionaDataDalMese(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
         SliderAnimation = "collapse-animation";
         Expanded = false;

salesbook.Shared/Components/Pages/Home.razor

@@ -15,12 +15,30 @@
 @inject PreloadService PreloadService
 @inject IMessenger Messenger
 
-<SpinnerLayout FullScreen="true" />
+<SpinnerLayout FullScreen="true"/>
 
 @code
 {
     protected override async Task OnInitializedAsync()
     {
+        var lastSyncDate = LocalStorage.Get<DateTime>("last-sync");
+        var syncAllData = lastSyncDate.Equals(DateTime.MinValue) || (DateTime.Now - lastSyncDate).TotalDays >= 7;
+        var syncCodJcom = lastSyncDate.Day != DateTime.Now.Day;
+        
+        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && syncAllData)
+        {
+            var returnPath = System.Web.HttpUtility.UrlEncode("/");
+            NavigationManager.NavigateTo($"/sync?path={returnPath}");
+            return;
+        }
+
+        if (syncCodJcom && !syncAllData)
+        {
+            var returnPath = System.Web.HttpUtility.UrlEncode("/");
+            NavigationManager.NavigateTo($"/sync/{DateTime.Today:yyyy-MM-dd}?path={returnPath}");
+            return;
+        }
+
         NetworkService.ConnectionAvailable = NetworkService.IsNetworkAvailable();
 
         await LoadNotification();
@@ -35,14 +53,6 @@
             Console.WriteLine($"Firebase init: {e.Message}");
         }
 
-        var lastSyncDate = LocalStorage.Get<DateTime>("last-sync");
-
-        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && lastSyncDate.Equals(DateTime.MinValue))
-        {
-            NavigationManager.NavigateTo("/sync");
-            return;
-        }
-
         _ = StartSyncUser();
         NavigationManager.NavigateTo("/Calendar");
     }
@@ -60,9 +70,6 @@
 
     private Task StartSyncUser()
     {
-        return Task.Run(() =>
+        return Task.Run(() => { _ = PreloadService.PreloadUsersAsync(); });
-        {
-            _ = PreloadService.PreloadUsersAsync();
-        });
     }
 }

salesbook.Shared/Components/Pages/Login.razor

@@ -1,8 +1,10 @@
 @page "/login"
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Interface.System
 @using salesbook.Shared.Core.Services
 @inject IUserAccountService UserAccountService
 @inject AppAuthenticationStateProvider AuthenticationStateProvider
+@inject IGenericSystemService GenericSystemService
 
 @if (Spinner)
 {
@@ -34,7 +36,7 @@ else
             </div>
 
             <div class="my-4 login-footer">
-                <span>Powered by</span>
+                <span>@($"v{GenericSystemService.GetCurrentAppVersion()} | Powered by")</span>
                 <img src="_content/salesbook.Shared/images/logoIntegry.svg" class="img-fluid" alt="Integry">
             </div>
         </div>

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -1,6 +1,7 @@
 @page "/PersonalInfo"
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Authorization.Enum
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Core.Interface.System.Network
@@ -16,7 +17,8 @@
     <div class="container content pb-safe-area">
         <div class="container-primary-info">
             <div class="section-primary-info">
-                <MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold" Color="Color.Secondary">
+                <MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold"
+                           Color="Color.Secondary">
                     @UtilityString.ExtractInitials(UserSession.User.Fullname)
                 </MudAvatar>
 
@@ -24,7 +26,8 @@
                     <span class="info-nome">@UserSession.User.Fullname</span>
                     @if (UserSession.User.KeyGroup is not null)
                     {
-                        <span class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span>
+                        <span
+                            class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span>
                     }
                 </div>
             </div>
@@ -85,7 +88,7 @@
                        FullWidth="true"
                        StartIcon="@Icons.Material.Outlined.Sync"
                        Size="Size.Medium"
-                       OnClick="() => UpdateDb()"
+                       OnClick="@(() => UpdateDb())"
                        Variant="Variant.Outlined">
                 Sincronizza
             </MudButton>
@@ -113,6 +116,8 @@
             </MudButton>
         </div>
     </div>
+
+    <AppVersion/>
 }
 
 @code {
@@ -149,6 +154,8 @@
 
     private void UpdateDb(bool withData = false)
     {
+        LocalStorage.Remove("last-user-sync");
+        
         var absoluteUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
         var pathAndQuery = absoluteUri.Segments.Length > 1 ? absoluteUri.PathAndQuery : null;
 

salesbook.Shared/Components/Pages/SyncPage.razor

@@ -1,23 +1,28 @@
 @page "/sync"
 @page "/sync/{DateFilter}"
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Interface
-@inject ISyncDbService syncDb
+@inject ISyncDbService SyncDb
-@inject IManageDataService manageData
+@inject IManageDataService ManageData
 
 <SyncSpinner Elements="@Elements"/>
 
+<AppVersion/>
+
 @code {
     [Parameter] public string? DateFilter { get; set; }
 
     private Dictionary<string, bool> Elements { get; set; } = new();
 
-    private bool _hasStarted = false;
+    private bool _hasStarted;
-    private int _completedCount = 0;
+    private int _completedCount;
 
     protected override void OnInitialized()
     {
         Elements["Commesse"] = false;
+
+        if (DateFilter is null)
             Elements["Impostazioni"] = false;
     }
 
@@ -28,9 +33,7 @@
             _hasStarted = true;
 
             if (DateFilter is null)
-            {
+                await ManageData.ClearDb();
-                await manageData.ClearDb();
-            }
 
             await Task.WhenAll(
                 RunAndTrack(SetCommesse),
@@ -58,7 +61,7 @@
 
     private async Task SetCommesse()
     {
-        await Task.Run(async () => { await syncDb.GetAndSaveCommesse(DateFilter); });
+        await Task.Run(async () => { await SyncDb.GetAndSaveCommesse(DateFilter); });
 
         Elements["Commesse"] = true;
         StateHasChanged();
@@ -66,10 +69,13 @@
 
     private async Task SetSettings()
     {
-        await Task.Run(async () => { await syncDb.GetAndSaveSettings(DateFilter); });
+        if (DateFilter is null)
+        {
+            await Task.Run(async () => { await SyncDb.GetAndSaveSettings(DateFilter); });
 
             Elements["Impostazioni"] = true;
             StateHasChanged();
         }
+    }
 
 }

salesbook.Shared/Components/SingleElements/AppVersion.razor

@@ -0,0 +1,6 @@
+@using salesbook.Shared.Core.Interface.System
+@inject IGenericSystemService GenericSystemService
+
+<div class="app-version">
+    <span>@($"v{GenericSystemService.GetCurrentAppVersion()}")</span>
+</div>

salesbook.Shared/Components/SingleElements/AppVersion.razor.css

@@ -0,0 +1,11 @@
+.app-version{
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    margin: 8px 0;
+}
+
+.app-version span{
+    font-size: smaller;
+    color: var(--mud-palette-gray-darker);
+}

salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor

@@ -214,29 +214,38 @@
                         @if (item.p.Type == AttachedDTO.TypeAttached.Position)
                         {
                             <MudChip T="string" Icon="@Icons.Material.Rounded.LocationOn" Color="Color.Success"
-                                     OnClick="() => OpenPosition(item.p)" OnClose="() => OnRemoveAttached(item.index)">
+                                     OnClick="@(() => OpenPosition(item.p))"
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
                                 @item.p.Description
                             </MudChip>
                         }
                         else
                         {
-                            <MudChip T="string" Color="Color.Default" OnClick="() => OpenAttached(item.p)"
+                            <MudChip T="string" Color="Color.Default" OnClick="@(() => OpenAttached(item.p))"
-                                     OnClose="() => OnRemoveAttached(item.index)">
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
                                 @item.p.Name
                             </MudChip>
                         }
                     }
                 }
 
-                @if (ActivityFileList != null)
+                @if (!IsLoading)
+                {
+                    if (ActivityFileList != null)
                     {
                         foreach (var file in ActivityFileList)
                         {
-                        <MudChip T="string" OnClick="() => OpenAttached(file.Id, file.FileName)" Color="Color.Default">
+                            <MudChip T="string" OnClick="@(() => OpenAttached(file.Id, file.FileName))"
+                                     OnClose="@(() => DeleteAttach(file))" Color="Color.Default">
                                 @file.FileName
                             </MudChip>
                         }
                     }
+                }
+                else
+                {
+                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
+                }
             </div>
 
             @if (!IsView)
@@ -318,6 +327,7 @@
     private List<ActivityFileDto>? ActivityFileList { get; set; }
 
     private bool IsNew { get; set; }
+    private bool IsLoading { get; set; }
     private bool IsView => !NetworkService.ConnectionAvailable;
 
     private string? LabelSave { get; set; }
@@ -443,11 +453,17 @@
     {
         return Task.Run(async () =>
         {
+            IsLoading = true;
+            await InvokeAsync(StateHasChanged);
+
             SelectedComessa = ActivityModel.Commessa;
 
             Users = await ManageData.GetTable<StbUser>();
             if (!ActivityModel.UserName.IsNullOrEmpty())
+            {
                 SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
+                await InvokeAsync(StateHasChanged);
+            }
 
             if (!IsNew && Id != null)
                 ActivityFileList = await IntegryApiService.GetActivityFile(Id);
@@ -456,6 +472,7 @@
             Clienti = await ManageData.GetClienti(new WhereCondContact { FlagStato = "A" });
             Pros = await ManageData.GetProspect();
 
+            IsLoading = false;
             await InvokeAsync(StateHasChanged);
         });
     }
@@ -479,8 +496,8 @@
         if (ActivityModel.CodAnag == null)
         {
             Commesse = await ManageData.GetTable<JtbComt>(x =>
-                x.CodJcom.Contains(searchValue) ||
+                x.CodJcom.ToUpper().Contains(searchValue.ToUpper()) ||
-                x.Descrizione.Contains(searchValue)
+                x.Descrizione.ToUpper().Contains(searchValue.ToUpper())
             );
         }
         else
@@ -544,11 +561,11 @@
         var results = new List<string>();
 
         results.AddRange(Clienti
-            .Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
+            .Where(x => (x.CodAnag != null && x.CodAnag.Contains(value, StringComparison.OrdinalIgnoreCase)) || x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
             .Select(x => $"{x.CodAnag} - {x.RagSoc}"));
 
         results.AddRange(Pros
-            .Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
+            .Where(x => (x.CodPpro != null && x.CodPpro.Contains(value, StringComparison.OrdinalIgnoreCase)) || x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase))
             .Select(x => $"{x.CodPpro} - {x.RagSoc}"));
 
         return Task.FromResult<IEnumerable<string>?>(results);
@@ -564,6 +581,9 @@
         {
             ActivityModel.CodAnag = parts[0];
             ActivityModel.Cliente = parts[1];
+
+            var isCliente = Clienti.FirstOrDefault(x => x.CodAnag != null && x.CodAnag.Equals(ActivityModel.CodAnag));
+            ActivityModel.TipoAnag = isCliente == null ? "P" : "C";
         }
 
         OnAfterChangeValue();
@@ -581,6 +601,7 @@
             if (com.CodAnag != null)
             {
                 ActivityModel.CodAnag = com.CodAnag;
+                ActivityModel.TipoAnag = com.TipoAnag;
                 ActivityModel.Cliente = Clienti
                     .Where(x => x.CodAnag != null && x.CodAnag.Equals(com.CodAnag))
                     .Select(x => x.RagSoc)
@@ -593,6 +614,7 @@
             {
                 ActivityModel.CodAnag = null;
                 ActivityModel.Cliente = null;
+                ActivityModel.TipoAnag = null;
             }
         }
         else
@@ -601,6 +623,7 @@
             ActivityModel.Commessa = null;
             ActivityModel.CodAnag = null;
             ActivityModel.Cliente = null;
+            ActivityModel.TipoAnag = null;
         }
 
         OnAfterChangeValue();
@@ -775,6 +798,33 @@
         }
     }
 
+    private async Task DeleteAttach(ActivityFileDto file)
+    {
+        Snackbar.Clear();
+
+        if (ActivityFileList == null) return;
+
+        try
+        {
+            ActivityFileList.Remove(file);
+            StateHasChanged();
+
+            await IntegryApiService.DeleteFile(ActivityModel.ActivityId!, file.FileName);
+        }
+        catch (Exception ex)
+        {
+            ActivityFileList.Add(file);
+            StateHasChanged();
+
+            Snackbar.Add("Impossibile eliminare il file", Severity.Error);
+            Console.WriteLine($"Impossibile eliminare il file: {ex.Message}");
+        }
+        finally
+        {
+            Snackbar.Add($"{file.FileName} eliminato con successo", Severity.Info);
+        }
+    }
+
     private void OpenPosition(AttachedDTO attached)
     {
         if (attached is { Lat: not null, Lng: not null })

salesbook.Shared/Core/Interface/System/IGenericSystemService.cs

@@ -0,0 +1,6 @@
+namespace salesbook.Shared.Core.Interface.System;
+
+public interface IGenericSystemService
+{
+    string GetCurrentAppVersion();
+}

salesbook.Shared/Core/Services/IntegryApiService.cs

@@ -160,7 +160,7 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
     }
 
     public Task<Stream> DownloadFile(string activityId, string fileName) =>
-        integryApiRestClient.Download($"downloadStbFileAttachment/{activityId}/{fileName}")!;
+        integryApiRestClient.Download($"downloadStbActivityFileAttachment/{activityId}/{fileName}")!;
 
     public Task<Stream> DownloadFileFromRefUuid(string refUuid, string fileName)
     {

salesbook.Shared/Core/Services/PreloadService.cs

@@ -1,4 +1,6 @@
-using salesbook.Shared.Core.Dto;
+using IntegryApiClient.Core.Domain.Abstraction.Contracts.Storage;
+using Java.Sql;
+using salesbook.Shared.Core.Dto;
 using salesbook.Shared.Core.Dto.Contact;
 using salesbook.Shared.Core.Dto.PageState;
 using salesbook.Shared.Core.Dto.Users;
@@ -6,7 +8,7 @@ using salesbook.Shared.Core.Interface;
 
 namespace salesbook.Shared.Core.Services;
 
-public class PreloadService(IManageDataService manageData, UserListState userState)
+public class PreloadService(IManageDataService manageData, ILocalStorage localStorage, UserListState userState)
 {
     public async Task PreloadUsersAsync()
     {
@@ -15,7 +17,10 @@ public class PreloadService(IManageDataService manageData, UserListState userSta
 
         userState.IsLoading = true;
         
-        var users = await manageData.GetContact(new WhereCondContact { FlagStato = "A" });
+        DateTime? lastSync = localStorage.Get<DateTime>("last-user-sync");
+        lastSync = lastSync.Equals(DateTime.MinValue) ? null : lastSync;
+
+        var users = await manageData.GetContact(new WhereCondContact { FlagStato = "A" }, lastSync);
 
         var sorted = users
             .Where(u => !string.IsNullOrWhiteSpace(u.RagSoc))
@@ -27,6 +32,8 @@ public class PreloadService(IManageDataService manageData, UserListState userSta
         userState.FilteredGroupedUserList = userState.GroupedUserList;
         userState.AllUsers = users;
 
+        localStorage.Set("last-user-sync", DateTime.Now);
+
         userState.NotifyUsersLoaded();
     }