Finish v2.2.0(24)

# 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/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

@@ -0,0 +1,142 @@
+using salesbook.Shared.Core.Dto;
+using salesbook.Shared.Core.Interface;
+
+namespace salesbook.Maui.Core.Services;
+
+public class AttachedService : IAttachedService
+{
+    public async Task<AttachedDTO?> SelectImageFromCamera()
+    {
+        var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageWrite>();
+
+        if (cameraPerm != PermissionStatus.Granted || storagePerm != PermissionStatus.Granted)
+            return null;
+
+        FileResult? result = null;
+
+        try
+        {
+            result = await MediaPicker.Default.CapturePhotoAsync();
+        }
+        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);
+    }
+
+    public async Task<AttachedDTO?> SelectFile()
+    {
+        var perm = await Permissions.RequestAsync<Permissions.StorageRead>();
+        if (perm != PermissionStatus.Granted) return null;
+
+        var result = await FilePicker.PickAsync();
+
+        return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Document);
+    }
+
+    public async Task<AttachedDTO?> SelectPosition()
+    {
+        var perm = await Permissions.RequestAsync<Permissions.LocationWhenInUse>();
+        if (perm != PermissionStatus.Granted) return null;
+
+        var loc = await Geolocation.GetLastKnownLocationAsync();
+        if (loc is null) return null;
+
+        return new AttachedDTO
+        {
+            Name = "Posizione attuale",
+            Lat = loc.Latitude,
+            Lng = loc.Longitude,
+            Type = AttachedDTO.TypeAttached.Position
+        };
+    }
+
+    private static async Task<AttachedDTO> ConvertToDto(FileResult file, AttachedDTO.TypeAttached type)
+    {
+        var stream = await file.OpenReadAsync();
+        using var ms = new MemoryStream();
+        await stream.CopyToAsync(ms);
+
+        return new AttachedDTO
+        {
+            Name = file.FileName,
+            Path = file.FullPath,
+            MimeType = file.ContentType,
+            DimensionBytes = ms.Length,
+            FileBytes = ms.ToArray(),
+            Type = type
+        };
+    }
+
+    private static async Task<string?> SaveToTempStorage(Stream file, string fileName)
+    {
+        var cacheDirectory = FileSystem.CacheDirectory;
+        var targetDirectory = Path.Combine(cacheDirectory, "file");
+
+        if (!Directory.Exists(targetDirectory)) Directory.CreateDirectory(targetDirectory);
+
+        var tempFilePath = Path.Combine(targetDirectory, fileName + ".temp");
+        var filePath = Path.Combine(targetDirectory, fileName);
+
+        if (File.Exists(filePath)) return filePath;
+
+        try
+        {
+            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}");
+            SentrySdk.CaptureException(e);
+            return null;
+        }
+        finally
+        {
+            if (File.Exists(tempFilePath)) File.Delete(tempFilePath);
+        }
+
+        return filePath;
+    }
+
+    public async Task OpenFile(Stream file, string fileName)
+    {
+        var filePath = await SaveToTempStorage(file, fileName);
+
+        if (filePath is null) return;
+        await Launcher.OpenAsync(new OpenFileRequest
+        {
+            File = new ReadOnlyFile(filePath)
+        });
+    }
+}

salesbook.Maui/Core/Services/LocalDbService.cs

@@ -22,7 +22,10 @@ public class LocalDbService
         _connection.CreateTableAsync<VtbDest>();
         _connection.CreateTableAsync<StbActivityResult>();
         _connection.CreateTableAsync<StbActivityType>();
+        _connection.CreateTableAsync<SrlActivityTypeUser>();
         _connection.CreateTableAsync<StbUser>();
+        _connection.CreateTableAsync<VtbTipi>();
+        _connection.CreateTableAsync<Nazioni>();
     }
 
     public async Task ResetSettingsDb()
@@ -31,11 +34,17 @@ public class LocalDbService
         {
             await _connection.ExecuteAsync("DROP TABLE IF EXISTS stb_activity_result;");
             await _connection.ExecuteAsync("DROP TABLE IF EXISTS stb_activity_type;");
+            await _connection.ExecuteAsync("DROP TABLE IF EXISTS srl_activity_type_user;");
             await _connection.ExecuteAsync("DROP TABLE IF EXISTS stb_user;");
+            await _connection.ExecuteAsync("DROP TABLE IF EXISTS vtb_tipi;");
+            await _connection.ExecuteAsync("DROP TABLE IF EXISTS nazioni;");
 
             await _connection.CreateTableAsync<StbActivityResult>();
             await _connection.CreateTableAsync<StbActivityType>();
+            await _connection.CreateTableAsync<SrlActivityTypeUser>();
             await _connection.CreateTableAsync<StbUser>();
+            await _connection.CreateTableAsync<VtbTipi>();
+            await _connection.CreateTableAsync<Nazioni>();
         }
         catch (Exception ex)
         {

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -1,20 +1,259 @@
 using AutoMapper;
-using System.Linq.Expressions;
 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 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) : IManageDataService
+public class ManageDataService(
+    LocalDbService localDb,
+    IMapper mapper,
+    UserListState userListState,
+    IIntegryApiService integryApiService,
+    INetworkService networkService,
+    IUserSession userSession
+) : IManageDataService
 {
     public Task<List<T>> GetTable<T>(Expression<Func<T, bool>>? whereCond = null) where T : new() =>
         localDb.Get(whereCond);
 
-    public async Task<List<ActivityDTO>> GetActivity(Expression<Func<StbActivity, bool>>? whereCond = null)
+    public async Task<List<AnagClie>> GetClienti(WhereCondContact? whereCond)
     {
-        var activities = await localDb.Get(whereCond);
+        List<AnagClie> clienti = [];
+        whereCond ??= new WhereCondContact();
+        whereCond.OnlyContact = true;
+
+        if (networkService.ConnectionAvailable)
+        {
+            var response = await integryApiService.RetrieveAnagClie(
+                new CRMAnagRequestDTO
+                {
+                    CodAnag = whereCond.CodAnag,
+                    FlagStato = whereCond.FlagStato,
+                    PartIva = whereCond.PartIva,
+                    ReturnPersRif = !whereCond.OnlyContact
+                }
+            );
+
+            clienti = response.AnagClie ?? [];
+        }
+        else
+        {
+            clienti = await localDb.Get<AnagClie>(x =>
+                (whereCond.FlagStato != null && x.FlagStato.Equals(whereCond.FlagStato)) ||
+                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
+                (whereCond.PartIva == null && whereCond.FlagStato == null)
+            );
+        }
+
+        return clienti;
+    }
+
+    public async Task<List<PtbPros>> GetProspect(WhereCondContact? whereCond)
+    {
+        List<PtbPros> prospect = [];
+        whereCond ??= new WhereCondContact();
+        whereCond.OnlyContact = true;
+
+        if (networkService.ConnectionAvailable)
+        {
+            var response = await integryApiService.RetrieveProspect(
+                new CRMProspectRequestDTO
+                {
+                    CodPpro = whereCond.CodAnag,
+                    PartIva = whereCond.PartIva,
+                    ReturnPersRif = !whereCond.OnlyContact
+                }
+            );
+
+            prospect = response.PtbPros ?? [];
+        }
+        else
+        {
+            prospect = await localDb.Get<PtbPros>(x =>
+                (whereCond.PartIva != null && x.PartIva.Equals(whereCond.PartIva)) ||
+                (whereCond.PartIva == null)
+            );
+        }
+
+        return prospect;
+    }
+
+    public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond, DateTime? lastSync)
+    {
+        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(
+                new CRMAnagRequestDTO
+                {
+                    CodAnag = whereCond.CodAnag,
+                    FlagStato = whereCond.FlagStato,
+                    PartIva = whereCond.PartIva,
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
+                }
+            );
+
+            var prospect = await integryApiService.RetrieveProspect(
+                new CRMProspectRequestDTO
+                {
+                    CodPpro = whereCond.CodAnag,
+                    PartIva = whereCond.PartIva,
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
+                }
+            );
+            
+            _ = 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 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 (localList == null || apiList == null) return null;
+        
+        var dictionary = localList.ToDictionary(keySelector);
+
+        foreach (var apiItem in apiList)
+        {
+            var key = keySelector(apiItem);
+            dictionary[key] = apiItem;
+        }
+
+        return dictionary.Values.ToList();
+    }
+
+    public async Task<ContactDTO?> GetSpecificContact(string codAnag, bool isContact)
+    {
+        if (isContact)
+        {
+            var contact = (await localDb.Get<AnagClie>(x => x.CodAnag != null && x.CodAnag.Equals(codAnag)))
+                .LastOrDefault();
+
+            return contact == null ? null : mapper.Map<ContactDTO>(contact);
+        }
+        else
+        {
+            var contact = (await localDb.Get<PtbPros>(x => x.CodPpro != null && x.CodPpro.Equals(codAnag)))
+                .LastOrDefault();
+
+            return contact == null ? null : mapper.Map<ContactDTO>(contact);
+        }
+    }
+
+    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;
+
+        if (networkService.ConnectionAvailable && !useLocalDb)
+        {
+            activities = await integryApiService.RetrieveActivity(
+                new CRMRetrieveActivityRequestDTO
+                {
+                    StarDate = whereCond.Start,
+                    EndDate = whereCond.End,
+                    ActivityId = whereCond.ActivityId
+                }
+            );
+
+            _ = UpdateDb(activities);
+        }
+        else return await GetActivityTryLocalDb(whereCond);
+
+        return await MapActivity(activities);
+    }
+
+    public async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
+    {
+        if (activities == null) return [];
 
         var codJcomList = activities
             .Select(x => x.CodJcom)
@@ -22,23 +261,40 @@ public class ManageDataService(LocalDbService localDb, IMapper mapper) : IManage
             .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;
@@ -52,16 +308,14 @@ public class ManageDataService(LocalDbService localDb, IMapper mapper) : IManage
                 {
                     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();
@@ -69,9 +323,71 @@ public class ManageDataService(LocalDbService localDb, IMapper mapper) : IManage
         return returnDto;
     }
 
+    private Task UpdateDbUsers(UsersSyncResponseDTO response)
+    {
+        return Task.Run(async () =>
+        {
+            try
+            {
+                if (response.AnagClie != null)
+                {
+                    await localDb.InsertOrUpdate(response.AnagClie);
+
+                    if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
+                    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)
+            {
+                Console.WriteLine(e.Message);
+                SentrySdk.CaptureException(e);
+                throw;
+            }
+        });
+    }
+
+    private Task UpdateDb<T>(List<T>? entityList)
+    {
+        return Task.Run(() =>
+        {
+            if (entityList == null) return;
+            _ = localDb.InsertOrUpdate(entityList);
+        });
+    }
+
+    public Task InsertOrUpdate<T>(List<T> listToSave) =>
+        localDb.InsertOrUpdate(listToSave);
+
     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,21 +1,11 @@
 using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Interface;
+using salesbook.Shared.Core.Interface.IntegryApi;
 
 namespace salesbook.Maui.Core.Services;
 
 public class SyncDbService(IIntegryApiService integryApiService, LocalDbService localDb) : ISyncDbService
 {
-    public async Task GetAndSaveActivity(string? dateFilter)
-    {
-        var allActivity = await integryApiService.RetrieveActivity(dateFilter);
-
-        if (!allActivity.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(allActivity!);
-            else
-                await localDb.InsertOrUpdate(allActivity!);
-    }
-
     public async Task GetAndSaveCommesse(string? dateFilter)
     {
         var allCommesse = await integryApiService.RetrieveAllCommesse(dateFilter);
@@ -27,46 +17,6 @@ public class SyncDbService(IIntegryApiService integryApiService, LocalDbService
                 await localDb.InsertOrUpdate(allCommesse!);
     }
 
-    public async Task GetAndSaveProspect(string? dateFilter)
-    {
-        var taskSyncResponseDto = await integryApiService.RetrieveProspect(dateFilter);
-
-        if (!taskSyncResponseDto.PtbPros.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(taskSyncResponseDto.PtbPros!);
-            else
-                await localDb.InsertOrUpdate(taskSyncResponseDto.PtbPros!);
-
-        if (!taskSyncResponseDto.PtbProsRif.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(taskSyncResponseDto.PtbProsRif!);
-            else
-                await localDb.InsertOrUpdate(taskSyncResponseDto.PtbProsRif!);
-    }
-
-    public async Task GetAndSaveClienti(string? dateFilter)
-    {
-        var taskSyncResponseDto = await integryApiService.RetrieveAnagClie(dateFilter);
-
-        if (!taskSyncResponseDto.AnagClie.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(taskSyncResponseDto.AnagClie!);
-            else
-                await localDb.InsertOrUpdate(taskSyncResponseDto.AnagClie!);
-
-        if (!taskSyncResponseDto.VtbDest.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(taskSyncResponseDto.VtbDest!);
-            else
-                await localDb.InsertOrUpdate(taskSyncResponseDto.VtbDest!);
-
-        if (!taskSyncResponseDto.VtbCliePersRif.IsNullOrEmpty())
-            if (dateFilter is null)
-                await localDb.InsertAll(taskSyncResponseDto.VtbCliePersRif!);
-            else
-                await localDb.InsertOrUpdate(taskSyncResponseDto.VtbCliePersRif!);
-    }
-
     public async Task GetAndSaveSettings(string? dateFilter)
     {
         if (dateFilter is not null)
@@ -80,7 +30,16 @@ public class SyncDbService(IIntegryApiService integryApiService, LocalDbService
         if (!settingsResponse.ActivityTypes.IsNullOrEmpty())
             await localDb.InsertAll(settingsResponse.ActivityTypes!);
 
+        if (!settingsResponse.ActivityTypeUsers.IsNullOrEmpty())
+            await localDb.InsertAll(settingsResponse.ActivityTypeUsers!);
+
         if (!settingsResponse.StbUsers.IsNullOrEmpty())
             await localDb.InsertAll(settingsResponse.StbUsers!);
+
+        if (!settingsResponse.VtbTipi.IsNullOrEmpty())
+            await localDb.InsertAll(settingsResponse.VtbTipi!);
+
+        if (!settingsResponse.Nazioni.IsNullOrEmpty())
+            await localDb.InsertAll(settingsResponse.Nazioni!);
     }
 }

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,11 +1,15 @@
 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
 {
+    public bool ConnectionAvailable { get; set; }
+
     public bool IsNetworkAvailable()
     {
+        //return false;
         return Connectivity.Current.NetworkAccess == NetworkAccess.Internet;
     }
 

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

@@ -5,14 +5,29 @@ using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
 using MudBlazor.Services;
 using MudExtensions.Services;
+using salesbook.Maui.Core.RestClient.IntegryApi;
 using salesbook.Maui.Core.Services;
+using salesbook.Maui.Core.System;
+using salesbook.Maui.Core.System.Network;
+using salesbook.Maui.Core.System.Notification;
+using salesbook.Maui.Core.System.Notification.Push;
 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
 {
@@ -20,7 +35,7 @@ namespace salesbook.Maui
     {
         private const string AppToken = "f0484398-1f8b-42f5-ab79-5282c164e1d8";
 
-        public static MauiApp CreateMauiApp()
+        public static MauiAppBuilder CreateMauiAppBuilder()
         {
             InteractiveRenderSettings.ConfigureBlazorHybridRenderModes();
 
@@ -29,6 +44,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";
@@ -50,16 +66,35 @@ namespace salesbook.Maui
             builder.Services.AddScoped<AuthenticationStateProvider>(provider =>
                 provider.GetRequiredService<AppAuthenticationStateProvider>());
 
-            builder.Services.AddScoped<INetworkService, NetworkService>();
             builder.Services.AddScoped<IIntegryApiService, IntegryApiService>();
             builder.Services.AddScoped<ISyncDbService, SyncDbService>();
             builder.Services.AddScoped<IManageDataService, ManageDataService>();
+            builder.Services.AddScoped<PreloadService>();
+
+            //SessionData
+            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.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();
@@ -67,9 +102,15 @@ namespace salesbook.Maui
 #endif
 
             builder.Services.AddSingleton<IFormFactor, FormFactor>();
+            builder.Services.AddSingleton<IAttachedService, AttachedService>();
+            builder.Services.AddSingleton<INetworkService, NetworkService>();
+            builder.Services.AddSingleton<IGenericSystemService, GenericSystemService>();
             builder.Services.AddSingleton<LocalDbService>();
 
-            return builder.Build();
+            _ = typeof(System.Runtime.InteropServices.SafeHandle);
+            _ = typeof(System.IO.FileStream);
+
+            return builder;
         }
     }
 }

salesbook.Maui/Platforms/Android/AndroidManifest.xml

@@ -1,6 +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_COARSE_LOCATION" />
+
+	<!-- Fotocamera -->
+	<uses-permission android:name="android.permission.CAMERA" />
+
+	<!-- Storage / Media -->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<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/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]
-    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/Info.plist

@@ -35,5 +35,28 @@
 	    <key>NSAllowsArbitraryLoads</key>
 	    <true/>
     </dict>
+
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Questa app utilizza la tua posizione per migliorare alcune funzionalità basate sulla localizzazione.</string>
+
+	<key>NSLocationWhenInUseUsageDescription</key>
+    <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>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.0.1</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>2.2.0</ApplicationDisplayVersion>
-		<ApplicationVersion>4</ApplicationVersion>
+		<ApplicationVersion>24</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -78,18 +78,21 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
-		<CodesignKey>Apple Development: Created via API (5B7B69P4JY)</CodesignKey>
+		<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
-		<CodesignProvision>VS: WildCard Development</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'">
@@ -102,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" />
@@ -117,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.2" />
-		<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

@@ -2,49 +2,61 @@
 
 <div class="@(Back ? "" : "container") header">
     <div class="header-content @(Back ? "with-back" : "no-back")">
-        @if (Back)
+        @if (!SmallHeader)
         {
-            <div class="left-section">
+            @if (Back)
-                <MudButton StartIcon="@(!Cancel ? Icons.Material.Outlined.ArrowBackIosNew : "")"
-                           OnClick="GoBack"
-                           Color="Color.Info"
-                           Style="text-transform: none"
-                           Variant="Variant.Text">
-                    @BackTo
-                </MudButton>
-            </div>
-        }
-
-        <h3 class="page-title">@Title</h3>
-
-        <div class="right-section">
-            @if (LabelSave.IsNullOrEmpty())
             {
-                @if (ShowFilter)
+                <div class="left-section">
-                {
+                    <MudButton StartIcon="@(!Cancel ? Icons.Material.Outlined.ArrowBackIosNew : "")"
-                    <MudIconButton OnClick="OnFilterToggle" Icon="@Icons.Material.Outlined.FilterAlt"/>
+                               OnClick="GoBack"
-                }
+                               Color="Color.Info"
+                               Style="text-transform: none"
+                               Variant="Variant.Text">
+                        @BackTo
+                    </MudButton>
+                </div>
+            }
 
-                @* @if (ShowCalendarToggle)
+            <h3 class="page-title">@Title</h3>
+
+            <div class="right-section">
+                @if (LabelSave.IsNullOrEmpty())
+                {
+                    @if (ShowFilter)
+                    {
+                        <MudIconButton OnClick="OnFilterToggle" Icon="@Icons.Material.Outlined.FilterAlt"/>
+                    }
+
+                    @* @if (ShowCalendarToggle)
                 {
                     <MudIconButton OnClick="OnCalendarToggle" Icon="@Icons.Material.Filled.CalendarMonth" Color="Color.Dark"/>
                 } *@
 
-                @if (ShowProfile)
+                    @if (ShowProfile)
-                {
+                    {
-                    <MudIconButton Class="user" OnClick="OpenPersonalInfo" Icon="@Icons.Material.Filled.Person"/>
+                        <MudIconButton Class="user" OnClick="OpenPersonalInfo" Icon="@Icons.Material.Filled.Person"/>
+                    }
                 }
-            }
+                else
-            else
+                {
-            {
+                    <MudButton OnClick="OnSave"
-                <MudButton OnClick="OnSave"
+                               Color="Color.Info"
-                           Color="Color.Info"
+                               Style="text-transform: none"
-                           Style="text-transform: none"
+                               Variant="Variant.Text">
-                           Variant="Variant.Text">
+                        @LabelSave
-                    @LabelSave
+                    </MudButton>
-                </MudButton>
+                }
-            }
+            </div>
-        </div>
+        }
+        else
+        {
+            <div class="title">
+                <MudText Typo="Typo.h6">
+                    <b>@Title</b>
+                </MudText>
+                <MudIconButton Icon="@Icons.Material.Filled.Close" OnClick="() => GoBack()" />
+            </div>
+        }
     </div>
 </div>
 
@@ -66,6 +78,8 @@
     [Parameter] public bool ShowCalendarToggle { get; set; }
     [Parameter] public EventCallback OnCalendarToggle { get; set; }
 
+    [Parameter] public bool SmallHeader { get; set; }
+
     protected override void OnParametersSet()
     {
         Back = !Back ? !Back && Cancel : Back;

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

@@ -1,4 +1,12 @@
+.header {
+    min-height: var(--mh-header);
+    width: 100%;
+    display: flex;
+    align-items: center;
+}
+
 .header-content {
+    width: 100%;
     line-height: normal;
     display: flex;
     justify-content: space-between;
@@ -6,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,16 +1,20 @@
 @using System.Globalization
-@using CommunityToolkit.Mvvm.Messaging
+@using salesbook.Shared.Core.Interface.IntegryApi
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Messages.Back
 @inherits LayoutComponentBase
 @inject IJSRuntime JS
-@inject IMessenger Messenger
 @inject BackNavigationService BackService
+@inject INetworkService NetworkService
+@inject IIntegryApiService IntegryApiService
 
 <MudThemeProvider Theme="_currentTheme" @ref="@_mudThemeProvider" @bind-IsDarkMode="@IsDarkMode" />
 <MudPopoverProvider/>
 <MudDialogProvider/>
 <MudSnackbarProvider/>
 
+<ConnectionState IsNetworkAvailable="IsNetworkAvailable" ServicesIsDown="ServicesIsDown" ShowWarning="ShowWarning" />
+
 <div class="page">
     <NavMenu/>
 
@@ -19,7 +23,6 @@
             @Body
         </article>
     </main>
-
 </div>
 
 @code {
@@ -27,6 +30,49 @@
     private bool IsDarkMode { get; set; }
     private string _mainContentClass = "";
 
+    //Connection state
+    private bool _isNetworkAvailable;
+    private bool _servicesIsDown;
+    private bool _showWarning;
+
+    private DateTime _lastApiCheck = DateTime.MinValue;
+    private const int DelaySeconds = 90;
+
+    private CancellationTokenSource? _cts;
+
+    private bool ServicesIsDown
+    {
+        get => _servicesIsDown;
+        set
+        {
+            if (_servicesIsDown == value) return;
+            _servicesIsDown = value;
+            StateHasChanged();
+        }
+    }
+
+    private bool IsNetworkAvailable
+    {
+        get => _isNetworkAvailable;
+        set
+        {
+            if (_isNetworkAvailable == value) return;
+            _isNetworkAvailable = value;
+            StateHasChanged();
+        }
+    }
+
+    private bool ShowWarning
+    {
+        get => _showWarning;
+        set
+        {
+            if (_showWarning == value) return;
+            _showWarning = value;
+            StateHasChanged();
+        }
+    }
+
     private readonly MudTheme _currentTheme = new()
     {
         PaletteLight = new PaletteLight()
@@ -81,6 +127,9 @@
 
     protected override void OnInitialized()
     {
+        _cts = new CancellationTokenSource();
+        _ = CheckConnectionState(_cts.Token);
+
         BackService.OnHardwareBack += async () => { await JS.InvokeVoidAsync("goBack"); };
 
         var culture = new CultureInfo("it-IT", false);
@@ -89,4 +138,40 @@
         CultureInfo.CurrentUICulture = culture;
     }
 
+    private Task CheckConnectionState(CancellationToken token)
+    {
+        return Task.Run(async () =>
+        {
+            while (!token.IsCancellationRequested)
+            {
+                var isNetworkAvailable = NetworkService.IsNetworkAvailable();
+                var servicesDown = ServicesIsDown;
+
+                if (isNetworkAvailable && (DateTime.UtcNow - _lastApiCheck).TotalSeconds >= DelaySeconds)
+                {
+                    servicesDown = !await IntegryApiService.SystemOk();
+                    _lastApiCheck = DateTime.UtcNow;
+                }
+
+                await InvokeAsync(async () =>
+                {
+                    IsNetworkAvailable = isNetworkAvailable;
+                    ServicesIsDown = servicesDown;
+
+                    await Task.Delay(1500, token);
+                    ShowWarning = !(IsNetworkAvailable && !ServicesIsDown);
+                    NetworkService.ConnectionAvailable = !ShowWarning;
+                });
+
+                await Task.Delay(500, token);
+            }
+        }, token);
+    }
+
+    public void Dispose()
+    {
+        _cts?.Cancel();
+        _cts?.Dispose();
+    }
+
 }

salesbook.Shared/Components/Layout/NavMenu.razor

@@ -1,14 +1,24 @@
 @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")">
+<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")">
+    <nav class="navbar @(IsVisible ? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
         <div class="container-navbar">
             <ul class="navbar-nav flex-row nav-justified align-items-center w-100 text-center">
                 <li class="nav-item">
@@ -28,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>
@@ -42,11 +54,11 @@
         {
             <MudMenu PopoverClass="custom_popover" AnchorOrigin="Origin.TopLeft" TransformOrigin="Origin.BottomRight">
                 <ActivatorContent>
-                    <MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add" />
+                    <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 Disabled="true">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>
         }
@@ -60,16 +72,16 @@
 
     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);
 
-            var newIsVisible = new List<string> { "Calendar", "Users", "Notifications" }
+            var newIsVisible = new List<string> { "Calendar", "Users", "Notifications", "Commessa" }
                 .Contains(location);
 
-            var newPlusVisible = new List<string> { "Calendar", "Users" }
+            var newPlusVisible = new List<string> { "Calendar", "Users", "Commessa" }
                 .Contains(location);
 
             if (IsVisible == newIsVisible && PlusVisible == newPlusVisible) return;
@@ -92,5 +104,27 @@
             Messenger.Send(new NewActivityMessage(((StbActivity)result.Data).ActivityId));
         }
     }
-}
 
+    private async Task CreateUser()
+    {
+        var result = await ModalHelpers.OpenUserForm(Dialog, null);
+
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(CRMCreateContactResponseDTO))
+        {
+            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

@@ -1,15 +1,16 @@
 @page "/Calendar"
-@using salesbook.Shared.Core.Dto
-@using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout
-@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Components.SingleElements.BottomSheet
-@using salesbook.Shared.Core.Entity
+@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"
@@ -169,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 = "");
 
@@ -181,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; }
@@ -222,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 };
 
@@ -269,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,10 +481,8 @@
 
         var start = CurrentMonth;
         var end = start.AddDays(DaysInMonth - 1);
-        var activities = await ManageData.GetActivity(x =>
+        var activities = await ManageData.GetActivity(new WhereCondActivity{Start = start, End = end});
-            (x.EffectiveDate == null && x.EstimatedDate >= start && x.EstimatedDate <= end) ||
+        MonthActivities = activities.OrderBy(x => x.EffectiveTime ?? x.EstimatedTime).ToList();
-            (x.EffectiveDate >= start && x.EffectiveDate <= end));
-        MonthActivities = activities.OrderBy(x => x.EffectiveDate ?? x.EstimatedDate).ToList();
 
         PrepareRenderingData();
         IsLoading = false;
@@ -485,6 +492,8 @@
     // Selezione giorno in settimana
     private async Task SelezionaData(DateTime day)
     {
+        if (IsLoading) return;
+        
         SelectedDate = day;
 
         var cacheInternalMonth = _internalMonth;
@@ -506,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;
@@ -542,7 +553,7 @@
 
         await ManageData.DeleteActivity(activity);
 
-        var indexActivity = MonthActivities?.FindIndex(x => x.ActivityId.Equals(activity.ActivityId));
+        var indexActivity = MonthActivities?.FindIndex(x => x.ActivityId!.Equals(activity.ActivityId));
 
         if (indexActivity != null)
         {
@@ -559,7 +570,7 @@
     {
         IsLoading = true;
 
-        var activity = (await ManageData.GetActivity(x => x.ActivityId.Equals(activityId))).LastOrDefault();
+        var activity = (await ManageData.GetActivity(new WhereCondActivity {ActivityId = activityId}, true)).LastOrDefault();
 
         if (activity == null)
         {
@@ -567,7 +578,7 @@
             return;
         }
 
-        var date = activity.EffectiveDate ?? activity.EstimatedDate;
+        var date = activity.EffectiveTime ?? activity.EstimatedTime;
 
         if (CurrentMonth.Month != date!.Value.Month)
         {
@@ -584,7 +595,7 @@
 
     private async Task OnActivityChanged(string activityId)
     {
-        var newActivity = await ManageData.GetActivity(x => x.ActivityId.Equals(activityId));
+        var newActivity = await ManageData.GetActivity(new WhereCondActivity { ActivityId = activityId }, true);
         var indexActivity = MonthActivities?.FindIndex(x => x.ActivityId.Equals(activityId));
 
         if (indexActivity != null && !newActivity.IsNullOrEmpty())

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: 70px;
+    padding-bottom: 9vh;
-    height: calc(100% - 130px);
 }
 
 .appointments.ah-calendar-m { height: calc(100% - 315px) !important; }

salesbook.Shared/Components/Pages/Commessa.razor

@@ -0,0 +1,173 @@
+@page "/commessa/{CodJcom}"
+@page "/commessa/{CodJcom}/{RagSoc}"
+@attribute [Authorize]
+@using AutoMapper
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Core.Dto.Activity
+@using salesbook.Shared.Core.Dto.JobProgress
+@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
+@inject IMapper Mapper
+
+<HeaderLayout Title="@CodJcom" ShowProfile="false" Back="true" BackTo="Indietro"/>
+
+@if (IsLoading)
+{
+    <SpinnerLayout FullScreen="true"/>
+}
+else
+{
+    <div class="container content pb-safe-area">
+        @if (CommessaModel == null)
+        {
+            <NoDataAvailable Text="Nessuna commessa trovata"/>
+        }
+        else
+        {
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked>
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3">
+
+            <div class="box">
+                <ul class="tab-list">
+                    <li class="tab-item"><label class="tab-trigger" for="tab1">Avanzamento</label></li>
+                    <li class="tab-item"><label class="tab-trigger" for="tab2">Attività</label></li>
+                    <li class="tab-item"><label class="tab-trigger" for="tab3">Allegati</label></li>
+                </ul>
+            </div>
+
+            <!-- contenuti -->
+            <div class="tab-container">
+                <div class="tab-content">
+                    @if (Steps != null)
+                    {
+                        <div class="timeline-container">
+                            <div class="timeline">
+                                @foreach (var step in Steps)
+                                {
+                                    <div class="step">
+                                        <div class="@(step.Status!.Skip ? "circle skipped" : step.Status!.Progress ? "in-progress" : "circle completed")"></div>
+                                        <div class="label">
+                                            <div class="titleStep">@step.StepName</div>
+                                            @if (step.Date is not null)
+                                            {
+                                                <div class="subtitleStep">@($"{step.Date.Value:D}") @(step.Status!.Progress ? "(In corso...)" : "")</div>
+                                            }
+                                        </div>
+                                    </div>
+                                }
+                            </div>
+                        </div>
+                    }
+                </div>
+                <div class="tab-content">
+                    @if (ActivityIsLoading)
+                    {
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    }
+                    else
+                    {
+                        @if (ActivityList is { Count: > 0 })
+                        {
+                            <div class="contentFlex">
+                                <Virtualize Items="ActivityList" Context="activity">
+                                    <ActivityCard ShowDate="true" Activity="activity" />
+                                </Virtualize>
+                            </div>
+                        }
+                        else
+                        {
+                            <NoDataAvailable Text="Nessuna attività trovata" />
+                        }
+                    }
+                </div>
+                <div class="tab-content">
+                    @if (AttachedIsLoading)
+                    {
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    }
+                    else
+                    {
+                        @if (ListAttached != null)
+                        {
+                            <div class="contentFlex">
+                                <Virtualize Items="ListAttached" Context="attached">
+                                    <AttachCard Attached="attached" />
+                                </Virtualize>
+                            </div>
+                        }
+                        else
+                        {
+                            <NoDataAvailable Text="Nessun allegato presente" />
+                        }
+                    }
+                </div>
+            </div>
+        }
+    </div>
+}
+
+@code {
+    [Parameter] public string CodJcom { get; set; } = "";
+    [Parameter] public string RagSoc { get; set; } = "";
+
+    private List<CRMJobStepDTO>? Steps { get; set; }
+    private List<ActivityDTO> ActivityList { get; set; } = [];
+    private List<CRMAttachedResponseDTO>? ListAttached { get; set; }
+    private JtbComt? CommessaModel { get; set; }
+
+    private bool IsLoading { get; set; } = true;
+    private bool ActivityIsLoading { get; set; } = true;
+    private bool AttachedIsLoading { get; set; } = true;
+
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadData();
+    }
+
+    private async Task LoadData()
+    {
+        CommessaModel = (await ManageData.GetTable<JtbComt>(x => x.CodJcom.Equals(CodJcom))).LastOrDefault();
+        Steps = JobSteps.Steps;
+
+        _ = LoadActivity();
+        _ = LoadAttached();
+
+        IsLoading = false;
+    }
+
+    private async Task LoadActivity()
+    {
+        await Task.Run(async () =>
+        {
+            var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodJcom = CodJcom });
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
+        });
+
+        ActivityIsLoading = false;
+        StateHasChanged();
+    }
+
+    private async Task LoadAttached()
+    {
+        await Task.Run(async () =>
+        {
+            ListAttached = await IntegryApiService.RetrieveAttached(CodJcom);
+        });
+
+        AttachedIsLoading = false;
+        StateHasChanged();
+    }
+
+}
+

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

@@ -0,0 +1,229 @@
+/* Container scrollabile */
+
+.timeline-container {
+    height: 100%;
+    overflow-y: auto;
+    padding-right: 10px;
+}
+
+.timeline {
+    display: flex;
+    flex-direction: column;
+    gap: 1.5rem;
+    position: relative;
+    padding-left: 40px; /* spazio per linea e cerchi */
+}
+
+.step {
+    display: flex;
+    align-items: flex-start;
+    gap: 15px;
+    position: relative;
+}
+
+/* Linea sopra e sotto ogni step */
+
+.step::before,
+.step::after {
+    content: "";
+    position: absolute;
+    left: -31px;
+    width: 2px;
+    background: #ddd;
+}
+
+.step::after {
+    top: 30%;
+    bottom: -1.5rem;
+}
+
+.step:first-child::before { display: none; }
+
+.step:last-child::after { display: none; }
+
+/* Cerchio base */
+
+.circle,
+.in-progress {
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    z-index: 1;
+    margin-left: -40px;
+    background-color: var(--mud-palette-tertiary);
+}
+
+/* Stato skippato */
+
+.skipped { background: #ccc; }
+
+/* Stato completato */
+
+.completed {
+    background: var(--mud-palette-primary);
+    color: white;
+    font-weight: bold;
+}
+
+/* Stato in corso con spinner */
+
+.in-progress {
+    border: 2px solid var(--mud-palette-primary);
+    border-top: 2px solid transparent;
+    animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+
+    100% { transform: rotate(360deg); }
+}
+
+/* Label con titolo + sottotitolo */
+
+.label {
+    display: flex;
+    flex-direction: column;
+}
+
+.titleStep {
+    font-size: 1.1rem;
+    font-weight: 600;
+    color: #111;
+    line-height: normal;
+}
+
+.subtitleStep {
+    font-size: .90rem;
+    color: #666;
+    line-height: normal;
+}
+
+.timeline-container::-webkit-scrollbar { width: 6px; }
+
+.timeline-container::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 3px;
+}
+
+/*--------------
+    TabPanel
+----------------*/
+
+.box {
+    display: flex;
+    flex-direction: column;
+    width: -webkit-fill-available;
+    background: var(--light-card-background);
+    border-radius: 16px;
+    overflow: clip;
+    margin-bottom: 1rem;
+}
+
+/* nascondo gli input */
+
+.tab-toggle { display: none; }
+
+.tab-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    display: flex;
+    position: relative;
+    z-index: 1;
+}
+
+/* la lineetta */
+
+.tab-list::before {
+    content: '';
+    display: block;
+    height: 3px;
+    width: calc(100% / 3);
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background-color: var(--mud-palette-primary);
+    transition: transform .3s;
+}
+
+.tab-item {
+    flex: 1;
+    text-align: center;
+    transition: .3s;
+    opacity: 0.5;
+}
+
+.tab-trigger {
+    display: block;
+    padding: 10px 0;
+    cursor: pointer;
+}
+
+/* tab attivo */
+
+#tab1:checked ~ .box .tab-list .tab-item:nth-child(1),
+#tab2:checked ~ .box .tab-list .tab-item:nth-child(2),
+#tab3:checked ~ .box .tab-list .tab-item:nth-child(3) {
+    opacity: 1;
+    font-weight: bold;
+    display: block;
+}
+
+/* spostamento lineetta */
+
+#tab1:checked ~ .box .tab-list::before { transform: translateX(0%); }
+
+#tab2:checked ~ .box .tab-list::before { transform: translateX(100%); }
+
+#tab3:checked ~ .box .tab-list::before { transform: translateX(200%); }
+
+.tab-container {
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    width: -webkit-fill-available;
+}
+
+.tab-content {
+    display: none;
+    flex: 1;
+    overflow-y: auto;
+    animation: fade .3s ease;
+    padding: .5rem;
+}
+
+.contentFlex {
+    display: flex;
+    flex-direction: column;
+    gap: 1.25rem;
+}
+
+.tab-content::-webkit-scrollbar { width: 6px; }
+
+.tab-content::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 3px;
+}
+
+.contentFlex ::deep > div:first-child:not(.activity-card) { display: none; }
+
+#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) { display: block; }
+
+@keyframes fade {
+    from {
+        opacity: 0;
+        transform: translateY(5px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}

salesbook.Shared/Components/Pages/Home.razor

@@ -1,22 +1,75 @@
 @page "/"
-@using salesbook.Shared.Core.Interface
 @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"/>
 
 @code
 {
-    protected override Task OnInitializedAsync()
+    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.IsNetworkAvailable() && 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("/");
-            return base.OnInitializedAsync();
+            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");
-        return base.OnInitializedAsync();
+    }
+
+    private async Task LoadNotification()
+    {
+        await NotificationService.LoadNotification();
+        Messenger.Send(new NotificationsLoadedMessage());
+    }
+
+    private async Task CheckAndRequestPermissions()
+    {
+        await NotificationManager.RequestAccess();
+    }
+
+    private Task StartSyncUser()
+    {
+        return Task.Run(() => { _ = PreloadService.PreloadUsersAsync(); });
     }
 }

salesbook.Shared/Components/Pages/Login.razor

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

salesbook.Shared/Components/Pages/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,8 +1,10 @@
 @page "/PersonalInfo"
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Authorization.Enum
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.System.Network
 @using salesbook.Shared.Core.Services
 @inject AppAuthenticationStateProvider AuthenticationStateProvider
 @inject INetworkService NetworkService
@@ -12,10 +14,11 @@
 
 @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 +26,8 @@
                     <span class="info-nome">@UserSession.User.Fullname</span>
                     @if (UserSession.User.KeyGroup is not null)
                     {
-                        <span class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span>
+                        <span
+                            class="info-section">@(((KeyGroupEnum)UserSession.User.KeyGroup).ConvertToHumanReadable())</span>
                     }
                 </div>
             </div>
@@ -39,7 +43,7 @@
 
                     <div>
                         <span class="info-title">Status</span>
-                        @if (NetworkService.IsNetworkAvailable())
+                        @if (NetworkService.ConnectionAvailable)
                         {
                             <div class="status online">
                                 <i class="ri-wifi-line"></i>
@@ -84,21 +88,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 +116,8 @@
             </MudButton>
         </div>
     </div>
+
+    <AppVersion/>
 }
 
 @code {
@@ -129,7 +135,7 @@
     {
         await Task.Run(() =>
         {
-            Unavailable = FormFactor.IsWeb() || !NetworkService.IsNetworkAvailable();
+            Unavailable = FormFactor.IsWeb() || !NetworkService.ConnectionAvailable;
             LastSync = LocalStorage.Get<DateTime>("last-sync");
         });
 
@@ -148,6 +154,8 @@
 
     private void UpdateDb(bool withData = false)
     {
+        LocalStorage.Remove("last-user-sync");
+        
         var absoluteUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri);
         var pathAndQuery = absoluteUri.Segments.Length > 1 ? absoluteUri.PathAndQuery : null;
 

salesbook.Shared/Components/Pages/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,27 +1,29 @@
 @page "/sync"
 @page "/sync/{DateFilter}"
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Core.Interface
-@inject ISyncDbService syncDb
+@inject ISyncDbService SyncDb
-@inject IManageDataService manageData
+@inject IManageDataService ManageData
 
 <SyncSpinner Elements="@Elements"/>
 
+<AppVersion/>
+
 @code {
     [Parameter] public string? DateFilter { get; set; }
 
     private Dictionary<string, bool> Elements { get; set; } = new();
 
-    private bool _hasStarted = false;
+    private bool _hasStarted;
-    private int _completedCount = 0;
+    private int _completedCount;
 
     protected override void OnInitialized()
     {
-        Elements["Attività"] = false;
         Elements["Commesse"] = false;
-        Elements["Clienti"] = false;
+
-        Elements["Prospect"] = false;
+        if (DateFilter is null)
-        Elements["Impostazioni"] = false;
+            Elements["Impostazioni"] = false;
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -31,14 +33,9 @@
             _hasStarted = true;
 
             if (DateFilter is null)
-            {
+                await ManageData.ClearDb();
-                await manageData.ClearDb();
-            }
 
             await Task.WhenAll(
-                RunAndTrack(SetActivity),
-                RunAndTrack(SetClienti),
-                RunAndTrack(SetProspect),
                 RunAndTrack(SetCommesse),
                 RunAndTrack(SetSettings)
             );
@@ -62,33 +59,9 @@
         }
     }
 
-    private async Task SetActivity()
-    {
-        await Task.Run(async () => { await syncDb.GetAndSaveActivity(DateFilter); });
-
-        Elements["Attività"] = true;
-        StateHasChanged();
-    }
-
-    private async Task SetClienti()
-    {
-        await Task.Run(async () => { await syncDb.GetAndSaveClienti(DateFilter); });
-
-        Elements["Clienti"] = true;
-        StateHasChanged();
-    }
-
-    private async Task SetProspect()
-    {
-        await Task.Run(async () => { await syncDb.GetAndSaveProspect(DateFilter); });
-
-        Elements["Prospect"] = true;
-        StateHasChanged();
-    }
-
     private async Task SetCommesse()
     {
-        await Task.Run(async () => { await syncDb.GetAndSaveCommesse(DateFilter); });
+        await Task.Run(async () => { await SyncDb.GetAndSaveCommesse(DateFilter); });
 
         Elements["Commesse"] = true;
         StateHasChanged();
@@ -96,10 +69,13 @@
 
     private async Task SetSettings()
     {
-        await Task.Run(async () => { await syncDb.GetAndSaveSettings(DateFilter); });
+        if (DateFilter is null)
+        {
+            await Task.Run(async () => { await SyncDb.GetAndSaveSettings(DateFilter); });
 
-        Elements["Impostazioni"] = true;
+            Elements["Impostazioni"] = true;
-        StateHasChanged();
+            StateHasChanged();
+        }
     }
 
 }

salesbook.Shared/Components/Pages/User.razor

@@ -1,12 +1,30 @@
-@page "/User/{CodAnag}"
+@page "/User/{CodContact}/{IsContact:bool}"
 @attribute [Authorize]
+@using AutoMapper
 @using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Components.SingleElements
+@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
+@inject IDialogService Dialog
+@inject IIntegryApiService IntegryApiService
+@inject UserPageState UserState
 
-<HeaderLayout BackTo="Indietro" Back="true" BackOnTop="true" Title="" ShowProfile="false"/>
+<HeaderLayout BackTo="Indietro"
+              LabelSave="Modifica"
+              OnSave="() => OpenUserForm(Anag)"
+              Back="true"
+              BackOnTop="true"
+              Title=""
+              ShowProfile="false"/>
 
 @if (IsLoading)
 {
@@ -14,18 +32,21 @@
 }
 else
 {
-    <div class="container content">
+    <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>
 
                 <div class="personal-info">
                     <span class="info-nome">@Anag.RagSoc</span>
-                    @if (UserSession.User.KeyGroup is not null)
+                    @if (!string.IsNullOrEmpty(Anag.Indirizzo))
                     {
                         <span class="info-section">@Anag.Indirizzo</span>
+                    }
+                    @if (!string.IsNullOrEmpty(Anag.Cap) && !string.IsNullOrEmpty(Anag.Citta) && !string.IsNullOrEmpty(Anag.Prov))
+                    {
                         <span class="info-section">@($"{Anag.Cap} - {Anag.Citta} ({Anag.Prov})")</span>
                     }
                 </div>
@@ -34,99 +55,752 @@ else
             <div class="divider"></div>
 
             <div class="section-info">
-                <div class="section-personal-info">
+                @if (Agente != null)
-                    <div>
-                        <span class="info-title">Telefono</span>
-                        <span class="info-text">
-                            @if (string.IsNullOrEmpty(Anag.Telefono))
-                            {
-                                @("Nessuna mail configurata")
-                            }
-                            else
-                            {
-                                @Anag.Telefono
-                            }
-                        </span>
-                    </div>
-                </div>
-
-                <div class="section-personal-info">
-                    <div>
-                        <span class="info-title">E-mail</span>
-                        <span class="info-text">
-                            @if (string.IsNullOrEmpty(Anag.EMail))
-                            {
-                                @("Nessuna mail configurata")
-                            }
-                            else
-                            {
-                                @Anag.EMail
-                            }
-                        </span>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <MudTabs Elevation="2" Rounded="true" PanelClass="pt-6" Style="width: 100%" Centered="true">
-            <MudTabPanel Text="Contatti">
-                @if (PersRif is { Count: > 0 })
                 {
-                    <div class="container-pers-rif">
+                    <div class="section-personal-info">
-                        <Virtualize Items="PersRif" Context="person">
+                        <div>
-                            @{
+                            <span class="info-title">Agente</span>
-                                var index = PersRif.IndexOf(person);
+                            <span class="info-text">@Agente.FullName</span>
-                                var isLast = index == PersRif.Count - 1;
+                        </div>
-                            }
-                            <ContactCard Contact="person" />
-                            @if (!isLast)
-                            {
-                                <div class="divider"></div>
-                            }
-                        </Virtualize>
                     </div>
                 }
 
-                <div class="container-button">
+                @if (!string.IsNullOrEmpty(Anag.Telefono))
-                    <MudButton Class="button-settings infoText"
+                {
-                               FullWidth="true"
+                    <div class="section-personal-info">
-                               Size="Size.Medium"
+                        <div>
-                               Variant="Variant.Outlined">
+                            <span class="info-title">Telefono</span>
-                        Aggiungi contatto
+                            <span class="info-text">@Anag.Telefono</span>
-                    </MudButton>
+                        </div>
+                    </div>
+                }
+
+                @if (!string.IsNullOrEmpty(Anag.PartIva))
+                {
+                    <div class="section-personal-info">
+                        <div>
+                            <span class="info-title">P. IVA</span>
+                            <span class="info-text">@Anag.PartIva</span>
+                        </div>
+                    </div>
+                }
+
+                @if (!string.IsNullOrEmpty(Anag.EMail))
+                {
+                    <div class="section-personal-info">
+                        <div>
+                            <span class="info-title">E-mail</span>
+                            <span class="info-text">@Anag.EMail</span>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+        
+        <div class="tab-section">
+            <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">
+                        <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>
-            </MudTabPanel>
+
-            <MudTabPanel Text="Commesse">
+                <!-- Tab Commesse -->
-                <Virtualize Items="Commesse" Context="commessa">
+                <div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
-                    <CommessaCard Commessa="commessa" />
+                    @if (IsLoadingCommesse)
-                </Virtualize>
+                    {
-            </MudTabPanel>
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
-        </MudTabs>
+                    }
+                    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<69> -->
+                <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<69> 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>
 }
 
 @code {
-    [Parameter] public string CodAnag { get; set; }
+    [Parameter] public string CodContact { get; set; } = string.Empty;
+    [Parameter] public bool IsContact { get; set; }
 
-    private AnagClie Anag { get; set; } = new();
+    // Dati principali
-    private List<VtbCliePersRif>? PersRif { get; set; }
+    private ContactDTO Anag { get; set; } = new();
-    private List<JtbComt> Commesse { get; set; }
+    private List<PersRifDTO>? PersRif { get; set; }
+    private List<JtbComt>? Commesse { get; set; }
+    private List<ActivityDTO> ActivityList { get; set; } = [];
+    private StbUser? Agente { get; set; }
+    private Dictionary<string, List<CRMJobStepDTO>?> Steps { get; set; } = new();
 
+    // Stati di caricamento
     private bool IsLoading { get; set; } = true;
+    private bool IsLoadingCommesse { get; set; } = true;
+    private bool ActivityIsLoading { get; set; } = true;
+    private bool IsLoadingSteps { get; set; }
+    private readonly HashSet<string> _loadingSteps = [];
+
+    // Gestione tab
+    private int ActiveTab { get; set; }
+
+    // Paginazione e filtri per COMMESSE
+    private int _selectedPageCommesse = 1;
+    private int _selectedPageSizeCommesse = 5;
+    private string _searchTermCommesse = string.Empty;
+    private List<JtbComt> _filteredCommesse = [];
+
+    // Paginazione e filtri per ATTIVIT<49>
+    private int _currentPageActivity = 1;
+    private int _selectedPageSizeActivity = 5;
+    private string _searchTermActivity = string.Empty;
+    private List<ActivityDTO> _filteredActivity = [];
+
+    // Cancellation tokens per gestire le richieste asincrone
+    private CancellationTokenSource? _loadingCts;
+    private CancellationTokenSource? _stepsCts;
+
+    // Timer per il debounce della ricerca
+    private Timer? _searchTimerCommesse;
+    private Timer? _searchTimerActivity;
+    private const int SearchDelayMs = 300;
+
+    #region Properties per Commesse
+
+    private int SelectedPageCommesse
+    {
+        get => _selectedPageCommesse;
+        set
+        {
+            if (_selectedPageCommesse == value) return;
+            _selectedPageCommesse = value;
+            _ = LoadStepsForCurrentPageAsync();
+        }
+    }
+
+    private int SelectedPageSizeCommesse
+    {
+        get => _selectedPageSizeCommesse;
+        set
+        {
+            if (_selectedPageSizeCommesse == value) return;
+            _selectedPageSizeCommesse = value;
+            _selectedPageCommesse = 1;
+            ApplyFiltersCommesse();
+            _ = LoadStepsForCurrentPageAsync();
+        }
+    }
+
+    private string SearchTermCommesse
+    {
+        get => _searchTermCommesse;
+        set
+        {
+            if (_searchTermCommesse == value) return;
+            _searchTermCommesse = value;
+
+            _searchTimerCommesse?.Dispose();
+            _searchTimerCommesse = new Timer(async _ => await InvokeAsync(ApplyFiltersCommesse), null, SearchDelayMs, Timeout.Infinite);
+        }
+    }
+
+    private List<JtbComt> FilteredCommesse
+    {
+        get => _filteredCommesse;
+        set
+        {
+            _filteredCommesse = value;
+            StateHasChanged();
+        }
+    }
+
+    private int TotalPagesCommesse =>
+        FilteredCommesse.Count == 0 ? 1 : (int)Math.Ceiling(FilteredCommesse.Count / (double)SelectedPageSizeCommesse);
+
+    private IEnumerable<JtbComt> CurrentPageCommesse =>
+        FilteredCommesse.Skip((SelectedPageCommesse - 1) * SelectedPageSizeCommesse).Take(SelectedPageSizeCommesse);
+
+    #endregion
+
+    #region Properties per Attivit<69>
+
+    private int CurrentPageActivityIndex
+    {
+        get => _currentPageActivity;
+        set
+        {
+            if (_currentPageActivity == value) return;
+            _currentPageActivity = value;
+            StateHasChanged();
+        }
+    }
+
+    private int SelectedPageSizeActivity
+    {
+        get => _selectedPageSizeActivity;
+        set
+        {
+            if (_selectedPageSizeActivity == value) return;
+            _selectedPageSizeActivity = value;
+            _currentPageActivity = 1;
+            ApplyFiltersActivity();
+        }
+    }
+
+    private string SearchTermActivity
+    {
+        get => _searchTermActivity;
+        set
+        {
+            if (_searchTermActivity == value) return;
+            _searchTermActivity = value;
+
+            _searchTimerActivity?.Dispose();
+            _searchTimerActivity = new Timer(async _ => await InvokeAsync(ApplyFiltersActivity), null, SearchDelayMs, Timeout.Infinite);
+        }
+    }
+
+    private List<ActivityDTO> FilteredActivity
+    {
+        get => _filteredActivity;
+        set
+        {
+            _filteredActivity = value;
+            InvokeAsync(StateHasChanged);
+        }
+    }
+
+    private int TotalPagesActivity =>
+        FilteredActivity.Count == 0 ? 1 : (int)Math.Ceiling(FilteredActivity.Count / (double)SelectedPageSizeActivity);
+
+    private IEnumerable<ActivityDTO> CurrentPageActivity =>
+        FilteredActivity.Skip((CurrentPageActivityIndex - 1) * SelectedPageSizeActivity).Take(SelectedPageSizeActivity);
+
+    #endregion
+
+    #region Lifecycle Methods
 
     protected override async Task OnInitializedAsync()
     {
-        await LoadData();
+        try
+        {
+            _loadingCts = new CancellationTokenSource();
+
+            if (UserState.CodUser?.Equals(CodContact) == true)
+            {
+                LoadDataFromSession();
+            }
+            else
+            {
+                await LoadDataAsync();
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore in OnInitializedAsync: {ex.Message}");
+        }
+        finally
+        {
+            IsLoading = false;
+            StateHasChanged();
+        }
     }
 
-    private async Task LoadData()
+    public async ValueTask DisposeAsync()
     {
-        Anag = (await ManageData.GetTable<AnagClie>(x => x.CodAnag.Equals(CodAnag))).Last();
+        _loadingCts?.CancelAsync();
-        PersRif = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag.Equals(Anag.CodAnag));
+        _loadingCts?.Dispose();
-        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodAnag));
+        _stepsCts?.CancelAsync();
+        _stepsCts?.Dispose();
+        _searchTimerCommesse?.DisposeAsync();
+        _searchTimerActivity?.DisposeAsync();
+    }
 
-        IsLoading = false;
+    #endregion
+
+    #region Data Loading Methods
+
+    private async Task LoadDataAsync()
+    {
+        try
+        {
+            await LoadAnagAsync();
+            await LoadPersRifAsync();
+            _ = LoadActivity();
+
+            if (!string.IsNullOrEmpty(Anag.CodVage))
+            {
+                Agente = (await ManageData.GetTable<StbUser>(x => x.UserCode != null && x.UserCode.Equals(Anag.CodVage)))
+                    .LastOrDefault();
+            }
+
+            SaveDataToSession();
+
+            _ = Task.Run(async () => await LoadCommesseAsync());
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore nel caricamento dati: {ex.Message}");
+        }
+    }
+
+    private async Task LoadAnagAsync()
+    {
+        if (IsContact)
+        {
+            var clie = (await ManageData.GetTable<AnagClie>(x => x.CodAnag!.Equals(CodContact))).Last();
+            Anag = Mapper.Map<ContactDTO>(clie);
+        }
+        else
+        {
+            var pros = (await ManageData.GetTable<PtbPros>(x => x.CodPpro!.Equals(CodContact))).Last();
+            Anag = Mapper.Map<ContactDTO>(pros);
+        }
+    }
+
+    private async Task LoadPersRifAsync()
+    {
+        if (IsContact)
+        {
+            var pers = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag!.Equals(Anag.CodContact));
+            PersRif = Mapper.Map<List<PersRifDTO>>(pers);
+        }
+        else
+        {
+            var pers = await ManageData.GetTable<PtbProsRif>(x => x.CodPpro!.Equals(Anag.CodContact));
+            PersRif = Mapper.Map<List<PersRifDTO>>(pers);
+        }
+    }
+
+    private async Task LoadActivity()
+    {
+        await Task.Run(async () =>
+        {
+            var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
+        });
+
+        UserState.Activitys = ActivityList;
+
+        ApplyFiltersActivity();
+
+        ActivityIsLoading = false;
         StateHasChanged();
     }
 
+    private async Task LoadCommesseAsync()
+    {
+        try
+        {
+            IsLoadingCommesse = true;
+
+            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodContact));
+
+            Commesse = Commesse?
+                .OrderByDescending(x => x.CodJcom)
+                .ToList();
+
+            UserState.Commesse = Commesse;
+
+            ApplyFiltersCommesse();
+
+            await LoadStepsForCurrentPageAsync();
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore nel caricamento commesse: {ex.Message}");
+        }
+        finally
+        {
+            IsLoadingCommesse = false;
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
+    private void LoadDataFromSession()
+    {
+        Anag = UserState.Anag;
+        PersRif = UserState.PersRif;
+        Commesse = UserState.Commesse;
+        Agente = UserState.Agente;
+        Steps = UserState.Steps;
+        ActivityList = UserState.Activitys;
+
+        if (ActiveTab != UserState.ActiveTab)
+            SwitchTab(UserState.ActiveTab);
+
+        ApplyFiltersCommesse();
+        ApplyFiltersActivity();
+
+        IsLoadingCommesse = false;
+        ActivityIsLoading = false;
+    }
+
+    private void SaveDataToSession()
+    {
+        UserState.CodUser = CodContact;
+        UserState.Anag = Anag;
+        UserState.PersRif = PersRif;
+        UserState.Agente = Agente;
+        UserState.Steps = Steps;
+        UserState.Activitys = ActivityList;
+    }
+
+    #endregion
+
+    #region Steps Loading Methods
+
+    private async Task LoadStepsForCurrentPageAsync()
+    {
+        if (CurrentPageCommesse?.Any() != true) return;
+
+        try
+        {
+            _stepsCts?.Cancel();
+            _stepsCts = new CancellationTokenSource();
+            var token = _stepsCts.Token;
+
+            IsLoadingSteps = true;
+
+            var tasksToLoad = new List<Task>();
+            var semaphore = new SemaphoreSlim(3); // Limita a 3 richieste simultanee
+
+            foreach (var commessa in CurrentPageCommesse.Where(c => !Steps.ContainsKey(c.CodJcom)))
+            {
+                if (token.IsCancellationRequested) break;
+
+                tasksToLoad.Add(LoadStepForCommessaAsync(commessa.CodJcom, semaphore, token));
+            }
+
+            if (tasksToLoad.Any())
+            {
+                await Task.WhenAll(tasksToLoad);
+                UserState.Steps = Steps;
+            }
+        }
+        catch (OperationCanceledException)
+        {
+            // Operazione annullata, non fare nulla
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore nel caricamento steps: {ex.Message}");
+        }
+        finally
+        {
+            IsLoadingSteps = false;
+            await InvokeAsync(StateHasChanged);
+        }
+    }
+
+    private async Task LoadStepForCommessaAsync(string codJcom, SemaphoreSlim semaphore, CancellationToken token)
+    {
+        await semaphore.WaitAsync(token);
+
+        try
+        {
+            _loadingSteps.Add(codJcom);
+            await InvokeAsync(StateHasChanged);
+
+            var jobProgress = await IntegryApiService.RetrieveJobProgress(codJcom);
+
+            if (!token.IsCancellationRequested)
+            {
+                Steps[codJcom] = jobProgress.Steps;
+                await InvokeAsync(StateHasChanged);
+            }
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore nel caricamento step per {codJcom}: {ex.Message}");
+            if (!token.IsCancellationRequested)
+            {
+                Steps[codJcom] = null;
+            }
+        }
+        finally
+        {
+            _loadingSteps.Remove(codJcom);
+            semaphore.Release();
+        }
+    }
+
+    private bool IsLoadingStep(string codJcom) => _loadingSteps.Contains(codJcom);
+
+    #endregion
+
+    #region UI Methods
+
+    private void SwitchTab(int tabIndex)
+    {
+        ActiveTab = tabIndex;
+        UserState.ActiveTab = ActiveTab;
+
+        if (tabIndex == 1 && Commesse == null)
+        {
+            _ = Task.Run(async () => await LoadCommesseAsync());
+        }
+        else if (tabIndex == 1 && Steps.IsNullOrEmpty())
+        {
+            _ = Task.Run(async () => await LoadStepsForCurrentPageAsync());
+        }
+        else if (tabIndex == 2 && ActivityList?.Count == 0)
+        {
+            _ = Task.Run(async () => await LoadActivity());
+        }
+    }
+
+    private void ApplyFiltersCommesse()
+    {
+        if (Commesse == null)
+        {
+            FilteredCommesse = [];
+            return;
+        }
+
+        var filtered = Commesse.AsEnumerable();
+        if (!string.IsNullOrWhiteSpace(SearchTermCommesse))
+        {
+            var searchLower = SearchTermCommesse.ToLowerInvariant();
+            filtered = filtered.Where(c =>
+                c.CodJcom?.ToLowerInvariant().Contains(searchLower) == true ||
+                c.Descrizione?.ToLowerInvariant().Contains(searchLower) == true ||
+                c.CodAnag?.ToLowerInvariant().Contains(searchLower) == true);
+        }
+
+        FilteredCommesse = filtered.ToList();
+        if (SelectedPageCommesse > TotalPagesCommesse && TotalPagesCommesse > 0) _selectedPageCommesse = 1;
+
+        _ = LoadStepsForCurrentPageAsync();
+    }
+
+    private void ApplyFiltersActivity()
+    {
+        var filtered = ActivityList.AsEnumerable();
+
+        if (!string.IsNullOrWhiteSpace(SearchTermActivity))
+        {
+            var searchLower = SearchTermActivity.ToLowerInvariant();
+            filtered = filtered.Where(a =>
+                a.ActivityDescription?.ToLowerInvariant().Contains(searchLower) == true ||
+                a.ActivityId?.ToLowerInvariant().Contains(searchLower) == true);
+        }
+
+        FilteredActivity = filtered.ToList();
+        if (CurrentPageActivityIndex > TotalPagesActivity && TotalPagesActivity > 0)
+        {
+            _currentPageActivity = 1;
+        }
+    }
+
+    private void ClearSearchCommesse()
+    {
+        SearchTermCommesse = string.Empty;
+        ApplyFiltersCommesse();
+    }
+
+    private void ClearSearchActivity()
+    {
+        SearchTermActivity = string.Empty;
+        ApplyFiltersActivity();
+    }
+
+    #endregion
+
+    #region Modal Methods
+
+    private async Task OpenPersRifForm()
+    {
+        var result = await ModalHelpers.OpenPersRifForm(Dialog, null, Anag, PersRif);
+
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(PersRifDTO))
+        {
+            await LoadPersRifAsync();
+            UserState.PersRif = PersRif;
+        }
+    }
+
+    private async Task OpenUserForm(ContactDTO anag)
+    {
+        var result = await ModalHelpers.OpenUserForm(Dialog, anag);
+
+        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();
+        }
+    }
+
+    #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,9 +91,11 @@
 
 .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;
 }
 
 .container-button .divider {
@@ -136,12 +145,157 @@
     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 { width: 3px; }
+
+.container-pers-rif::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 2px;
 }
 
 .container-pers-rif .divider {
     margin: 0 0 0 3.5rem;
     width: unset;
-}
+}
+
+.custom-tab-panel {
+    width: 100%;
+    display: flex;
+    gap: 1rem;
+    flex-direction: column;
+}
+
+.commesse-container {
+    display: flex;
+    flex-direction: column;
+    gap: 1.25rem;
+}
+
+.attivita-container {
+    display: flex;
+    flex-direction: column;
+    gap: 1.25rem;
+}
+
+/*--------------
+    TabPanel
+----------------*/
+
+.box {
+    display: flex;
+    flex-direction: column;
+    width: -webkit-fill-available;
+    background: var(--light-card-background);
+    border-radius: 20px 20px 0 0;
+    border-bottom: .1rem solid var(--card-border-color);
+    overflow: clip;
+    margin-bottom: 1rem;
+}
+
+/* nascondo gli input */
+
+.tab-toggle { display: none; }
+
+.tab-list {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    display: flex;
+    position: relative;
+    z-index: 1;
+}
+
+/* la lineetta */
+
+.tab-list::before {
+    content: '';
+    display: block;
+    height: 3px;
+    width: calc(100% / 3);
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    background-color: var(--mud-palette-primary);
+    transition: transform .3s;
+}
+
+.tab-item {
+    flex: 1;
+    text-align: center;
+    transition: .3s;
+    opacity: 0.5;
+}
+
+.tab-trigger {
+    display: block;
+    padding: 10px 0;
+    cursor: pointer;
+}
+
+/* tab attivo */
+
+#tab1:checked ~ .box .tab-list .tab-item:nth-child(1),
+#tab2:checked ~ .box .tab-list .tab-item:nth-child(2),
+#tab3:checked ~ .box .tab-list .tab-item:nth-child(3) {
+    opacity: 1;
+    font-weight: bold;
+    display: block;
+}
+
+/* spostamento lineetta */
+
+#tab1:checked ~ .box .tab-list::before { transform: translateX(0%); }
+
+#tab2:checked ~ .box .tab-list::before { transform: translateX(100%); }
+
+#tab3:checked ~ .box .tab-list::before { transform: translateX(200%); }
+
+.tab-container {
+    display: flex;
+    flex-direction: column;
+    width: -webkit-fill-available;
+}
+
+.tab-content {
+    display: none;
+    flex: 1;
+    overflow-y: hidden;
+    animation: fade .3s ease;
+    padding: .5rem;
+}
+
+.tab-content::-webkit-scrollbar { width: 3px; }
+
+.tab-content::-webkit-scrollbar-thumb {
+    background: #bbb;
+    border-radius: 2px;
+}
+
+#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) { display: block; }
+
+@keyframes fade {
+    from {
+        opacity: 0;
+        transform: translateY(5px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+.custom-pagination ::deep ul { padding-left: 0 !important; }
+
+.SelectedPageSize { width: 100%; }
+
+.FilterSection { display: flex; }

salesbook.Shared/Components/Pages/Users.razor

@@ -2,28 +2,49 @@
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Core.Dto
-@using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.SingleElements.BottomSheet
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Dto.PageState
+@using salesbook.Shared.Core.Dto.Users
+@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Messages.Contact
 @inject IManageDataService ManageData
+@inject NewContactService NewContact
+@inject FilterUserDTO Filter
+@inject UserListState UserState
+@implements IDisposable
 
-<HeaderLayout Title="Contatti" ShowFilter="true" OnFilterToggle="ToggleFilter" />
+<HeaderLayout Title="Contatti"/>
 
 <div class="container search-box">
     <div class="input-card clearButton">
-        <MudTextField T="string?" Placeholder="Cerca..." Variant="Variant.Text" @bind-Value="TextToFilter" OnDebounceIntervalElapsed="() => FilterUsers()" DebounceInterval="500" />
+        <MudTextField T="string?" Placeholder="Cerca..." Variant="Variant.Text" @bind-Value="TextToFilter" OnDebounceIntervalElapsed="() => FilterUsers()" DebounceInterval="500"/>
 
         @if (!TextToFilter.IsNullOrEmpty())
         {
             <MudIconButton Class="closeIcon" Icon="@Icons.Material.Filled.Close" OnClick="() => FilterUsers(true)"/>
         }
+        
+        <MudIconButton Class="rounded-button" OnClick="ToggleFilter" Icon="@Icons.Material.Rounded.FilterList" Variant="Variant.Filled" Color="Color.Primary" Size="Size.Small" />
     </div>
+    
+    <MudChipSet Class="mt-2" T="string" @bind-SelectedValue="TypeUser" @bind-SelectedValue:after="FilterUsers" SelectionMode="SelectionMode.SingleSelection">
+        <MudChip Color="Color.Primary" Variant="Variant.Text" Value="@("all")">Tutti</MudChip>
+        <MudChip Color="Color.Primary" Variant="Variant.Text" Value="@("contact")">Clienti</MudChip>
+        <MudChip Color="Color.Primary" Variant="Variant.Text" Value="@("prospect")">Prospect</MudChip>
+    </MudChipSet>
 </div>
 
 <div class="container users">
-    @if (GroupedUserList?.Count > 0)
+    @if (IsLoading)
     {
-        <Virtualize Items="FilteredGroupedUserList" Context="item">
+        <SpinnerLayout FullScreen="false"/>
+    }
+    else if (GroupedUserList?.Count > 0)
+    {
+        <Virtualize OverscanCount="20" Items="FilteredGroupedUserList" Context="item">
             @if (item.ShowHeader)
             {
                 <div class="letter-header">@item.HeaderLetter</div>
@@ -31,70 +52,75 @@
             <UserCard User="item.User"/>
         </Virtualize>
     }
+    else
+    {
+        <NoDataAvailable Text="Nessun contatto trovato"/>
+    }
 </div>
 
-<FilterUsers @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="ApplyFilter"/>
+<FilterUsers @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="FilterUsers"/>
 
 @code {
     private List<UserDisplayItem> GroupedUserList { get; set; } = [];
     private List<UserDisplayItem> FilteredGroupedUserList { get; set; } = [];
-    private string? TextToFilter { get; set; }
+
+    private bool IsLoading { get; set; }
 
     //Filtri
+    private string? TextToFilter { get; set; }
     private bool OpenFilter { get; set; }
-    private FilterUserDTO Filter { get; set; } = new();
+    private string TypeUser { get; set; } = "all";
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
+    protected override async Task OnInitializedAsync()
     {
-        if (firstRender)
+        IsLoading = true;
+
+        if (!UserState.IsLoaded)
+        {
+            UserState.OnUsersLoaded += OnUsersLoaded;
+        }
+        else
         {
             await LoadData();
-            StateHasChanged();
+            LoadFromSession();
+            FilterUsers();
         }
+
+        NewContact.OnContactCreated += async response => await OnUserCreated(response);
+    }
+
+    private void OnUsersLoaded()
+    {
+        InvokeAsync(async () =>
+        {
+            await LoadData();
+            LoadFromSession();
+            FilterUsers();
+        });
+    }
+
+    void IDisposable.Dispose()
+    {
+        UserState.OnUsersLoaded -= OnUsersLoaded;
+    }
+
+    private void LoadFromSession()
+    {
+        GroupedUserList = UserState.GroupedUserList!;
+        FilteredGroupedUserList = UserState.FilteredGroupedUserList!;
     }
 
     private async Task LoadData()
     {
-        var users = await ManageData.GetTable<AnagClie>(x => x.FlagStato.Equals("A"));
+        if (!Filter.IsInitialized)
-
-        var sortedUsers = users
-            .Where(u => !string.IsNullOrWhiteSpace(u.RagSoc))
-            .OrderBy(u =>
-            {
-                var firstChar = char.ToUpper(u.RagSoc[0]);
-                return char.IsLetter(firstChar) ? firstChar.ToString() : "ZZZ";
-            })
-            .ThenBy(u => u.RagSoc)
-            .ToList();
-
-        GroupedUserList = [];
-
-        string? lastHeader = null;
-
-        foreach (var user in sortedUsers)
         {
-            var firstChar = char.ToUpper(user.RagSoc[0]);
+            var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
-            var currentLetter = char.IsLetter(firstChar) ? firstChar.ToString() : "#";
 
-            var showHeader = currentLetter != lastHeader;
+            if (loggedUser.UserCode != null)
-            lastHeader = currentLetter;
+                Filter.Agenti = [loggedUser.UserCode];
 
-            GroupedUserList.Add(new UserDisplayItem
+            Filter.IsInitialized = true;
-            {
-                User = user,
-                ShowHeader = showHeader,
-                HeaderLetter = currentLetter
-            });
         }
-
-        FilterUsers();
-    }
-
-    private class UserDisplayItem
-    {
-        public required AnagClie User { get; set; }
-        public bool ShowHeader { get; set; }
-        public string? HeaderLetter { get; set; }
     }
 
     private void FilterUsers() => FilterUsers(false);
@@ -104,40 +130,157 @@
         if (clearFilter || string.IsNullOrWhiteSpace(TextToFilter))
         {
             TextToFilter = null;
-            FilteredGroupedUserList = GroupedUserList;
-            return;
         }
 
-        var filter = TextToFilter.Trim();
         var result = new List<UserDisplayItem>();
 
         foreach (var item in GroupedUserList)
         {
             var user = item.User;
-            if (
+
-                (!string.IsNullOrEmpty(user.RagSoc) && user.RagSoc.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
+            switch (TypeUser)
-                (!string.IsNullOrEmpty(user.Indirizzo) && user.Indirizzo.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
+            {
-                (!string.IsNullOrEmpty(user.Telefono) && user.Telefono.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
+                case "contact" when !user.IsContact:
-                (!string.IsNullOrEmpty(user.EMail) && user.EMail.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
+                case "prospect" when user.IsContact:
-                (!string.IsNullOrEmpty(user.PartIva) && user.PartIva.Contains(filter, StringComparison.OrdinalIgnoreCase))
+                    continue;
-            )
+            }
+
+            var matchesFilter =
+                (Filter.Prov.IsNullOrEmpty() ||
+                 (!string.IsNullOrEmpty(user.Prov) &&
+                  user.Prov.Trim().Contains(Filter.Prov!.Trim(), StringComparison.OrdinalIgnoreCase))) &&
+                (Filter.Citta.IsNullOrEmpty() ||
+                 (!string.IsNullOrEmpty(user.Citta) &&
+                  user.Citta.Trim().Contains(Filter.Citta!.Trim(), StringComparison.OrdinalIgnoreCase))) &&
+                (Filter.Nazione.IsNullOrEmpty() ||
+                 (!string.IsNullOrEmpty(user.Nazione) &&
+                  user.Nazione.Trim().Contains(Filter.Nazione!.Trim(), StringComparison.OrdinalIgnoreCase))) &&
+                (Filter.Indirizzo.IsNullOrEmpty() || 
+                 (!string.IsNullOrEmpty(user.Indirizzo) &&
+                  user.Indirizzo.Trim().Contains(Filter.Indirizzo!.Trim(), StringComparison.OrdinalIgnoreCase))) &&
+                (!Filter.ConAgente || user.CodVage is not null) &&
+                (!Filter.SenzaAgente || user.CodVage is null) &&
+                (Filter.Agenti.IsNullOrEmpty() || (user.CodVage != null && Filter.Agenti!.Contains(user.CodVage)));
+
+            if (!matchesFilter) continue;
+
+            if (!string.IsNullOrWhiteSpace(TextToFilter))
+            {
+                var filter = TextToFilter.Trim();
+
+                var matchesText =
+                    (!string.IsNullOrEmpty(user.RagSoc) && user.RagSoc.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)) ||
+                    (!string.IsNullOrEmpty(user.PartIva) && user.PartIva.Contains(filter, StringComparison.OrdinalIgnoreCase));
+
+                if (matchesText)
+                {
+                    result.Add(item);
+                }
+            }
+            else
             {
                 result.Add(item);
             }
         }
 
         FilteredGroupedUserList = result;
+
+        IsLoading = false;
+        StateHasChanged();
     }
 
+    private async Task OnUserCreated(CRMCreateContactResponseDTO response)
+    {
+        IsLoading = true;
+
+        string codAnag;
+        bool isContact;
+
+        switch (response)
+        {
+            case null:
+                return;
+            case { AnagClie: null, PtbPros: not null }:
+                await ManageData.InsertOrUpdate(response.PtbPros);
+                isContact = false;
+                codAnag = response.PtbPros.CodPpro!;
+                break;
+            case { AnagClie: not null, PtbPros: null }:
+                await ManageData.InsertOrUpdate(response.AnagClie);
+                isContact = true;
+                codAnag = response.AnagClie.CodAnag!;
+                break;
+            default:
+                return;
+        }
+
+        var contact = await ManageData.GetSpecificContact(codAnag, isContact);
+        if (contact == null)
+        {
+            IsLoading = false;
+            return;
+        }
+
+        var firstChar = char.ToUpper(contact.RagSoc![0]);
+        var currentLetter = char.IsLetter(firstChar) ? firstChar.ToString() : "#";
+
+        var insertIndex = -1;
+        var foundHeader = false;
+
+        for (var i = 0; i < GroupedUserList.Count; i++)
+        {
+            var current = GroupedUserList[i];
+
+            if (!current.ShowHeader || current.HeaderLetter != currentLetter) continue;
+            foundHeader = true;
+            insertIndex = i + 1;
+
+            while (insertIndex < GroupedUserList.Count &&
+                   GroupedUserList[insertIndex].HeaderLetter == currentLetter &&
+                   string.Compare(contact.RagSoc, GroupedUserList[insertIndex].User.RagSoc, StringComparison.OrdinalIgnoreCase) > 0)
+            {
+                insertIndex++;
+            }
+
+            break;
+        }
+
+        if (!foundHeader)
+        {
+            var headerItem = new UserDisplayItem
+            {
+                HeaderLetter = currentLetter,
+                ShowHeader = true,
+                User = contact
+            };
+
+            GroupedUserList.Add(headerItem);
+        }
+        else
+        {
+            var newItem = new UserDisplayItem
+            {
+                HeaderLetter = currentLetter,
+                ShowHeader = false,
+                User = contact
+            };
+
+            GroupedUserList.Insert(insertIndex, newItem);
+        }
+
+        FilterUsers();
+
+        IsLoading = false;
+    }
+
+
     private void ToggleFilter()
     {
         OpenFilter = !OpenFilter;
         StateHasChanged();
     }
 
-    private void ApplyFilter()
-    {
-
-    }
-
 }

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 {
@@ -28,6 +27,6 @@
     padding-bottom: .5rem;
 }
 
-.search-box .input-card {
+.search-box .input-card { margin: 0 !important; }
-    margin: 0 !important;
+
-}
+.search-box .input-card ::deep .rounded-button { border-radius: 50%; }

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/FilterActivity.razor

@@ -1,4 +1,5 @@
 @using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Helpers.Enum
 @using salesbook.Shared.Core.Interface

salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor

@@ -1,6 +1,5 @@
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Entity
-@using salesbook.Shared.Core.Helpers.Enum
 @using salesbook.Shared.Core.Interface
 @inject IManageDataService manageData
 
@@ -17,81 +16,79 @@
 
         <div class="input-card">
             <div class="form-container">
-                <span class="disable-full-width">Assegnata a</span>
+                <span class="disable-full-width">Con agente</span>
-
-                <MudSelectExtended SearchBox="true"
-                                   ItemCollection="Users.Select(x => x.UserName).ToList()"
-                                   SelectAllPosition="SelectAllPosition.NextToSearchBox"
-                                   SelectAll="true"
-                                   NoWrap="true"
-                                   MultiSelection="true"
-                                   MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionUser))"
-                                   FullWidth="true" T="string"
-                                   Variant="Variant.Text"
-                                   Virtualize="true"
-                                   @bind-SelectedValues="FilterActivity.User"
-                                   Class="customIcon-select"
-                                   AdornmentIcon="@Icons.Material.Filled.Code"/>
 
+                <MudCheckBox @bind-Value="Filter.ConAgente" Color="Color.Primary" @bind-Value:after="OnAfterChangeConAgente"/>
             </div>
 
             <div class="divider"></div>
 
             <div class="form-container">
-                <span class="disable-full-width">Tipo</span>
+                <span class="disable-full-width">Senza agente</span>
 
-                <MudSelectExtended FullWidth="true"
+                <MudCheckBox @bind-Value="Filter.SenzaAgente" Color="Color.Primary" @bind-Value:after="OnAfterChangeSenzaAgente"/>
-                                   T="string?"
-                                   Variant="Variant.Text"
-                                   @bind-Value="FilterActivity.Type"
-                                   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>
 
             <div class="form-container">
-                <span class="disable-full-width">Esito</span>
+                <span class="disable-full-width">Agente</span>
-
+                
-                <MudSelectExtended FullWidth="true"
+                <MudSelectExtended FullWidth="true" T="string?" Variant="Variant.Text" NoWrap="true"
-                                   T="string?"
+                                   @bind-SelectedValues="Filter.Agenti" @bind-SelectedValues:after="OnAfterChangeAgenti"
-                                   Variant="Variant.Text"
+                                   MultiSelection="true" MultiSelectionTextFunc="@(new Func<List<string>, string>(GetMultiSelectionAgente))"
-                                   @bind-Value="FilterActivity.Result"
+                                   SelectAllPosition="SelectAllPosition.NextToSearchBox" SelectAll="true"
-                                   Class="customIcon-select"
+                                   Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
-                                   AdornmentIcon="@Icons.Material.Filled.Code">
+                    @foreach (var user in Users)
-                    @foreach (var result in ActivityResult)
                     {
-                        <MudSelectItemExtended Class="custom-item-select" Value="@result.ActivityResultId">@result.ActivityResultId</MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Value="@user.UserCode">@($"{user.UserCode} - {user.FullName}")</MudSelectItemExtended>
-                    }
-                </MudSelectExtended>
-            </div>
-
-            <div class="divider"></div>
-
-            <div class="form-container">
-                <span class="disable-full-width">Categoria</span>
-
-                <MudSelectExtended FullWidth="true"
-                                   T="ActivityCategoryEnum?"
-                                   Variant="Variant.Text"
-                                   @bind-Value="FilterActivity.Category"
-                                   Class="customIcon-select"
-                                   AdornmentIcon="@Icons.Material.Filled.Code">
-                    @foreach (var category in CategoryList)
-                    {
-                        <MudSelectItemExtended T="ActivityCategoryEnum?" Class="custom-item-select" Value="@category">@category.ConvertToHumanReadable()</MudSelectItemExtended>
                     }
                 </MudSelectExtended>
             </div>
         </div>
 
+        <div class="input-card">
+            <div class="form-container">
+                <MudTextField T="string?"
+                              Placeholder="Indirizzo"
+                              Variant="Variant.Text"
+                              @bind-Value="Filter.Indirizzo"
+                              DebounceInterval="500"/>
+            </div>
+
+            <div class="divider"></div>
+
+            <div class="form-container">
+                <MudTextField T="string?"
+                              Placeholder="Città"
+                              Variant="Variant.Text"
+                              @bind-Value="Filter.Citta"
+                              DebounceInterval="500"/>
+            </div>
+
+            <div class="divider"></div>
+
+            <div class="form-container">
+                <MudTextField T="string?"
+                              Placeholder="Provincia"
+                              Variant="Variant.Text"
+                              @bind-Value="Filter.Prov"
+                              DebounceInterval="500"/>
+            </div>
+
+            <div class="divider"></div>
+
+            <div class="form-container">
+                <MudTextField T="string?"
+                              Placeholder="Nazione"
+                              Variant="Variant.Text"
+                              @bind-Value="Filter.Nazione"
+                              DebounceInterval="500"/>
+            </div>
+        </div>
+
         <div class="button-section">
-            <MudButton OnClick="() => Filter = new FilterUserDTO()" Variant="Variant.Outlined" Color="Color.Error">Pulisci</MudButton>
+            <MudButton OnClick="ClearFilters" Variant="Variant.Outlined" Color="Color.Error">Pulisci</MudButton>
             <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OnFilterButton">Filtra</MudButton>
         </div>
     </div>
@@ -104,12 +101,7 @@
     [Parameter] public FilterUserDTO Filter { get; set; }
     [Parameter] public EventCallback<FilterUserDTO> FilterChanged { get; set; }
 
-    private FilterActivityDTO FilterActivity { get; set; } = new();
-
-    private List<StbActivityResult> ActivityResult { get; set; } = [];
-    private List<StbActivityType> ActivityType { get; set; } = [];
     private List<StbUser> Users { get; set; } = [];
-    private List<ActivityCategoryEnum> CategoryList { get; set; } = [];
 
     protected override async Task OnParametersSetAsync()
     {
@@ -117,19 +109,14 @@
             await LoadData();
     }
 
-    private string GetMultiSelectionUser(List<string> selectedValues)
-    {
-        return $"{selectedValues.Count} Utent{(selectedValues.Count != 1 ? "i selezionati" : "e selezionato")}";
-    }
-
     private async Task LoadData()
     {
-        Users = await manageData.GetTable<StbUser>();
+        Users = await manageData.GetTable<StbUser>(x => x.KeyGroup == 5);
-        ActivityResult = await manageData.GetTable<StbActivityResult>();
+    }
-        ActivityType = await manageData.GetTable<StbActivityType>(x => x.FlagTipologia.Equals("A"));
-        CategoryList = ActivityCategoryHelper.AllActivityCategory;
 
-        StateHasChanged();
+    private string GetMultiSelectionAgente(List<string> selectedValues)
+    {
+        return $"{selectedValues.Count} Agent{(selectedValues.Count != 1 ? "i selezionati" : "e selezionato")}";
     }
 
     private void CloseBottomSheet()
@@ -144,4 +131,27 @@
         CloseBottomSheet();
     }
 
+    private void OnAfterChangeAgenti()
+    {
+        if (Filter.Agenti == null || !Filter.Agenti.Any()) return;
+
+        Filter.ConAgente = false;
+        Filter.SenzaAgente = false;
+    }
+
+    private void ClearFilters()
+    {
+        Filter.ConAgente = false;
+        Filter.SenzaAgente = false;
+        Filter.Agenti = [];
+        Filter.Indirizzo = null;
+        Filter.Citta = null;
+        Filter.Nazione = null;
+        Filter.Prov = null;
+    }
+
+    private void OnAfterChangeConAgente() => Filter.SenzaAgente = false;
+
+    private void OnAfterChangeSenzaAgente() => Filter.ConAgente = false;
+
 }

salesbook.Shared/Components/SingleElements/BottomSheet/SearchAddress.razor

@@ -0,0 +1,124 @@
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Core.Dto
+@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>
+
+<div class="bottom-sheet-container @(IsSheetVisible ? "show" : "")">
+    <div style="height: 95vh" class="bottom-sheet pb-safe-area">
+        <div class="title">
+            <MudText Typo="Typo.h6">
+                <b>Cerca indirizzo</b>
+            </MudText>
+            <MudIconButton Icon="@Icons.Material.Filled.Close" OnClick="() => CloseBottomSheet()"/>
+        </div>
+        
+        <div class="input-card clearButton">
+            <MudTextField T="string?" Placeholder="Cerca..." Variant="Variant.Text" @bind-Value="Address" DebounceInterval="500" OnDebounceIntervalElapsed="SearchAllAddress" />
+
+            <MudIconButton Class="closeIcon" Icon="@Icons.Material.Filled.Close" OnClick="() => Address = null" />
+        </div>
+        
+        <div>
+            @if (Loading)
+            {
+                <SpinnerLayout />
+            }
+            else
+            {
+                if (Addresses != null)
+                {
+                    foreach (var address in Addresses)
+                    {
+                        <b><span @onclick="() => OnSelectAddress(address.PlaceId)">@address.Description</span></b>
+
+                        <div class="divider"></div>
+                    }
+                }
+                else
+                {
+                    <NoDataAvailable Text="Nessun indirizzo trovato" />
+                }
+            }
+        </div>
+    </div>
+</div>
+
+<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
+
+@code {
+    [Parameter] public string Region { get; set; }
+
+    [Parameter] public IndirizzoDTO Indirizzo { get; set; }
+    [Parameter] public EventCallback<IndirizzoDTO> IndirizzoChanged { get; set; }
+
+    [Parameter] public bool IsSheetVisible { get; set; }
+    [Parameter] public EventCallback<bool> IsSheetVisibleChanged { get; set; }
+
+    private bool Loading { get; set; }
+
+    private string? Address { get; set; }
+    private List<AutoCompleteAddressDTO>? Addresses { get; set; }
+
+    private string? Uuid { get; set; }
+
+    //Overlay for save
+    private bool VisibleOverlay { get; set; }
+    private bool SuccessAnimation { get; set; }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        if (IsSheetVisible)
+        {
+            Uuid = Guid.NewGuid().ToString();
+            Address = null;
+            Addresses = null;
+        }
+    }
+
+    private void CloseBottomSheet()
+    {
+        IsSheetVisible = false;
+        IsSheetVisibleChanged.InvokeAsync(IsSheetVisible);
+    }
+
+    private async Task SearchAllAddress()
+    {
+        if (Address == null || Uuid == null) return;
+
+        Loading = true;
+        StateHasChanged();
+
+        Addresses = await IntegryApiService.AutoCompleteAddress(Address, Region, Uuid);
+
+        Loading = false;
+        StateHasChanged();
+    }
+
+    private async Task OnSelectAddress(string placeId)
+    {
+        CloseBottomSheet();
+
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        try
+        {
+            Indirizzo = await IntegryApiService.PlaceDetails(placeId, Uuid);
+            await IndirizzoChanged.InvokeAsync(Indirizzo);
+        }
+        catch (Exception e)
+        {
+            Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+            Snackbar.Clear();
+
+            Snackbar.Add("Impossibile selezionare questo indirizzo", Severity.Error);
+        }
+
+        VisibleOverlay = false;
+        StateHasChanged();
+    }
+
+}

salesbook.Shared/Components/SingleElements/BottomSheet/SearchAddress.razor.css

@@ -0,0 +1 @@
+

salesbook.Shared/Components/SingleElements/BottomSheet/SelectEsito.razor

@@ -1,4 +1,5 @@
 @using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
 @inject IManageDataService ManageData

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

@@ -1,4 +1,4 @@
-@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Helpers.Enum
 @inject IDialogService Dialog
@@ -11,7 +11,7 @@
                     @switch (Activity.Category)
                     {
                         case ActivityCategoryEnum.Commessa:
-                            @Activity.Commessa
+                            @Activity.Commessa?.Descrizione
                             break;
                         case ActivityCategoryEnum.Interna:
                             @Activity.Cliente
@@ -28,11 +28,25 @@
                     <span class="activity-hours">
                         @if (Activity.EffectiveTime is null)
                         {
-                            @($"{Activity.EstimatedTime:t}")
+                            if (ShowDate)
+                            {
+                                @($"{Activity.EstimatedTime:g}")
+                            }
+                            else
+                            {
+                                @($"{Activity.EstimatedTime:t}")
+                            }
                         }
                         else
                         {
-                            @($"{Activity.EffectiveTime:t}")
+                            if (ShowDate)
+                            {
+                                @($"{Activity.EffectiveTime:g}")
+                            }
+                            else
+                            {
+                                @($"{Activity.EffectiveTime:t}")
+                            }
                         }
                     </span>
                 </div>
@@ -67,6 +81,8 @@
     [Parameter] public EventCallback<string> ActivityChanged { get; set; }
     [Parameter] public EventCallback<ActivityDTO> ActivityDeleted { get; set; }
 
+    [Parameter] public bool ShowDate { get; set; }
+
     private TimeSpan? Durata { get; set; }
 
     protected override void OnParametersSet()
@@ -81,7 +97,7 @@
 
     private async Task OpenActivity()
     {
-        var result = await ModalHelpers.OpenActivityForm(Dialog, null, Activity.ActivityId);
+        var result = await ModalHelpers.OpenActivityForm(Dialog, Activity, null);
 
         switch (result)
         {

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

@@ -0,0 +1,45 @@
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Core.Interface.IntegryApi
+@inject IIntegryApiService IntegryApiService
+@inject IAttachedService AttachedService
+
+<div @onclick="OpenAttached" class="activity-card">
+    <div class="activity-left-section">
+        <div class="activity-body-section">
+            <div class="title-section">
+                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">
+                    @(Attached.Description.IsNullOrEmpty() ? Attached.FileName : Attached.Description)
+                </MudText>
+                <div class="activity-hours-section">
+                    <span class="activity-hours">@($"{Attached.DateAttached:g}")</span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="activity-info-section">
+        @if (Attached.IsActivity)
+        {
+            <MudChip T="string" Color="Color.Primary" Variant="Variant.Outlined" Icon="@IconConstants.Chip.Tag" Size="Size.Small">
+                @Attached.RefAttached
+            </MudChip>
+        }
+        else
+        {
+            <MudChip T="string" Color="Color.Warning" Variant="Variant.Outlined" Icon="@IconConstants.Chip.FileTextLine" Size="Size.Small">
+                @Attached.RefAttached
+            </MudChip>
+        }
+    </div>
+</div>
+
+@code {
+    [Parameter] public CRMAttachedResponseDTO Attached { get; set; } = new();
+
+    private async Task OpenAttached()
+    {
+        var bytes = await IntegryApiService.DownloadFileFromRefUuid(Attached.RefUuid, Attached.FileName);
+        await AttachedService.OpenFile(bytes, Attached.FileName);
+    }
+}

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

@@ -0,0 +1,61 @@
+.activity-card {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: .5rem .5rem;
+    border-radius: 12px;
+    line-height: normal;
+    background: var(--light-card-background);
+}
+
+.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;
+    margin-left: 4px;
+}
+
+.title-section {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+}
+
+.activity-hours {
+    color: var(--mud-palette-gray-darker);
+    font-weight: 600;
+    font-size: .8rem;
+}
+
+.activity-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; }
+
+.activity-body-section {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.title-section ::deep > .activity-title {
+    font-weight: 700 !important;
+    margin: 0 !important;
+    line-height: normal !important;
+    color: var(--mud-palette-text-primary);
+}
+
+.activity-body-section ::deep > .activity-subtitle {
+    color: var(--mud-palette-gray-darker);
+    margin: .2rem 0 !important;
+    line-height: normal !important;
+}
+
+.activity-info-section {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: .25rem;
+}

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

@@ -1,24 +1,72 @@
+@using salesbook.Shared.Core.Dto.JobProgress
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Entity
+@inject JobSteps JobSteps
 
-<div class="activity-card">
+<div @onclick="OpenPageCommessa" class="activity-card">
     <div class="activity-left-section">
         <div class="activity-body-section">
             <div class="title-section">
-                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">@Commessa.Descrizione</MudText>
+                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">@Commessa.CodJcom</MudText>
                 <div class="activity-hours-section">
-                    <span class="activity-hours">
+                    @if (LastUpd is not null)
-                        @Commessa.CodJcom
+                    {
-                    </span>
+                        <span class="activity-hours">Aggiornato il @($"{LastUpd:d}")</span>
+                    }
                 </div>
             </div>
+            <span class="activity-title">@Commessa.Descrizione</span>
         </div>
     </div>
 
     <div class="activity-info-section">
-        <MudChip T="string" Icon="@IconConstants.Chip.User" Size="Size.Small">Stato</MudChip>
+        @if (Stato is not null)
+        {
+            <MudChip T="string" Variant="Variant.Outlined" Icon="@IconConstants.Chip.Stato" Size="Size.Small">@Stato</MudChip>
+        }
     </div>
 </div>
 
 @code {
     [Parameter] public JtbComt Commessa { get; set; } = new();
+    [Parameter] public string RagSoc { get; set; } = "";
+    [Parameter] public List<CRMJobStepDTO>? Steps { get; set; }
+
+    private string? Stato { get; set; }
+    private DateTime? LastUpd { get; set; }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        GetStepInfo();
+    }
+
+    private void GetStepInfo()
+    {
+        if (Steps is null) return;
+
+        // Ultimo step non skip
+        var lastBeforeSkip = Steps
+            .LastOrDefault(s => s.Status is { Skip: false });
+
+        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;
+    }
+
+
+    private void OpenPageCommessa()
+    {
+        JobSteps.Steps = Steps;
+        NavigationManager.NavigateTo($"commessa/{Commessa.CodJcom}/{RagSoc}");
+    }
+
 }

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;
@@ -28,8 +24,9 @@
 }
 
 .activity-hours {
-    font-weight: 700;
+    color: var(--mud-palette-gray-darker);
-    color: var(--mud-palette-text-primary);
+    font-weight: 600;
+    font-size: .8rem;
 }
 
 .activity-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; }
@@ -40,13 +37,18 @@
     flex-direction: column;
 }
 
-.title-section ::deep > .activity-title {
+.activity-title {
     font-weight: 800 !important;
     margin: 0 !important;
     line-height: normal !important;
     color: var(--mud-palette-text-primary);
 }
 
+.title-section ::deep > .activity-title {
+    font-weight: 600;
+    color: var(--mud-palette-text-primary);
+}
+
 .activity-body-section ::deep > .activity-subtitle {
     color: var(--mud-palette-gray-darker);
     margin: .2rem 0 !important;
@@ -55,5 +57,7 @@
 
 .activity-info-section {
     display: flex;
-    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: .25rem;
 }

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

@@ -1,8 +1,9 @@
-@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Core.Dto
+@inject IDialogService Dialog
 
-<div class="contact-card">
+<div class="contact-card" @onclick="OpenPersRifForm">
     <div class="contact-left-section">
-        <MudIcon Color="Color.Default" Icon="@Icons.Material.Filled.PersonOutline" Size="Size.Large" />
+        <MudIcon Color="Color.Default" Icon="@Icons.Material.Filled.PersonOutline" Size="Size.Large"/>
 
         <div class="contact-body-section">
             <div class="title-section">
@@ -18,15 +19,25 @@
     <div class="contact-right-section">
         @if (!Contact.NumCellulare.IsNullOrEmpty())
         {
-            <MudIcon Color="Color.Success" Size="Size.Large" Icon="@Icons.Material.Outlined.Phone" />
+            <a href="@($"tel:{Contact.NumCellulare}")">
+                <MudIcon Color="Color.Success" Size="Size.Large" Icon="@Icons.Material.Outlined.Phone"/>
+            </a>
         }
 
-        @if (!Contact.EMail.IsNullOrEmpty()){
+        @if (!Contact.EMail.IsNullOrEmpty())
-            <MudIcon Color="Color.Info" Size="Size.Large" Icon="@Icons.Material.Filled.MailOutline" />
+        {
+            <a href="@($"mailto:{Contact.EMail}")">
+                <MudIcon Color="Color.Info" Size="Size.Large" Icon="@Icons.Material.Filled.MailOutline"/>
+            </a>
         }
     </div>
 </div>
 
 @code {
-    [Parameter] public VtbCliePersRif Contact { get; set; } = new();
+    [Parameter] public PersRifDTO Contact { get; set; } = new();
+
+    private async Task OpenPersRifForm()
+    {
+        var result = await ModalHelpers.OpenPersRifForm(Dialog, Contact);
+    }
 }

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/Card/UserCard.razor

@@ -1,3 +1,4 @@
+@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
 @inject IManageDataService ManageData
@@ -6,7 +7,7 @@
     <div class="user-card-left-section">
         <div class="user-card-body-section">
             <div class="title-section">
-                <MudIcon @onclick="OpenUser" Color="Color.Primary" Icon="@Icons.Material.Filled.Person" Size="Size.Large" />
+                <MudIcon @onclick="OpenUser" Color="Color.Primary" Icon="@(User.IsContact? Icons.Material.Filled.Person : Icons.Material.Filled.PersonOutline)" Size="Size.Large" />
 
                 <div class="user-card-right-section">
                     <div class="user-card-title">
@@ -24,11 +25,23 @@
                             @if (!Commesse.IsNullOrEmpty())
                             {
                                 <div @onclick="OpenUser" class="container-commesse">
-                                    @foreach (var commessa in Commesse!)
+
+                                    @for (var i = 0; i < Commesse!.Count; i++)
                                     {
+                                        var commessa = Commesse[i];
+
                                         <div class="commessa">
-                                            <span>@($"{commessa.CodJcom} - {commessa.Descrizione}")</span>
+                                            @if (i > 5 && Commesse.Count - i > 1)
+                                            {
+                                                <span>@($"E altre {Commesse.Count - i} commesse")</span>
+                                            }
+                                            else
+                                            {
+                                                <span>@($"{commessa.CodJcom} - {commessa.Descrizione}")</span>
+                                            }
                                         </div>
+
+                                        @if (i > 5 && Commesse.Count - i > 1) break;
                                     }
                                 </div>
                             }
@@ -47,14 +60,14 @@
 </div>
 
 @code {
-    [Parameter] public AnagClie User { get; set; } = new();
+    [Parameter] public ContactDTO User { get; set; } = new();
 
     private List<JtbComt>? Commesse { get; set; }
     private bool IsLoading { get; set; } = true;
     private bool ShowSectionCommesse { get; set; }
 
     private void OpenUser() =>
-        NavigationManager.NavigateTo($"/User/{User.CodAnag}");
+        NavigationManager.NavigateTo($"/User/{User.CodContact}/{User.IsContact}");
 
     private async Task ShowCommesse()
     {
@@ -62,7 +75,8 @@
 
         if (ShowSectionCommesse)
         {
-            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag.Equals(User.CodAnag));
+            Commesse = (await ManageData.GetTable<JtbComt>(x => x.CodAnag.Equals(User.CodContact)))
+                .OrderByDescending(x => x.CodJcom).ToList();
             IsLoading = false;
             StateHasChanged();
             return;

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

@@ -1,31 +1,51 @@
 @using System.Globalization
-@using System.Text.RegularExpressions
 @using CommunityToolkit.Mvvm.Messaging
-@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Components.Layout
-@using salesbook.Shared.Core.Entity
-@using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Components.Layout.Overlay
 @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
 @inject IIntegryApiService IntegryApiService
 @inject IMessenger Messenger
+@inject IDialogService Dialog
+@inject IAttachedService AttachedService
 
 <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>
 
@@ -34,18 +54,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>
@@ -54,7 +80,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>
@@ -62,15 +91,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>
 
@@ -78,12 +135,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>
@@ -91,12 +163,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>
@@ -104,76 +187,127 @@
                 <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>
-            
+
-            @if (!IsNew)
+            <div class="container-chip-attached">
+                @if (!AttachedList.IsNullOrEmpty())
+                {
+                    foreach (var item in AttachedList!.Select((p, index) => new { p, index }))
+                    {
+                        @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))">
+                                @item.p.Description
+                            </MudChip>
+                        }
+                        else
+                        {
+                            <MudChip T="string" Color="Color.Default" OnClick="@(() => OpenAttached(item.p))"
+                                     OnClose="@(() => OnRemoveAttached(item.index))">
+                                @item.p.Name
+                            </MudChip>
+                        }
+                    }
+                }
+
+                @if (!IsLoading)
+                {
+                    if (ActivityFileList != null)
+                    {
+                        foreach (var file in ActivityFileList)
+                        {
+                            <MudChip T="string" OnClick="@(() => OpenAttached(file.Id, file.FileName))"
+                                     OnClose="@(() => DeleteAttach(file))" Color="Color.Default">
+                                @file.FileName
+                            </MudChip>
+                        }
+                    }
+                }
+                else
+                {
+                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
+                }
+            </div>
+
+            @if (!IsView)
             {
                 <div class="container-button">
-                    <MudButton Class="button-settings gray-icon"
+                    <MudButton Class="button-settings green-icon"
                                FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.ContentCopy"
+                               StartIcon="@Icons.Material.Rounded.AttachFile"
                                Size="Size.Medium"
-                               OnClick="Duplica"
+                               OnClick="OpenAddAttached"
                                Variant="Variant.Outlined">
-                        Duplica
+                        Aggiungi allegati
                     </MudButton>
 
-                    <div class="divider"></div>
+                    @if (!IsNew)
+                    {
+                        <div class="divider"></div>
 
-                    <MudButton Class="button-settings red-icon"
+                        <MudButton Class="button-settings gray-icon"
-                               FullWidth="true"
+                                   FullWidth="true"
-                               StartIcon="@Icons.Material.Outlined.Delete"
+                                   StartIcon="@Icons.Material.Filled.ContentCopy"
-                               Size="Size.Medium"
+                                   Size="Size.Medium"
-                               OnClick="DeleteActivity"
+                                   OnClick="Duplica"
-                               Variant="Variant.Outlined">
+                                   Variant="Variant.Outlined">
-                        Elimina
+                            Duplica
-                    </MudButton>
+                        </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">
             <MessageContent>
                 Confermi la cancellazione dell'attività corrente?
             </MessageContent>
             <YesButton>
                 <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error"
-                           StartIcon="@Icons.Material.Filled.Check">
+                           StartIcon="@Icons.Material.Rounded.DeleteForever">
                     Cancella
                 </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.Filled.DeleteForever">
-                    Crea
-                </MudButton>
-            </YesButton>
-        </MudMessageBox>
     </DialogContent>
 </MudDialog>
 
 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
 
-<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeEsito"/>
+<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel"
+             @bind-ActivityModel:after="OnAfterChangeEsito"/>
 
-<AddMemo @bind-IsSheetVisible="OpenAddMemo" />
+<AddMemo @bind-IsSheetVisible="OpenAddMemo"/>
 
 @code {
     [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
@@ -185,14 +319,16 @@
     private ActivityDTO ActivityModel { get; set; } = new();
 
     private List<StbActivityResult> ActivityResult { get; set; } = [];
-    private List<StbActivityType> ActivityType { get; set; } = [];
+    private List<SrlActivityTypeUser> ActivityType { get; set; } = [];
     private List<StbUser> Users { get; set; } = [];
     private List<JtbComt> Commesse { get; set; } = [];
     private List<AnagClie> Clienti { get; set; } = [];
     private List<PtbPros> Pros { get; set; } = [];
+    private List<ActivityFileDto>? ActivityFileList { get; set; }
 
-    private bool IsNew => Id.IsNullOrEmpty();
+    private bool IsNew { get; set; }
-    private bool IsView => !NetworkService.IsNetworkAvailable();
+    private bool IsLoading { get; set; }
+    private bool IsView => !NetworkService.ConnectionAvailable;
 
     private string? LabelSave { get; set; }
 
@@ -205,33 +341,47 @@
 
     //MessageBox
     private MudMessageBox ConfirmDelete { get; set; }
-    private MudMessageBox ConfirmMemo { get; set; }
+
+    //Attached
+    private List<AttachedDTO>? AttachedList { 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;
 
-        _ = LoadData();
-
-        LabelSave = IsNew ? "Aggiungi" : null;
-
-        if (!Id.IsNullOrEmpty())
-            ActivityModel = (await ManageData.GetActivity(x => x.ActivityId.Equals(Id))).Last();
-
         if (ActivityCopied != null)
         {
             ActivityModel = ActivityCopied.Clone();
         }
+        else if (!Id.IsNullOrEmpty())
+        {
+            ActivityModel = (await ManageData.GetActivity(new WhereCondActivity { ActivityId = Id }, true)).Last();
+        }
 
-        await LoadCommesse();
+        if (Id.IsNullOrEmpty()) Id = ActivityModel.ActivityId;
+        IsNew = Id.IsNullOrEmpty();
+        LabelSave = IsNew ? "Aggiungi" : null;
 
         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;
         }
 
+        _ = LoadData();
+
+        await LoadActivityType();
         OriginalModel = ActivityModel.Clone();
     }
 
@@ -242,111 +392,303 @@
         VisibleOverlay = true;
         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 is null) return;
+
+        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 is null) return;
+
+        var uploadTasks = AttachedList
+            .Where(a => a.FileContent is not null && a.Type != AttachedDTO.TypeAttached.Position)
+            .Select(a => IntegryApiService.UploadFile(activityId, a.FileBytes, a.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()
     {
-        Users = await ManageData.GetTable<StbUser>();
+        return Task.Run(async () =>
-        ActivityResult = await ManageData.GetTable<StbActivityResult>();
+        {
-        Clienti = await ManageData.GetTable<AnagClie>(x => x.FlagStato.Equals("A"));
+            IsLoading = true;
-        Pros = await ManageData.GetTable<PtbPros>();
+            await InvokeAsync(StateHasChanged);
-        ActivityType = await ManageData.GetTable<StbActivityType>(x => x.FlagTipologia.Equals("A"));
+
+            SelectedComessa = ActivityModel.Commessa;
+
+            Users = await ManageData.GetTable<StbUser>();
+            if (!ActivityModel.UserName.IsNullOrEmpty())
+            {
+                SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
+                await InvokeAsync(StateHasChanged);
+            }
+
+            if (!IsNew && Id != null)
+                ActivityFileList = await IntegryApiService.GetActivityFile(Id);
+
+            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 LoadCommesse() =>
+    private async Task LoadActivityType()
-        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 (ActivityModel.UserName is null)
-            return null;
+        {
+            ActivityType = [];
+            return;
+        }
 
-        var listToReturn = new List<string>();
+        ActivityType = await ManageData.GetTable<SrlActivityTypeUser>(x => x.UserName != null && x.UserName.Equals(ActivityModel.UserName)
-
-        listToReturn.AddRange(
-            Clienti.Where(x => x.RagSoc.Contains(value, StringComparison.OrdinalIgnoreCase)).Select(x => $"{x.CodAnag} - {x.RagSoc}")
         );
-
-        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 LoadCommesse(string searchValue)
+    {
+        if (_lastLoadedCodAnag == ActivityModel.CodAnag && searchValue.IsNullOrEmpty()) return;
+
+        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);
+        }
+
+        Commesse = Commesse.OrderByDescending(x => x.CodJcom).ToList();
+        _lastLoadedCodAnag = ActivityModel.CodAnag;
+    }
+
+    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;
+        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);
@@ -390,9 +732,141 @@
     private void Duplica()
     {
         var activityCopy = ActivityModel.Clone();
+        activityCopy.ActivityId = null;
 
         MudDialog.Cancel();
         Messenger.Send(new CopyActivityMessage(activityCopy));
     }
 
+    private async Task OpenAddAttached()
+    {
+        var result = await ModalHelpers.OpenAddAttached(Dialog, CanAddPosition);
+
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(AttachedDTO))
+        {
+            var attached = (AttachedDTO)result.Data;
+
+            if (attached.Type == AttachedDTO.TypeAttached.Position)
+                CanAddPosition = false;
+
+            AttachedList ??= [];
+            AttachedList.Add(attached);
+
+            LabelSave = "Aggiorna";
+        }
+    }
+
+    private void OnRemoveAttached(int index)
+    {
+        if (AttachedList is null || index < 0 || index >= AttachedList.Count)
+            return;
+
+        var attached = AttachedList[index];
+
+        if (attached.Type == AttachedDTO.TypeAttached.Position)
+            CanAddPosition = true;
+
+        AttachedList.RemoveAt(index);
+        StateHasChanged();
+    }
+
+    private async Task OpenAttached(string idAttached, string fileName)
+    {
+        try
+        {
+            var bytes = await IntegryApiService.DownloadFile(ActivityModel.ActivityId!, fileName);
+            await AttachedService.OpenFile(bytes, fileName);
+        }
+        catch (Exception ex)
+        {
+            Snackbar.Clear();
+            Snackbar.Add("Impossibile aprire il file", Severity.Error);
+            Console.WriteLine($"Errore durante l'apertura del file: {ex.Message}");
+        }
+    }
+
+    private async Task OpenAttached(AttachedDTO attached)
+    {
+        if (attached is { FileContent: not null, MimeType: not null })
+        {
+            await AttachedService.OpenFile(attached.FileContent!, attached.Name);
+        }
+        else
+        {
+            Snackbar.Clear();
+            Snackbar.Add("Impossibile aprire il file", Severity.Error);
+        }
+    }
+
+    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 })
+        {
+            const string baseUrl = "https://www.google.it/maps/place/";
+            NavigationManager.NavigateTo(
+                $"{baseUrl}{AdjustCoordinate(attached.Lat.Value)},{AdjustCoordinate(attached.Lng.Value)}"
+            );
+        }
+        else
+        {
+            Snackbar.Clear();
+            Snackbar.Add("Impossibile aprire la posizione", Severity.Error);
+        }
+    }
+
+    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/ActivityForm.razor.css

@@ -1,3 +1,8 @@
+.container-chip-attached {
+    width: 100%;
+    margin-bottom: 1rem;
+}
+
 .container-button {
     background: var(--mud-palette-background-gray) !important;
     box-shadow: unset;

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

@@ -0,0 +1,184 @@
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.Layout.Overlay
+@inject IAttachedService AttachedService
+
+<MudDialog Class="customDialog-form disable-safe-area">
+    <DialogContent>
+        <HeaderLayout ShowProfile="false" SmallHeader="true" Cancel="true" OnCancel="() => MudDialog.Cancel()" Title="@TitleModal"/>
+
+        @if (RequireNewName)
+        {
+            <MudTextField @bind-Value="NewName" Class="px-3" Variant="Variant.Outlined"/>            
+        }
+        else
+        {
+            @if (!SelectTypePicture)
+            {
+                <div style="margin-bottom: 1rem;" class="content attached">
+                    <MudFab Size="Size.Small" Color="Color.Primary"
+                            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>
+            }
+            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"/>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+
+    [Parameter] public bool CanAddPosition { get; set; }
+
+    //Overlay for save
+    private bool VisibleOverlay { get; set; }
+    private bool SuccessAnimation { get; set; }
+
+    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;
+    }
+
+    private async Task OnImage()
+    {
+        SelectTypePicture = true;
+        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()
+    {
+        Attached = await AttachedService.SelectFile();
+        MudDialog.Close(Attached);
+    }
+
+    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

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

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

@@ -0,0 +1,658 @@
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.Layout.Overlay
+@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
+@inject IDialogService Dialog
+
+<MudDialog Class="customDialog-form">
+    <DialogContent>
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuovo" : $"{ContactModel.CodContact}")"/>
+
+        <div class="content">
+            <div class="input-card">
+                <MudTextField ReadOnly="IsView"
+                              T="string?"
+                              Placeholder="Azienda"
+                              Variant="Variant.Text"
+                              Lines="1"
+                              @bind-Value="ContactModel.RagSoc"
+                              @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500"
+                              OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+            </div>
+            
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Nazione</span>
+
+                    @if (Nazioni.IsNullOrEmpty())
+                    {
+                        <span class="warning-text">Nessuna nazione trovata</span>
+                    }
+                    else
+                    {
+                        <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || Nazioni.IsNullOrEmpty())" T="string?"
+                                           Variant="Variant.Text" @bind-Value="ContactModel.Nazione" @bind-Value:after="OnAfterChangeValue" 
+                                           Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                            @foreach (var nazione in Nazioni)
+                            {
+                                <MudSelectItemExtended Class="custom-item-select" Value="@nazione.CodNazioneAlpha2">@($"{nazione.Descrizione}")</MudSelectItemExtended>
+                            }
+                        </MudSelectExtended>
+                    }
+                </div>
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">P. IVA</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.PartIva"
+                                  @bind-Value:after="OnAfterChangePIva"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Cod. Fiscale</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.CodFisc"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Tipo cliente</span>
+                    
+                    <MudAutocomplete Disabled="VtbTipi.IsNullOrEmpty()" ReadOnly="IsView"
+                                     T="VtbTipi"
+                                     @bind-Value="SelectedType"
+                                     @bind-Value:after="OnTypeSelectedAfter"
+                                     SearchFunc="SearchTypeAsync"
+                                     ToStringFunc="@(u => u == null ? string.Empty : $"{u.CodVtip} - {u.Descrizione}")"
+                                     Clearable="true"
+                                     ShowProgressIndicator="true"
+                                     DebounceInterval="300"
+                                     MaxItems="50"
+                                     Class="customIcon-select"
+                                     AdornmentIcon="@Icons.Material.Filled.Code" />
+                </div>
+            </div>
+            
+            @if (!IsView)
+            {
+                <div class="container-button mb-3">
+                    <MudButton Class="button-settings blue-icon"
+                               FullWidth="true"
+                               StartIcon="@Icons.Material.Rounded.Search"
+                               Size="Size.Medium"
+                               OnClick="() => OpenSearchAddress = !OpenSearchAddress"
+                               Variant="Variant.Outlined">
+                        Cerca indirizzo
+                    </MudButton>
+                </div>
+            }
+
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Indirizzo</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  @bind-Value="ContactModel.Indirizzo"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">CAP</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Cap"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Città</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Citta"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Provincia</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  MaxLength="2"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Prov"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">PEC</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.EMailPec"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">E-Mail</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.EMail"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Telefono</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Telefono"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+            </div>
+            
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Agente</span>
+                    
+                    <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"
+                                     ShowProgressIndicator="true"
+                                     DebounceInterval="300"
+                                     MaxItems="50"
+                                     Class="customIcon-select"
+                                     AdornmentIcon="@Icons.Material.Filled.Code" />
+                </div>
+            </div>
+
+            @if (IsNew)
+            {
+                <div class="container-chip-persrif">
+                    @if (!PersRifList.IsNullOrEmpty())
+                    {
+                        foreach (var item in PersRifList!.Select((p, index) => new { p, index }))
+                        {
+                            <MudChip T="string" Color="Color.Default" OnClick="() => OpenPersRifForm(item.index, item.p)" OnClose="() => OnRemovePersRif(item.index)">
+                                @item.p.PersonaRif
+                            </MudChip>
+                        }
+                    }
+                </div>
+            }
+            
+            @if (IsNew)
+            {
+                <div class="container-button">
+                    <MudButton Class="button-settings gray-icon"
+                               FullWidth="true"
+                               StartIcon="@Icons.Material.Filled.PersonAddAlt1"
+                               Size="Size.Medium"
+                               OnClick="NewPersRif"
+                               Variant="Variant.Outlined">
+                        Persona di riferimento
+                    </MudButton>
+                </div>
+            }
+            else
+            {
+                @if (NetworkService.ConnectionAvailable && !ContactModel.IsContact)
+                {
+                    <div class="container-button">
+                        <MudButton Class="button-settings blue-icon"
+                                   FullWidth="true"
+                                   StartIcon="@Icons.Material.Rounded.Sync"
+                                   Size="Size.Medium"
+                                   OnClick="ConvertProspectToContact"
+                                   Variant="Variant.Outlined">
+                            Converti in cliente
+                        </MudButton>
+                    </div>
+                }
+            }
+        </div>
+        
+        <MudMessageBox MarkupMessage="new MarkupString(VatMessage)" @ref="CheckVat" Class="c-messageBox" Title="Verifica partita iva" CancelText="@(VatAlreadyRegistered ? "" : "Annulla")">
+            <YesButton>
+                @if (VatAlreadyRegistered)
+                {
+                    <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error"
+                               StartIcon="@Icons.Material.Rounded.Close">
+                        Chiudi
+                    </MudButton>
+                }
+                else
+                {
+                    <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
+                               StartIcon="@Icons.Material.Rounded.Check">
+                        Aggiungi
+                    </MudButton>
+                }
+            </YesButton>
+        </MudMessageBox>
+    </DialogContent>
+</MudDialog>
+
+<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
+
+<SearchAddress Region="@ContactModel.Nazione" @bind-IsSheetVisible="OpenSearchAddress" @bind-Indirizzo="Address" @bind-Indirizzo:after="OnAddressSet"/>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+
+    [Parameter] public ContactDTO? OriginalModel { get; set; }
+    private ContactDTO ContactModel { get; set; } = new();
+
+    private List<VtbTipi>? VtbTipi { get; set; }
+    private List<PersRifDTO>? PersRifList { get; set; }
+    private List<Nazioni>? Nazioni { get; set; }
+    private List<StbUser> Users { get; set; } = [];
+
+    private bool IsNew => OriginalModel is null;
+    private bool IsView => !NetworkService.ConnectionAvailable;
+
+    private string? LabelSave { get; set; }
+
+    //Overlay for save
+    private bool VisibleOverlay { get; set; }
+    private bool SuccessAnimation { get; set; }
+
+    //MessageBox
+    private MudMessageBox CheckVat { get; set; }
+    private string VatMessage { get; set; } = "";
+    private bool VatAlreadyRegistered { get; set; }
+
+    //BottomSeath
+    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;
+
+        _ = LoadData();
+
+        LabelSave = IsNew ? "Aggiungi" : null;
+    }
+
+    private async Task Save()
+    {
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        var requestDto = new CRMCreateContactRequestDTO
+        {
+            TipoAnag = ContactModel.IsContact ? "C" : "P",
+            Cliente = ContactModel,
+            PersRif = PersRifList,
+            CodVage = ContactModel.CodVage
+        };
+
+        var response = await IntegryApiService.SaveContact(requestDto);
+
+        switch (response)
+        {
+            case null:
+                VisibleOverlay = false;
+                StateHasChanged();
+                return;
+            case {AnagClie: null, PtbPros: not null}:
+                await ManageData.InsertOrUpdate(response.PtbPros);
+                await ManageData.InsertOrUpdate(response.PtbProsRif);
+                break;
+            case { AnagClie: not null, PtbPros: null }:
+                await ManageData.InsertOrUpdate(response.AnagClie);
+                await ManageData.InsertOrUpdate(response.VtbCliePersRif);
+                break;
+            default:
+                VisibleOverlay = false;
+                StateHasChanged();
+                return;
+        }
+
+        SuccessAnimation = true;
+        StateHasChanged();
+
+        await Task.Delay(1250);
+
+        MudDialog.Close(response);
+    }
+
+    private Task LoadData()
+    {
+        return Task.Run(async () =>
+        {
+            if (IsNew)
+            {
+                var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
+
+                ContactModel.IsContact = false;
+                ContactModel.Nazione = "IT";
+                ContactModel.CodVage = loggedUser.UserCode;
+            }
+            else
+            {
+                ContactModel = OriginalModel!.Clone();
+            }
+
+            Users = await ManageData.GetTable<StbUser>(x => x.KeyGroup == 5);
+            Nazioni = await ManageData.GetTable<Nazioni>();
+            VtbTipi = await ManageData.GetTable<VtbTipi>();
+        });
+    }
+
+    private void OnAfterChangeValue()
+    {
+        if (!IsNew)
+        {
+            LabelSave = !OriginalModel.Equals(ContactModel) ? "Aggiorna" : null;
+        }
+    }
+
+    private Task NewPersRif() => OpenPersRifForm(null, null);
+
+    private async Task OpenPersRifForm(int? index, PersRifDTO? persRif)
+    {
+        var result = await ModalHelpers.OpenPersRifForm(Dialog, persRif);
+
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(PersRifDTO))
+        {
+            if (index != null)
+                OnRemovePersRif(index.Value);
+
+            PersRifList ??= [];
+
+            PersRifList.Add((PersRifDTO)result.Data);
+        }
+    }
+
+    private void OnRemovePersRif(int index)
+    {
+        if (PersRifList is null || index < 0 || index >= PersRifList.Count)
+            return;
+
+        PersRifList.RemoveAt(index);
+        StateHasChanged();
+    }
+
+    private async Task OnAfterChangePIva()
+    {
+        CheckVatResponseDTO? response = null;
+        var error = false;
+
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        var nazione = Nazioni?.Find(x => 
+            x.CodNazioneAlpha2.Equals(ContactModel.Nazione) ||
+            x.CodNazioneIso.Equals(ContactModel.Nazione) ||
+            x.Nazione.Equals(ContactModel.Nazione)
+        );
+
+        if (nazione == null)
+            return;
+
+        var pIva = ContactModel.PartIva.Trim();
+
+        var clie = (await ManageData.GetClienti(new WhereCondContact {PartIva = pIva})).LastOrDefault();
+
+        if (clie == null)
+        {
+            var pros = (await ManageData.GetProspect(new WhereCondContact {PartIva = pIva})).LastOrDefault();
+
+            if (pros == null)
+            {
+                if (nazione.ChkPartIva)
+                {
+                    if (!IsView)
+                    {
+                        try
+                        {
+                            response = await IntegryApiService.CheckVat(new CheckVatRequestDTO
+                            {
+                                CountryCode = nazione.CodNazioneAlpha2,
+                                VatNumber = pIva
+                            });
+
+                            VatMessage = $"La p.Iva (<b>{pIva}</b>) corrisponde a:<br><br><b>{response.RagSoc}</b><br><b>{response.CompleteAddress}</b><br><br>Si desidera aggiungere questi dati nel form?";
+                            VatAlreadyRegistered = false;
+                        }
+                        catch (Exception e)
+                        {
+                            Snackbar.Clear();
+                            Snackbar.Add(e.Message, Severity.Error);
+                            error = true;
+                        }
+                    }
+                    else
+                    {
+                        Snackbar.Clear();
+                        Snackbar.Add("La ricerca della partita iva non è al momento disponibile", Severity.Warning);
+                        error = true;
+                    }
+                }
+                else
+                {
+                    Snackbar.Clear();
+                    Snackbar.Add("La ricerca della partita iva non è abilitata per questa nazione", Severity.Warning);
+                    error = true;
+                }
+            }
+            else
+            {
+                VatMessage = $"Prospect (<b>{pros.CodPpro}</b>) già censito con la p.iva: <b>{pIva} - {pros.RagSoc}</b>";
+                VatAlreadyRegistered = true;
+            }
+        }
+        else
+        {
+            VatMessage = $"Cliente (<b>{clie.CodAnag}</b>) già censito con la p.iva: <b>{pIva} - {clie.RagSoc}</b>";
+            VatAlreadyRegistered = true;
+        }
+
+        VisibleOverlay = false;
+        StateHasChanged();
+
+        if (!error)
+        {
+            var result = await CheckVat.ShowAsync();
+
+            if (result is true && response != null)
+            {
+                ContactModel.RagSoc = response.RagSoc;
+                ContactModel.Indirizzo = response.Indirizzo;
+                ContactModel.Cap = response.Cap;
+                ContactModel.Citta = response.Citta;
+                ContactModel.Prov = response.Prov;
+            }
+        }
+
+        OnAfterChangeValue();
+    }
+
+    private void OnAddressSet()
+    {
+        ContactModel.Citta = Address.Citta;
+        ContactModel.Indirizzo = Address.Indirizzo;
+        ContactModel.Prov = Address.Prov;
+        ContactModel.Cap = Address.Cap;
+    }
+
+    private async Task ConvertProspectToContact()
+    {
+        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/ContactForm.razor.css

@@ -0,0 +1,19 @@
+.container-button {
+    background: var(--mud-palette-background-gray) !important;
+    box-shadow: unset;
+}
+
+.container-chip-persrif {
+    width: 100%;
+    margin-bottom: 1rem;
+}
+
+.search-address {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 0.65rem;
+    color: var(--mud-palette-primary);
+    font-weight: 600;
+    align-items: center;
+}

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

@@ -0,0 +1,202 @@
+@using salesbook.Shared.Core.Dto
+@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
+
+<MudDialog Class="customDialog-form">
+    <DialogContent>
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuovo" : "")" />
+
+        <div class="content">
+            <div class="input-card">
+                <MudTextField ReadOnly="IsView" 
+                              T="string?" 
+                              Placeholder="Cognome e Nome"
+                              Variant="Variant.Text"
+                              Lines="1"
+                              @bind-Value="PersRifModel.PersonaRif"
+                              @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500"
+                              OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+            </div>
+
+            <div class="input-card">
+                <MudTextField ReadOnly="IsView"
+                              T="string?"
+                              Placeholder="Mansione"
+                              Variant="Variant.Text"
+                              Lines="1"
+                              @bind-Value="PersRifModel.Mansione"
+                              @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500"
+                              OnDebounceIntervalElapsed="OnAfterChangeValue" />
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Email</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="PersRifModel.EMail"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+                
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Fax</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="PersRifModel.Fax"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+                
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <span class="disable-full-width">Cellulare</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="PersRifModel.NumCellulare"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                </div>
+                
+                <div class="divider"></div>
+                
+                <div class="form-container">
+                    <span class="disable-full-width">Telefono</span>
+
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Variant="Variant.Text"
+                                  FullWidth="true"
+                                  Class="customIcon-select"
+                                  Lines="1"
+                                  @bind-Value="PersRifModel.Telefono"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+            </div>
+        </div>
+    </DialogContent>
+</MudDialog>
+
+<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+
+    [Parameter] public PersRifDTO? OriginalModel { get; set; }
+    [Parameter] public ContactDTO? ContactModel { get; set; }
+    [Parameter] public List<PersRifDTO>? PersRifList { get; set; }
+
+    private PersRifDTO PersRifModel { get; set; } = new();
+
+    private bool IsNew => OriginalModel is null;
+    private bool IsView => !NetworkService.ConnectionAvailable;
+
+    private string? LabelSave { get; set; }
+
+    //Overlay for save
+    private bool VisibleOverlay { get; set; }
+    private bool SuccessAnimation { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+
+        _ = LoadData();
+
+        LabelSave = IsNew ? "Aggiungi" : null;
+    }
+
+    private async Task Save()
+    {
+        VisibleOverlay = true;
+        StateHasChanged();
+
+        if (ContactModel != null && PersRifList != null)
+        {
+            PersRifList.Add(PersRifModel);
+
+            var requestDto = new CRMCreateContactRequestDTO
+            {
+                TipoAnag = ContactModel.IsContact ? "C" : "P",
+                Cliente = ContactModel,
+                PersRif = PersRifList,
+                CodVage = ContactModel.CodVage,
+                CodAnag = ContactModel.CodContact
+            };
+
+            var response = await IntegryApiService.SaveContact(requestDto);
+
+            switch (response)
+            {
+                case null:
+                    VisibleOverlay = false;
+                    StateHasChanged();
+                    return;
+                case {AnagClie: null, PtbPros: not null}:
+                    await ManageData.InsertOrUpdate(response.PtbPros);
+                    await ManageData.InsertOrUpdate(response.PtbProsRif);
+                    break;
+                case { AnagClie: not null, PtbPros: null }:
+                    await ManageData.InsertOrUpdate(response.AnagClie);
+                    await ManageData.InsertOrUpdate(response.VtbCliePersRif);
+                    break;
+                default:
+                    VisibleOverlay = false;
+                    StateHasChanged();
+                    return;
+            }
+        }
+
+        SuccessAnimation = true;
+        StateHasChanged();
+
+        await Task.Delay(1250);
+
+        MudDialog.Close(PersRifModel);
+    }
+
+    private async Task LoadData()
+    {
+        if (!IsNew)
+            PersRifModel = OriginalModel!.Clone();
+    }
+
+    private void OnAfterChangeValue()
+    {
+        if (!IsNew)
+        {
+            LabelSave = !OriginalModel.Equals(PersRifModel) ? "Aggiorna" : null;
+        }
+    }
+}

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

@@ -0,0 +1,4 @@
+.container-button {
+    background: var(--mud-palette-background-gray) !important;
+    box-shadow: unset;
+}

salesbook.Shared/Core/Dto/Activity/ActivityDTO.cs

@@ -1,17 +1,26 @@
-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;
+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()
     {
         return (ActivityDTO)MemberwiseClone();
@@ -21,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)
@@ -45,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);
@@ -95,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/Activity/CRMRetrieveActivityRequestDTO.cs

@@ -0,0 +1,24 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.Activity;
+
+public class CRMRetrieveActivityRequestDTO
+{
+    [JsonPropertyName("dateFilter")]
+    public string? DateFilter { get; set; }
+
+    [JsonPropertyName("activityId")]
+    public string? ActivityId { get; set; }
+
+    [JsonPropertyName("codAnag")]
+    public string? CodAnag { get; set; }
+
+    [JsonPropertyName("codJcom")]
+    public string? CodJcom { get; set; }
+
+    [JsonPropertyName("startDate")]
+    public DateTime? StarDate { get; set; }
+
+    [JsonPropertyName("endDate")]
+    public DateTime? EndDate { get; set; }
+}

salesbook.Shared/Core/Dto/Activity/FilterActivityDTO.cs

@@ -1,7 +1,7 @@
 using salesbook.Shared.Core.Helpers;
 using salesbook.Shared.Core.Helpers.Enum;
 
-namespace salesbook.Shared.Core.Dto;
+namespace salesbook.Shared.Core.Dto.Activity;
 
 public class FilterActivityDTO
 {

salesbook.Shared/Core/Dto/Activity/WhereCondActivity.cs

@@ -0,0 +1,11 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.Activity;
+
+public class WhereCondActivity
+{
+    public DateTime? Start { get; set; }
+    public DateTime? End { get; set; }
+    
+    public string? ActivityId { get; set; }
+}

salesbook.Shared/Core/Dto/ActivityFileDto.cs

@@ -0,0 +1,24 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class ActivityFileDto
+{
+    [JsonPropertyName("id")]
+    public string Id { get; set; }
+
+    [JsonPropertyName("fileName")]
+    public string FileName { get; set; }
+
+    [JsonPropertyName("originalSize")]
+    public int OriginalSize { get; set; }
+
+    [JsonPropertyName("lastUpd")]
+    public DateTime LastUpd { get; set; }
+
+    [JsonPropertyName("descrizione")]
+    public string Descrizione { get; set; }
+
+    [JsonPropertyName("modello")]
+    public string Modello { get; set; }
+}

salesbook.Shared/Core/Dto/AttachedDTO.cs

@@ -0,0 +1,28 @@
+namespace salesbook.Shared.Core.Dto;
+
+public class AttachedDTO
+{
+    public string Name { get; set; }
+    public string? Description { get; set; }
+    
+    public string? MimeType { get; set; }
+    public long? DimensionBytes { get; set; }
+    public string? Path { get; set; }
+
+    public byte[]? FileBytes { get; set; }
+
+    public Stream? FileContent =>
+        FileBytes is null ? null : new MemoryStream(FileBytes);
+
+    public double? Lat { get; set; }
+    public double? Lng { get; set; }
+    
+    public TypeAttached Type { get; set; }
+
+    public enum TypeAttached
+    {
+        Image,
+        Document,
+        Position
+    }
+}

salesbook.Shared/Core/Dto/AutoCompleteAddressDTO.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class AutoCompleteAddressDTO
+{
+    [JsonPropertyName("description")]
+    public string Description { get; set; }
+
+    [JsonPropertyName("placeId")]
+    public string PlaceId { get; set; }
+}

salesbook.Shared/Core/Dto/CRMAttachedResponseDTO.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CRMAttachedResponseDTO
+{
+    [JsonPropertyName("fileName")]
+    public string FileName { get; set; }
+
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
+    [JsonPropertyName("dateAttached")]
+    public DateTime DateAttached { get; set; }
+
+    [JsonPropertyName("fileSize")]
+    public decimal FileSize { get; set; }
+
+    [JsonPropertyName("refUuid")]
+    public string RefUuid { get; set; }
+
+    [JsonPropertyName("refAttached")]
+    public string RefAttached { get; set; }
+
+    [JsonPropertyName("activity")]
+    public bool IsActivity { get; set; }
+}

salesbook.Shared/Core/Dto/CRMCreateContactRequestDTO.cs

@@ -0,0 +1,24 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CRMCreateContactRequestDTO
+{
+    [JsonPropertyName("codAnag")]
+    public string? CodAnag { get; set; }
+
+    [JsonPropertyName("codVdes")] 
+    public string? CodVdes { get; set; }
+
+    [JsonPropertyName("codVage")] 
+    public string? CodVage { get; set; }
+
+    [JsonPropertyName("tipoAnag")] 
+    public string TipoAnag { get; set; }
+
+    [JsonPropertyName("cliente")] 
+    public ContactDTO Cliente { get; set; }
+
+    [JsonPropertyName("persRif")] 
+    public List<PersRifDTO>? PersRif { get; set; }
+}

salesbook.Shared/Core/Dto/CRMCreateContactResponseDTO.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+using salesbook.Shared.Core.Entity;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CRMCreateContactResponseDTO
+{
+    [JsonPropertyName("anagClie")]
+    public AnagClie? AnagClie { get; set; }
+
+    [JsonPropertyName("ptbPros")]
+    public PtbPros? PtbPros { get; set; }
+
+    [JsonPropertyName("vtbCliePersRif")]
+    public List<VtbCliePersRif> VtbCliePersRif { get; set; }
+    
+    [JsonPropertyName("ptbProsRifs")]
+    public List<PtbProsRif> PtbProsRif { get; set; }
+}

salesbook.Shared/Core/Dto/CRMTransferProspectRequestDTO.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CRMTransferProspectRequestDTO
+{
+    [JsonPropertyName("codAnag")]
+    public string? CodAnag { get; set; }
+
+    [JsonPropertyName("codPpro")]
+    public string? CodPpro { get; set; }
+}

salesbook.Shared/Core/Dto/CRMTransferProspectResponseDTO.cs

@@ -0,0 +1,16 @@
+using salesbook.Shared.Core.Entity;
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+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/CheckVatRequestDTO.cs

@@ -0,0 +1,12 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CheckVatRequestDTO
+{
+    [JsonPropertyName("countryCode")]
+    public string CountryCode { get; set; }
+
+    [JsonPropertyName("vatNumber")]
+    public string VatNumber { get; set; }
+}

salesbook.Shared/Core/Dto/CheckVatResponseDTO.cs

@@ -0,0 +1,39 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class CheckVatResponseDTO
+{
+    [JsonPropertyName("countryCode")]
+    public string? CountryCode { get; set; }
+
+    [JsonPropertyName("vatNumber ")]
+    public string? VatNumber { get; set; }
+
+    [JsonPropertyName("requestDate")]
+    public string? RequestDate { get; set; }
+
+    [JsonPropertyName("valid")]
+    public bool Valid { get; set; }
+
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    [JsonPropertyName("address")]
+    public string? CompleteAddress { get; set; }
+
+    [JsonPropertyName("ragSoc")]
+    public string? RagSoc { get; set; }
+
+    [JsonPropertyName("indirizzo")]
+    public string? Indirizzo { get; set; }
+
+    [JsonPropertyName("cap")]
+    public string? Cap { get; set; }
+
+    [JsonPropertyName("citta")]
+    public string? Citta { get; set; }
+
+    [JsonPropertyName("prov")]
+    public string? Prov { get; set; }
+}

salesbook.Shared/Core/Dto/Contact/CRMAnagRequestDTO.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.Contact;
+
+public class CRMAnagRequestDTO
+{
+    [JsonPropertyName("filterDate")]
+    public DateTime? FilterDate { get; set; }
+
+    [JsonPropertyName("flagStato")]
+    public string? FlagStato { get; set; }
+    [JsonPropertyName("partitaIva")]
+    public string? PartIva { get; set; }
+    [JsonPropertyName("codAnag")]
+    public string? CodAnag { get; set; }
+    
+    [JsonPropertyName("returnPersRif")]
+    public bool ReturnPersRif { get; set; }
+}

salesbook.Shared/Core/Dto/Contact/CRMProspectRequestDTO.cs

@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto.Contact;
+
+public class CRMProspectRequestDTO
+{
+    [JsonPropertyName("filterDate")]
+    public DateTime? FilterDate { get; set; }
+
+    [JsonPropertyName("partitaIva")]
+    public string? PartIva { get; set; }
+    [JsonPropertyName("codPpro")]
+    public string? CodPpro { get; set; }
+
+    [JsonPropertyName("returnPersRif")]
+    public bool ReturnPersRif { get; set; }
+}

salesbook.Shared/Core/Dto/Contact/WhereCondContact.cs

@@ -0,0 +1,10 @@
+namespace salesbook.Shared.Core.Dto.Contact;
+
+public class WhereCondContact
+{
+    public string? FlagStato { get; set; }
+    public string? PartIva { get; set; }
+    public string? CodAnag { get; set; }
+    
+    public bool OnlyContact { get; set; }
+}