Finish v2.2.2(26)

# Conflicts:
#	salesbook.Shared/Components/Pages/Home.razor

salesbook.Maui/App.xaml.cs

@@ -1,20 +1,15 @@
-using CommunityToolkit.Mvvm.Messaging;
-
 namespace salesbook.Maui
 {
     public partial class App : Application
     {
-        private readonly IMessenger _messenger;
+        public App()
-        
-        public App(IMessenger messenger)
         {
             InitializeComponent();
-            _messenger = messenger;
         }
 
         protected override Window CreateWindow(IActivationState? activationState)
         {
-            return new Window(new MainPage(_messenger));
+            return new Window(new MainPage());
         }
     }
 }

salesbook.Maui/Core/Interface/IFilePreviewService.cs

@@ -0,0 +1,6 @@
+namespace salesbook.Maui.Core.Interface;
+
+public interface IFilePreviewService
+{
+    Task Preview(string fileName, string filePath);
+}

salesbook.Maui/Core/RestClient/IntegryApi/Dto/RegisterDeviceDTO.cs

@@ -0,0 +1,10 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Maui.Core.RestClient.IntegryApi.Dto;
+
+public class RegisterDeviceDTO
+{
+    [JsonPropertyName("userDeviceToken")]
+    public WtbUserDeviceTokenDTO UserDeviceToken { get; set; }
+
+}

salesbook.Maui/Core/RestClient/IntegryApi/Dto/WtbUserDeviceTokenDTO.cs

@@ -0,0 +1,22 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Maui.Core.RestClient.IntegryApi.Dto;
+
+public class WtbUserDeviceTokenDTO
+{
+    [JsonPropertyName("type")]
+    public string Type => "wtb_user_device_tokens";
+
+    [JsonPropertyName("deviceToken")]
+    public string DeviceToken { get; set; }
+
+    [JsonPropertyName("userName")]
+    public string Username { get; set; }
+
+    [JsonPropertyName("appName")]
+    public int AppName => 7; //salesbook
+
+    [JsonPropertyName("platform")]
+    public string Platform { get; set; }
+
+}

salesbook.Maui/Core/RestClient/IntegryApi/IntegryRegisterNotificationRestClient.cs

@@ -0,0 +1,38 @@
+using IntegryApiClient.Core.Domain.Abstraction.Contracts.Account;
+using IntegryApiClient.Core.Domain.RestClient.Contacts;
+using Microsoft.Extensions.Logging;
+using salesbook.Maui.Core.RestClient.IntegryApi.Dto;
+using salesbook.Shared.Core.Interface.IntegryApi;
+
+namespace salesbook.Maui.Core.RestClient.IntegryApi;
+
+public class IntegryRegisterNotificationRestClient(
+    ILogger<IntegryRegisterNotificationRestClient> logger,
+    IUserSession userSession,
+    IIntegryApiRestClient integryApiRestClient
+) : IIntegryRegisterNotificationRestClient
+{
+    public async Task Register(string fcmToken, ILogger? logger1 = null)
+    {
+        logger1 ??= logger;
+
+        var userDeviceToken = new RegisterDeviceDTO()
+        {
+            UserDeviceToken = new WtbUserDeviceTokenDTO()
+            {
+                DeviceToken = fcmToken,
+                Platform = OperatingSystem.IsAndroid() ? "Android" : "iOS",
+                Username = userSession.User.Username
+            }
+        };
+        try
+        {
+            await integryApiRestClient.AuthorizedPost<object>($"device_tokens/insert", userDeviceToken,
+                logger: logger1);
+        }
+        catch (Exception ex)
+        {
+            SentrySdk.CaptureException(ex);
+        }
+    }
+}

salesbook.Maui/Core/Services/AttachedService.cs

@@ -1,20 +1,53 @@
-using salesbook.Shared.Core.Dto;
+using salesbook.Maui.Core.Interface;
+using salesbook.Shared.Core.Dto;
 using salesbook.Shared.Core.Interface;
 
 namespace salesbook.Maui.Core.Services;
 
-public class AttachedService : IAttachedService
+public class AttachedService(IFilePreviewService filePreviewService) : IAttachedService
 {
-    public async Task<AttachedDTO?> SelectImage()
+    public async Task<AttachedDTO?> SelectImageFromCamera()
     {
-        var perm = await Permissions.RequestAsync<Permissions.Photos>();
+        var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
-        if (perm != PermissionStatus.Granted) return null;
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageWrite>();
 
-        var result = await FilePicker.PickAsync(new PickOptions
+        if (cameraPerm != PermissionStatus.Granted || storagePerm != PermissionStatus.Granted)
+            return null;
+
+        FileResult? result = null;
+
+        try
         {
-            PickerTitle = "Scegli un'immagine",
+            result = await MediaPicker.Default.CapturePhotoAsync();
-            FileTypes = FilePickerFileType.Images
+        }
-        });
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore cattura foto: {ex.Message}");
+            SentrySdk.CaptureException(ex);
+            return null;
+        }
+
+        return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
+    }
+
+    public async Task<AttachedDTO?> SelectImageFromGallery()
+    {
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageRead>();
+        if (storagePerm != PermissionStatus.Granted)
+            return null;
+
+        FileResult? result = null;
+
+        try
+        {
+            result = await MediaPicker.Default.PickPhotoAsync();
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore selezione galleria: {ex.Message}");
+            SentrySdk.CaptureException(ex);
+            return null;
+        }
 
         return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
     }
@@ -63,47 +96,34 @@ public class AttachedService : IAttachedService
         };
     }
 
-    private static async Task<string?> SaveToTempStorage(Stream file, string fileName)
+    public async Task<string> SaveToTempStorage(Stream file, string fileName, CancellationToken ct = default)
     {
-        var cacheDirectory = FileSystem.CacheDirectory;
+        ArgumentNullException.ThrowIfNull(file);
-        var targetDirectory = Path.Combine(cacheDirectory, "file");
 
-        if (!Directory.Exists(targetDirectory)) Directory.CreateDirectory(targetDirectory);
+        if (file.CanSeek)
+            file.Position = 0;
 
-        var tempFilePath = Path.Combine(targetDirectory, fileName + ".temp");
+        fileName = Path.GetFileName(fileName);
-        var filePath = Path.Combine(targetDirectory, fileName);
 
-        if (File.Exists(filePath)) return filePath;
+        var dir = FileSystem.CacheDirectory;
+        var filePath = Path.Combine(dir, fileName);
 
-        try
+        await using var fileStream = File.Create(filePath);
-        {
+        await file.CopyToAsync(fileStream, ct);
-            await using var fileStream =
-                new FileStream(tempFilePath, FileMode.Create, FileAccess.Write, FileShare.None);
-            await file.CopyToAsync(fileStream);
-
-            File.Move(tempFilePath, filePath);
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Errore durante il salvataggio dello stream: {e.Message}");
-            return null;
-        }
-        finally
-        {
-            if (File.Exists(tempFilePath)) File.Delete(tempFilePath);
-        }
 
         return filePath;
     }
 
-    public async Task OpenFile(Stream file, string fileName)
+    public Task OpenFile(string fileName, string filePath)
     {
-        var filePath = await SaveToTempStorage(file, fileName);
+#if IOS
-        
+        return filePreviewService.Preview(fileName, filePath);
-        if (filePath is null) return;
+#else
-        await Launcher.OpenAsync(new OpenFileRequest
+        return Launcher.OpenAsync(new OpenFileRequest
         {
+            Title = "Apri file",
             File = new ReadOnlyFile(filePath)
         });
+#endif
     }
 }

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -2,19 +2,25 @@
 using salesbook.Shared.Core.Dto;
 using salesbook.Shared.Core.Dto.Activity;
 using salesbook.Shared.Core.Dto.Contact;
+using salesbook.Shared.Core.Dto.PageState;
 using salesbook.Shared.Core.Entity;
+using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Helpers.Enum;
 using salesbook.Shared.Core.Interface;
-using Sentry.Protocol;
+using salesbook.Shared.Core.Interface.IntegryApi;
+using salesbook.Shared.Core.Interface.System.Network;
 using System.Linq.Expressions;
+using IntegryApiClient.Core.Domain.Abstraction.Contracts.Account;
 
 namespace salesbook.Maui.Core.Services;
 
 public class ManageDataService(
     LocalDbService localDb,
     IMapper mapper,
+    UserListState userListState,
     IIntegryApiService integryApiService,
-    INetworkService networkService
+    INetworkService networkService,
+    IUserSession userSession
 ) : IManageDataService
 {
     public Task<List<T>> GetTable<T>(Expression<Func<T, bool>>? whereCond = null) where T : new() =>
@@ -82,12 +88,22 @@ public class ManageDataService(
         return prospect;
     }
 
-    public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond)
+    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 clienti = await integryApiService.RetrieveAnagClie(
@@ -96,47 +112,92 @@ public class ManageDataService(
                     CodAnag = whereCond.CodAnag,
                     FlagStato = whereCond.FlagStato,
                     PartIva = whereCond.PartIva,
-                    ReturnPersRif = !whereCond.OnlyContact
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
                 }
             );
-            _ = UpdateDbUsers(clienti);
 
             var prospect = await integryApiService.RetrieveProspect(
                 new CRMProspectRequestDTO
                 {
                     CodPpro = whereCond.CodAnag,
                     PartIva = whereCond.PartIva,
-                    ReturnPersRif = !whereCond.OnlyContact
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
                 }
             );
-            _ = UpdateDbUsers(prospect);
 
-            contactList = clienti.AnagClie;
+            if (lastSync == null)
-            prospectList = prospect.PtbPros;
+            {
-        }
+                await InsertDbUsers(new UsersSyncResponseDTO
-        else
+                {
-        {
+                    AnagClie = clienti.AnagClie,
-            contactList = await localDb.Get<AnagClie>(x =>
+                    VtbDest = clienti.VtbDest,
-                (whereCond.FlagStato != null && x.FlagStato.Equals(whereCond.FlagStato)) ||
+                    VtbCliePersRif = clienti.VtbCliePersRif,
-                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
+                    PtbPros = prospect.PtbPros,
-                (whereCond.PartIva == null && whereCond.FlagStato == null)
+                    PtbProsRif = prospect.PtbProsRif
-            );
+                });
-            prospectList = await localDb.Get<PtbPros>(x =>
+            }
-                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
+            else
-                (whereCond.PartIva == null)
+            {
-            );
+                _ = UpdateDbUsers(new UsersSyncResponseDTO
+                {
+                    AnagClie = clienti.AnagClie,
+                    VtbDest = clienti.VtbDest,
+                    VtbCliePersRif = clienti.VtbCliePersRif,
+                    PtbPros = prospect.PtbPros,
+                    PtbProsRif = prospect.PtbProsRif
+                });
+            }
+
+            if (lastSync != null)
+            {
+                contactList = MergeLists(
+                    contactList,
+                    clienti.AnagClie,
+                    x => x.CodAnag
+                );
+
+                prospectList = MergeLists(
+                    prospectList,
+                    prospect.PtbPros,
+                    x => x.CodPpro
+                );
+            }
+            else
+            {
+                contactList = clienti.AnagClie;
+                prospectList = prospect.PtbPros;
+            }
         }
 
         // 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);
 
         return contactMapper;
     }
+    
+    private static List<T>? MergeLists<T, TKey>(List<T>? localList, List<T>? apiList, Func<T, TKey> 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)
+        {
+            var key = keySelector(apiItem);
+            dictionary[key] = apiItem;
+        }
+
+        return dictionary.Values.ToList();
+    }
 
     public async Task<ContactDTO?> GetSpecificContact(string codAnag, bool isContact)
     {
@@ -156,6 +217,34 @@ public class ManageDataService(
         }
     }
 
+    public async Task<List<ActivityDTO>> GetActivityTryLocalDb(WhereCondActivity whereCond)
+    {
+        var 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))
+        );
+
+        if (activities.IsNullOrEmpty() && networkService.ConnectionAvailable)
+        {
+            activities = await integryApiService.RetrieveActivity(
+                new CRMRetrieveActivityRequestDTO
+                {
+                    StarDate = whereCond.Start,
+                    EndDate = whereCond.End,
+                    ActivityId = whereCond.ActivityId
+                }
+            );
+
+            _ = UpdateDb(activities);
+        }
+        else return [];
+
+        return await MapActivity(activities);
+    }
+
     public async Task<List<ActivityDTO>> GetActivity(WhereCondActivity whereCond, bool useLocalDb)
     {
         List<StbActivity>? activities;
@@ -173,17 +262,13 @@ 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.EffectiveDate == null &&
-                 x.EstimatedDate >= whereCond.Start && x.EstimatedDate <= whereCond.End) ||
-                (x.EffectiveDate >= whereCond.Start && x.EffectiveDate <= whereCond.End) ||
-                (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
-            );
-        }
 
+        return await MapActivity(activities);
+    }
+
+    public async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
+    {
         if (activities == null) return [];
 
         var codJcomList = activities
@@ -192,23 +277,40 @@ public class ManageDataService(
             .Distinct().ToList();
 
         var jtbComtList = await localDb.Get<JtbComt>(x => codJcomList.Contains(x.CodJcom));
-        var commesseDict = jtbComtList.ToDictionary(x => x.CodJcom, x => x.Descrizione);
 
         var codAnagList = activities
             .Select(x => x.CodAnag)
             .Where(x => !string.IsNullOrEmpty(x))
             .Distinct().ToList();
-        var clientList = await localDb.Get<AnagClie>(x => codAnagList.Contains(x.CodAnag));
-        var distinctClient = clientList.ToDictionary(x => x.CodAnag, x => x.RagSoc);
 
-        var prospectList = await localDb.Get<PtbPros>(x => codAnagList.Contains(x.CodPpro));
+        IDictionary<string, string?>? distinctUser = null;
-        var distinctProspect = prospectList.ToDictionary(x => x.CodPpro, x => x.RagSoc);
+
+        if (userListState.AllUsers != null)
+        {
+            distinctUser = userListState.AllUsers
+                .Where(x => codAnagList.Contains(x.CodContact))
+                .ToDictionary(x => x.CodContact, x => x.RagSoc);
+        }
 
         var returnDto = activities
             .Select(activity =>
             {
+                if (activity.CodJcom is "0000" && userSession.ProfileDb != null &&
+                    userSession.ProfileDb.Equals("smetar", StringComparison.OrdinalIgnoreCase))
+                {
+                    activity.CodJcom = null;
+                }
+
                 var dto = mapper.Map<ActivityDTO>(activity);
 
+                if (activity is { AlarmTime: not null, EstimatedTime: not null })
+                {
+                    var minuteBefore = activity.EstimatedTime.Value - activity.AlarmTime.Value;
+                    dto.MinuteBefore = (int)Math.Abs(minuteBefore.TotalMinutes);
+
+                    dto.NotificationDate = dto.MinuteBefore == 0 ? activity.EstimatedTime : activity.AlarmTime;
+                }
+
                 if (activity.CodJcom != null)
                 {
                     dto.Category = ActivityCategoryEnum.Commessa;
@@ -222,16 +324,14 @@ public class ManageDataService(
                 {
                     string? ragSoc;
 
-                    if (distinctClient.TryGetValue(activity.CodAnag, out ragSoc) ||
+                    if (distinctUser != null && (distinctUser.TryGetValue(activity.CodAnag, out ragSoc) ||
-                        distinctProspect.TryGetValue(activity.CodAnag, out ragSoc))
+                                                 distinctUser.TryGetValue(activity.CodAnag, out ragSoc)))
                     {
                         dto.Cliente = ragSoc;
                     }
                 }
 
-                dto.Commessa = activity.CodJcom != null && commesseDict.TryGetValue(activity.CodJcom, out var descr)
+                dto.Commessa = jtbComtList.Find(x => x.CodJcom.Equals(dto.CodJcom));
-                    ? descr
-                    : null;
                 return dto;
             })
             .ToList();
@@ -239,23 +339,50 @@ public class ManageDataService(
         return returnDto;
     }
 
+    private async Task InsertDbUsers(UsersSyncResponseDTO response)
+    {
+        if (response.AnagClie != null)
+        {
+            await localDb.InsertAll(response.AnagClie);
+
+            if (response.VtbDest != null) await localDb.InsertAll(response.VtbDest);
+            if (response.VtbCliePersRif != null) await localDb.InsertAll(response.VtbCliePersRif);
+        }
+
+        if (response.PtbPros != null)
+        {
+            await localDb.InsertAll(response.PtbPros);
+
+            if (response.PtbProsRif != null) await localDb.InsertAll(response.PtbProsRif);
+        }
+    }
+
     private Task UpdateDbUsers(UsersSyncResponseDTO response)
     {
         return Task.Run(async () =>
         {
-            if (response.AnagClie != null)
+            try
             {
-                await localDb.InsertOrUpdate(response.AnagClie);
+                if (response.AnagClie != null)
+                {
+                    await localDb.InsertOrUpdate(response.AnagClie);
 
-                if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
+                    if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
-                if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                    if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                }
+
+                if (response.PtbPros != null)
+                {
+                    await localDb.InsertOrUpdate(response.PtbPros);
+
+                    if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                }
             }
-
+            catch (Exception e)
-            if (response.PtbPros != null)
             {
-                await localDb.InsertOrUpdate(response.PtbPros);
+                Console.WriteLine(e.Message);
-
+                SentrySdk.CaptureException(e);
-                if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                throw;
             }
         });
     }
@@ -275,6 +402,26 @@ public class ManageDataService(
     public Task InsertOrUpdate<T>(T objectToSave) =>
         localDb.InsertOrUpdate<T>([objectToSave]);
 
+    public async Task DeleteProspect(string codPpro)
+    {
+        var persRifList = await GetTable<PtbProsRif>(x => x.CodPpro!.Equals(codPpro));
+
+        if (!persRifList.IsNullOrEmpty())
+        {
+            foreach (var persRif in persRifList)
+            {
+                await localDb.Delete(persRif);
+            }
+        }
+
+        var ptbPros = (await GetTable<PtbPros>(x => x.CodPpro!.Equals(codPpro))).FirstOrDefault();
+
+        if (ptbPros != null)
+        {
+            await localDb.Delete(ptbPros);
+        }
+    }
+
     public Task Delete<T>(T objectToDelete) =>
         localDb.Delete(objectToDelete);
 

salesbook.Maui/Core/Services/SyncDbService.cs

@@ -1,5 +1,6 @@
 using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Interface;
+using salesbook.Shared.Core.Interface.IntegryApi;
 
 namespace salesbook.Maui.Core.Services;
 

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/Core/System/Network/NetworkService.cs

@@ -1,6 +1,7 @@
 using salesbook.Shared.Core.Interface;
+using salesbook.Shared.Core.Interface.System.Network;
 
-namespace salesbook.Maui.Core.Services;
+namespace salesbook.Maui.Core.System.Network;
 
 public class NetworkService : INetworkService
 {

salesbook.Maui/Core/System/Notification/FirebaseNotificationService.cs

@@ -0,0 +1,37 @@
+using salesbook.Shared.Core.Interface;
+using salesbook.Shared.Core.Interface.IntegryApi;
+using Shiny;
+using Shiny.Notifications;
+using Shiny.Push;
+
+namespace salesbook.Maui.Core.System.Notification;
+
+public class FirebaseNotificationService(
+    IPushManager pushManager,
+    IIntegryRegisterNotificationRestClient integryRegisterNotificationRestClient,
+    INotificationManager notificationManager
+) : IFirebaseNotificationService
+{
+    public async Task InitFirebase()
+    {
+        CreateNotificationChannel();
+        
+        var (accessState, token) = await pushManager.RequestAccess();
+
+        if (accessState == AccessState.Denied || token is null) return;
+        await integryRegisterNotificationRestClient.Register(token);
+    }
+
+    private void CreateNotificationChannel()
+    {
+        var channel = new Channel
+        {
+            Identifier = "salesbook_push",
+            Description = "Notifiche push di SalesBook",
+            Importance = ChannelImportance.High,
+            Actions = []
+        };
+
+        notificationManager.AddChannel(channel);
+    }
+}

salesbook.Maui/Core/System/Notification/Push/PushNotificationDelegate.cs

@@ -0,0 +1,63 @@
+using CommunityToolkit.Mvvm.Messaging;
+using salesbook.Shared.Core.Dto;
+using salesbook.Shared.Core.Entity;
+using salesbook.Shared.Core.Helpers;
+using salesbook.Shared.Core.Interface.IntegryApi;
+using salesbook.Shared.Core.Messages.Notification.NewPush;
+using Shiny.Push;
+using System.Text.Json;
+
+namespace salesbook.Maui.Core.System.Notification.Push;
+
+public class PushNotificationDelegate(
+    IIntegryRegisterNotificationRestClient integryRegisterNotificationRestClient,
+    IMessenger messenger
+) : IPushDelegate
+{
+    public Task OnEntry(PushNotification notification)
+    {
+        // fires when the user taps on a push notification
+        return Task.CompletedTask;
+    }
+
+    public Task OnReceived(PushNotification notification)
+    {
+        if (notification.Notification is null) return Task.CompletedTask;
+        var data = notification.Data;
+
+        NotificationDataDTO? notificationDataDto = null;
+        
+        if (!data.IsNullOrEmpty())
+        {
+            var json = JsonSerializer.Serialize(data);
+            notificationDataDto = JsonSerializer.Deserialize<NotificationDataDTO>(json);
+        }
+
+        if (notificationDataDto?.NotificationId == null) return Task.CompletedTask;
+        var notificationId = long.Parse(notificationDataDto.NotificationId);
+
+        var pushNotification = new WtbNotification
+        {
+            Id = notificationId,
+            Title = notification.Notification.Title,
+            Body = notification.Notification.Message,
+            NotificationData = notificationDataDto
+        };
+
+        messenger.Send(new NewPushNotificationMessage(pushNotification));
+
+        return Task.CompletedTask;
+    }
+
+    public Task OnNewToken(string token)
+    {
+        integryRegisterNotificationRestClient.Register(token);
+        return Task.CompletedTask;
+    }
+
+    public Task OnUnRegistered(string token)
+    {
+        // fires when a push notification change is set by the operating system or provider
+        return Task.CompletedTask;
+    }
+}

salesbook.Maui/Core/System/Notification/ShinyNotificationManager.cs

@@ -0,0 +1,9 @@
+using salesbook.Shared.Core.Interface.System.Notification;
+using Shiny.Notifications;
+
+namespace salesbook.Maui.Core.System.Notification;
+
+public class ShinyNotificationManager(INotificationManager notificationManager) : IShinyNotificationManager
+{
+    public Task RequestAccess() => notificationManager.RequestAccess();
+}

salesbook.Maui/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyC_QtQpsVortjzgl-B7__IQZ-85lOct55E</string>
+	<key>GCM_SENDER_ID</key>
+	<string>830771692001</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>it.integry.salesbook</string>
+	<key>PROJECT_ID</key>
+	<string>salesbook-smetar</string>
+	<key>STORAGE_BUCKET</key>
+	<string>salesbook-smetar.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:830771692001:ios:59d8b1d8570ac81f3752a0</string>
+</dict>
+</plist>

salesbook.Maui/ILLink.Descriptors.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+	<assembly fullname="salesbook.Shared" preserve="all" />
+
+	<assembly fullname="System.Private.CoreLib">
+		<type fullname="System.Runtime.InteropServices.SafeHandle" preserve="all" />
+		<type fullname="System.IO.FileStream" preserve="all" />
+	</assembly>
+
+	<assembly fullname="SourceGear.sqlite3" preserve="all"/>
+	<assembly fullname="sqlite-net-e" preserve="all"/>
+
+	<assembly fullname="Sentry.Maui" preserve="all"/>
+	<assembly fullname="Shiny.Hosting.Maui" preserve="all"/>
+	<assembly fullname="Shiny.Notifications" preserve="all"/>
+	<assembly fullname="Shiny.Push" preserve="all"/>
+</linker>

salesbook.Maui/MainPage.xaml.cs

@@ -1,23 +1,10 @@
-using CommunityToolkit.Mvvm.Messaging;
-using salesbook.Shared.Core.Messages.Back;
-
 namespace salesbook.Maui
 {
     public partial class MainPage : ContentPage
     {
-        private readonly IMessenger _messenger;
+        public MainPage()
-        
-        public MainPage(IMessenger messenger)
         {
             InitializeComponent();
-            _messenger = messenger;
         }
-
-        protected override bool OnBackButtonPressed()
-        {
-            _messenger.Send(new HardwareBackMessage("back"));
-            return true;
-        }
-
     }
 }

salesbook.Maui/MauiProgram.cs

@@ -1,4 +1,3 @@
-using AutoMapper;
 using CommunityToolkit.Maui;
 using CommunityToolkit.Mvvm.Messaging;
 using IntegryApiClient.MAUI;
@@ -6,17 +5,31 @@ using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
 using MudBlazor.Services;
 using MudExtensions.Services;
+using salesbook.Maui.Core;
+using salesbook.Maui.Core.Interface;
+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;
 using salesbook.Shared;
 using salesbook.Shared.Core.Dto;
 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;
 using salesbook.Shared.Core.Messages.Activity.New;
 using salesbook.Shared.Core.Messages.Back;
 using salesbook.Shared.Core.Messages.Contact;
+using salesbook.Shared.Core.Messages.Notification.Loaded;
+using salesbook.Shared.Core.Messages.Notification.NewPush;
 using salesbook.Shared.Core.Services;
+using Shiny;
 
 namespace salesbook.Maui
 {
@@ -24,7 +37,7 @@ namespace salesbook.Maui
     {
         private const string AppToken = "f0484398-1f8b-42f5-ab79-5282c164e1d8";
 
-        public static MauiApp CreateMauiApp()
+        public static MauiAppBuilder CreateMauiAppBuilder()
         {
             InteractiveRenderSettings.ConfigureBlazorHybridRenderModes();
 
@@ -33,6 +46,7 @@ namespace salesbook.Maui
                 .UseMauiApp<App>()
                 .UseIntegry(appToken: AppToken, useLoginAzienda: true)
                 .UseMauiCommunityToolkit()
+                .UseShiny()
                 .UseSentry(options =>
                 {
                     options.Dsn = "https://453b6b38f94fd67e40e0d5306d6caff8@o4508499810254848.ingest.de.sentry.io/4509605099667536";
@@ -63,14 +77,26 @@ namespace salesbook.Maui
             builder.Services.AddSingleton<JobSteps>();
             builder.Services.AddSingleton<UserPageState>();
             builder.Services.AddSingleton<UserListState>();
+            builder.Services.AddSingleton<NotificationState>();
             builder.Services.AddSingleton<FilterUserDTO>();
 
             //Message
-            builder.Services.AddScoped<IMessenger, WeakReferenceMessenger>();
+            builder.Services.AddSingleton<IMessenger, WeakReferenceMessenger>();
-            builder.Services.AddScoped<NewActivityService>();
+            builder.Services.AddSingleton<NewActivityService>();
-            builder.Services.AddScoped<BackNavigationService>();
+            builder.Services.AddSingleton<BackNavigationService>();
-            builder.Services.AddScoped<CopyActivityService>();
+            builder.Services.AddSingleton<CopyActivityService>();
-            builder.Services.AddScoped<NewContactService>();
+            builder.Services.AddSingleton<NewContactService>();
+            builder.Services.AddSingleton<NotificationsLoadedService>();
+            builder.Services.AddSingleton<NewPushNotificationService>();
+
+            //Notification
+            builder.Services.AddNotifications();
+            builder.Services.AddPush<PushNotificationDelegate>();
+            builder.Services.AddSingleton<IIntegryRegisterNotificationRestClient, IntegryRegisterNotificationRestClient>();
+            builder.Services.AddSingleton<IIntegryNotificationRestClient, IntegryNotificationRestClient>();
+            builder.Services.AddSingleton<IFirebaseNotificationService, FirebaseNotificationService>();
+            builder.Services.AddSingleton<IShinyNotificationManager, ShinyNotificationManager>();
+            builder.Services.AddSingleton<INotificationService, NotificationService>();
 
 #if DEBUG
             builder.Services.AddBlazorWebViewDeveloperTools();
@@ -80,9 +106,14 @@ 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>();
+            builder.Services.AddSingleton<IFilePreviewService, FilePreviewService>();
 
-            return builder.Build();
+            _ = typeof(System.Runtime.InteropServices.SafeHandle);
+            _ = typeof(System.IO.FileStream);
+
+            return builder;
         }
     }
 }

salesbook.Maui/Platforms/Android/AndroidManifest.xml

@@ -1,9 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:usesCleartextTraffic="true" android:supportsRtl="true"></application>
+    package="it.integry.salesbook">
+
+	<application
+        android:allowBackup="true"
+        android:icon="@mipmap/appicon"
+        android:usesCleartextTraffic="true"
+        android:supportsRtl="true">
+
+		<!-- Firebase push -->
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
+            android:exported="false" />
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
+            android:exported="true"
+            android:permission="com.google.android.c2dm.permission.SEND">
+			<intent-filter>
+				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
+				<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
+				<category android:name="${applicationId}" />
+			</intent-filter>
+		</receiver>
+
+	</application>
+
+	<!-- Rete -->
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+
+	<!-- Geolocalizzazione -->
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+	<!-- Fotocamera -->
+	<uses-permission android:name="android.permission.CAMERA" />
+
+	<!-- Storage / Media -->
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-</manifest>
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+	<!-- Android 10+ -->
+	<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+
+	<!-- Android 13+ -->
+	<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+	<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+	<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+
+	<!-- Background / Notifiche -->
+	<uses-permission android:name="android.permission.BATTERY_STATS" />
+	<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+
+</manifest>

salesbook.Maui/Platforms/Android/AndroidModule.cs

@@ -0,0 +1,13 @@
+using salesbook.Maui.Core;
+using salesbook.Shared.Core.Interface.System.Battery;
+
+namespace salesbook.Maui;
+
+public static class AndroidModule
+{
+    public static MauiAppBuilder RegisterAndroidAppServices(this MauiAppBuilder mauiAppBuilder)
+    {
+        mauiAppBuilder.Services.AddSingleton<IBatteryOptimizationManagerService, BatteryOptimizationManagerService>();
+        return mauiAppBuilder;
+    }
+}

salesbook.Maui/Platforms/Android/Core/BatteryOptimizationManagerService.cs

@@ -0,0 +1,28 @@
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Provider;
+using salesbook.Shared.Core.Interface.System.Battery;
+using Application = Android.App.Application;
+
+namespace salesbook.Maui.Core;
+
+public class BatteryOptimizationManagerService : IBatteryOptimizationManagerService
+{
+    public bool IsBatteryOptimizationEnabled()
+    {
+        var packageName = AppInfo.PackageName;
+        
+        var pm = (PowerManager)Application.Context.GetSystemService(Context.PowerService)!;
+        return !pm.IsIgnoringBatteryOptimizations(packageName);
+    }
+
+    public void OpenBatteryOptimizationSettings(Action<bool> onCompleted)
+    {
+        var packageName = AppInfo.PackageName;
+
+        var intent = new Intent(Settings.ActionRequestIgnoreBatteryOptimizations);
+        intent.SetData(Android.Net.Uri.Parse("package:" + packageName));
+        ((MainActivity)Platform.CurrentActivity!).StartActivityForResult(intent, (result, _) => { onCompleted(result == Result.Ok); });
+    }
+}

salesbook.Maui/Platforms/Android/Core/FilePreviewService.cs

@@ -0,0 +1,11 @@
+using salesbook.Maui.Core.Interface;
+
+namespace salesbook.Maui.Core;
+
+public class FilePreviewService :IFilePreviewService
+{
+    public Task Preview(string fileName, string filePath)
+    {
+        throw new NotImplementedException();
+    }
+}

salesbook.Maui/Platforms/Android/MainActivity.cs

@@ -1,13 +1,42 @@
 using Android.App;
+using Android.Content;
 using Android.Content.PM;
 
 namespace salesbook.Maui
 {
-    [Activity(Theme = "@style/Maui.SplashTheme",
+    [Activity(
+        Theme = "@style/Maui.SplashTheme",
         MainLauncher = true,
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode |
                                ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+
+    [IntentFilter(
+        [
+            Shiny.ShinyPushIntents.NotificationClickAction
+        ],
+        Categories =
+        [
+            "android.intent.category.DEFAULT"
+        ]
+    )]
     public class MainActivity : MauiAppCompatActivity
     {
+        private readonly IDictionary<int, Action<Result, Intent>> _onActivityResultSubscriber =
+            new Dictionary<int, Action<Result, Intent>>();
+
+        public void StartActivityForResult(Intent intent, Action<Result, Intent> onResultAction)
+        {
+            var requestCode = new Random(DateTime.Now.Millisecond).Next();
+            _onActivityResultSubscriber.Add(requestCode, onResultAction);
+            StartActivityForResult(intent, requestCode);
+        }
+
+        protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
+        {
+            if (_onActivityResultSubscriber.TryGetValue(requestCode, out var value))
+                value(resultCode, data);
+
+            base.OnActivityResult(requestCode, resultCode, data);
+        }
     }
 }

salesbook.Maui/Platforms/Android/MainApplication.cs

@@ -1,16 +1,16 @@
 using Android.App;
 using Android.Runtime;
 
-namespace salesbook.Maui
+namespace salesbook.Maui;
-{
-    [Application(HardwareAccelerated = true)]
-    public class MainApplication : MauiApplication
-    {
-        public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-            : base(handle, ownership)
-        {
-        }
 
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+[Application(HardwareAccelerated = true)]
+public class MainApplication : MauiApplication
+{
+    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+        : base(handle, ownership)
+    {
     }
-}
+
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiAppBuilder()
+        .RegisterAndroidAppServices().Build();
+}

salesbook.Maui/Platforms/iOS/AppDelegate.cs

@@ -1,10 +1,24 @@
 using Foundation;
+using UIKit;
 
 namespace salesbook.Maui
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate
     {
-        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiAppBuilder()
+            .RegisterIosAppServices().Build();
+
+        [Export("application:didRegisterForRemoteNotificationsWithDeviceToken:")]
+        public void RegisteredForRemoteNotifications(UIApplication application, NSData deviceToken)
+            => global::Shiny.Hosting.Host.Lifecycle.OnRegisteredForRemoteNotifications(deviceToken);
+
+        [Export("application:didFailToRegisterForRemoteNotificationsWithError:")]
+        public void FailedToRegisterForRemoteNotifications(UIApplication application, NSError error)
+            => global::Shiny.Hosting.Host.Lifecycle.OnFailedToRegisterForRemoteNotifications(error);
+
+        [Export("application:didReceiveRemoteNotification:fetchCompletionHandler:")]
+        public void DidReceiveRemoteNotification(UIApplication application, NSDictionary userInfo, Action<UIBackgroundFetchResult> completionHandler)
+            => global::Shiny.Hosting.Host.Lifecycle.OnDidReceiveRemoteNotification(userInfo, completionHandler);
     }
 }

salesbook.Maui/Platforms/iOS/Core/BatteryOptimizationManagerService.cs

@@ -0,0 +1,12 @@
+using salesbook.Shared.Core.Interface.System.Battery;
+
+namespace salesbook.Maui.Core;
+
+public class BatteryOptimizationManagerService : IBatteryOptimizationManagerService
+{
+    public bool IsBatteryOptimizationEnabled() => true;
+
+    public void OpenBatteryOptimizationSettings(Action<bool> onCompleted)
+    {
+    }
+}

salesbook.Maui/Platforms/iOS/Core/FilePreviewService.cs

@@ -0,0 +1,24 @@
+using QuickLook;
+using salesbook.Maui.Core.Interface;
+using salesbook.Maui.Helpers;
+using UIKit;
+
+namespace salesbook.Maui.Core;
+
+public class FilePreviewService : IFilePreviewService
+{
+    public Task Preview(string fileName, string filePath)
+    {
+        var currentController = UIApplication.SharedApplication.KeyWindow?.RootViewController;
+        while (currentController?.PresentedViewController != null)
+            currentController = currentController.PresentedViewController;
+
+        var currentView = currentController?.View;
+        var qLPreview = new QLPreviewController();
+        var item = new QlPreviewItemBundle(fileName, filePath);
+        qLPreview.DataSource = new PreviewControllerDs(item);
+        currentController?.PresentViewController(qLPreview, true, null);
+        
+        return Task.CompletedTask;
+    }
+}

salesbook.Maui/Platforms/iOS/Helpers/PreviewControllerDs.cs

@@ -0,0 +1,16 @@
+using QuickLook;
+
+namespace salesbook.Maui.Helpers;
+
+public class PreviewControllerDs(QLPreviewItem item) : QLPreviewControllerDataSource
+{
+    public override nint PreviewItemCount(QLPreviewController controller)
+    {
+        return 1;
+    }
+
+    public override IQLPreviewItem GetPreviewItem(QLPreviewController controller, nint index)
+    {
+        return item;
+    }
+}

salesbook.Maui/Platforms/iOS/Helpers/QlPreviewItemBundle.cs

@@ -0,0 +1,19 @@
+using Foundation;
+using QuickLook;
+
+namespace salesbook.Maui.Helpers;
+
+public class QlPreviewItemBundle(string fileName, string filePath) : QLPreviewItem
+{
+    public override string PreviewItemTitle => fileName;
+    public override NSUrl PreviewItemUrl
+    {
+        get
+        {
+            var documents = NSBundle.MainBundle.BundlePath;
+            var lib = Path.Combine(documents, filePath);
+            var url = NSUrl.FromFilename(lib);
+            return url;
+        }
+    }
+}

salesbook.Maui/Platforms/iOS/Helpers/QlPreviewItemFileSystem.cs

@@ -0,0 +1,12 @@
+using Foundation;
+using QuickLook;
+
+namespace salesbook.Maui.Helpers;
+
+public class QlPreviewItemFileSystem(string fileName, string filePath) : QLPreviewItem
+{
+    public override string PreviewItemTitle => fileName;
+
+    public override NSUrl PreviewItemUrl => NSUrl.FromString(filePath);
+
+}

salesbook.Maui/Platforms/iOS/Info.plist

@@ -36,14 +36,27 @@
 	    <true/>
     </dict>
 
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Questa app utilizza la tua posizione per migliorare alcune funzionalità basate sulla localizzazione.</string>
+
 	<key>NSLocationWhenInUseUsageDescription</key>
-    <string>L'app utilizza la tua posizione per allegarla alle attività.</string>
+    <string>Questa app utilizza la tua posizione solo mentre è in uso per allegarla alle attività.</string>
+
+	<key>NSCameraUsageDescription</key>
+    <string>Questa app necessita di accedere alla fotocamera per scattare foto.</string>
 
 	<key>NSPhotoLibraryUsageDescription</key>
-    <string>Consente di selezionare immagini da allegare alle attività.</string>
+    <string>Questa app necessita di accedere alla libreria foto.</string>
 
     <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>
+	</array>
 </dict>
 </plist>

salesbook.Maui/Platforms/iOS/PrivacyInfo.xcprivacy

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>NSPrivacyAccessedAPITypes</key>
+		<array>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>CA92.1</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>35F9.1</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>C617.1</string>
+				</array>
+			</dict>
+		</array>
+		
+		<key>NSPrivacyCollectedDataTypes</key>
+		<array>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypeCrashData</string>
+				<key>NSPrivacyCollectedDataTypeLinked</key>
+				<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/Platforms/iOS/iOSModule.cs

@@ -0,0 +1,13 @@
+using salesbook.Maui.Core;
+using salesbook.Shared.Core.Interface.System.Battery;
+
+namespace salesbook.Maui;
+
+public static class iOSModule
+{
+    public static MauiAppBuilder RegisterIosAppServices(this MauiAppBuilder mauiAppBuilder)
+    {
+        mauiAppBuilder.Services.AddSingleton<IBatteryOptimizationManagerService, BatteryOptimizationManagerService>();
+        return mauiAppBuilder;
+    }
+}

salesbook.Maui/Resources/AppIcon/appicon.svg

@@ -1 +1,8 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 230 230" width="230" height="230"><style>.a{fill:#dff2ff}</style><path fill-rule="evenodd" class="a" d="m230 0v230h-230v-230z"/></svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 456 456" width="456" height="456">
+	<defs>
+		<image  width="456" height="456" id="img1" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcgAAAHIAQMAAADwb+ipAAAAAXNSR0IB2cksfwAAAANQTFRF3/L/KicjZQAAAGhJREFUeJztyzENAAAMA6DVv+l5aHrCT64V0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN05zNB6OcAcm2KNubAAAAAElFTkSuQmCC"/>
+	</defs>
+	<style>
+	</style>
+	<use id="Background" href="#img1" x="0" y="0"/>
+</svg>

salesbook.Maui/Resources/AppIcon/appiconfg.svg

@@ -1 +1,10 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 230 230" width="230" height="230"><style>.a{fill:none;stroke:#002339;stroke-linecap:round;stroke-linejoin:round;stroke-width:16}.b{fill:none;stroke:#00a0de;stroke-linecap:round;stroke-linejoin:round;stroke-width:16}</style><path fill-rule="evenodd" class="a" d="m119.9 71.4h34.4c20.3 0 36.8 16.5 36.8 36.9v28.3c0 20.4-16.5 36.9-36.8 36.9h-5.1l0.1 32.2-34.7-32.2h-72.2"/><path fill-rule="evenodd" class="b" d="m117.3 24l-77.1 47.4v102.1l77.1-47.4v-102.1z"/></svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024">
+	<defs>
+		<image width="920" height="920" id="img1" href="data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDIzMCAyMzAiIHdpZHRoPSIyMzAiIGhlaWdodD0iMjMwIj48c3R5bGU+LmF7ZmlsbDpub25lO3N0cm9rZTojMDAyMzM5O3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2Utd2lkdGg6MTZ9LmJ7ZmlsbDpub25lO3N0cm9rZTojMDBhMGRlO3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2Utd2lkdGg6MTZ9PC9zdHlsZT48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJhIiBkPSJtMTE5LjkgNzEuNGgzNC40YzIwLjMgMCAzNi44IDE2LjUgMzYuOCAzNi45djI4LjNjMCAyMC40LTE2LjUgMzYuOS0zNi44IDM2LjloLTUuMWwwLjEgMzIuMi0zNC43LTMyLjJoLTcyLjIiLz48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJiIiBkPSJtMTE3LjMgMjRsLTc3LjEgNDcuNHYxMDIuMWw3Ny4xLTQ3LjR2LTEwMi4xeiIvPjwvc3ZnPg=="/>
+	</defs>
+	<style>
+	</style>
+	<g>
+		<use id="appiconfg" href="#img1" transform="matrix(1.113,0,0,1.113,0,0)"/>
+	</g>
+</svg>

salesbook.Maui/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "830771692001",
+    "project_id": "salesbook-smetar",
+    "storage_bucket": "salesbook-smetar.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:830771692001:android:06bc5a9706bc9bef3752a0",
+        "android_client_info": {
+          "package_name": "it.integry.salesbook"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyB43ai_Ph0phO_OkBC1wAOazKZUV9KsLaM"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>2.2.2</ApplicationDisplayVersion>
-		<ApplicationVersion>5</ApplicationVersion>
+		<ApplicationVersion>26</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -79,18 +79,20 @@
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
 		<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
-		<CodesignProvision></CodesignProvision>
+		<CodesignProvision>salesbook</CodesignProvision>
 		<ProvisioningType>manual</ProvisioningType>
 	</PropertyGroup>
 
-	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
+	<ItemGroup Condition="$(TargetFramework.Contains('-ios'))">
 		<!--
-		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
+	// For scheduled notifications, you need to setup "Time Sensitive Notifications" in the Apple Developer Portal for your app provisioning and uncomment below
-
+	// <CustomEntitlements Include="com.apple.developer.usernotifications.time-sensitive" Type="Boolean" Value="true" Visible="false" />
-		<CustomEntitlements Include="keychain-access-groups" Type="StringArray" Value="%24(AppIdentifierPrefix)$(ApplicationId)" Visible="false" />
+	-->
 		<CustomEntitlements Include="aps-environment" Type="string" Value="development" Condition="'$(Configuration)' == 'Debug'" Visible="false" />
 		<CustomEntitlements Include="aps-environment" Type="string" Value="production" Condition="'$(Configuration)' == 'Release'" Visible="false" />
-		-->
+	</ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
+		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
@@ -103,6 +105,29 @@
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<BlazorWebAssemblyLazyLoad Include="salesbook.Shared.dll" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<PublishTrimmed>true</PublishTrimmed>
+		<RunAOTCompilation>true</RunAOTCompilation>
+	</PropertyGroup>
+	
+	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios' and '$(Configuration)'=='Release'">
+		<UseInterpreter>true</UseInterpreter>
+		<RunAOTCompilation>true</RunAOTCompilation>
+		<PublishTrimmed>true</PublishTrimmed>
+		<PublishAot>true</PublishAot>
+		<MonoAotMode>Hybrid</MonoAotMode>
+		<MtouchLink>None</MtouchLink>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<TrimmerRootAssembly Include="salesbook.Shared" RootMode="All" />
+		<TrimmerRootDescriptor Include="ILLink.Descriptors.xml" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<!-- Splash Screen -->
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#dff2ff" BaseSize="128,128" />
@@ -118,17 +143,31 @@
 		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+		<GoogleServicesJson Include="google-services.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</GoogleServicesJson>
+	</ItemGroup>
+
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+		<BundleResource Include="GoogleService-Info.plist" />
+	</ItemGroup>
+
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.6" />
+		<PackageReference Include="IntegryApiClient.MAUI" Version="1.2.3" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.81" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.120" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
-		<PackageReference Include="Sentry.Maui" Version="5.11.2" />
+		<PackageReference Include="Sentry.Maui" Version="5.16.1" />
-		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+		<PackageReference Include="Shiny.Hosting.Maui" Version="3.3.4" />
+		<PackageReference Include="Shiny.Notifications" Version="3.3.4" />
+		<PackageReference Include="Shiny.Push" Version="3.3.4" />
+		<PackageReference Include="SourceGear.sqlite3" Version="3.50.4.2" />
+		<PackageReference Include="sqlite-net-e" Version="1.10.0-beta2" />
 	</ItemGroup>
 
 	<ItemGroup>

salesbook.Maui/wwwroot/index.html

@@ -53,6 +53,7 @@
 <script src="_content/salesbook.Shared/js/main.js"></script>
 <script src="_content/salesbook.Shared/js/calendar.js"></script>
 <script src="_content/salesbook.Shared/js/alphaScroll.js"></script>
+<script src="_content/salesbook.Shared/js/notifications.js"></script>
 
 </body>
 

salesbook.Shared/Components/Layout/ConnectionState.razor

@@ -0,0 +1,26 @@
+<div class="Connection @(ShowWarning ? "Show" : "Hide") @(IsNetworkAvailable? ServicesIsDown ? "ServicesIsDown" : "SystemOk" : "NetworkKo")">
+    @if (IsNetworkAvailable)
+    {
+        if(ServicesIsDown)
+        {
+            <i class="ri-cloud-off-fill"></i>
+            <span>Servizi offline</span>
+        }
+        else
+        {
+            <i class="ri-cloud-fill"></i>
+            <span>Online</span>
+        }
+    }
+    else
+    {
+        <i class="ri-wifi-off-line"></i>
+        <span>Nessuna connessione</span>
+    }
+</div>
+
+@code{
+    [Parameter] public bool IsNetworkAvailable { get; set; }
+    [Parameter] public bool ServicesIsDown { get; set; }
+    [Parameter] public bool ShowWarning { get; set; }
+}

salesbook.Shared/Components/Layout/HeaderLayout.razor.css

@@ -14,6 +14,8 @@
     position: relative;
 }
 
+.header-content > .title { width: 100%; }
+
 .header-content.with-back .page-title {
     position: absolute;
     left: 50%;

salesbook.Shared/Components/Layout/MainLayout.razor

@@ -1,5 +1,6 @@
 @using System.Globalization
-@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Messages.Back
 @inherits LayoutComponentBase
 @inject IJSRuntime JS
@@ -12,29 +13,10 @@
 <MudDialogProvider/>
 <MudSnackbarProvider/>
 
+<ConnectionState IsNetworkAvailable="IsNetworkAvailable" ServicesIsDown="ServicesIsDown" ShowWarning="ShowWarning" />
+
 <div class="page">
     <NavMenu/>
-    
-    <div class="Connection @(ShowWarning ? "Show" : "Hide") @(IsNetworkAvailable? ServicesIsDown ? "ServicesIsDown" : "SystemOk" : "NetworkKo")">
-        @if (IsNetworkAvailable)
-        {
-            if(ServicesIsDown)
-            {
-                <i class="ri-cloud-off-fill"></i>
-                <span>Servizi offline</span>
-            }
-            else
-            {
-                <i class="ri-cloud-fill"></i>
-                <span>Online</span>
-            }
-        }
-        else
-        {
-            <i class="ri-wifi-off-line"></i>
-            <span>Nessuna connessione</span>
-        }
-    </div>
 
     <main>
         <article>
@@ -49,13 +31,12 @@
     private string _mainContentClass = "";
 
     //Connection state
-    private bool FirstCheck { get; set; } = true;
     private bool _isNetworkAvailable;
     private bool _servicesIsDown;
     private bool _showWarning;
 
     private DateTime _lastApiCheck = DateTime.MinValue;
-    private const int DelaySeconds = 60;
+    private const int DelaySeconds = 90;
 
     private CancellationTokenSource? _cts;
 

salesbook.Shared/Components/Layout/NavMenu.razor

@@ -1,13 +1,21 @@
 @using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Dto.Activity
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Messages.Activity.Copy
 @using salesbook.Shared.Core.Messages.Activity.New
 @using salesbook.Shared.Core.Messages.Contact
+@using salesbook.Shared.Core.Messages.Notification.Loaded
+@using salesbook.Shared.Core.Messages.Notification.NewPush
 @inject IDialogService Dialog
 @inject IMessenger Messenger
 @inject CopyActivityService CopyActivityService
+@inject NewPushNotificationService NewPushNotificationService
+@inject NotificationState Notification
+@inject INetworkService NetworkService
+@inject NotificationsLoadedService NotificationsLoadedService
 
 <div class="container animated-navbar @(IsVisible ? "show-nav" : "hide-nav") @(IsVisible ? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
     <nav class="navbar @(IsVisible ? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
@@ -30,12 +38,14 @@
                     </NavLink>
                 </li>
                 <li class="nav-item">
-                    <NavLink class="nav-link" href="Notifications" Match="NavLinkMatch.All">
+                    <MudBadge Content="Notification.Count" Visible="Notification.Count > 0" Color="Color.Error" Overlap="true">
-                        <div class="d-flex flex-column">
+                        <NavLink class="nav-link" href="Notifications" Match="NavLinkMatch.All">
-                            <i class="ri-notification-4-line"></i>
+                            <div class="d-flex flex-column">
-                            <span>Notifiche</span>
+                                <i class="ri-notification-4-line"></i>
-                        </div>
+                                <span>Notifiche</span>
-                    </NavLink>
+                            </div>
+                        </NavLink>
+                    </MudBadge>
                 </li>
             </ul>
         </div>
@@ -47,8 +57,8 @@
                     <MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add"/>
                 </ActivatorContent>
                 <ChildContent>
-                    <MudMenuItem OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
+                    <MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
-                    <MudMenuItem OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
+                    <MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
                 </ChildContent>
             </MudMenu>
         }
@@ -62,9 +72,9 @@
 
     protected override Task OnInitializedAsync()
     {
-        CopyActivityService.OnCopyActivity += async dto => await CreateActivity(dto);
+        InitMessage();
 
-        NavigationManager.LocationChanged += (_, args) =>
+        NavigationManager.LocationChanged += (_, args) => 
         {
             var location = args.Location.Remove(0, NavigationManager.BaseUri.Length);
 
@@ -104,4 +114,17 @@
             Messenger.Send(new NewContactMessage((CRMCreateContactResponseDTO)result.Data));
         }
     }
+
+    private void NewNotificationReceived(WtbNotification notification)
+    {
+        Notification.ReceivedNotifications.Add(notification);
+        InvokeAsync(StateHasChanged);
+    }
+
+    private void InitMessage()
+    {
+        CopyActivityService.OnCopyActivity += async dto => await CreateActivity(dto);
+        NewPushNotificationService.OnNotificationReceived += NewNotificationReceived;
+        NotificationsLoadedService.OnNotificationsLoaded += () => InvokeAsync(StateHasChanged);
+    }
 }

salesbook.Shared/Components/Layout/NavMenu.razor.css

@@ -9,7 +9,7 @@
 
 .animated-navbar.show-nav { transform: translateY(0); }
 
-.animated-navbar.hide-nav { transform: translateY(100%); }
+.animated-navbar.hide-nav { transform: translateY(150%); }
 
 .animated-navbar.with-plus { margin-left: 30px; }
 

salesbook.Shared/Components/Layout/Spinner/OverlayLayout.razor

@@ -0,0 +1,12 @@
+<MudOverlay Visible="Visible" DarkBackground="false">
+    <div class="overlay-container">
+        <span>Caricamento</span>
+
+        <MudProgressLinear Color="Color.Primary" Rounded="true" Size="Size.Medium" Indeterminate="true" />
+    </div>
+</MudOverlay>
+
+@code
+{
+    [Parameter] public bool Visible { get; set; }
+}

salesbook.Shared/Components/Layout/Spinner/OverlayLayout.razor.css

@@ -0,0 +1,18 @@
+.overlay-container {
+    background: var(--mud-palette-background);
+    width: 20rem;
+    height: 6rem;
+    padding: 0 1rem;
+    display: flex;
+    gap: .5rem;
+    flex-direction: column;
+    justify-content: center;
+    border-radius: 20px;
+    box-shadow: var(--custom-box-shadow);
+}
+
+    .overlay-container > span {
+        text-align: center;
+        font-size: 20px;
+        font-weight: 600;
+    }

salesbook.Shared/Components/Pages/Calendar.razor

@@ -4,11 +4,13 @@
 @using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Components.SingleElements.BottomSheet
 @using salesbook.Shared.Core.Dto.Activity
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Core.Messages.Activity.New
 @inject IManageDataService ManageData
 @inject IJSRuntime JS
 @inject NewActivityService NewActivity
+@inject UserListState UserState
 
 <HeaderLayout Title="@_headerTitle"
               ShowFilter="true"
@@ -168,7 +170,6 @@
 <FilterActivity @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="ApplyFilter"/>
 
 @code {
-
     // Modelli per ottimizzazione rendering
     private record DayData(DateTime Date, string CssClass, bool HasEvents, CategoryData[] EventCategories, string DayName = "");
 
@@ -180,7 +181,7 @@
     private string _headerTitle = string.Empty;
     private readonly Dictionary<DateTime, List<ActivityDTO>> _eventsCache = new();
     private readonly Dictionary<DateTime, CategoryData[]> _categoriesCache = new();
-    private bool _isInitialized = false;
+    private bool _isInitialized;
 
     // Stato UI
     private bool Expanded { get; set; }
@@ -221,11 +222,20 @@
         PrepareRenderingData();
 
         NewActivity.OnActivityCreated += async activityId => await OnActivityCreated(activityId);
+        UserState.OnUsersLoaded += async () => await InvokeAsync(LoadData);
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender && UserState.IsLoaded)
+        {
+            await LoadData();
+        }
+    }
+
+    private async Task LoadData()
+    {
+        if (!_isInitialized)
         {
             Filter.User = new HashSet<string> { UserSession.User.Username };
 
@@ -268,7 +278,7 @@
 
         // Raggruppa le attività per data
         var activitiesByDate = MonthActivities
-            .GroupBy(x => (x.EffectiveDate ?? x.EstimatedDate!).Value.Date)
+            .GroupBy(x => (x.EffectiveTime ?? x.EstimatedTime!).Value.Date)
             .ToDictionary(g => g.Key, g => g.ToList());
 
         foreach (var (date, activities) in activitiesByDate)
@@ -472,7 +482,7 @@
         var start = CurrentMonth;
         var end = start.AddDays(DaysInMonth - 1);
         var activities = await ManageData.GetActivity(new WhereCondActivity{Start = start, End = end});
-        MonthActivities = activities.OrderBy(x => x.EffectiveDate ?? x.EstimatedDate).ToList();
+        MonthActivities = activities.OrderBy(x => x.EffectiveTime ?? x.EstimatedTime).ToList();
 
         PrepareRenderingData();
         IsLoading = false;
@@ -482,6 +492,8 @@
     // Selezione giorno in settimana
     private async Task SelezionaData(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
 
         var cacheInternalMonth = _internalMonth;
@@ -503,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;
@@ -564,7 +578,7 @@
             return;
         }
 
-        var date = activity.EffectiveDate ?? activity.EstimatedDate;
+        var date = activity.EffectiveTime ?? activity.EstimatedTime;
 
         if (CurrentMonth.Month != date!.Value.Month)
         {

salesbook.Shared/Components/Pages/Calendar.razor.css

@@ -24,6 +24,7 @@
     padding-bottom: 1rem;
     overflow-x: hidden;
     overflow-y: visible;
+    min-height: 7rem;
 }
 
 .week-slider.expanded {
@@ -31,7 +32,7 @@
     grid-template-columns: repeat(7, 1fr);
     gap: 0.4rem;
     padding: 1rem;
-    overflow-y: auto;
+    overflow-y: hidden;
 }
 
 .week-slider.expand-animation { animation: expandFromCenter 0.3s ease forwards; }
@@ -79,13 +80,12 @@
     }
 
 .day {
-    background: var(--mud-palette-surface);
     border-radius: 10px;
     text-align: center;
     cursor: pointer;
     transition: background 0.3s ease, transform 0.2s ease;
     font-size: 0.95rem;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--mud-palette-background-gray);
     width: 38px;
     height: 38px;
     display: flex;
@@ -93,7 +93,7 @@
     justify-content: center;
     align-items: center;
     color: var(--mud-palette-text-primary);
-    border: 1px solid var(--mud-palette-surface);
+    border: 1px solid var(--mud-palette-background-gray);
     margin: 0 auto;
 }
 
@@ -122,8 +122,7 @@
     flex-direction: column;
     -ms-overflow-style: none;
     scrollbar-width: none;
-    padding-bottom: 16vh;
+    padding-bottom: 9vh;
-    height: calc(100% - 130px);
 }
 
 .appointments.ah-calendar-m { height: calc(100% - 315px) !important; }

salesbook.Shared/Components/Pages/Commessa.razor

@@ -11,6 +11,7 @@
 @using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
 @inject JobSteps JobSteps
 @inject IManageDataService ManageData
 @inject IIntegryApiService IntegryApiService
@@ -24,7 +25,7 @@
 }
 else
 {
-    <div class="container content">
+    <div class="container content pb-safe-area">
         @if (CommessaModel == null)
         {
             <NoDataAvailable Text="Nessuna commessa trovata"/>
@@ -148,10 +149,9 @@ else
         await Task.Run(async () =>
         {
             var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodJcom = CodJcom });
-            ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
-                .OrderBy(x => 
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
-                ).ToList();
         });
 
         ActivityIsLoading = false;

salesbook.Shared/Components/Pages/Commessa.razor.css

@@ -118,9 +118,10 @@
     display: flex;
     flex-direction: column;
     width: -webkit-fill-available;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
     border-radius: 16px;
     overflow: clip;
+    min-height: 45px;
     margin-bottom: 1rem;
 }
 
@@ -135,7 +136,6 @@
     display: flex;
     position: relative;
     z-index: 1;
-    background: var(--mud-palette-surface);
 }
 
 /* la lineetta */

salesbook.Shared/Components/Pages/Home.razor

@@ -1,35 +1,75 @@
 @page "/"
 @attribute [Authorize]
+@using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Interface.System.Network
+@using salesbook.Shared.Core.Interface.System.Notification
+@using salesbook.Shared.Core.Messages.Notification.Loaded
 @using salesbook.Shared.Core.Services
 @inject IFormFactor FormFactor
 @inject INetworkService NetworkService
+@inject IFirebaseNotificationService FirebaseNotificationService
+@inject IShinyNotificationManager NotificationManager
+@inject INotificationService NotificationService
 @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;
-        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && lastSyncDate.Equals(DateTime.MinValue))
+        var syncCodJcom = lastSyncDate.Day != DateTime.Now.Day;
+        
+        if (!FormFactor.IsWeb() && NetworkService.ConnectionAvailable && syncAllData)
         {
-            NavigationManager.NavigateTo("/sync");
+            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();
+        await CheckAndRequestPermissions();
+
+        try
+        {
+            await FirebaseNotificationService.InitFirebase();
+        }
+        catch (Exception e)
+        {
+            Console.WriteLine($"Firebase init: {e.Message}");
+        }
+
         _ = StartSyncUser();
         NavigationManager.NavigateTo("/Calendar");
     }
 
+    private async Task LoadNotification()
+    {
+        await NotificationService.LoadNotification();
+        Messenger.Send(new NotificationsLoadedMessage());
+    }
+
+    private async Task CheckAndRequestPermissions()
+    {
+        await NotificationManager.RequestAccess();
+    }
+
     private Task StartSyncUser()
     {
-        return Task.Run(() =>
+        return Task.Run(() => { _ = PreloadService.PreloadUsersAsync(); });
-        {
-            _ = PreloadService.PreloadUsersAsync();
-        });
     }
 }

salesbook.Shared/Components/Pages/Login.razor

@@ -1,10 +1,10 @@
 @page "/login"
 @using salesbook.Shared.Components.Layout.Spinner
-@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.System
 @using salesbook.Shared.Core.Services
 @inject IUserAccountService UserAccountService
 @inject AppAuthenticationStateProvider AuthenticationStateProvider
-@inject INetworkService NetworkService
+@inject IGenericSystemService GenericSystemService
 
 @if (Spinner)
 {
@@ -28,7 +28,7 @@ else
                     <MudTextField @bind-Value="UserData.CodHash" Label="Profilo azienda" Variant="Variant.Outlined"/>
                 </div>
 
-                <MudButton Disabled="@(!NetworkService.ConnectionAvailable)" OnClick="SignInUser" Color="Color.Primary" Variant="Variant.Filled">Login</MudButton>
+                <MudButton OnClick="SignInUser" Color="Color.Primary" Variant="Variant.Filled">Login</MudButton>
                 @if (_attemptFailed)
                 {
                     <MudAlert Class="my-3" Dense="true" Severity="Severity.Error" Variant="Variant.Filled">@ErrorMessage</MudAlert>
@@ -36,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/Notifications.razor

@@ -1,14 +1,146 @@
 @page "/Notifications"
 @attribute [Authorize]
+@using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto.PageState
+@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Messages.Notification.Loaded
+@using salesbook.Shared.Core.Messages.Notification.NewPush
+@inject NotificationState Notification
+@inject NewPushNotificationService NewPushNotificationService
+@inject IJSRuntime JS
+@inject IIntegryNotificationRestClient IntegryNotificationRestClient
+@inject INotificationService NotificationService
+@inject IMessenger Messenger
 
 <HeaderLayout Title="Notifiche" />
 
-<div class="container">
+<div class="container container-notifications">
-    <NoDataAvailable Text="Nessuna notifica meno recente" />
+    @if (Loading)
+    {
+        <SpinnerLayout FullScreen="true" />
+
+    }
+    else
+    {
+        if (Notification.ReceivedNotifications.IsNullOrEmpty() && Notification.UnreadNotifications.IsNullOrEmpty() && Notification.NotificationsRead.IsNullOrEmpty())
+        {
+            <NoDataAvailable Text="Nessuna notifica meno recente" />
+        }
+        else
+        {
+            <div class="list" id="list">
+                @foreach(var notification in Notification.ReceivedNotifications)
+                {
+                    <NotificationCard Unread="true" Notification="notification" />
+                }
+                
+                @foreach(var notification in Notification.UnreadNotifications)
+                {
+                    <NotificationCard Unread="true" Notification="notification" />
+                }
+
+                @foreach (var notification in Notification.NotificationsRead)
+                {
+                    <NotificationCard Notification="notification" />
+                }
+            </div>
+        }
+    }
 </div>
 
 @code {
+    private DotNetObjectReference<Notifications>? _objectReference;
+    private bool Loading { get; set; }
 
+    protected override Task OnInitializedAsync()
+    {
+        _objectReference = DotNetObjectReference.Create(this);
+        NewPushNotificationService.OnNotificationReceived += NewNotificationReceived;
+        return Task.CompletedTask;
+    }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await JS.InvokeVoidAsync("initNotifications", _objectReference);
+    }
+
+    private void NewNotificationReceived(WtbNotification notification)
+    {
+        InvokeAsync(StateHasChanged);
+    }
+
+    [JSInvokable]
+    public async Task Delete(string id)
+    {
+        if (!long.TryParse(id, out var notificationId)) return;
+
+        Loading = true;
+        StateHasChanged();
+
+        var removed = false;
+
+        if (Notification.ReceivedNotifications.RemoveAll(x => x.Id == notificationId) > 0)
+            removed = true;
+        else if (Notification.UnreadNotifications.RemoveAll(x => x.Id == notificationId) > 0)
+            removed = true;
+        else if (Notification.NotificationsRead.RemoveAll(x => x.Id == notificationId) > 0)
+            removed = true;
+
+        if (!removed)
+        {
+            Loading = false;
+            StateHasChanged();
+            return;
+        }
+
+        await IntegryNotificationRestClient.Delete(notificationId);
+
+        NotificationService.OrderNotificationList();
+        Loading = false;
+        StateHasChanged();
+
+        Messenger.Send(new NotificationsLoadedMessage());
+    }
+
+    [JSInvokable]
+    public async Task MarkAsRead(string id)
+    {
+        Loading = true;
+        StateHasChanged();
+
+        var notificationId = long.Parse(id);
+
+        var wtbNotification = Notification.ReceivedNotifications
+            .FindLast(x => x.Id == notificationId);
+
+        if (wtbNotification == null)
+        {
+            wtbNotification = Notification.UnreadNotifications
+                .FindLast(x => x.Id == notificationId);
+
+            Notification.UnreadNotifications.Remove(wtbNotification!);
+        }
+        else
+        {
+            Notification.ReceivedNotifications.Remove(wtbNotification);
+        }
+
+        wtbNotification = await IntegryNotificationRestClient.MarkAsRead(notificationId);
+        Notification.NotificationsRead.Add(wtbNotification);
+
+        NotificationService.OrderNotificationList();
+        Messenger.Send(new NotificationsLoadedMessage());
+        Loading = false;
+        StateHasChanged();
+    }
+
+    public void Dispose()
+    {
+        _objectReference?.Dispose();
+    }
 }

salesbook.Shared/Components/Pages/Notifications.razor.css

@@ -0,0 +1,21 @@
+.container-notifications {
+    height: 100%;
+    overflow: auto;
+    padding: .2rem 0 75px 0;
+}
+
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+}
+
+.container-notifications::-webkit-scrollbar {
+    width: 6px;
+}
+
+.container-notifications::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 3px;
+}

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -1,21 +1,26 @@
 @page "/PersonalInfo"
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Authorization.Enum
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Services
 @inject AppAuthenticationStateProvider AuthenticationStateProvider
 @inject INetworkService NetworkService
 @inject IFormFactor FormFactor
+@inject UserListState UserState
 
 <HeaderLayout BackTo="Indietro" Back="true" BackOnTop="true" Title="Profilo" ShowProfile="false"/>
 
 @if (IsLoggedIn)
 {
-    <div class="container content">
+    <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>
 
@@ -23,7 +28,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>
@@ -84,21 +90,21 @@
                        FullWidth="true"
                        StartIcon="@Icons.Material.Outlined.Sync"
                        Size="Size.Medium"
-                       OnClick="() => UpdateDb(true)"
+                       OnClick="@(() => UpdateDb())"
                        Variant="Variant.Outlined">
                 Sincronizza
             </MudButton>
 
-            <div class="divider"></div>
+            @* <div class="divider"></div> *@
 
-            <MudButton Class="button-settings red-icon"
+            @* <MudButton Class="button-settings red-icon"
                        FullWidth="true"
                        StartIcon="@Icons.Material.Outlined.Sync"
                        Size="Size.Medium"
                        OnClick="() => UpdateDb()"
                        Variant="Variant.Outlined">
                 Ripristina dati
-            </MudButton>
+            </MudButton> *@
         </div>
 
         <div class="container-button">
@@ -112,6 +118,8 @@
             </MudButton>
         </div>
     </div>
+
+    <AppVersion/>
 }
 
 @code {
@@ -148,17 +156,11 @@
 
     private void UpdateDb(bool withData = false)
     {
-        var absoluteUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
+        LocalStorage.Remove("last-user-sync");
-        var pathAndQuery = absoluteUri.Segments.Length > 1 ? absoluteUri.PathAndQuery : null;
+        UserState.IsLoaded = false;
+        UserState.IsLoading = false;
 
-        string path;
+        NavigationManager.NavigateTo(withData ? $"/sync/{DateTime.Today:yyyy-MM-dd}" : "/sync", replace: true);
-
-        if (withData)
-            path = pathAndQuery == null ? $"/sync/{DateTime.Today:yyyy-MM-dd}" : $"/sync/{DateTime.Today:yyyy-MM-dd}?path=" + System.Web.HttpUtility.UrlEncode(pathAndQuery);
-        else
-            path = pathAndQuery == null ? "/sync" : "/sync?path=" + System.Web.HttpUtility.UrlEncode(pathAndQuery);
-
-        NavigationManager.NavigateTo(path, replace: true);
     }
 
 }

salesbook.Shared/Components/Pages/PersonalInfo.razor.css

@@ -1,5 +1,5 @@
 .container-primary-info {
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
     width: 100%;
     margin-bottom: 2rem;
     border-radius: 12px;

salesbook.Shared/Components/Pages/SyncPage.razor

@@ -1,24 +1,31 @@
 @page "/sync"
 @page "/sync/{DateFilter}"
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Interface
-@inject ISyncDbService syncDb
+@using salesbook.Shared.Core.Services
-@inject IManageDataService manageData
+@inject ISyncDbService SyncDb
+@inject IManageDataService ManageData
+@inject PreloadService PreloadService
 
 <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;
-        Elements["Impostazioni"] = false;
+
+        if (DateFilter is null)
+            Elements["Impostazioni"] = false;
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -28,9 +35,7 @@
             _hasStarted = true;
 
             if (DateFilter is null)
-            {
+                await ManageData.ClearDb();
-                await manageData.ClearDb();
-            }
 
             await Task.WhenAll(
                 RunAndTrack(SetCommesse),
@@ -52,13 +57,18 @@
             var originalPath = pathQuery["path"] ?? null;
             var path = originalPath ?? "/Calendar";
 
+            if (path.Equals("/Calendar") && DateFilter is null)
+            {
+                _ = Task.Run(() => { _ = PreloadService.PreloadUsersAsync(); });
+            }
+
             NavigationManager.NavigateTo(path, replace: true);
         }
     }
 
     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 +76,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;
+            Elements["Impostazioni"] = true;
-        StateHasChanged();
+            StateHasChanged();
+        }
     }
 
 }

salesbook.Shared/Components/Pages/User.razor

@@ -10,6 +10,7 @@
 @using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Dto.JobProgress
 @using salesbook.Shared.Core.Dto.PageState
+@using salesbook.Shared.Core.Interface.IntegryApi
 @implements IAsyncDisposable
 @inject IManageDataService ManageData
 @inject IMapper Mapper
@@ -22,19 +23,19 @@
               OnSave="() => OpenUserForm(Anag)"
               Back="true"
               BackOnTop="true"
-              Title=""
+              Title="@Anag.CodContact"
-              ShowProfile="false" />
+              ShowProfile="false"/>
 
 @if (IsLoading)
 {
-    <SpinnerLayout FullScreen="true" />
+    <SpinnerLayout FullScreen="true"/>
 }
 else
 {
-    <div class="container content" style="overflow: auto;" id="topPage">
+    <div class="container content pb-safe-area" style="overflow: auto;" id="topPage">
         <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" Variant="@(IsContact ? Variant.Filled : Variant.Outlined)" Color="Color.Secondary">
                     @UtilityString.ExtractInitials(Anag.RagSoc)
                 </MudAvatar>
 
@@ -54,216 +55,229 @@ else
             <div class="divider"></div>
 
             <div class="section-info">
-                <div class="section-personal-info">
+                @if (Agente != null)
-                    @if (!string.IsNullOrEmpty(Anag.Telefono))
+                {
-                    {
+                    <div class="section-personal-info">
-                        <div>
-                            <span class="info-title">Telefono</span>
-                            <span class="info-text">@Anag.Telefono</span>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(Anag.PartIva))
-                    {
-                        <div>
-                            <span class="info-title">P. IVA</span>
-                            <span class="info-text">@Anag.PartIva</span>
-                        </div>
-                    }
-                </div>
-
-                <div class="section-personal-info">
-                    @if (!string.IsNullOrEmpty(Anag.EMail))
-                    {
-                        <div>
-                            <span class="info-title">E-mail</span>
-                            <span class="info-text">@Anag.EMail</span>
-                        </div>
-                    }
-
-                    @if (Agente != null)
-                    {
                         <div>
                             <span class="info-title">Agente</span>
                             <span class="info-text">@Agente.FullName</span>
                         </div>
-                    }
-                </div>
-            </div>
-        </div>
-
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
-
-        <div class="box">
-            <ul class="tab-list">
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab1" @onclick="() => SwitchTab(0)">Contatti</label>
-                </li>
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab2" @onclick="() => SwitchTab(1)">Commesse</label>
-                </li>
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab3" @onclick="() => SwitchTab(2)">Attivit<69></label>
-                </li>
-            </ul>
-        </div>
-
-        <div class="tab-container">
-            <!-- Tab Contatti -->
-            <div class="tab-content" style="display: @(ActiveTab == 0 ? "block" : "none")">
-                @if (PersRif?.Count > 0)
-                {
-                    <div class="container-pers-rif">
-                        @foreach (var person in PersRif)
-                        {
-                            <ContactCard Contact="person" />
-                            @if (person != PersRif.Last())
-                            {
-                                <div class="divider"></div>
-                            }
-                        }
                     </div>
                 }
 
-                <div class="container-button">
+                @if (!string.IsNullOrEmpty(Anag.Telefono))
-                    <MudButton Class="button-settings infoText"
-                               FullWidth="true"
-                               Size="Size.Medium"
-                               OnClick="OpenPersRifForm"
-                               Variant="Variant.Outlined">
-                        Aggiungi contatto
-                    </MudButton>
-                </div>
-            </div>
-
-            <!-- Tab Commesse -->
-            <div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
-                @if (IsLoadingCommesse)
                 {
-                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    <div class="section-personal-info">
-                }
+                        <div>
-                else if (Commesse?.Count == 0)
+                            <span class="info-title">Telefono</span>
-                {
+                            <span class="info-text">@Anag.Telefono</span>
-                    <NoDataAvailable Text="Nessuna commessa presente" />
+                        </div>
-                }
-                else if (Commesse != null)
-                {
-                    <!-- Filtri e ricerca -->
-                    <div class="input-card clearButton">
-                        <MudTextField T="string?"
-                                      Placeholder="Cerca..."
-                                      Variant="Variant.Text"
-                                      @bind-Value="SearchTermCommesse"
-                                      OnDebounceIntervalElapsed="() => ApplyFiltersCommesse()"
-                                      DebounceInterval="500" />
-                    </div>
-
-                    <div class="commesse-container">
-                        @if (IsLoadingSteps)
-                        {
-                            <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3" />
-                        }
-
-                        @foreach (var commessa in CurrentPageCommesse)
-                        {
-                            <div class="commessa-wrapper" style="@(IsLoadingStep(commessa.CodJcom) ? "opacity: 0.7;" : "")">
-                                @if (Steps.TryGetValue(commessa.CodJcom, out var steps))
-                                {
-                                    <CommessaCard Steps="@steps" RagSoc="@Anag.RagSoc" Commessa="commessa" />
-                                }
-                                else
-                                {
-                                    <CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa" />
-                                    @if (IsLoadingStep(commessa.CodJcom))
-                                    {
-                                        <MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;" />
-                                    }
-                                }
-                            </div>
-                        }
-
-                        @if (TotalPagesCommesse > 1)
-                        {
-                            <div class="custom-pagination">
-                                <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
-                                               @bind-Selected="SelectedPageCommesse"
-                                               Color="Color.Primary" />
-                            </div>
-
-                            <div class="SelectedPageSize">
-                                <MudSelect @bind-Value="SelectedPageSizeCommesse"
-                                           Variant="Variant.Text"
-                                           Label="Elementi per pagina"
-                                           Dense="true"
-                                           Style="width: 100%;">
-                                    <MudSelectItem Value="5">5</MudSelectItem>
-                                    <MudSelectItem Value="10">10</MudSelectItem>
-                                    <MudSelectItem Value="15">15</MudSelectItem>
-                                </MudSelect>
-                            </div>
-                        }
                     </div>
                 }
-            </div>
 
-            <!-- Tab Attivit<69> -->
+                @if (!string.IsNullOrEmpty(Anag.PartIva))
-            <div class="tab-content" style="display: @(ActiveTab == 2 ? "block" : "none")">
-                @if (ActivityIsLoading)
                 {
-                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    <div class="section-personal-info">
-                }
+                        <div>
-                else if (ActivityList?.Count == 0)
+                            <span class="info-title">P. IVA</span>
-                {
+                            <span class="info-text">@Anag.PartIva</span>
-                    <NoDataAvailable Text="Nessuna attivit<69> presente" />
+                        </div>
-                }
-                else if (ActivityList != null)
-                {
-                    <!-- Filtri e ricerca -->
-                    <div class="input-card clearButton">
-                        <MudTextField T="string?"
-                                      Placeholder="Cerca..."
-                                      Variant="Variant.Text"
-                                      @bind-Value="SearchTermActivity"
-                                      OnDebounceIntervalElapsed="() => ApplyFiltersActivity()"
-                                      DebounceInterval="500" />
                     </div>
+                }
 
-                    <div class="attivita-container">
+                @if (!string.IsNullOrEmpty(Anag.EMail))
-                        @foreach (var activity in CurrentPageActivity)
+                {
-                        {
+                    <div class="section-personal-info">
-                            <ActivityCard ShowDate="true" Activity="activity" />
+                        <div>
-                        }
+                            <span class="info-title">E-mail</span>
-
+                            <span class="info-text">@Anag.EMail</span>
-                        @if (TotalPagesActivity > 1)
+                        </div>
-                        {
-                            <div class="custom-pagination">
-                                <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesActivity"
-                                               @bind-Selected="CurrentPageActivityIndex"
-                                               Color="Color.Primary" />
-                            </div>
-
-                            <div class="SelectedPageSize">
-                                <MudSelect @bind-Value="SelectedPageSizeActivity"
-                                           Variant="Variant.Text"
-                                           Label="Elementi per pagina"
-                                           Dense="true"
-                                           Style="width: 100%;">
-                                    <MudSelectItem Value="5">5</MudSelectItem>
-                                    <MudSelectItem Value="15">15</MudSelectItem>
-                                    <MudSelectItem Value="30">30</MudSelectItem>
-                                </MudSelect>
-                            </div>
-                        }
                     </div>
                 }
             </div>
         </div>
         
-        <MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
+        <div class="tab-section">
-            <MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp" />
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
-        </MudScrollToTop>
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
+
+            <div class="box">
+                <ul class="tab-list">
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab1" @onclick="() => SwitchTab(0)">Contatti</label>
+                    </li>
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab2" @onclick="() => SwitchTab(1)">Commesse</label>
+                    </li>
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab3" @onclick="() => SwitchTab(2)">Attività</label>
+                    </li>
+                </ul>
+            </div>
+
+            <div class="tab-container">
+                <!-- Tab Contatti -->
+                <div class="tab-content" style="display: @(ActiveTab == 0 ? "block" : "none")">
+                    @if (PersRif?.Count > 0)
+                    {
+                        <div class="container-pers-rif">
+                            @foreach (var person in PersRif)
+                            {
+                                <ContactCard Contact="person"/>
+                                @if (person != PersRif.Last())
+                                {
+                                    <div class="divider"></div>
+                                }
+                            }
+                        </div>
+                    }
+
+                    <div class="container-button">
+                        <div class="divider"></div>
+
+                        <MudButton Class="button-settings infoText"
+                                   FullWidth="true"
+                                   Size="Size.Medium"
+                                   StartIcon="@Icons.Material.Rounded.Add"
+                                   OnClick="OpenPersRifForm"
+                                   Variant="Variant.Outlined">
+                            Aggiungi contatto
+                        </MudButton>
+                    </div>
+                </div>
+
+                <!-- Tab Commesse -->
+                <div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
+                    @if (IsLoadingCommesse)
+                    {
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
+                    }
+                    else if (Commesse?.Count == 0)
+                    {
+                        <NoDataAvailable Text="Nessuna commessa presente"/>
+                    }
+                    else if (Commesse != null)
+                    {
+                        <!-- Filtri e ricerca -->
+                        <div class="input-card clearButton custom-border-bottom">
+                            <MudTextField T="string?"
+                                          Placeholder="Cerca..."
+                                          Variant="Variant.Text"
+                                          @bind-Value="SearchTermCommesse"
+                                          AdornmentIcon="@Icons.Material.Rounded.Search"
+                                          Adornment="Adornment.Start"
+                                          OnDebounceIntervalElapsed="() => ApplyFiltersCommesse()"
+                                          DebounceInterval="500"/>
+                        </div>
+
+                        <div class="commesse-container">
+                            @if (IsLoadingSteps)
+                            {
+                                <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3"/>
+                            }
+
+                            @foreach (var commessa in CurrentPageCommesse)
+                            {
+                                <div class="commessa-wrapper" style="@(IsLoadingStep(commessa.CodJcom) ? "opacity: 0.7;" : "")">
+                                    @if (Steps.TryGetValue(commessa.CodJcom, out var steps))
+                                    {
+                                        <CommessaCard Steps="@steps" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
+                                    }
+                                    else
+                                    {
+                                        <CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
+                                        @if (IsLoadingStep(commessa.CodJcom))
+                                        {
+                                            <MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;"/>
+                                        }
+                                    }
+                                </div>
+                            }
+
+                            @if (TotalPagesCommesse > 1)
+                            {
+                                <div class="custom-pagination">
+                                    <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
+                                                   @bind-Selected="SelectedPageCommesse"
+                                                   Color="Color.Primary"/>
+                                </div>
+
+                                <div class="SelectedPageSize">
+                                    <MudSelect @bind-Value="SelectedPageSizeCommesse"
+                                               Variant="Variant.Text"
+                                               Label="Elementi per pagina"
+                                               Dense="true"
+                                               Style="width: 100%;">
+                                        <MudSelectItem Value="5">5</MudSelectItem>
+                                        <MudSelectItem Value="10">10</MudSelectItem>
+                                        <MudSelectItem Value="15">15</MudSelectItem>
+                                    </MudSelect>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
+
+                <!-- Tab Attività -->
+                <div class="tab-content" style="display: @(ActiveTab == 2 ? "block" : "none")">
+                    @if (ActivityIsLoading)
+                    {
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
+                    }
+                    else if (ActivityList?.Count == 0)
+                    {
+                        <NoDataAvailable Text="Nessuna attività presente"/>
+                    }
+                    else if (ActivityList != null)
+                    {
+                        <!-- Filtri e ricerca -->
+                        <div class="input-card clearButton custom-border-bottom">
+                            <MudTextField T="string?"
+                                          Placeholder="Cerca..."
+                                          Variant="Variant.Text"
+                                          AdornmentIcon="@Icons.Material.Rounded.Search"
+                                          Adornment="Adornment.Start"
+                                          @bind-Value="SearchTermActivity"
+                                          OnDebounceIntervalElapsed="() => ApplyFiltersActivity()"
+                                          DebounceInterval="500"/>
+                        </div>
+
+                        <div class="attivita-container">
+                            @foreach (var activity in CurrentPageActivity)
+                            {
+                                <ActivityCard ShowDate="true" Activity="activity"/>
+                            }
+
+                            @if (TotalPagesActivity > 1)
+                            {
+                                <div class="custom-pagination">
+                                    <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesActivity"
+                                                   @bind-Selected="CurrentPageActivityIndex"
+                                                   Color="Color.Primary"/>
+                                </div>
+
+                                <div class="SelectedPageSize">
+                                    <MudSelect @bind-Value="SelectedPageSizeActivity"
+                                               Variant="Variant.Text"
+                                               Label="Elementi per pagina"
+                                               Dense="true"
+                                               Style="width: 100%;">
+                                        <MudSelectItem Value="5">5</MudSelectItem>
+                                        <MudSelectItem Value="15">15</MudSelectItem>
+                                        <MudSelectItem Value="30">30</MudSelectItem>
+                                    </MudSelect>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
+            </div>
+
+            @* <MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible"> *@
+            @*     <MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp"/> *@
+            @* </MudScrollToTop> *@
+        </div>
     </div>
 }
 
@@ -295,7 +309,7 @@ else
     private string _searchTermCommesse = string.Empty;
     private List<JtbComt> _filteredCommesse = [];
 
-    // Paginazione e filtri per ATTIVIT<EFBFBD>
+    // Paginazione e filtri per attività
     private int _currentPageActivity = 1;
     private int _selectedPageSizeActivity = 5;
     private string _searchTermActivity = string.Empty;
@@ -367,7 +381,7 @@ else
 
     #endregion
 
-    #region Properties per Attivit<EFBFBD>
+    #region Properties per Attività
 
     private int CurrentPageActivityIndex
     {
@@ -411,7 +425,7 @@ else
         set
         {
             _filteredActivity = value;
-            StateHasChanged();
+            InvokeAsync(StateHasChanged);
         }
     }
 
@@ -431,7 +445,7 @@ else
         {
             _loadingCts = new CancellationTokenSource();
 
-            if (UserState.CodUser?.Equals(CodContact) == true)
+            if (UserState.CodUser != null && UserState.CodUser.Equals(CodContact))
             {
                 LoadDataFromSession();
             }
@@ -522,10 +536,9 @@ else
         await Task.Run(async () =>
         {
             var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
-            ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
-                .OrderByDescending(x => 
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
-                ).ToList();
         });
 
         UserState.Activitys = ActivityList;
@@ -574,6 +587,9 @@ else
         Steps = UserState.Steps;
         ActivityList = UserState.Activitys;
 
+        if (ActiveTab != UserState.ActiveTab)
+            SwitchTab(UserState.ActiveTab);
+
         ApplyFiltersCommesse();
         ApplyFiltersActivity();
 
@@ -679,6 +695,7 @@ else
     private void SwitchTab(int tabIndex)
     {
         ActiveTab = tabIndex;
+        UserState.ActiveTab = ActiveTab;
 
         if (tabIndex == 1 && Commesse == null)
         {
@@ -768,7 +785,16 @@ else
     {
         var result = await ModalHelpers.OpenUserForm(Dialog, anag);
 
-        if (result is { Canceled: false })
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(AnagClie))
+        {
+            var clie = (AnagClie)result.Data;
+            IsContact = true;
+            CodContact = clie.CodAnag!;
+
+            await LoadAnagAsync();
+            SaveDataToSession();
+        }
+        else if (result is { Canceled: false })
         {
             await LoadAnagAsync();
             SaveDataToSession();
@@ -776,4 +802,5 @@ else
     }
 
     #endregion
+
 }

salesbook.Shared/Components/Pages/User.razor.css

@@ -1,5 +1,11 @@
+.tab-section {
+    width: 100%;
+    border-radius: var(--mud-default-borderradius);
+    background: var(--light-card-background);
+}
+
 .container-primary-info {
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
     width: 100%;
     margin-bottom: 2rem;
     border-radius: 16px;
@@ -39,9 +45,10 @@
 
 .section-info {
     display: flex;
-    justify-content: space-between;
     flex-direction: row;
     padding: .4rem 1.2rem .8rem;
+    flex-wrap: wrap;
+    justify-content: space-between;
 }
 
 .section-personal-info {
@@ -84,8 +91,9 @@
 
 .container-button {
     width: 100%;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
-    padding: .25rem 0;
+    padding: 0 !important;
+    padding-bottom: .5rem !important;
     border-radius: 16px;
     margin-bottom: 0 !important;
 }
@@ -137,15 +145,20 @@
     display: flex;
     flex-direction: column;
     gap: 1rem;
-    margin-bottom: 1rem;
+    background: var(--light-card-background);
-    box-shadow: var(--custom-box-shadow);
     border-radius: 16px;
     max-height: 32vh;
     overflow: auto;
     scrollbar-width: none;
+    padding: 1rem 0;
 }
 
-.container-pers-rif::-webkit-scrollbar { display: none; }
+.container-pers-rif::-webkit-scrollbar { width: 3px; }
+
+.container-pers-rif::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 2px;
+}
 
 .container-pers-rif .divider {
     margin: 0 0 0 3.5rem;
@@ -174,12 +187,14 @@
 /*--------------
     TabPanel
 ----------------*/
+
 .box {
     display: flex;
     flex-direction: column;
     width: -webkit-fill-available;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
-    border-radius: 16px;
+    border-radius: 20px 20px 0 0;
+    border-bottom: .1rem solid var(--card-border-color);
     overflow: clip;
     margin-bottom: 1rem;
 }
@@ -195,7 +210,6 @@
     display: flex;
     position: relative;
     z-index: 1;
-    background: var(--mud-palette-surface);
 }
 
 /* la lineetta */
@@ -266,9 +280,7 @@
 
 #tab1:checked ~ .tab-container .tab-content:nth-child(1),
 #tab2:checked ~ .tab-container .tab-content:nth-child(2),
-#tab3:checked ~ .tab-container .tab-content:nth-child(3) {
+#tab3:checked ~ .tab-container .tab-content:nth-child(3) { display: block; }
-    display: block;
-}
 
 @keyframes fade {
     from {
@@ -284,10 +296,6 @@
 
 .custom-pagination ::deep ul { padding-left: 0 !important; }
 
-.SelectedPageSize {
+.SelectedPageSize { width: 100%; }
-    width: 100%;
-}
 
-.FilterSection {
+.FilterSection { display: flex; }
-    display: flex;
-}

salesbook.Shared/Components/Pages/Users.razor

@@ -170,6 +170,7 @@
 
                 var matchesText =
                     (!string.IsNullOrEmpty(user.RagSoc) && user.RagSoc.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
+                    (!string.IsNullOrEmpty(user.CodContact) && user.CodContact.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.Indirizzo) && user.Indirizzo.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.Telefono) && user.Telefono.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.EMail) && user.EMail.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||

salesbook.Shared/Components/Pages/Users.razor.css

@@ -5,8 +5,7 @@
     flex-direction: column;
     -ms-overflow-style: none;
     scrollbar-width: none;
-    padding-bottom: 70px;
+    padding-bottom: 9vh;
-    height: 100%;
 }
 
 .users .divider {

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/BottomSheet/SearchAddress.razor

@@ -1,7 +1,7 @@
 @using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Core.Dto
-@using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout.Overlay
+@using salesbook.Shared.Core.Interface.IntegryApi
 @inject IIntegryApiService IntegryApiService
 
 <div class="bottom-sheet-backdrop @(IsSheetVisible ? "show" : "")" @onclick="CloseBottomSheet"></div>

salesbook.Shared/Components/SingleElements/Card/ActivityCard.razor

@@ -1,4 +1,3 @@
-@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Helpers.Enum
@@ -12,7 +11,7 @@
                     @switch (Activity.Category)
                     {
                         case ActivityCategoryEnum.Commessa:
-                            @Activity.Commessa
+                            @Activity.Commessa?.Descrizione
                             break;
                         case ActivityCategoryEnum.Interna:
                             @Activity.Cliente

salesbook.Shared/Components/SingleElements/Card/ActivityCard.razor.css

@@ -5,14 +5,23 @@
     padding: .5rem .5rem;
     border-radius: 12px;
     line-height: normal;
-    box-shadow: var(--custom-box-shadow);
+    /*box-shadow: var(--custom-box-shadow);*/
 }
 
-.activity-card.memo { border-left: 5px solid var(--mud-palette-info-darken); }
+.activity-card.memo {
+    border-left: 5px solid var(--mud-palette-info-darken);
+    background-color: hsl(from var(--mud-palette-info-darken) h s 99%);
+}
 
-.activity-card.interna { border-left: 5px solid var(--mud-palette-success-darken); }
+.activity-card.interna {
+    border-left: 5px solid var(--mud-palette-success-darken);
+    background-color: hsl(from var(--mud-palette-success-darken) h s 99%);
+}
 
-.activity-card.commessa { border-left: 5px solid var(--mud-palette-warning); }
+.activity-card.commessa {
+    border-left: 5px solid var(--mud-palette-warning);
+    background-color: hsl(from var(--mud-palette-warning) h s 99%);
+}
 
 .activity-left-section {
     display: flex;

salesbook.Shared/Components/SingleElements/Card/AttachCard.razor

@@ -1,5 +1,7 @@
+@using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
 @inject IIntegryApiService IntegryApiService
 @inject IAttachedService AttachedService
 
@@ -33,12 +35,24 @@
     </div>
 </div>
 
+<OverlayLayout Visible="VisibleOverlay" />
+
 @code {
     [Parameter] public CRMAttachedResponseDTO Attached { get; set; } = new();
+    
+    private bool VisibleOverlay { get; set; }
 
     private async Task OpenAttached()
     {
-        var bytes = await IntegryApiService.DownloadFileFromRefUuid(Attached.RefUuid, Attached.FileName);
+        VisibleOverlay = true;
-        await AttachedService.OpenFile(bytes, Attached.FileName);
+        StateHasChanged();
+
+        await using var file = await IntegryApiService.DownloadFileFromRefUuid(Attached.RefUuid, Attached.FileName);
+        var path = await AttachedService.SaveToTempStorage(file, Attached.FileName);
+
+        VisibleOverlay = false;
+        StateHasChanged();
+        
+        await AttachedService.OpenFile(Attached.FileName, path);
     }
 }

salesbook.Shared/Components/SingleElements/Card/AttachCard.razor.css

@@ -5,7 +5,7 @@
     padding: .5rem .5rem;
     border-radius: 12px;
     line-height: normal;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
 }
 
 .activity-card.memo { border-left: 5px solid var(--mud-palette-info-darken); }

salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor

@@ -44,21 +44,25 @@
     {
         if (Steps is null) return;
 
+        // Ultimo step non skip
         var lastBeforeSkip = Steps
-            .TakeWhile(s => s.Status is { Skip: false })
+            .LastOrDefault(s => s.Status is { Skip: false });
-            .LastOrDefault();
 
-        if (lastBeforeSkip is not null) Stato = lastBeforeSkip.StepName;
+        if (lastBeforeSkip is not null)
+            Stato = lastBeforeSkip.StepName;
 
+        // Ultima data disponibile
         LastUpd = Steps
             .Where(s => s.Date.HasValue)
             .Select(s => s.Date!.Value)
             .DefaultIfEmpty()
             .Max();
 
-        if (LastUpd.Equals(DateTime.MinValue)) LastUpd = null;
+        if (LastUpd.Equals(DateTime.MinValue))
+            LastUpd = null;
     }
 
+
     private void OpenPageCommessa()
     {
         JobSteps.Steps = Steps;

salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor.css

@@ -5,15 +5,11 @@
     padding: .5rem .5rem;
     border-radius: 12px;
     line-height: normal;
-    box-shadow: var(--custom-box-shadow);
+
+    border-left: 5px solid var(--card-border-color);
+    background-color: hsl(from var(--card-border-color) h s 99%);
 }
 
-.activity-card.memo { border-left: 5px solid var(--mud-palette-info-darken); }
-
-.activity-card.interna { border-left: 5px solid var(--mud-palette-success-darken); }
-
-.activity-card.commessa { border-left: 5px solid var(--mud-palette-warning); }
-
 .activity-left-section {
     display: flex;
     align-items: center;

salesbook.Shared/Components/SingleElements/Card/ContactCard.razor.css

@@ -2,8 +2,7 @@
     width: 100%;
     display: flex;
     flex-direction: row;
-    padding: 0 .75rem;
+    padding: 0 .5rem;
-    border-radius: 16px;
     line-height: normal;
     justify-content: space-between;
     align-items: center;

salesbook.Shared/Components/SingleElements/Card/NotificationCard.razor

@@ -0,0 +1,121 @@
+@using Java.Sql
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Dto.Activity
+@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Interface
+@inject IManageDataService ManageDataService
+@inject ISnackbar Snackbar
+@inject IDialogService Dialog
+
+<div class="row" id="@Notification.Id" @onclick="OpenActivity">
+    <div class="behind-left">
+        <button class="read-btn">
+            <MudIcon Icon="@Icons.Material.Rounded.Check" />
+        </button>
+    </div>
+    <div class="behind-right">
+        <button class="trash-btn">
+            <MudIcon Icon="@Icons.Material.Rounded.Delete" />
+        </button>
+    </div>
+    <div class="notification-card">
+        @if (Notification.NotificationData is { Type: not null })
+        {
+            @switch (Notification.NotificationData.Type)
+            {
+                case "memo":
+                    <div class="avatar"><MudIcon Icon="@Icons.Material.Rounded.ContentPaste" /></div>
+                    break;
+                case "newPlanned":
+                    <div class="avatar"><MudIcon Icon="@Icons.Material.Rounded.CalendarMonth" /></div>
+                    break;
+            }
+        }
+        <div class="notification-body">
+            <div class="title-row">
+                <div class="title">@Notification.Title</div>
+
+                <div class="section-time">
+                    <div class="notification-time">@GetTimeAgo(Notification.StartDate)</div>
+                    @if (Unread)
+                    {
+                        <span class="unread-dot"></span>
+                    }
+                </div>
+            </div>
+
+            @if (
+                Notification.StartDate < DateTime.Today && Notification.Body != null && Notification.Body.Contains("Oggi")
+            )
+            {
+                <div class="subtitle">@Notification.Body.Replace("Oggi", $"{Notification.StartDate:d}")</div>
+            }
+            else
+            {
+                <div class="subtitle">@Notification.Body</div>
+            }
+        </div>
+    </div>
+</div>
+
+<OverlayLayout Visible="VisibleOverlay" />
+
+@code {
+    [Parameter] public bool Unread { get; set; }
+    [Parameter] public WtbNotification Notification { get; set; } = new();
+
+    private bool VisibleOverlay { get; set; }
+
+    private async Task OpenActivity()
+    {
+        if(Notification.NotificationData?.ActivityId == null) return;
+        var activityId = Notification.NotificationData.ActivityId;
+
+        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+        Snackbar.Clear();
+
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        var activity = (await ManageDataService.GetActivityTryLocalDb(new WhereCondActivity { ActivityId = activityId })).LastOrDefault();
+
+        VisibleOverlay = false;
+        StateHasChanged();
+
+        if (activity == null) Snackbar.Add("Impossibile aprire l'attivit<69>", Severity.Error);
+
+        _ = ModalHelpers.OpenActivityForm(Dialog, activity, null);
+    }
+
+    private static string GetTimeAgo(DateTime? timestamp)
+    {
+        if (timestamp is null) return "";
+
+        var difference = DateTime.Now - timestamp.Value;
+
+        if (DateTime.Now.Day != timestamp.Value.Day)
+            return timestamp.Value.ToString("dd/MM/yyyy");
+
+        switch (difference.TotalMinutes)
+        {
+            case < 1:
+                return "Adesso";
+            case < 60:
+                return $"{(int)difference.TotalMinutes} minuti fa";
+            default:
+            {
+                switch (difference.TotalHours)
+                {
+                    case < 2:
+                        return $"{(int)difference.TotalHours} ora fa";
+                    case < 24:
+                        return $"{timestamp.Value:t}";
+                    default:
+                    {
+                        return timestamp.Value.ToString("dd/MM/yyyy");
+                    }
+                }
+            }
+        }
+    }
+}

salesbook.Shared/Components/SingleElements/Card/NotificationCard.razor.css

@@ -0,0 +1,109 @@
+.row {
+    position: relative;
+    overflow: hidden;
+    border-radius: var(--mud-default-borderradius);
+    width: 100%;
+}
+
+.behind-left, .behind-right {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    z-index: 0;
+}
+
+.behind-right {
+    justify-content: flex-end;
+    padding-right: 14px;
+    background: var(--mud-palette-error);
+}
+
+.behind-left {
+    justify-content: flex-start;
+    padding-left: 14px;
+    background: var(--mud-palette-info);
+}
+
+.read-btn, .trash-btn {
+    color: white;
+    padding: 10px 15px;
+    cursor: pointer;
+}
+
+.notification-card {
+    position: relative;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    padding: 12px;
+    gap: 12px;
+    background: var(--light-card-background);
+    transition: transform .2s ease;
+    touch-action: pan-y;
+    will-change: transform;
+    transform: translateX(0);
+}
+
+.avatar {
+    min-width: 42px;
+    height: 42px;
+    border-radius: 12px;
+    display: grid;
+    place-items: center;
+    background: var(--mud-palette-background);
+    border: 1px solid var(--mud-palette-divider);
+    font-weight: bold;
+    color: var(--mud-palette-primary);
+}
+
+.notification-body {
+    width: 100%
+}
+
+.title-row {
+    display: flex;
+    gap: 8px;
+    justify-items: center;
+    align-items: flex-start;
+    justify-content: space-between;
+}
+
+.unread-dot {
+    width: 10px;
+    height: 10px;
+    background-color: var(--mud-palette-error);
+    border-radius: 50%;
+}
+
+.title {
+    font-weight: 700;
+    margin-bottom: unset !important;
+    line-height: normal;
+}
+
+.section-time {
+    display: flex;
+    gap: .65rem;
+    min-width: max-content;
+    justify-content: flex-end;
+    align-items: center;
+}
+
+.notification-time {
+    font-size: 13px;
+    color: #94a3b8;
+    line-height: normal;
+}
+
+.collapsing {
+    transition: height .22s ease, margin .22s ease, opacity .22s ease;
+    overflow: hidden;
+}
+
+.notification-body ::deep > .subtitle {
+    font-size: 12px;
+    color: var(--mud-palette-drawer-text);
+    line-height: inherit;
+    margin-top: .5rem;
+}

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

@@ -1,14 +1,16 @@
 @using System.Globalization
-@using System.Text.RegularExpressions
 @using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Components.Layout.Overlay
+@using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Components.SingleElements.BottomSheet
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Dto.Contact
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Messages.Activity.Copy
 @inject IManageDataService ManageData
 @inject INetworkService NetworkService
@@ -19,17 +21,32 @@
 
 <MudDialog Class="customDialog-form">
     <DialogContent>
-        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")"/>
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave"
+                      OnSave="Save" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")"/>
 
         <div class="content">
             <div class="input-card">
-                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Descrizione" Variant="Variant.Text" Lines="3" @bind-Value="ActivityModel.ActivityDescription" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Descrizione" Variant="Variant.Text" Lines="3"
+                              @bind-Value="ActivityModel.ActivityDescription" @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+            </div>
+
+            <div class="container-button">
+                <MudButton Class="button-settings blue-icon"
+                           FullWidth="true"
+                           StartIcon="@Icons.Material.Rounded.Description"
+                           Size="Size.Medium"
+                           OnClick="@SuggestActivityDescription"
+                           Variant="Variant.Outlined">
+                    Suggerisci descrizione
+                </MudButton>
             </div>
 
             <div class="input-card">
                 <div class="form-container">
                     <MudAutocomplete ReadOnly="IsView" T="string?" Placeholder="Cliente"
-                                     SearchFunc="@SearchCliente" @bind-Value="ActivityModel.Cliente" @bind-Value:after="OnClienteChanged"
+                                     SearchFunc="@SearchCliente" @bind-Value="ActivityModel.Cliente"
+                                     @bind-Value:after="OnClienteChanged"
                                      CoerceValue="true"/>
                 </div>
 
@@ -38,18 +55,24 @@
                 <div class="form-container">
                     <span class="disable-full-width">Commessa</span>
 
-                    @if (Commesse.IsNullOrEmpty())
+                    @if (ActivityModel.CodJcom != null && SelectedComessa == null)
                     {
-                        <span class="warning-text">Nessuna commessa presente</span>
+                        <MudSkeleton/>
                     }
                     else
                     {
-                        <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || Commesse.IsNullOrEmpty())" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.CodJcom" @bind-Value:after="OnCommessaChanged" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                        <MudAutocomplete
-                            @foreach (var com in Commesse)
+                            T="JtbComt?" ReadOnly="IsView"
-                            {
+                            @bind-Value="SelectedComessa"
-                                <MudSelectItemExtended Class="custom-item-select" Value="@com.CodJcom">@($"{com.CodJcom} - {com.Descrizione}")</MudSelectItemExtended>
+                            @bind-Value:after="OnCommessaSelectedAfter"
-                            }
+                            SearchFunc="SearchCommesseAsync"
-                        </MudSelectExtended>
+                            ToStringFunc="@(c => c == null ? string.Empty : $"{c.CodJcom} - {c.Descrizione}")"
+                            Clearable="true"
+                            OnClearButtonClick="OnCommessaClear"
+                            ShowProgressIndicator="true"
+                            DebounceInterval="300"
+                            MaxItems="50"
+                            Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code"/>
                     }
                 </div>
             </div>
@@ -58,7 +81,10 @@
                 <div class="form-container">
                     <span>Inizio</span>
 
-                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture" InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedTime" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture"
+                                  InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedTime"
+                                  @bind-Value:after="OnAfterChangeValue" DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
                 </div>
 
                 <div class="divider"></div>
@@ -66,15 +92,43 @@
                 <div class="form-container">
                     <span>Fine</span>
 
-                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture" InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedEndtime" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture"
+                                  InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedEndtime"
+                                  @bind-Value:after="OnAfterChangeValue" DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
                 </div>
 
                 <div class="divider"></div>
 
                 <div class="form-container">
-                    <span>Avviso</span>
+                    <span class="disable-full-width">Avviso</span>
 
-                    <MudSwitch ReadOnly="IsView" T="bool" Disabled="true" Color="Color.Primary"/>
+                    <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || ActivityModel.EstimatedTime == null)"
+                                       T="int" Variant="Variant.Text" @bind-Value="ActivityModel.MinuteBefore"
+                                       @bind-Value:after="OnAfterChangeTimeBefore" Class="customIcon-select"
+                                       AdornmentIcon="@Icons.Material.Filled.Code">
+                        <MudSelectItemExtended Class="custom-item-select" Text="Nessuno" Value="-1">
+                            Nessuno
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="All'ora pianificata" Value="0">All'ora
+                            pianificata
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="30 minuti prima" Value="30">
+                            30 minuti prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 ora prima" Value="60">
+                            1 ora prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="2 ore prima" Value="120">
+                            2 ore prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 giorno prima" Value="1440">
+                            1 giorno prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 settimana prima" Value="10080">
+                            1 settimana prima
+                        </MudSelectItemExtended>
+                    </MudSelectExtended>
                 </div>
             </div>
 
@@ -82,12 +136,27 @@
                 <div class="form-container">
                     <span class="disable-full-width">Assegnata a</span>
 
-                    <MudSelectExtended FullWidth="true" ReadOnly="IsView" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.UserName" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                    @if (ActivityModel.UserName != null && SelectedUser == null)
-                        @foreach (var user in Users)
+                    {
-                        {
+                        <MudSkeleton/>
-                            <MudSelectItemExtended Class="custom-item-select" Value="@user.UserName">@user.FullName</MudSelectItemExtended>
+                    }
-                        }
+                    else
-                    </MudSelectExtended>
+                    {
+                        <MudAutocomplete
+                            Disabled="Users.IsNullOrEmpty()" ReadOnly="IsView"
+                            T="StbUser"
+                            @bind-Value="SelectedUser"
+                            @bind-Value:after="OnUserSelectedAfter"
+                            SearchFunc="SearchUtentiAsync"
+                            ToStringFunc="@(u => u == null ? string.Empty : u.FullName)"
+                            Clearable="true"
+                            OnClearButtonClick="OnUserClear"
+                            ShowProgressIndicator="true"
+                            DebounceInterval="300"
+                            MaxItems="50"
+                            Class="customIcon-select"
+                            AdornmentIcon="@Icons.Material.Filled.Code"/>
+                    }
                 </div>
 
                 <div class="divider"></div>
@@ -95,12 +164,23 @@
                 <div class="form-container">
                     <span class="disable-full-width">Tipo</span>
 
-                    <MudSelectExtended ReadOnly="IsView" FullWidth="true" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.ActivityTypeId" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                    @if (ActivityType.IsNullOrEmpty())
-                        @foreach (var type in ActivityType)
+                    {
-                        {
+                        <MudSkeleton/>
-                            <MudSelectItemExtended Class="custom-item-select" Value="@type.ActivityTypeId">@type.ActivityTypeId</MudSelectItemExtended>
+                    }
-                        }
+                    else
-                    </MudSelectExtended>
+                    {
+                        <MudSelectExtended ReadOnly="IsView" FullWidth="true" T="string?" Variant="Variant.Text"
+                                           @bind-Value="ActivityModel.ActivityTypeId"
+                                           @bind-Value:after="OnAfterChangeValue" Class="customIcon-select"
+                                           AdornmentIcon="@Icons.Material.Filled.Code">
+                            @foreach (var type in ActivityType)
+                            {
+                                <MudSelectItemExtended Class="custom-item-select"
+                                                       Value="@type.ActivityTypeId">@type.ActivityTypeId</MudSelectItemExtended>
+                            }
+                        </MudSelectExtended>
+                    }
                 </div>
 
                 <div class="divider"></div>
@@ -108,17 +188,23 @@
                 <div class="form-container" @onclick="OpenSelectEsito">
                     <span class="disable-full-width">Esito</span>
 
-                    <MudSelectExtended ReadOnly="true" FullWidth="true" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.ActivityResultId" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                    <MudSelectExtended ReadOnly="true" FullWidth="true" T="string?" Variant="Variant.Text"
+                                       @bind-Value="ActivityModel.ActivityResultId"
+                                       @bind-Value:after="OnAfterChangeValue" Class="customIcon-select"
+                                       AdornmentIcon="@Icons.Material.Filled.Code">
                         @foreach (var result in ActivityResult)
                         {
-                            <MudSelectItemExtended Class="custom-item-select" Value="@result.ActivityResultId">@result.ActivityResultId</MudSelectItemExtended>
+                            <MudSelectItemExtended Class="custom-item-select"
+                                                   Value="@result.ActivityResultId">@result.ActivityResultId</MudSelectItemExtended>
                         }
                     </MudSelectExtended>
                 </div>
             </div>
 
             <div class="input-card">
-                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Note" Variant="Variant.Text" Lines="4" @bind-Value="ActivityModel.Note" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Note" Variant="Variant.Text" Lines="4"
+                              @bind-Value="ActivityModel.Note" @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
             </div>
 
             <div class="container-chip-attached">
@@ -128,65 +214,79 @@
                     {
                         @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)">
+                            <MudChip T="string" Icon="@Icons.Material.Rounded.LocationOn" Color="Color.Success"
+                                     OnClick="@(() => OpenPosition(item.p))"
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
                                 @item.p.Description
                             </MudChip>
                         }
                         else
                         {
-                            <MudChip T="string" Color="Color.Default" OnClick="() => OpenAttached(item.p)" OnClose="() => OnRemoveAttached(item.index)">
+                            <MudChip T="string" Color="Color.Default" OnClick="@(() => OpenAttached(item.p))"
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
                                 @item.p.Name
                             </MudChip>
                         }
                     }
                 }
-                
+
-                @if (ActivityFileList != null)
+                @if (!IsLoading)
                 {
-                    foreach (var file in ActivityFileList)
+                    if (ActivityFileList != null)
                     {
-                        <MudChip T="string" OnClick="() => OpenAttached(file.Id, file.FileName)" Color="Color.Default">
+                        foreach (var file in ActivityFileList)
-                            @file.FileName
+                        {
-                        </MudChip>
+                            <MudChip T="string" OnClick="@(() => OpenAttached(file.FileName))"
+                                     OnClose="@(() => DeleteAttach(file))" Color="Color.Default">
+                                @file.FileName
+                            </MudChip>
+                        }
                     }
                 }
-            </div>
+                else
-
-            <div class="container-button">
-                <MudButton Class="button-settings green-icon"
-                           FullWidth="true"
-                           StartIcon="@Icons.Material.Rounded.AttachFile"
-                           Size="Size.Medium"
-                           OnClick="OpenAddAttached"
-                           Variant="Variant.Outlined">
-                    Aggiungi allegati
-                </MudButton>
-
-                @if (!IsNew)
                 {
-                    <div class="divider"></div>
+                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
-
-                    <MudButton Class="button-settings gray-icon"
-                               FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.ContentCopy"
-                               Size="Size.Medium"
-                               OnClick="Duplica"
-                               Variant="Variant.Outlined">
-                        Duplica
-                    </MudButton>
-
-                    <div class="divider"></div>
-
-                    <MudButton Class="button-settings red-icon"
-                               FullWidth="true"
-                               StartIcon="@Icons.Material.Outlined.Delete"
-                               Size="Size.Medium"
-                               OnClick="DeleteActivity"
-                               Variant="Variant.Outlined">
-                        Elimina
-                    </MudButton>
                 }
             </div>
+
+            @if (!IsView)
+            {
+                <div class="container-button">
+                    <MudButton Class="button-settings green-icon"
+                               FullWidth="true"
+                               StartIcon="@Icons.Material.Rounded.AttachFile"
+                               Size="Size.Medium"
+                               OnClick="OpenAddAttached"
+                               Variant="Variant.Outlined">
+                        Aggiungi allegati
+                    </MudButton>
+
+                    @if (!IsNew)
+                    {
+                        <div class="divider"></div>
+
+                        <MudButton Class="button-settings gray-icon"
+                                   FullWidth="true"
+                                   StartIcon="@Icons.Material.Filled.ContentCopy"
+                                   Size="Size.Medium"
+                                   OnClick="Duplica"
+                                   Variant="Variant.Outlined">
+                            Duplica
+                        </MudButton>
+
+                        <div class="divider"></div>
+
+                        <MudButton Class="button-settings red-icon"
+                                   FullWidth="true"
+                                   StartIcon="@Icons.Material.Outlined.Delete"
+                                   Size="Size.Medium"
+                                   OnClick="DeleteActivity"
+                                   Variant="Variant.Outlined">
+                            Elimina
+                        </MudButton>
+                    }
+                </div>
+            }
         </div>
 
         <MudMessageBox @ref="ConfirmDelete" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
@@ -200,36 +300,15 @@
                 </MudButton>
             </YesButton>
         </MudMessageBox>
-        
-        <MudMessageBox @ref="AddNamePosition" Class="c-messageBox" Title="Nome della posizione" CancelText="Annulla">
-            <MessageContent>
-                <MudTextField @bind-Value="NamePosition" Variant="Variant.Outlined" />
-            </MessageContent>
-            <YesButton>
-                <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                           StartIcon="@Icons.Material.Rounded.Check">
-                    Salva
-                </MudButton>
-            </YesButton>
-        </MudMessageBox>
-
-        <MudMessageBox @ref="ConfirmMemo" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
-            <MessageContent>
-                Vuoi creare un promemoria?
-            </MessageContent>
-            <YesButton>
-                <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                           StartIcon="@Icons.Material.Rounded.Check">
-                    Crea
-                </MudButton>
-            </YesButton>
-        </MudMessageBox>
     </DialogContent>
 </MudDialog>
 
 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
 
-<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeEsito"/>
+<OverlayLayout Visible="VisibleLoadingOverlay"/>
+
+<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel"
+             @bind-ActivityModel:after="OnAfterChangeEsito"/>
 
 <AddMemo @bind-IsSheetVisible="OpenAddMemo"/>
 
@@ -251,12 +330,14 @@
     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; }
 
-    //Overlay for save
+    //Overlay
     private bool VisibleOverlay { get; set; }
+    private bool VisibleLoadingOverlay { get; set; }
     private bool SuccessAnimation { get; set; }
 
     private bool OpenEsito { get; set; }
@@ -264,14 +345,20 @@
 
     //MessageBox
     private MudMessageBox ConfirmDelete { get; set; }
-    private MudMessageBox ConfirmMemo { get; set; }
-    private MudMessageBox AddNamePosition { get; set; }
 
     //Attached
     private List<AttachedDTO>? AttachedList { get; set; }
-    private string? NamePosition { get; set; }
     private bool CanAddPosition { get; set; } = true;
 
+    // cache per commesse
+    private string? _lastLoadedCodAnag;
+
+    //Commessa
+    private JtbComt? SelectedComessa { get; set; }
+
+    //User
+    private StbUser? SelectedUser { get; set; }
+
     protected override async Task OnInitializedAsync()
     {
         Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
@@ -281,24 +368,24 @@
             ActivityModel = ActivityCopied.Clone();
         }
         else if (!Id.IsNullOrEmpty())
+        {
             ActivityModel = (await ManageData.GetActivity(new WhereCondActivity { ActivityId = Id }, true)).Last();
+        }
 
         if (Id.IsNullOrEmpty()) Id = ActivityModel.ActivityId;
         IsNew = Id.IsNullOrEmpty();
         LabelSave = IsNew ? "Aggiungi" : null;
 
-        _ = LoadData();
-        await LoadCommesse();
-
         if (IsNew)
         {
-            ActivityModel.EstimatedTime = DateTime.Today.Add(TimeSpan.FromHours(DateTime.Now.Hour));
+            ActivityModel.EstimatedTime = DateTime.Today.AddHours(DateTime.Now.Hour);
-            ActivityModel.EstimatedEndtime = DateTime.Today.Add(TimeSpan.FromHours(DateTime.Now.Hour) + TimeSpan.FromHours(1));
+            ActivityModel.EstimatedEndtime = ActivityModel.EstimatedTime?.AddHours(1);
             ActivityModel.UserName = UserSession.User.Username;
         }
 
-        await LoadActivityType();
+        _ = LoadData();
 
+        await LoadActivityType();
         OriginalModel = ActivityModel.Clone();
     }
 
@@ -310,167 +397,302 @@
         StateHasChanged();
 
         await SavePosition();
-
         var response = await IntegryApiService.SaveActivity(ActivityModel);
 
         if (response == null)
             return;
 
         var newActivity = response.Last();
-
         await ManageData.InsertOrUpdate(newActivity);
-
         await SaveAttached(newActivity.ActivityId!);
 
         SuccessAnimation = true;
         StateHasChanged();
 
         await Task.Delay(1250);
-
         MudDialog.Close(newActivity);
     }
 
     private async Task SavePosition()
     {
-        if (AttachedList != null)
+        if (AttachedList is null) return;
-        {
-            foreach (var attached in AttachedList)
-            {
-                if (attached.Type != AttachedDTO.TypeAttached.Position) continue;
 
+        var positionTasks = AttachedList
+            .Where(a => a.Type == AttachedDTO.TypeAttached.Position)
+            .Select(async attached =>
+            {
                 var position = new PositionDTO
                 {
                     Description = attached.Description,
                     Lat = attached.Lat,
                     Lng = attached.Lng
                 };
-
                 ActivityModel.Position = await IntegryApiService.SavePosition(position);
-            }
+            });
-        }
+
+        await Task.WhenAll(positionTasks);
     }
 
     private async Task SaveAttached(string activityId)
     {
-        if (AttachedList != null)
+        if (AttachedList is null) return;
-        {
+
-            foreach (var attached in AttachedList)
+        var uploadTasks = AttachedList
-            {
+            .Where(a => a.FileContent is not null && a.Type != AttachedDTO.TypeAttached.Position)
-                if (attached.FileContent is not null && attached.Type != AttachedDTO.TypeAttached.Position)
+            .Select(a => IntegryApiService.UploadFile(activityId, a.FileBytes, a.Name));
-                {
+
-                    await IntegryApiService.UploadFile(activityId, attached.FileBytes, attached.Name);
+        await Task.WhenAll(uploadTasks);
-                }
-            }
-        }
     }
 
     private bool CheckPreSave()
     {
         Snackbar.Clear();
-
         if (!ActivityModel.ActivityTypeId.IsNullOrEmpty()) return true;
-        Snackbar.Add("Tipo attività obbligatorio!", Severity.Error);
 
+        Snackbar.Add("Tipo attività obbligatorio!", Severity.Error);
         return false;
     }
 
-    private async Task LoadData()
+    private Task LoadData()
     {
-        if (!IsNew && Id != null)
+        return Task.Run(async () =>
         {
-            ActivityFileList = await IntegryApiService.GetActivityFile(Id);
+            IsLoading = true;
-        }
+            await InvokeAsync(StateHasChanged);
 
-        Users = await ManageData.GetTable<StbUser>();
+            SelectedComessa = ActivityModel.Commessa;
-        ActivityResult = await ManageData.GetTable<StbActivityResult>();
+
-        Clienti = await ManageData.GetClienti(new WhereCondContact {FlagStato = "A"});
+            Users = await ManageData.GetTable<StbUser>();
-        Pros = await ManageData.GetProspect();
+            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);
+
+            ActivityResult = await ManageData.GetTable<StbActivityResult>();
+            Clienti = await ManageData.GetClienti(new WhereCondContact { FlagStato = "A" });
+            Pros = await ManageData.GetProspect();
+
+            IsLoading = false;
+            await InvokeAsync(StateHasChanged);
+        });
     }
 
     private async Task LoadActivityType()
     {
-        if (ActivityModel.UserName is null) ActivityType = [];
+        if (ActivityModel.UserName is null)
+        {
+            ActivityType = [];
+            return;
+        }
 
-        ActivityType = await ManageData.GetTable<SrlActivityTypeUser>(x => 
+        ActivityType = await ManageData.GetTable<SrlActivityTypeUser>(x => x.UserName != null && x.UserName.Equals(ActivityModel.UserName)
-            x.UserName != null && x.UserName.Equals(ActivityModel.UserName)
         );
     }
 
-    private async Task LoadCommesse() =>
+    private async Task LoadCommesse(string searchValue)
-        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(ActivityModel.CodAnag));
-
-    private async Task<IEnumerable<string>?> SearchCliente(string value, CancellationToken token)
     {
-        if (string.IsNullOrEmpty(value))
+        if (_lastLoadedCodAnag == ActivityModel.CodAnag && searchValue.IsNullOrEmpty()) return;
-            return null;
 
-        var listToReturn = new List<string>();
+        if (ActivityModel.CodAnag == null)
+        {
+            Commesse = await ManageData.GetTable<JtbComt>(x =>
+                x.CodJcom.ToUpper().Contains(searchValue.ToUpper()) ||
+                x.Descrizione.ToUpper().Contains(searchValue.ToUpper())
+            );
+        }
+        else
+        {
+            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag == ActivityModel.CodAnag);
+        }
 
-        listToReturn.AddRange(
+        Commesse = Commesse.OrderByDescending(x => x.CodJcom).ToList();
-            Clienti.Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase)).Select(x => $"{x.CodAnag} - {x.RagSoc}")
+        _lastLoadedCodAnag = ActivityModel.CodAnag;
-        );
-
-        listToReturn.AddRange(
-            Pros.Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase)).Select(x => $"{x.CodPpro} - {x.RagSoc}")
-        );
-
-        return listToReturn;
     }
 
-    private async Task OnClienteChanged()
+    private async Task<IEnumerable<JtbComt>> SearchCommesseAsync(string value, CancellationToken token)
+    {
+        await LoadCommesse(value);
+        if (Commesse.IsNullOrEmpty()) return [];
+
+        IEnumerable<JtbComt> list;
+
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            list = Commesse.OrderByDescending(x => x.CodJcom).Take(10);
+        }
+        else
+        {
+            list = Commesse
+                .Where(x => (x.CodJcom.Contains(value, StringComparison.OrdinalIgnoreCase)
+                             || x.Descrizione.Contains(value, StringComparison.OrdinalIgnoreCase))
+                            && (x.CodAnag == ActivityModel.CodAnag || ActivityModel.CodAnag == null))
+                .OrderByDescending(x => x.CodJcom)
+                .Take(50);
+        }
+
+        return token.IsCancellationRequested ? [] : list;
+    }
+
+    private Task<IEnumerable<StbUser>> SearchUtentiAsync(string value, CancellationToken token)
+    {
+        IEnumerable<StbUser> list;
+
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            list = Users.OrderBy(u => u.FullName).Take(50);
+        }
+        else
+        {
+            list = Users
+                .Where(x => x.UserName.Contains(value, StringComparison.OrdinalIgnoreCase)
+                            || x.FullName.Contains(value, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(u => u.FullName)
+                .Take(50);
+        }
+
+        return Task.FromResult(token.IsCancellationRequested ? [] : list);
+    }
+
+    private Task<IEnumerable<string>?> SearchCliente(string value, CancellationToken token)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+            return Task.FromResult<IEnumerable<string>?>(null);
+
+        var results = new List<string>();
+
+        results.AddRange(Clienti
+            .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.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);
+    }
+
+    private Task OnClienteChanged()
     {
         ActivityModel.CodJcom = null;
+        if (string.IsNullOrWhiteSpace(ActivityModel.Cliente)) return Task.CompletedTask;
 
-        if (ActivityModel.Cliente.IsNullOrEmpty()) return;
+        var parts = ActivityModel.Cliente.Split('-', 2, StringSplitOptions.TrimEntries);
+        if (parts.Length == 2)
+        {
+            ActivityModel.CodAnag = parts[0];
+            ActivityModel.Cliente = parts[1];
 
-        var match = Regex.Match(ActivityModel.Cliente!, @"^\s*(\S+)\s*-\s*(.*)$");
+            var isCliente = Clienti.FirstOrDefault(x => x.CodAnag != null && x.CodAnag.Equals(ActivityModel.CodAnag));
-        if (!match.Success)
+            ActivityModel.TipoAnag = isCliente == null ? "P" : "C";
-            return;
+        }
 
-        ActivityModel.CodAnag = match.Groups[1].Value;
+        OnAfterChangeValue();
-        ActivityModel.Cliente = match.Groups[2].Value;
+        return Task.CompletedTask;
+    }
+
+    private void OnCommessaSelectedAfter()
+    {
+        var com = SelectedComessa;
+        if (com != null)
+        {
+            ActivityModel.CodJcom = com.CodJcom;
+            ActivityModel.Commessa = com;
+
+            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)
+                    .FirstOrDefault() ?? Pros
+                    .Where(x => x.CodPpro != null && x.CodPpro.Equals(com.CodAnag))
+                    .Select(x => x.RagSoc)
+                    .FirstOrDefault();
+            }
+            else
+            {
+                ActivityModel.CodAnag = null;
+                ActivityModel.Cliente = null;
+                ActivityModel.TipoAnag = null;
+            }
+        }
+        else
+        {
+            ActivityModel.CodJcom = null;
+            ActivityModel.Commessa = null;
+            ActivityModel.CodAnag = null;
+            ActivityModel.Cliente = null;
+            ActivityModel.TipoAnag = null;
+        }
 
-        await LoadCommesse();
         OnAfterChangeValue();
     }
 
-    private async Task OnCommessaChanged()
+    private async Task OnUserSelectedAfter()
-    {
-        ActivityModel.Commessa = (await ManageData.GetTable<JtbComt>(x => x.CodJcom.Equals(ActivityModel.CodJcom))).Last().Descrizione;
-        OnAfterChangeValue();
-    }
-
-    private async Task OnUserChanged()
     {
+        ActivityModel.UserName = SelectedUser?.UserName;
         await LoadActivityType();
         OnAfterChangeValue();
     }
 
+    private async Task OnCommessaClear()
+    {
+        ActivityModel.Commessa = null;
+        ActivityModel.CodJcom = null;
+        StateHasChanged();
+    }
+
+    private async Task OnUserClear()
+    {
+        ActivityModel.UserName = null;
+        ActivityType = [];
+        StateHasChanged();
+    }
+
+    private void OnAfterChangeTimeBefore()
+    {
+        if (ActivityModel.EstimatedTime is not null)
+        {
+            ActivityModel.NotificationDate = ActivityModel.MinuteBefore switch
+            {
+                -1 => null,
+                0 => ActivityModel.EstimatedTime,
+                _ => ActivityModel.EstimatedTime.Value.AddMinutes(ActivityModel.MinuteBefore * -1)
+            };
+        }
+
+        OnAfterChangeValue();
+    }
+
     private void OnAfterChangeValue()
     {
         if (!IsNew)
-        {
             LabelSave = !OriginalModel.Equals(ActivityModel) ? "Aggiorna" : null;
-        }
 
-        if (ActivityModel.EstimatedEndtime <= ActivityModel.EstimatedTime)
+        if (ActivityModel.EstimatedTime is not null &&
+            (ActivityModel.EstimatedEndtime is null || ActivityModel.EstimatedEndtime <= ActivityModel.EstimatedTime))
         {
             ActivityModel.EstimatedEndtime = ActivityModel.EstimatedTime.Value.AddHours(1);
         }
+
+        StateHasChanged();
     }
 
-    private async Task OnAfterChangeEsito()
+    private Task OnAfterChangeEsito()
     {
         OnAfterChangeValue();
-
+        return Task.CompletedTask;
-        // var result = await ConfirmMemo.ShowAsync();
-
-        // if (result is true)
-        //     OpenAddMemo = !OpenAddMemo;
     }
 
     private void OpenSelectEsito()
     {
+        if (IsView) return;
+
         if (!IsNew && (ActivityModel.UserName is null || !ActivityModel.UserName.Equals(UserSession.User.Username)))
         {
             Snackbar.Add("Non puoi inserire un esito per un'attività che non ti è stata assegnata.", Severity.Info);
@@ -529,16 +751,8 @@
             var attached = (AttachedDTO)result.Data;
 
             if (attached.Type == AttachedDTO.TypeAttached.Position)
-            {
                 CanAddPosition = false;
 
-                var resultNamePosition = await AddNamePosition.ShowAsync();
-
-                if (resultNamePosition is true)
-                    attached.Description = NamePosition;
-                attached.Name = NamePosition!;
-            }
-
             AttachedList ??= [];
             AttachedList.Add(attached);
 
@@ -560,15 +774,29 @@
         StateHasChanged();
     }
 
-    private async Task OpenAttached(string idAttached, string fileName)
+    private async Task OpenAttached(string fileName)
     {
         try
         {
-            var bytes = await IntegryApiService.DownloadFile(ActivityModel.ActivityId!, fileName);
+            VisibleOverlay = true;
-            await AttachedService.OpenFile(bytes, fileName);
+            StateHasChanged();
+            
+            await using var file = await IntegryApiService.DownloadFile(ActivityModel.ActivityId!, fileName);
+            var path = await AttachedService.SaveToTempStorage(file, fileName);
+            
+            VisibleOverlay = false;
+            StateHasChanged();
+            
+            await AttachedService.OpenFile(fileName, path);
         }
         catch (Exception ex)
         {
+            if (VisibleOverlay)
+            {
+                VisibleOverlay = false;
+                StateHasChanged();
+            }
+            
             Snackbar.Clear();
             Snackbar.Add("Impossibile aprire il file", Severity.Error);
             Console.WriteLine($"Errore durante l'apertura del file: {ex.Message}");
@@ -579,7 +807,15 @@
     {
         if (attached is { FileContent: not null, MimeType: not null })
         {
-            await AttachedService.OpenFile(attached.FileContent!, attached.Name);
+            VisibleOverlay = true;
+            StateHasChanged();
+            
+            var path = await AttachedService.SaveToTempStorage(attached.FileContent!, attached.Name);
+            
+            VisibleOverlay = false;
+            StateHasChanged();
+            
+            await AttachedService.OpenFile(attached.Name, path);
         }
         else
         {
@@ -588,6 +824,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 })
@@ -604,7 +867,32 @@
         }
     }
 
-    private static string AdjustCoordinate(double coordinate) => 
+    private static string AdjustCoordinate(double coordinate) =>
         coordinate.ToString(CultureInfo.InvariantCulture).Replace(",", ".");
 
+    private async Task SuggestActivityDescription()
+    {
+        if (ActivityModel.ActivityTypeId == null)
+        {
+            Snackbar.Add("Indicare prima il tipo attività", Severity.Error);
+            return;
+        }
+
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        _ = Task.Run(async () =>
+        {
+            var activityDescriptions = await IntegryApiService.SuggestActivityDescription(ActivityModel.ActivityTypeId);
+
+            var modal = ModalHelpers.OpenSuggestActivityDescription(Dialog, activityDescriptions);
+
+            if (modal is { IsCanceled: false, Result: not null })
+                ActivityModel.ActivityDescription = modal.Result.Data!.ToString();
+
+            VisibleOverlay = false;
+            await InvokeAsync(StateHasChanged);
+        });
+    }
+
 }

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

@@ -4,27 +4,58 @@
 @using salesbook.Shared.Components.Layout.Overlay
 @inject IAttachedService AttachedService
 
-<MudDialog Class="customDialog-form">
+<MudDialog Class="customDialog-form disable-safe-area">
     <DialogContent>
-        <HeaderLayout ShowProfile="false" SmallHeader="true" Cancel="true" OnCancel="() => MudDialog.Cancel()" Title="Aggiungi allegati"/>
+        <HeaderLayout ShowProfile="false" SmallHeader="true" Cancel="true" OnCancel="() => MudDialog.Cancel()" Title="@TitleModal"/>
 
-        <div style="margin-bottom: 1rem;" class="content attached">
+        @if (RequireNewName)
-            <MudFab Size="Size.Small" Color="Color.Primary"
+        {
-                    StartIcon="@Icons.Material.Rounded.Image"
+            <MudTextField @bind-Value="NewName" Class="px-3" Variant="Variant.Outlined"/>            
-                    Label="Immagini" OnClick="OnImage"/>
+        }
-
+        else
-            <MudFab Size="Size.Small" Color="Color.Primary"
+        {
-                    StartIcon="@Icons.Material.Rounded.InsertDriveFile"
+            @if (!SelectTypePicture)
-                    Label="File" OnClick="OnFile"/>
-            
-            @if (CanAddPosition)
             {
-                <MudFab Size="Size.Small" Color="Color.Primary"
+                <div style="margin-bottom: 1rem;" class="content attached">
-                        StartIcon="@Icons.Material.Rounded.AddLocationAlt"
+                    <MudFab Size="Size.Small" Color="Color.Primary"
-                        Label="Posizione" OnClick="OnPosition"/>
+                            StartIcon="@Icons.Material.Rounded.Image"
+                            Label="Immagini" OnClick="OnImage"/>
+
+                    <MudFab Size="Size.Small" Color="Color.Primary"
+                            StartIcon="@Icons.Material.Rounded.InsertDriveFile"
+                            Label="File" OnClick="OnFile"/>
+
+                    @if (CanAddPosition)
+                    {
+                        <MudFab Size="Size.Small" Color="Color.Primary"
+                                StartIcon="@Icons.Material.Rounded.AddLocationAlt"
+                                Label="Posizione" OnClick="OnPosition"/>
+                    }
+                </div>
             }
-        </div>
+            else
+            {
+                <div style="margin-bottom: 1rem;" class="content attached">
+                    <MudFab Size="Size.Small" Color="Color.Primary"
+                            StartIcon="@Icons.Material.Rounded.CameraAlt"
+                            Label="Camera" OnClick="OnCamera"/>
+
+                    <MudFab Size="Size.Small" Color="Color.Primary"
+                            StartIcon="@Icons.Material.Rounded.Image"
+                            Label="Galleria" OnClick="OnGallery"/>
+                </div>
+            }
+        }
     </DialogContent>
+    <DialogActions>
+        @if (RequireNewName)
+        {
+            <MudButton Disabled="NewName.IsNullOrEmpty()" Class="my-3" Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
+                       StartIcon="@Icons.Material.Rounded.Check" OnClick="OnNewName">
+                Salva
+            </MudButton>
+        }
+    </DialogActions>
 </MudDialog>
 
 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
@@ -40,34 +71,65 @@
 
     private AttachedDTO? Attached { get; set; }
 
+    private bool _requireNewName;
+    private bool RequireNewName
+    {
+        get => _requireNewName;
+        set
+        {
+            _requireNewName = value;
+            TitleModal = _requireNewName ? "Nome allegato" : "Aggiungi allegati";
+            StateHasChanged();
+        }
+    }
+    private bool SelectTypePicture { get; set; }
+
+    private string TitleModal { get; set; } = "Aggiungi allegati";
+
+    private string? _newName;
+    private string? NewName
+    {
+        get => _newName;
+        set
+        {
+            _newName = value;
+            StateHasChanged();
+        }
+    }
+
     protected override async Task OnInitializedAsync()
     {
+        SelectTypePicture = false;
+        RequireNewName = false;
         Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
-
-        _ = LoadData();
-    }
-
-    private async Task LoadData()
-    {
-    }
-
-    private async Task Save()
-    {
-        VisibleOverlay = true;
-        StateHasChanged();
-
-        SuccessAnimation = true;
-        StateHasChanged();
-
-        await Task.Delay(1250);
-
-        MudDialog.Close();
     }
 
     private async Task OnImage()
     {
-        Attached = await AttachedService.SelectImage();
+        SelectTypePicture = true;
-        MudDialog.Close(Attached);
+        StateHasChanged();
+    }
+
+    private async Task OnCamera()
+    {
+        Attached = await AttachedService.SelectImageFromCamera();
+
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
+    }
+
+    private async Task OnGallery()
+    {
+        Attached = await AttachedService.SelectImageFromGallery();
+
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
     }
 
     private async Task OnFile()
@@ -79,6 +141,43 @@
     private async Task OnPosition()
     {
         Attached = await AttachedService.SelectPosition();
+
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
+    }
+
+    private void OnNewName()
+    {
+        if (Attached != null)
+        {
+            switch (Attached.Type)
+            {
+                case AttachedDTO.TypeAttached.Position:
+                {
+                    CanAddPosition = false;
+
+                    Attached.Description = NewName!;
+                    Attached.Name = NewName!;
+
+                    break;
+                }
+                case AttachedDTO.TypeAttached.Image:
+                {
+                    var extension = Path.GetExtension(Attached.Name);
+                    Attached.Name = NewName! + extension;
+
+                    break;
+                }
+                case AttachedDTO.TypeAttached.Document:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
         MudDialog.Close(Attached);
     }
 

salesbook.Shared/Components/SingleElements/Modal/AddAttached.razor.css

@@ -1,7 +1,9 @@
 .content.attached {
     display: flex;
-    flex-direction: column;
     gap: 2rem;
     padding: 1rem;
     height: unset;
+    flex-direction: row;
+    flex-wrap: wrap;
+    justify-content: center;
 }

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

@@ -5,6 +5,8 @@
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Components.SingleElements.BottomSheet
 @using salesbook.Shared.Core.Dto.Contact
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Interface.System.Network
 @inject IManageDataService ManageData
 @inject INetworkService NetworkService
 @inject IIntegryApiService IntegryApiService
@@ -84,20 +86,19 @@
             <div class="input-card">
                 <div class="form-container">
                     <span class="disable-full-width">Tipo cliente</span>
-
+                    
-                    @if (VtbTipi.IsNullOrEmpty())
+                    <MudAutocomplete Disabled="VtbTipi.IsNullOrEmpty()" ReadOnly="IsView"
-                    {
+                                     T="VtbTipi"
-                        <span class="warning-text">Nessun tipo cliente trovato</span>
+                                     @bind-Value="SelectedType"
-                    }
+                                     @bind-Value:after="OnTypeSelectedAfter"
-                    else
+                                     SearchFunc="SearchTypeAsync"
-                    {
+                                     ToStringFunc="@(u => u == null ? string.Empty : $"{u.CodVtip} - {u.Descrizione}")"
-                        <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || VtbTipi.IsNullOrEmpty())" T="string?" Variant="Variant.Text" @bind-Value="ContactModel.CodVtip" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                                     Clearable="true"
-                            @foreach (var tipo in VtbTipi)
+                                     ShowProgressIndicator="true"
-                            {
+                                     DebounceInterval="300"
-                                <MudSelectItemExtended Class="custom-item-select" Value="@tipo.CodVtip">@($"{tipo.CodVtip} - {tipo.Descrizione}")</MudSelectItemExtended>
+                                     MaxItems="50"
-                            }
+                                     Class="customIcon-select"
-                        </MudSelectExtended>
+                                     AdornmentIcon="@Icons.Material.Filled.Code" />
-                    }
                 </div>
             </div>
             
@@ -239,15 +240,19 @@
             <div class="input-card">
                 <div class="form-container">
                     <span class="disable-full-width">Agente</span>
-                
+                    
-                    <MudSelectExtended FullWidth="true" T="string?" Variant="Variant.Text" NoWrap="true"
+                    <MudAutocomplete Disabled="Users.IsNullOrEmpty()" ReadOnly="IsView"
-                                       @bind-Value="ContactModel.CodVage" @bind-Value:after="OnAfterChangeValue"
+                                     T="StbUser"
-                                       Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                                     @bind-Value="SelectedUser"
-                        @foreach (var user in Users)
+                                     @bind-Value:after="OnUserSelectedAfter"
-                        {
+                                     SearchFunc="SearchUtentiAsync"
-                            <MudSelectItemExtended Class="custom-item-select" Value="@user.UserCode">@($"{user.UserCode} - {user.FullName}")</MudSelectItemExtended>
+                                     ToStringFunc="@(u => u == null ? string.Empty : u.FullName)"
-                        }
+                                     Clearable="true"
-                    </MudSelectExtended>
+                                     ShowProgressIndicator="true"
+                                     DebounceInterval="300"
+                                     MaxItems="50"
+                                     Class="customIcon-select"
+                                     AdornmentIcon="@Icons.Material.Filled.Code" />
                 </div>
             </div>
 
@@ -266,9 +271,9 @@
                 </div>
             }
             
-            <div class="container-button">
+            @if (IsNew)
-                @if (IsNew)
+            {
-                {
+                <div class="container-button">
                     <MudButton Class="button-settings gray-icon"
                                FullWidth="true"
                                StartIcon="@Icons.Material.Filled.PersonAddAlt1"
@@ -277,11 +282,13 @@
                                Variant="Variant.Outlined">
                         Persona di riferimento
                     </MudButton>
-                }
+                </div>
-                else
+            }
+            else
+            {
+                @if (NetworkService.ConnectionAvailable && !ContactModel.IsContact)
                 {
-                    @if (NetworkService.ConnectionAvailable && !ContactModel.IsContact)
+                    <div class="container-button">
-                    {
                         <MudButton Class="button-settings blue-icon"
                                    FullWidth="true"
                                    StartIcon="@Icons.Material.Rounded.Sync"
@@ -290,9 +297,9 @@
                                    Variant="Variant.Outlined">
                             Converti in cliente
                         </MudButton>
-                    }
+                    </div>
                 }
-            </div>
+            }
         </div>
         
         <MudMessageBox MarkupMessage="new MarkupString(VatMessage)" @ref="CheckVat" Class="c-messageBox" Title="Verifica partita iva" CancelText="@(VatAlreadyRegistered ? "" : "Annulla")">
@@ -349,11 +356,17 @@
     private bool OpenSearchAddress { get; set; }
     private IndirizzoDTO Address { get; set; }
 
+    //Agente
+    private StbUser? SelectedUser { get; set; }
+
+    //Type
+    private VtbTipi? SelectedType { get; set; }
+
     protected override async Task OnInitializedAsync()
     {
         Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
 
-        await LoadData();
+        _ = LoadData();
 
         LabelSave = IsNew ? "Aggiungi" : null;
     }
@@ -401,24 +414,27 @@
         MudDialog.Close(response);
     }
 
-    private async Task LoadData()
+    private Task LoadData()
     {
-        if (IsNew)
+        return Task.Run(async () =>
         {
-            var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
+            if (IsNew)
+            {
+                var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
 
-            ContactModel.IsContact = false;
+                ContactModel.IsContact = false;
-            ContactModel.Nazione = "IT";
+                ContactModel.Nazione = "IT";
-            ContactModel.CodVage = loggedUser.UserCode;
+                ContactModel.CodVage = loggedUser.UserCode;
-        }
+            }
-        else
+            else
-        {
+            {
-            ContactModel = OriginalModel!.Clone();
+                ContactModel = OriginalModel!.Clone();
-        }
+            }
 
-        Users = await ManageData.GetTable<StbUser>(x => x.KeyGroup == 5);
+            Users = await ManageData.GetTable<StbUser>(x => x.KeyGroup == 5);
-        Nazioni = await ManageData.GetTable<Nazioni>();
+            Nazioni = await ManageData.GetTable<Nazioni>();
-        VtbTipi = await ManageData.GetTable<VtbTipi>();
+            VtbTipi = await ManageData.GetTable<VtbTipi>();
+        });
     }
 
     private void OnAfterChangeValue()
@@ -560,9 +576,83 @@
 
     private async Task ConvertProspectToContact()
     {
-        await IntegryApiService.TransferProspect(new CRMTransferProspectRequestDTO
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        var response = await IntegryApiService.TransferProspect(new CRMTransferProspectRequestDTO
         {
             CodPpro = ContactModel.CodContact
         });
+
+        await ManageData.DeleteProspect(ContactModel.CodContact);
+
+        if (response.AnagClie != null)
+            await ManageData.InsertOrUpdate(response.AnagClie);
+
+        if (response.VtbCliePersRif != null) 
+            await ManageData.InsertOrUpdate(response.VtbCliePersRif);
+
+        if (response.VtbDest != null)
+            await ManageData.InsertOrUpdate(response.VtbDest);
+
+        SuccessAnimation = true;
+        StateHasChanged();
+
+        await Task.Delay(1250);
+        MudDialog.Close(response.AnagClie);
+    }
+
+    private async Task OnUserSelectedAfter()
+    {
+        ContactModel.CodVage = SelectedUser?.UserCode;
+        OnAfterChangeValue();
+    }
+
+    private Task<IEnumerable<StbUser>> SearchUtentiAsync(string value, CancellationToken token)
+    {
+        IEnumerable<StbUser> list;
+
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            list = Users.OrderBy(u => u.FullName).Take(50);
+        }
+        else
+        {
+            list = Users
+                .Where(x => x.UserName.Contains(value, StringComparison.OrdinalIgnoreCase)
+                            || x.FullName.Contains(value, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(u => u.FullName)
+                .Take(50);
+        }
+
+        return Task.FromResult(token.IsCancellationRequested ? [] : list);
+    }
+
+    private async Task OnTypeSelectedAfter()
+    {
+        ContactModel.CodVtip = SelectedType?.CodVtip;
+        OnAfterChangeValue();
+    }
+
+    private Task<IEnumerable<VtbTipi>> SearchTypeAsync(string value, CancellationToken token)
+    {
+        IEnumerable<VtbTipi> list = [];
+
+        if (VtbTipi == null) return Task.FromResult(token.IsCancellationRequested ? [] : list);
+        
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            list = VtbTipi.OrderBy(u => u.CodVtip);
+        }
+        else
+        {
+            list = VtbTipi
+                .Where(x => x.CodVtip.Contains(value, StringComparison.OrdinalIgnoreCase)
+                            || x.Descrizione.Contains(value, StringComparison.OrdinalIgnoreCase))
+                .OrderBy(u => u.CodVtip)
+                .Take(50);
+        }
+
+        return Task.FromResult(token.IsCancellationRequested ? [] : list);
     }
 }

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

@@ -0,0 +1,32 @@
+@using salesbook.Shared.Core.Entity
+
+<MudDialog OnBackdropClick="Cancel">
+    <DialogContent>
+        @if (!ActivityTypers.IsNullOrEmpty())
+        {
+            <MudList T="string" SelectedValueChanged="OnClickItem">
+                @foreach (var item in ActivityTypers!)
+                {
+                    <MudListItem Text="@item.ActivityTypeDescription" Value="item.ActivityTypeDescription"/>
+                }
+            </MudList>
+        }
+        else
+        {
+            <div class="spinner-container">
+                <MudIcon Size="Size.Large" Color="Color.Error" Icon="@Icons.Material.Rounded.Close"/>
+                <MudText>Nessuna descrizione consigliata</MudText>
+            </div>
+        }
+    </DialogContent>
+</MudDialog>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+    [Parameter] public List<StbActivityTyper>? ActivityTypers { get; set; }
+
+    private void Cancel() => MudDialog.Cancel();
+
+    private void OnClickItem(string? selectedValue) =>
+        MudDialog.Close(DialogResult.Ok(selectedValue));
+}

salesbook.Shared/Components/SingleElements/Modal/ModalSuggestDescription.razor.css

@@ -0,0 +1 @@
+

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

@@ -2,6 +2,8 @@
 @using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout.Overlay
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Interface.System.Network
 @inject IManageDataService ManageData
 @inject INetworkService NetworkService
 @inject IIntegryApiService IntegryApiService

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/Dto/Activity/ActivityDTO.cs

@@ -1,17 +1,24 @@
-using salesbook.Shared.Core.Entity;
+using System.Text.Json.Serialization;
+using salesbook.Shared.Core.Entity;
 using salesbook.Shared.Core.Helpers.Enum;
 
 namespace salesbook.Shared.Core.Dto.Activity;
 
 public class ActivityDTO : StbActivity
 {
-    public string? Commessa { get; set; }
+    public JtbComt? Commessa { get; set; }
     public string? Cliente { get; set; }
     public ActivityCategoryEnum Category { get; set; }
     public bool Complete { get; set; }
     
+    //Notification
+    public int MinuteBefore { get; set; } = -1;
+    [JsonPropertyName("notificationDate")]
+    public DateTime? NotificationDate { get; set; }
+
     public bool Deleted { get; set; }
-    
+
+    [JsonPropertyName("stbPosizioni")]
     public PositionDTO? Position { get; set; }
 
     public ActivityDTO Clone()
@@ -23,8 +30,11 @@ public class ActivityDTO : StbActivity
     {
         return Commessa == other.Commessa &&
                Cliente == other.Cliente &&
+               Position == other.Position &&
+               MinuteBefore == other.MinuteBefore &&
+               NotificationDate == other.NotificationDate &&
                Category == other.Category &&
-               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedDate, other.EstimatedDate) && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveDate, other.EffectiveDate) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEnddate, other.EstimatedEnddate) && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEnddate, other.EffectiveEnddate) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
+               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
     }
 
     public override bool Equals(object? obj)
@@ -47,16 +57,12 @@ public class ActivityDTO : StbActivity
         hashCode.Add(CodAnag);
         hashCode.Add(CodJcom);
         hashCode.Add(CodJfas);
-        hashCode.Add(EstimatedDate);
         hashCode.Add(EstimatedTime);
         hashCode.Add(AlarmDate);
         hashCode.Add(AlarmTime);
-        hashCode.Add(EffectiveDate);
         hashCode.Add(EffectiveTime);
         hashCode.Add(ResultDescription);
-        hashCode.Add(EstimatedEnddate);
         hashCode.Add(EstimatedEndtime);
-        hashCode.Add(EffectiveEnddate);
         hashCode.Add(EffectiveEndtime);
         hashCode.Add(UserCreator);
         hashCode.Add(UserName);
@@ -97,6 +103,9 @@ public class ActivityDTO : StbActivity
         hashCode.Add(Cliente);
         hashCode.Add(Category);
         hashCode.Add(Complete);
+        hashCode.Add(Position);
+        hashCode.Add(MinuteBefore);
+        hashCode.Add(NotificationDate);
         return hashCode.ToHashCode();
     }
 }

salesbook.Shared/Core/Dto/CRMTransferProspectResponseDTO.cs

@@ -7,4 +7,10 @@ public class CRMTransferProspectResponseDTO
 {
     [JsonPropertyName("anagClie")]
     public AnagClie? AnagClie { get; set; }
+
+    [JsonPropertyName("vtbDest")]
+    public List<VtbDest>? VtbDest { get; set; }
+
+    [JsonPropertyName("vtbCliePersRif")]
+    public List<VtbCliePersRif>? VtbCliePersRif { get; set; }
 }

salesbook.Shared/Core/Dto/NotificationDataDTO.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class NotificationDataDTO
+{
+    [JsonPropertyName("notificationId")]
+    public string? NotificationId { get; set; }
+
+    [JsonPropertyName("activityId")]
+    public string? ActivityId { get; set; }
+    
+    [JsonPropertyName("type")]
+    public string? Type { get; set; }
+}

salesbook.Shared/Core/Dto/PageState/NotificationState.cs

@@ -0,0 +1,12 @@
+using salesbook.Shared.Core.Entity;
+
+namespace salesbook.Shared.Core.Dto.PageState;
+
+public class NotificationState
+{
+    public List<WtbNotification> ReceivedNotifications { get; set; } = [];
+    public List<WtbNotification> UnreadNotifications { get; set; } = [];
+    public List<WtbNotification> NotificationsRead { get; set; } = [];
+
+    public int Count => ReceivedNotifications.Count() + UnreadNotifications.Count();
+}

salesbook.Shared/Core/Dto/PageState/UserListState.cs

@@ -6,6 +6,8 @@ public class UserListState
 {
     public List<UserDisplayItem>? GroupedUserList { get; set; }
     public List<UserDisplayItem>? FilteredGroupedUserList { get; set; }
+    
+    public List<ContactDTO>? AllUsers { get; set; }
 
     public bool IsLoaded { get; set; }
     public bool IsLoading { get; set; }

salesbook.Shared/Core/Dto/PageState/UserPageState.cs

@@ -14,4 +14,6 @@ public class UserPageState
     public StbUser? Agente { get; set; }
     public Dictionary<string, List<CRMJobStepDTO>?> Steps { get; set; }
     public List<ActivityDTO> Activitys { get; set; }
+
+    public int ActiveTab { get; set; }
 }

salesbook.Shared/Core/Dto/PositionDTO.cs

@@ -7,7 +7,7 @@ public class PositionDTO
     [JsonPropertyName("id")]
     public long? Id { get; set; }
     
-    [JsonPropertyName("description")]
+    [JsonPropertyName("descrizione")]
     public string? Description { get; set; }
 
     [JsonPropertyName("lat")]

salesbook.Shared/Core/Dto/ReadNotificationRequestDTO.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class ReadNotificationRequestDTO
+{
+    [JsonPropertyName("deviceToken")]
+    public string DeviceToken { get; set; }
+
+    [JsonPropertyName("username")]
+    public string Username { get; set; }
+
+    [JsonPropertyName("notificationId")]
+    public long NotificationId { get; set; }
+}

salesbook.Shared/Core/Entity/PtbProsRif.cs

@@ -7,7 +7,7 @@ namespace salesbook.Shared.Core.Entity;
 public class PtbProsRif
 {
     [PrimaryKey, Column("composite_key")] 
-    public string CompositeKey { get; set; }
+    public string CompositeKey { get; set; } = null!;
 
     private string? _codPpro;
 

salesbook.Shared/Core/Entity/StbActivity.cs

@@ -36,9 +36,6 @@ public class StbActivity
     [Column("cod_jfas"), JsonPropertyName("codJfas")]
     public string? CodJfas { get; set; }
 
-    [Column("estimated_date"), JsonPropertyName("estimatedDate")]
-    public DateTime? EstimatedDate { get; set; }
-
     [Column("estimated_time"), JsonPropertyName("estimatedTime")]
     public DateTime? EstimatedTime { get; set; }
 
@@ -48,24 +45,15 @@ public class StbActivity
     [Column("alarm_time"), JsonPropertyName("alarmTime")]
     public DateTime? AlarmTime { get; set; }
 
-    [Column("effective_date"), JsonPropertyName("effectiveDate")]
-    public DateTime? EffectiveDate { get; set; }
-
     [Column("effective_time"), JsonPropertyName("effectiveTime")]
     public DateTime? EffectiveTime { get; set; }
 
     [Column("result_description"), JsonPropertyName("resultDescription")]
     public string? ResultDescription { get; set; }
 
-    [Column("estimated_enddate"), JsonPropertyName("estimatedEnddate")]
-    public DateTime? EstimatedEnddate { get; set; }
-
     [Column("estimated_endtime"), JsonPropertyName("estimatedEndtime")]
     public DateTime? EstimatedEndtime { get; set; }
 
-    [Column("effective_enddate"), JsonPropertyName("effectiveEnddate")]
-    public DateTime? EffectiveEnddate { get; set; }
-
     [Column("effective_endtime"), JsonPropertyName("effectiveEndtime")]
     public DateTime? EffectiveEndtime { get; set; }
 
@@ -173,4 +161,7 @@ public class StbActivity
 
     [Column("plan_id"), JsonPropertyName("planId")]
     public long? PlanId { get; set; }
+
+    [Column("id_posizione"), JsonPropertyName("idPosizione")]
+    public long? IdPosizione { get; set; }
 }

salesbook.Shared/Core/Entity/StbActivityTyper.cs

@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Entity;
+
+public class StbActivityTyper
+{
+    [JsonPropertyName("activityTypeId")]
+    public string? ActivityTypeId { get; set; }
+
+    [JsonPropertyName("activityTypeDescription")]
+    public string? ActivityTypeDescription { get; set; }
+
+    [JsonPropertyName("flagTipologia")]
+    public string? FlagTipologia { get; set; }
+    
+    [JsonPropertyName("idRiga")]
+    public int IdRiga { get; set; }
+}

salesbook.Shared/Core/Entity/WtbDeviceNotification.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Entity;
+
+public class WtbDeviceNotification
+{
+    [JsonPropertyName("userDeviceId")]
+    public long? UserDeviceId { get; set; }
+
+    [JsonPropertyName("notificationId")]
+    public long? NotificationId { get; set; }
+
+    [JsonPropertyName("readDate")]
+    public DateTime? ReadDate { get; set; }
+}

salesbook.Shared/Core/Entity/WtbNotification.cs

@@ -0,0 +1,37 @@
+using System.Text.Json.Serialization;
+using salesbook.Shared.Core.Dto;
+
+namespace salesbook.Shared.Core.Entity;
+
+public class WtbNotification
+{
+    [JsonPropertyName("id")]
+    public long Id { get; set; }
+
+    [JsonPropertyName("title")]
+    public string? Title { get; set; }
+
+    [JsonPropertyName("body")]
+    public string? Body { get; set; }
+
+    [JsonPropertyName("imageUrl")]
+    public string? ImageUrl { get; set; }
+
+    [JsonPropertyName("notificationData")]
+    public NotificationDataDTO? NotificationData { get; set; }
+
+    [JsonPropertyName("startDate")]
+    public DateTime? StartDate { get; set; }
+
+    [JsonPropertyName("endDate")]
+    public DateTime? EndDate { get; set; }
+
+    [JsonPropertyName("persistent")]
+    public bool? Persistent { get; set; }
+
+    [JsonPropertyName("topics")]
+    public List<string>? Topics { get; set; }
+
+    [JsonPropertyName("wtbDeviceNotifications")]
+    public List<WtbDeviceNotification>? WtbDeviceNotifications { get; set; }
+}

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)
         };
     }

salesbook.Shared/Core/Helpers/ModalHelpers.cs

@@ -2,6 +2,7 @@
 using salesbook.Shared.Components.SingleElements.Modal;
 using salesbook.Shared.Core.Dto;
 using salesbook.Shared.Core.Dto.Activity;
+using salesbook.Shared.Core.Entity;
 
 namespace salesbook.Shared.Core.Helpers;
 
@@ -46,7 +47,7 @@ public class ModalHelpers
         return await modal.Result;
     }
 
-    public static async Task<DialogResult?> OpenPersRifForm(IDialogService dialog, PersRifDTO? persRif, 
+    public static async Task<DialogResult?> OpenPersRifForm(IDialogService dialog, PersRifDTO? persRif,
         ContactDTO? contactModel = null, List<PersRifDTO>? persRifList = null)
     {
         var modal = await dialog.ShowAsync<PersRifForm>(
@@ -54,7 +55,7 @@ public class ModalHelpers
             new DialogParameters<PersRifForm>
             {
                 { x => x.OriginalModel, persRif },
-                { x => x.ContactModel,  contactModel},
+                { x => x.ContactModel, contactModel },
                 { x => x.PersRifList, persRifList }
             },
             new DialogOptions
@@ -74,16 +75,38 @@ public class ModalHelpers
             "Add attached",
             new DialogParameters<AddAttached>
             {
-                { x => x.CanAddPosition,  canAddPosition}
+                { x => x.CanAddPosition, canAddPosition }
             },
             new DialogOptions
             {
                 FullScreen = false,
                 CloseButton = false,
-                NoHeader = true
+                NoHeader = true,
+                BackdropClick = false
             }
         );
 
         return await modal.Result;
     }
+
+    public static async Task<DialogResult?> OpenSuggestActivityDescription(IDialogService dialog,
+        List<StbActivityTyper>? activityTypers)
+    {
+        var modal = await dialog.ShowAsync<ModalSuggestDescription>(
+            "Suggest activity description",
+            new DialogParameters<ModalSuggestDescription>
+            {
+                { x => x.ActivityTypers, activityTypers }
+            },
+            new DialogOptions
+            {
+                FullScreen = false,
+                CloseButton = false,
+                NoHeader = true,
+                BackdropClick = false
+            }
+        );
+        
+        return await modal.Result;
+    }
 }

salesbook.Shared/Core/Interface/IAttachedService.cs

@@ -4,8 +4,11 @@ namespace salesbook.Shared.Core.Interface;
 
 public interface IAttachedService
 {
-    Task<AttachedDTO?> SelectImage();
+    Task<AttachedDTO?> SelectImageFromCamera();
+    Task<AttachedDTO?> SelectImageFromGallery();
     Task<AttachedDTO?> SelectFile();
     Task<AttachedDTO?> SelectPosition();
-    Task OpenFile(Stream file, string fileName);
+
+    Task<string> SaveToTempStorage(Stream file, string fileName, CancellationToken ct = default);
+    Task OpenFile(string fileName, string filePath);
 }

salesbook.Shared/Core/Interface/IFirebaseNotificationService.cs

@@ -0,0 +1,6 @@
+namespace salesbook.Shared.Core.Interface;
+
+public interface IFirebaseNotificationService
+{
+    Task InitFirebase();
+}

salesbook.Shared/Core/Interface/IManageDataService.cs

@@ -12,16 +12,20 @@ public interface IManageDataService
 
     Task<List<AnagClie>> GetClienti(WhereCondContact? whereCond = null);
     Task<List<PtbPros>> GetProspect(WhereCondContact? whereCond = null);
-    Task<List<ContactDTO>> GetContact(WhereCondContact whereCond);
+    Task<List<ContactDTO>> GetContact(WhereCondContact whereCond, DateTime? lastSync = null);
     Task<ContactDTO?> GetSpecificContact(string codAnag, bool IsContact);
 
+    Task<List<ActivityDTO>> GetActivityTryLocalDb(WhereCondActivity whereCond);
     Task<List<ActivityDTO>> GetActivity(WhereCondActivity whereCond, bool useLocalDb = false);
 
     Task InsertOrUpdate<T>(T objectToSave);
     Task InsertOrUpdate<T>(List<T> listToSave);
 
+    Task DeleteProspect(string codPpro);
     Task Delete<T>(T objectToDelete);
     Task DeleteActivity(ActivityDTO activity);
 
+    Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities);
+
     Task ClearDb();
 }

salesbook.Shared/Core/Interface/INotificationService.cs

@@ -0,0 +1,7 @@
+namespace salesbook.Shared.Core.Interface;
+
+public interface INotificationService
+{
+    Task LoadNotification();
+    void OrderNotificationList();
+}

salesbook.Shared/Core/Interface/IntegryApi/IIntegryApiService.cs

@@ -4,7 +4,7 @@ using salesbook.Shared.Core.Dto.Contact;
 using salesbook.Shared.Core.Dto.JobProgress;
 using salesbook.Shared.Core.Entity;
 
-namespace salesbook.Shared.Core.Interface;
+namespace salesbook.Shared.Core.Interface.IntegryApi;
 
 public interface IIntegryApiService
 {
@@ -25,15 +25,18 @@ public interface IIntegryApiService
     Task<CRMTransferProspectResponseDTO> TransferProspect(CRMTransferProspectRequestDTO request);
 
     Task UploadFile(string id, byte[] file, string fileName);
+    Task DeleteFile(string activityId, string fileName);
     Task<List<ActivityFileDto>> GetActivityFile(string activityId);
     Task<Stream> DownloadFile(string activityId, string fileName);
     Task<Stream> DownloadFileFromRefUuid(string refUuid, string fileName);
 
     Task<CRMJobProgressResponseDTO> RetrieveJobProgress(string codJcom);
+    
+    Task<List<StbActivityTyper>?> SuggestActivityDescription(string activityType);
 
     //Position
     Task<PositionDTO> SavePosition(PositionDTO position);
-    Task<PositionDTO> RetrievePosition(string id);
+    Task<PositionDTO> RetrievePosition(long id);
 
     //Google
     Task<List<IndirizzoDTO>?> Geocode(string address);

salesbook.Shared/Core/Interface/IntegryApi/IIntegryNotificationRestClient.cs

@@ -0,0 +1,11 @@
+using salesbook.Shared.Core.Entity;
+
+namespace salesbook.Shared.Core.Interface.IntegryApi;
+
+public interface IIntegryNotificationRestClient
+{
+    Task<List<WtbNotification>?> Get();
+    Task<WtbNotification> MarkAsRead(long id);
+    Task Delete(long id);
+    Task DeleteAll();
+}