Finish v2.0.2(9)

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/Services/AttachedService.cs

@@ -5,16 +5,48 @@ namespace salesbook.Maui.Core.Services;
 
 public class AttachedService : IAttachedService
 {
-    public async Task<AttachedDTO?> SelectImage()
+    public async Task<AttachedDTO?> SelectImageFromCamera()
     {
-        var perm = await Permissions.RequestAsync<Permissions.Photos>();
+        var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
-        if (perm != PermissionStatus.Granted) return null;
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageWrite>();
 
-        var result = await FilePicker.PickAsync(new PickOptions
+        if (cameraPerm != PermissionStatus.Granted || storagePerm != PermissionStatus.Granted)
+            return null;
+
+        FileResult? result = null;
+
+        try
         {
-            PickerTitle = "Scegli un'immagine",
+            result = await MediaPicker.Default.CapturePhotoAsync();
-            FileTypes = FilePickerFileType.Images
+        }
-        });
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore cattura foto: {ex.Message}");
+            SentrySdk.CaptureException(ex);
+            return null;
+        }
+
+        return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
+    }
+
+    public async Task<AttachedDTO?> SelectImageFromGallery()
+    {
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageRead>();
+        if (storagePerm != PermissionStatus.Granted)
+            return null;
+
+        FileResult? result = null;
+
+        try
+        {
+            result = await MediaPicker.Default.PickPhotoAsync();
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine($"Errore selezione galleria: {ex.Message}");
+            SentrySdk.CaptureException(ex);
+            return null;
+        }
 
         return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
     }
@@ -86,6 +118,7 @@ public class AttachedService : IAttachedService
         catch (Exception e)
         {
             Console.WriteLine($"Errore durante il salvataggio dello stream: {e.Message}");
+            SentrySdk.CaptureException(e);
             return null;
         }
         finally
@@ -99,7 +132,7 @@ public class AttachedService : IAttachedService
     public async Task OpenFile(Stream file, string fileName)
     {
         var filePath = await SaveToTempStorage(file, fileName);
-        
+
         if (filePath is null) return;
         await Launcher.OpenAsync(new OpenFileRequest
         {

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -1,24 +1,26 @@
 using AutoMapper;
-using MudBlazor.Extensions;
 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 Sentry.Protocol;
 using System.Linq.Expressions;
-using salesbook.Shared.Core.Helpers;
+using IntegryApiClient.Core.Domain.Abstraction.Contracts.Account;
 
 namespace salesbook.Maui.Core.Services;
 
 public class ManageDataService(
     LocalDbService localDb,
     IMapper mapper,
+    UserListState userListState,
     IIntegryApiService integryApiService,
-    INetworkService networkService
+    INetworkService networkService,
+    IUserSession userSession
 ) : IManageDataService
 {
     public Task<List<T>> GetTable<T>(Expression<Func<T, bool>>? whereCond = null) where T : new() =>
@@ -86,7 +88,7 @@ public class ManageDataService(
         return prospect;
     }
 
-    public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond)
+    public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond, DateTime? lastSync)
     {
         List<AnagClie>? contactList;
         List<PtbPros>? prospectList;
@@ -94,26 +96,37 @@ public class ManageDataService(
 
         if (networkService.ConnectionAvailable)
         {
+            var response = new UsersSyncResponseDTO();
+            
             var clienti = await integryApiService.RetrieveAnagClie(
                 new CRMAnagRequestDTO
                 {
                     CodAnag = whereCond.CodAnag,
                     FlagStato = whereCond.FlagStato,
                     PartIva = whereCond.PartIva,
-                    ReturnPersRif = !whereCond.OnlyContact
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
                 }
             );
-            _ = UpdateDbUsers(clienti);
+
+            response.AnagClie = clienti.AnagClie;
+            response.VtbDest = clienti.VtbDest;
+            response.VtbCliePersRif = clienti.VtbCliePersRif;
 
             var prospect = await integryApiService.RetrieveProspect(
                 new CRMProspectRequestDTO
                 {
                     CodPpro = whereCond.CodAnag,
                     PartIva = whereCond.PartIva,
-                    ReturnPersRif = !whereCond.OnlyContact
+                    ReturnPersRif = !whereCond.OnlyContact,
+                    FilterDate = lastSync
                 }
             );
-            _ = UpdateDbUsers(prospect);
+
+            response.PtbPros = prospect.PtbPros;
+            response.PtbProsRif = prospect.PtbProsRif;
+
+            _ = UpdateDbUsers(response);
 
             contactList = clienti.AnagClie;
             prospectList = prospect.PtbPros;
@@ -220,7 +233,7 @@ public class ManageDataService(
         return await MapActivity(activities);
     }
 
-    private async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
+    public async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
     {
         if (activities == null) return [];
 
@@ -230,21 +243,29 @@ public class ManageDataService(
             .Distinct().ToList();
 
         var jtbComtList = await localDb.Get<JtbComt>(x => codJcomList.Contains(x.CodJcom));
-        var commesseDict = jtbComtList.ToDictionary(x => x.CodJcom, x => x.Descrizione);
 
         var codAnagList = activities
             .Select(x => x.CodAnag)
             .Where(x => !string.IsNullOrEmpty(x))
             .Distinct().ToList();
-        var clientList = await localDb.Get<AnagClie>(x => codAnagList.Contains(x.CodAnag));
-        var distinctClient = clientList.ToDictionary(x => x.CodAnag, x => x.RagSoc);
 
-        var prospectList = await localDb.Get<PtbPros>(x => codAnagList.Contains(x.CodPpro));
+        IDictionary<string, string?>? distinctUser = null;
-        var distinctProspect = prospectList.ToDictionary(x => x.CodPpro, x => x.RagSoc);
+        
+        if (userListState.AllUsers != null)
+        {
+            distinctUser = userListState.AllUsers
+                .Where(x => codAnagList.Contains(x.CodContact))
+                .ToDictionary(x => x.CodContact, x => x.RagSoc);
+        }
 
         var returnDto = activities
             .Select(activity =>
             {
+                if (activity.CodJcom is "0000" && userSession.ProfileDb != null && userSession.ProfileDb.Equals("smetar", StringComparison.OrdinalIgnoreCase))
+                {
+                    activity.CodJcom = null;
+                }
+
                 var dto = mapper.Map<ActivityDTO>(activity);
 
                 if (activity is { AlarmTime: not null, EstimatedTime: not null })
@@ -269,16 +290,14 @@ public class ManageDataService(
                 {
                     string? ragSoc;
 
-                    if (distinctClient.TryGetValue(activity.CodAnag, out ragSoc) ||
+                    if (distinctUser != null && (distinctUser.TryGetValue(activity.CodAnag, out ragSoc) ||
-                        distinctProspect.TryGetValue(activity.CodAnag, out ragSoc))
+                        distinctUser.TryGetValue(activity.CodAnag, out ragSoc)))
                     {
                         dto.Cliente = ragSoc;
                     }
                 }
 
-                dto.Commessa = activity.CodJcom != null && commesseDict.TryGetValue(activity.CodJcom, out var descr)
+                dto.Commessa = jtbComtList.Find(x => x.CodJcom.Equals(dto.CodJcom));
-                    ? descr
-                    : null;
                 return dto;
             })
             .ToList();
@@ -322,6 +341,26 @@ public class ManageDataService(
     public Task InsertOrUpdate<T>(T objectToSave) =>
         localDb.InsertOrUpdate<T>([objectToSave]);
 
+    public async Task DeleteProspect(string codPpro)
+    {
+        var persRifList = await GetTable<PtbProsRif>(x => x.CodPpro!.Equals(codPpro));
+        
+        if (!persRifList.IsNullOrEmpty())
+        {
+            foreach (var persRif in persRifList)
+            {
+                await localDb.Delete(persRif);
+            }
+        }
+
+        var ptbPros = (await GetTable<PtbPros>(x => x.CodPpro!.Equals(codPpro))).FirstOrDefault();
+
+        if (ptbPros != null)
+        {
+            await localDb.Delete(ptbPros);
+        }
+    }
+
     public Task Delete<T>(T objectToDelete) =>
         localDb.Delete(objectToDelete);
 

salesbook.Maui/ILLink.Descriptors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+	<assembly fullname="salesbook.Shared" 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/Platforms/Android/AndroidManifest.xml

@@ -1,24 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="it.integry.salesbook">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:usesCleartextTraffic="true" android:supportsRtl="true">
+    package="it.integry.salesbook">
-		<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">
+	<application
+        android:allowBackup="true"
+        android:icon="@mipmap/appicon"
+        android:usesCleartextTraffic="true"
+        android:supportsRtl="true">
+
+		<!-- Firebase push -->
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
+            android:exported="false" />
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
+            android:exported="true"
+            android:permission="com.google.android.c2dm.permission.SEND">
 			<intent-filter>
 				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
 				<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
 				<category android:name="${applicationId}" />
 			</intent-filter>
 		</receiver>
+
 	</application>
+
+	<!-- Rete -->
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+
+	<!-- Geolocalizzazione -->
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+	<!-- Fotocamera -->
+	<uses-permission android:name="android.permission.CAMERA" />
+
+	<!-- Storage / Media -->
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+	<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>
+
+</manifest>

salesbook.Maui/Platforms/iOS/Info.plist

@@ -39,8 +39,11 @@
 	<key>NSLocationWhenInUseUsageDescription</key>
     <string>L'app utilizza la tua posizione per allegarla alle attività.</string>
 
+	<key>NSCameraUsageDescription</key>
+    <string>Questa app necessita di accedere alla fotocamera per scattare foto.</string>
+
 	<key>NSPhotoLibraryUsageDescription</key>
-    <string>Consente di selezionare immagini da allegare alle attività.</string>
+    <string>Questa app necessita di accedere alla libreria foto.</string>
 
     <key>NSPhotoLibraryAddUsageDescription</key>
     <string>Permette all'app di salvare file o immagini nella tua libreria fotografica se necessario.</string>

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+		<ApplicationDisplayVersion>2.0.2</ApplicationDisplayVersion>
-		<ApplicationVersion>5</ApplicationVersion>
+		<ApplicationVersion>9</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -78,8 +78,8 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
-		<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
+		<CodesignKey>Apple Development: Created via API (5B7B69P4JY)</CodesignKey>
-		<CodesignProvision></CodesignProvision>
+		<CodesignProvision>VS: it.integry.salesbook Development</CodesignProvision>
 		<ProvisioningType>manual</ProvisioningType>
 	</PropertyGroup>
 
@@ -95,16 +95,6 @@
 		<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
-		<GoogleServicesJson Include="google-services.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</GoogleServicesJson>
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-ios'">
-		<BundleResource Include="GoogleService-Info.plist" />
-	</ItemGroup>
-
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
 		<!-- Android App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" ForegroundScale="0.65" />
@@ -115,6 +105,20 @@
 		<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>
+
+	<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" />
@@ -130,20 +134,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.2.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.81" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.110" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
-		<PackageReference Include="Sentry.Maui" Version="5.11.2" />
+		<PackageReference Include="Sentry.Maui" Version="5.15.1" />
 		<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="sqlite-net-pcl" Version="1.9.172" />
+		<PackageReference Include="SourceGear.sqlite3" Version="3.50.4.2" />
+		<PackageReference Include="sqlite-net-e" Version="1.10.0-beta2" />
 	</ItemGroup>
 
 	<ItemGroup>

salesbook.Shared/Components/Layout/ConnectionState.razor

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

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

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

salesbook.Shared/Components/Layout/MainLayout.razor

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

salesbook.Shared/Components/Layout/NavMenu.razor

@@ -3,6 +3,7 @@
 @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
@@ -13,6 +14,7 @@
 @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")">
@@ -55,8 +57,8 @@
                     <MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add"/>
                 </ActivatorContent>
                 <ChildContent>
-                    <MudMenuItem OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
+                    <MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
-                    <MudMenuItem OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
+                    <MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
                 </ChildContent>
             </MudMenu>
         }

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/Pages/Calendar.razor

@@ -4,11 +4,13 @@
 @using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Components.SingleElements.BottomSheet
 @using salesbook.Shared.Core.Dto.Activity
+@using salesbook.Shared.Core.Dto.PageState
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Core.Messages.Activity.New
 @inject IManageDataService ManageData
 @inject IJSRuntime JS
 @inject NewActivityService NewActivity
+@inject UserListState UserState
 
 <HeaderLayout Title="@_headerTitle"
               ShowFilter="true"
@@ -168,7 +170,6 @@
 <FilterActivity @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="ApplyFilter"/>
 
 @code {
-
     // Modelli per ottimizzazione rendering
     private record DayData(DateTime Date, string CssClass, bool HasEvents, CategoryData[] EventCategories, string DayName = "");
 
@@ -221,11 +222,20 @@
         PrepareRenderingData();
 
         NewActivity.OnActivityCreated += async activityId => await OnActivityCreated(activityId);
+        UserState.OnUsersLoaded += async () => await InvokeAsync(LoadData);
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        if (firstRender)
+        if (firstRender && UserState.IsLoaded)
+        {
+            await LoadData();
+        }
+    }
+
+    private async Task LoadData()
+    {
+        if (!_isInitialized)
         {
             Filter.User = new HashSet<string> { UserSession.User.Username };
 

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

@@ -80,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;
@@ -94,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;
 }
 

salesbook.Shared/Components/Pages/Commessa.razor

@@ -25,7 +25,7 @@
 }
 else
 {
-    <div class="container content">
+    <div class="container content pb-safe-area">
         @if (CommessaModel == null)
         {
             <NoDataAvailable Text="Nessuna commessa trovata"/>
@@ -149,10 +149,9 @@ else
         await Task.Run(async () =>
         {
             var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodJcom = CodJcom });
-            ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
-                .OrderBy(x => 
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
-                ).ToList();
         });
 
         ActivityIsLoading = false;

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

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

salesbook.Shared/Components/Pages/Home.razor

@@ -21,6 +21,8 @@
 {
     protected override async Task OnInitializedAsync()
     {
+        NetworkService.ConnectionAvailable = NetworkService.IsNetworkAvailable();
+
         await LoadNotification();
         await CheckAndRequestPermissions();
 
@@ -54,9 +56,6 @@
     private async Task CheckAndRequestPermissions()
     {
         await NotificationManager.RequestAccess();
-
-        // if (BatteryOptimizationManagerService.IsBatteryOptimizationEnabled())
-        //     BatteryOptimizationManagerService.OpenBatteryOptimizationSettings(_ => { });
     }
 
     private Task StartSyncUser()

salesbook.Shared/Components/Pages/Login.razor

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

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -13,7 +13,7 @@
 
 @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">

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

@@ -24,18 +24,18 @@
               Back="true"
               BackOnTop="true"
               Title=""
-              ShowProfile="false" />
+              ShowProfile="false"/>
 
 @if (IsLoading)
 {
-    <SpinnerLayout FullScreen="true" />
+    <SpinnerLayout FullScreen="true"/>
 }
 else
 {
-    <div class="container content" style="overflow: auto;" id="topPage">
+    <div class="container content pb-safe-area" style="overflow: auto;" id="topPage">
         <div class="container-primary-info">
             <div class="section-primary-info">
-                <MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold" Color="Color.Secondary">
+                <MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold" Variant="@(IsContact ? Variant.Filled : Variant.Outlined)" Color="Color.Secondary">
                     @UtilityString.ExtractInitials(Anag.RagSoc)
                 </MudAvatar>
 
@@ -55,216 +55,229 @@ else
             <div class="divider"></div>
 
             <div class="section-info">
-                <div class="section-personal-info">
+                @if (Agente != null)
-                    @if (!string.IsNullOrEmpty(Anag.Telefono))
+                {
-                    {
+                    <div class="section-personal-info">
-                        <div>
-                            <span class="info-title">Telefono</span>
-                            <span class="info-text">@Anag.Telefono</span>
-                        </div>
-                    }
-
-                    @if (!string.IsNullOrEmpty(Anag.PartIva))
-                    {
-                        <div>
-                            <span class="info-title">P. IVA</span>
-                            <span class="info-text">@Anag.PartIva</span>
-                        </div>
-                    }
-                </div>
-
-                <div class="section-personal-info">
-                    @if (!string.IsNullOrEmpty(Anag.EMail))
-                    {
-                        <div>
-                            <span class="info-title">E-mail</span>
-                            <span class="info-text">@Anag.EMail</span>
-                        </div>
-                    }
-
-                    @if (Agente != null)
-                    {
                         <div>
                             <span class="info-title">Agente</span>
                             <span class="info-text">@Agente.FullName</span>
                         </div>
-                    }
-                </div>
-            </div>
-        </div>
-
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
-        <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
-
-        <div class="box">
-            <ul class="tab-list">
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab1" @onclick="() => SwitchTab(0)">Contatti</label>
-                </li>
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab2" @onclick="() => SwitchTab(1)">Commesse</label>
-                </li>
-                <li class="tab-item">
-                    <label class="tab-trigger" for="tab3" @onclick="() => SwitchTab(2)">Attivit<69></label>
-                </li>
-            </ul>
-        </div>
-
-        <div class="tab-container">
-            <!-- Tab Contatti -->
-            <div class="tab-content" style="display: @(ActiveTab == 0 ? "block" : "none")">
-                @if (PersRif?.Count > 0)
-                {
-                    <div class="container-pers-rif">
-                        @foreach (var person in PersRif)
-                        {
-                            <ContactCard Contact="person" />
-                            @if (person != PersRif.Last())
-                            {
-                                <div class="divider"></div>
-                            }
-                        }
                     </div>
                 }
 
-                <div class="container-button">
+                @if (!string.IsNullOrEmpty(Anag.Telefono))
-                    <MudButton Class="button-settings infoText"
-                               FullWidth="true"
-                               Size="Size.Medium"
-                               OnClick="OpenPersRifForm"
-                               Variant="Variant.Outlined">
-                        Aggiungi contatto
-                    </MudButton>
-                </div>
-            </div>
-
-            <!-- Tab Commesse -->
-            <div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
-                @if (IsLoadingCommesse)
                 {
-                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    <div class="section-personal-info">
-                }
+                        <div>
-                else if (Commesse?.Count == 0)
+                            <span class="info-title">Telefono</span>
-                {
+                            <span class="info-text">@Anag.Telefono</span>
-                    <NoDataAvailable Text="Nessuna commessa presente" />
+                        </div>
-                }
-                else if (Commesse != null)
-                {
-                    <!-- Filtri e ricerca -->
-                    <div class="input-card clearButton">
-                        <MudTextField T="string?"
-                                      Placeholder="Cerca..."
-                                      Variant="Variant.Text"
-                                      @bind-Value="SearchTermCommesse"
-                                      OnDebounceIntervalElapsed="() => ApplyFiltersCommesse()"
-                                      DebounceInterval="500" />
-                    </div>
-
-                    <div class="commesse-container">
-                        @if (IsLoadingSteps)
-                        {
-                            <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3" />
-                        }
-
-                        @foreach (var commessa in CurrentPageCommesse)
-                        {
-                            <div class="commessa-wrapper" style="@(IsLoadingStep(commessa.CodJcom) ? "opacity: 0.7;" : "")">
-                                @if (Steps.TryGetValue(commessa.CodJcom, out var steps))
-                                {
-                                    <CommessaCard Steps="@steps" RagSoc="@Anag.RagSoc" Commessa="commessa" />
-                                }
-                                else
-                                {
-                                    <CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa" />
-                                    @if (IsLoadingStep(commessa.CodJcom))
-                                    {
-                                        <MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;" />
-                                    }
-                                }
-                            </div>
-                        }
-
-                        @if (TotalPagesCommesse > 1)
-                        {
-                            <div class="custom-pagination">
-                                <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
-                                               @bind-Selected="SelectedPageCommesse"
-                                               Color="Color.Primary" />
-                            </div>
-
-                            <div class="SelectedPageSize">
-                                <MudSelect @bind-Value="SelectedPageSizeCommesse"
-                                           Variant="Variant.Text"
-                                           Label="Elementi per pagina"
-                                           Dense="true"
-                                           Style="width: 100%;">
-                                    <MudSelectItem Value="5">5</MudSelectItem>
-                                    <MudSelectItem Value="10">10</MudSelectItem>
-                                    <MudSelectItem Value="15">15</MudSelectItem>
-                                </MudSelect>
-                            </div>
-                        }
                     </div>
                 }
-            </div>
 
-            <!-- Tab Attivit<69> -->
+                @if (!string.IsNullOrEmpty(Anag.PartIva))
-            <div class="tab-content" style="display: @(ActiveTab == 2 ? "block" : "none")">
-                @if (ActivityIsLoading)
                 {
-                    <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
+                    <div class="section-personal-info">
-                }
+                        <div>
-                else if (ActivityList?.Count == 0)
+                            <span class="info-title">P. IVA</span>
-                {
+                            <span class="info-text">@Anag.PartIva</span>
-                    <NoDataAvailable Text="Nessuna attivit<69> presente" />
+                        </div>
-                }
-                else if (ActivityList != null)
-                {
-                    <!-- Filtri e ricerca -->
-                    <div class="input-card clearButton">
-                        <MudTextField T="string?"
-                                      Placeholder="Cerca..."
-                                      Variant="Variant.Text"
-                                      @bind-Value="SearchTermActivity"
-                                      OnDebounceIntervalElapsed="() => ApplyFiltersActivity()"
-                                      DebounceInterval="500" />
                     </div>
+                }
 
-                    <div class="attivita-container">
+                @if (!string.IsNullOrEmpty(Anag.EMail))
-                        @foreach (var activity in CurrentPageActivity)
+                {
-                        {
+                    <div class="section-personal-info">
-                            <ActivityCard ShowDate="true" Activity="activity" />
+                        <div>
-                        }
+                            <span class="info-title">E-mail</span>
-
+                            <span class="info-text">@Anag.EMail</span>
-                        @if (TotalPagesActivity > 1)
+                        </div>
-                        {
-                            <div class="custom-pagination">
-                                <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesActivity"
-                                               @bind-Selected="CurrentPageActivityIndex"
-                                               Color="Color.Primary" />
-                            </div>
-
-                            <div class="SelectedPageSize">
-                                <MudSelect @bind-Value="SelectedPageSizeActivity"
-                                           Variant="Variant.Text"
-                                           Label="Elementi per pagina"
-                                           Dense="true"
-                                           Style="width: 100%;">
-                                    <MudSelectItem Value="5">5</MudSelectItem>
-                                    <MudSelectItem Value="15">15</MudSelectItem>
-                                    <MudSelectItem Value="30">30</MudSelectItem>
-                                </MudSelect>
-                            </div>
-                        }
                     </div>
                 }
             </div>
         </div>
         
-        <MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
+        <div class="tab-section">
-            <MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp" />
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
-        </MudScrollToTop>
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
+
+            <div class="box">
+                <ul class="tab-list">
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab1" @onclick="() => SwitchTab(0)">Contatti</label>
+                    </li>
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab2" @onclick="() => SwitchTab(1)">Commesse</label>
+                    </li>
+                    <li class="tab-item">
+                        <label class="tab-trigger" for="tab3" @onclick="() => SwitchTab(2)">Attivit<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>
+
+                <!-- Tab Commesse -->
+                <div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
+                    @if (IsLoadingCommesse)
+                    {
+                        <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
+                    }
+                    else if (Commesse?.Count == 0)
+                    {
+                        <NoDataAvailable Text="Nessuna commessa presente"/>
+                    }
+                    else if (Commesse != null)
+                    {
+                        <!-- Filtri e ricerca -->
+                        <div class="input-card clearButton custom-border-bottom">
+                            <MudTextField T="string?"
+                                          Placeholder="Cerca..."
+                                          Variant="Variant.Text"
+                                          @bind-Value="SearchTermCommesse"
+                                          AdornmentIcon="@Icons.Material.Rounded.Search"
+                                          Adornment="Adornment.Start"
+                                          OnDebounceIntervalElapsed="() => ApplyFiltersCommesse()"
+                                          DebounceInterval="500"/>
+                        </div>
+
+                        <div class="commesse-container">
+                            @if (IsLoadingSteps)
+                            {
+                                <MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3"/>
+                            }
+
+                            @foreach (var commessa in CurrentPageCommesse)
+                            {
+                                <div class="commessa-wrapper" style="@(IsLoadingStep(commessa.CodJcom) ? "opacity: 0.7;" : "")">
+                                    @if (Steps.TryGetValue(commessa.CodJcom, out var steps))
+                                    {
+                                        <CommessaCard Steps="@steps" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
+                                    }
+                                    else
+                                    {
+                                        <CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
+                                        @if (IsLoadingStep(commessa.CodJcom))
+                                        {
+                                            <MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;"/>
+                                        }
+                                    }
+                                </div>
+                            }
+
+                            @if (TotalPagesCommesse > 1)
+                            {
+                                <div class="custom-pagination">
+                                    <MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
+                                                   @bind-Selected="SelectedPageCommesse"
+                                                   Color="Color.Primary"/>
+                                </div>
+
+                                <div class="SelectedPageSize">
+                                    <MudSelect @bind-Value="SelectedPageSizeCommesse"
+                                               Variant="Variant.Text"
+                                               Label="Elementi per pagina"
+                                               Dense="true"
+                                               Style="width: 100%;">
+                                        <MudSelectItem Value="5">5</MudSelectItem>
+                                        <MudSelectItem Value="10">10</MudSelectItem>
+                                        <MudSelectItem Value="15">15</MudSelectItem>
+                                    </MudSelect>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
+
+                <!-- Tab Attivit<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>
 }
 
@@ -523,10 +536,9 @@ else
         await Task.Run(async () =>
         {
             var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
-            ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
-                .OrderByDescending(x => 
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
-                ).ToList();
         });
 
         UserState.Activitys = ActivityList;
@@ -773,7 +785,16 @@ else
     {
         var result = await ModalHelpers.OpenUserForm(Dialog, anag);
 
-        if (result is { Canceled: false })
+        if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(AnagClie))
+        {
+            var clie = (AnagClie)result.Data;
+            IsContact = true;
+            CodContact = clie.CodAnag!;
+
+            await LoadAnagAsync();
+            SaveDataToSession();
+        }
+        else if (result is { Canceled: false })
         {
             await LoadAnagAsync();
             SaveDataToSession();
@@ -781,4 +802,5 @@ else
     }
 
     #endregion
+
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,4 @@
+@using Java.Sql
 @using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Core.Dto.Activity
 @using salesbook.Shared.Core.Entity
@@ -92,6 +93,9 @@
 
         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:

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

@@ -2,7 +2,6 @@
     position: relative;
     overflow: hidden;
     border-radius: var(--mud-default-borderradius);
-    box-shadow: var(--custom-box-shadow);
     width: 100%;
 }
 
@@ -39,7 +38,7 @@
     align-items: center;
     padding: 12px;
     gap: 12px;
-    background: var(--mud-palette-background);
+    background: var(--light-card-background);
     transition: transform .2s ease;
     touch-action: pan-y;
     will-change: transform;

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

@@ -1,5 +1,4 @@
 @using System.Globalization
-@using System.Text.RegularExpressions
 @using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Components.Layout.Overlay
@@ -40,18 +39,26 @@
                 <div class="form-container">
                     <span class="disable-full-width">Commessa</span>
 
-                    <MudAutocomplete
+                    @if (ActivityModel.CodJcom != null && SelectedComessa == null)
-                        Disabled="ActivityModel.Cliente.IsNullOrEmpty()"
+                    {
-                        T="JtbComt?"
+                        <MudSkeleton />
-                        @bind-Value="SelectedComessa"
+                    }
-                        @bind-Value:after="OnCommessaSelectedAfter"
+                    else
-                        SearchFunc="SearchCommesseAsync"
+                    {
-                        ToStringFunc="@(c => c == null ? string.Empty : $"{c.CodJcom} - {c.Descrizione}")"
+                        <MudAutocomplete
-                        Clearable="true"
+                            Disabled="ActivityModel.Cliente.IsNullOrEmpty()"
-                        ShowProgressIndicator="true"
+                            T="JtbComt?" ReadOnly="IsView"
-                        DebounceInterval="300"
+                            @bind-Value="SelectedComessa"
-                        MaxItems="50"
+                            @bind-Value:after="OnCommessaSelectedAfter"
-                        Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code"/>
+                            SearchFunc="SearchCommesseAsync"
+                            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>
 
@@ -90,19 +97,28 @@
             <div class="input-card">
                 <div class="form-container">
                     <span class="disable-full-width">Assegnata a</span>
-                    <MudAutocomplete
+
-                        Disabled="Users.IsNullOrEmpty()"
+                    @if (ActivityModel.UserName != null && SelectedUser == null)
-                        T="StbUser"
+                    {
-                        @bind-Value="SelectedUser"
+                        <MudSkeleton />
-                        @bind-Value:after="OnUserSelectedAfter"
+                    }
-                        SearchFunc="SearchUtentiAsync"
+                    else
-                        ToStringFunc="@(u => u == null ? string.Empty : u.FullName)"
+                    {
-                        Clearable="true"
+                        <MudAutocomplete
-                        ShowProgressIndicator="true"
+                            Disabled="Users.IsNullOrEmpty()" ReadOnly="IsView"
-                        DebounceInterval="300"
+                            T="StbUser"
-                        MaxItems="50"
+                            @bind-Value="SelectedUser"
-                        Class="customIcon-select" 
+                            @bind-Value:after="OnUserSelectedAfter"
-                        AdornmentIcon="@Icons.Material.Filled.Code"/>
+                            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>
@@ -110,12 +126,19 @@
                 <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>
@@ -167,41 +190,44 @@
                 }
             </div>
 
-            <div class="container-button">
+            @if (!IsView)
-                <MudButton Class="button-settings green-icon"
+            {
-                           FullWidth="true"
+                <div class="container-button">
-                           StartIcon="@Icons.Material.Rounded.AttachFile"
+                    <MudButton Class="button-settings green-icon"
-                           Size="Size.Medium"
-                           OnClick="OpenAddAttached"
-                           Variant="Variant.Outlined">
-                    Aggiungi allegati
-                </MudButton>
-
-                @if (!IsNew)
-                {
-                    <div class="divider"></div>
-
-                    <MudButton Class="button-settings gray-icon"
                                FullWidth="true"
-                               StartIcon="@Icons.Material.Filled.ContentCopy"
+                               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>
+                        <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">
@@ -215,30 +241,6 @@
                 </MudButton>
             </YesButton>
         </MudMessageBox>
-
-        <MudMessageBox @ref="AddNamePosition" Class="c-messageBox" Title="Nome della posizione" CancelText="Annulla">
-            <MessageContent>
-                <MudTextField @bind-Value="NamePosition" Variant="Variant.Outlined"/>
-            </MessageContent>
-            <YesButton>
-                <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                           StartIcon="@Icons.Material.Rounded.Check">
-                    Salva
-                </MudButton>
-            </YesButton>
-        </MudMessageBox>
-
-        <MudMessageBox @ref="ConfirmMemo" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
-            <MessageContent>
-                Vuoi creare un promemoria?
-            </MessageContent>
-            <YesButton>
-                <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
-                           StartIcon="@Icons.Material.Rounded.Check">
-                    Crea
-                </MudButton>
-            </YesButton>
-        </MudMessageBox>
     </DialogContent>
 </MudDialog>
 
@@ -279,12 +281,9 @@
 
     //MessageBox
     private MudMessageBox ConfirmDelete { get; set; }
-    private MudMessageBox ConfirmMemo { get; set; }
-    private MudMessageBox AddNamePosition { get; set; }
 
     //Attached
     private List<AttachedDTO>? AttachedList { get; set; }
-    private string? NamePosition { get; set; }
     private bool CanAddPosition { get; set; } = true;
 
     // cache per commesse
@@ -394,13 +393,15 @@
     {
         return Task.Run(async () =>
         {
-            if (!IsNew && Id != null)
+            SelectedComessa = ActivityModel.Commessa;
-                ActivityFileList = await IntegryApiService.GetActivityFile(Id);
 
             Users = await ManageData.GetTable<StbUser>();
             if (!ActivityModel.UserName.IsNullOrEmpty())
                 SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
 
+            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();
@@ -514,7 +515,7 @@
         if (com != null)
         {
             ActivityModel.CodJcom = com.CodJcom;
-            ActivityModel.Commessa = com.Descrizione;
+            ActivityModel.Commessa = com;
         }
         else
         {
@@ -532,6 +533,20 @@
         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)
@@ -569,6 +584,8 @@
 
     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);
@@ -627,16 +644,8 @@
             var attached = (AttachedDTO)result.Data;
 
             if (attached.Type == AttachedDTO.TypeAttached.Position)
-            {
                 CanAddPosition = false;
 
-                var resultNamePosition = await AddNamePosition.ShowAsync();
-
-                if (resultNamePosition is true)
-                    attached.Description = NamePosition;
-                attached.Name = NamePosition!;
-            }
-
             AttachedList ??= [];
             AttachedList.Add(attached);
 

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

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

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

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

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

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

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

@@ -6,7 +6,7 @@ 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; }
@@ -17,7 +17,8 @@ public class ActivityDTO : StbActivity
     public DateTime? NotificationDate { get; set; }
 
     public bool Deleted { get; set; }
-    
+
+    [JsonPropertyName("stbPosizioni")]
     public PositionDTO? Position { get; set; }
 
     public ActivityDTO Clone()

salesbook.Shared/Core/Dto/CRMTransferProspectResponseDTO.cs

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

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

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

salesbook.Shared/Core/Dto/PositionDTO.cs

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

salesbook.Shared/Core/Helpers/ModalHelpers.cs

@@ -80,7 +80,8 @@ public class ModalHelpers
             {
                 FullScreen = false,
                 CloseButton = false,
-                NoHeader = true
+                NoHeader = true,
+                BackdropClick = false
             }
         );
 

salesbook.Shared/Core/Interface/IAttachedService.cs

@@ -4,7 +4,8 @@ namespace salesbook.Shared.Core.Interface;
 
 public interface IAttachedService
 {
-    Task<AttachedDTO?> SelectImage();
+    Task<AttachedDTO?> SelectImageFromCamera();
+    Task<AttachedDTO?> SelectImageFromGallery();
     Task<AttachedDTO?> SelectFile();
     Task<AttachedDTO?> SelectPosition();
     Task OpenFile(Stream file, string fileName);

salesbook.Shared/Core/Interface/IManageDataService.cs

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

salesbook.Shared/Core/Services/IntegryApiService.cs

@@ -72,8 +72,15 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
         return integryApiRestClient.AuthorizedGet<object>($"activity/delete", queryParams);
     }
 
-    public Task<List<StbActivity>?> SaveActivity(ActivityDTO activity) =>
+    public Task<List<StbActivity>?> SaveActivity(ActivityDTO activity)
-        integryApiRestClient.AuthorizedPost<List<StbActivity>?>("crm/saveActivity", activity);
+    {
+        if (activity.CodJcom is null && userSession.ProfileDb != null && userSession.ProfileDb.Equals("smetar", StringComparison.OrdinalIgnoreCase))
+        {
+            activity.CodJcom = "0000";
+        }
+
+        return integryApiRestClient.AuthorizedPost<List<StbActivity>?>("crm/saveActivity", activity);
+    }
 
     public Task<CRMCreateContactResponseDTO?> SaveContact(CRMCreateContactRequestDTO request) =>
         integryApiRestClient.AuthorizedPost<CRMCreateContactResponseDTO>("crm/createContact", request);

salesbook.Shared/Core/Services/PreloadService.cs

@@ -25,6 +25,7 @@ public class PreloadService(IManageDataService manageData, UserListState userSta
 
         userState.GroupedUserList = BuildGroupedList(sorted);
         userState.FilteredGroupedUserList = userState.GroupedUserList;
+        userState.AllUsers = users;
 
         userState.NotifyUsersLoaded();
     }

salesbook.Shared/Core/Utility/UtilityString.cs

@@ -4,8 +4,10 @@ namespace salesbook.Shared.Core.Utility;
 
 public static class UtilityString
 {
-    public static string ExtractInitials(string fullname)
+    public static string ExtractInitials(string? fullname)
     {
+        if (fullname == null) return "";
+        
         return string.Concat(fullname
             .Split(' ', StringSplitOptions.RemoveEmptyEntries)
             .Take(3)

salesbook.Shared/salesbook.Shared.csproj

@@ -22,15 +22,16 @@
 
 	<ItemGroup>
 		<PackageReference Include="AutoMapper" Version="14.0.0" />
-		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.2" />
+		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.4" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="IntegryApiClient.Core" Version="1.2.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
-		<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.110" />
-		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+		<PackageReference Include="SourceGear.sqlite3" Version="3.50.4.2" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
+		<PackageReference Include="sqlite-net-e" Version="1.10.0-beta2" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.6" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
-		<PackageReference Include="MudBlazor" Version="8.6.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
+		<PackageReference Include="MudBlazor" Version="8.12.0" />
 		<PackageReference Include="MudBlazor.ThemeManager" Version="3.0.0" />
 	</ItemGroup>
 

salesbook.Shared/wwwroot/css/app.css

@@ -1,6 +1,6 @@
 html { overflow: hidden; }
 
-.page, article, main { height: 100% !important; }
+.page, article, main { height: 100% !important; overflow: hidden; }
 
 #app { height: 100vh; }
 
@@ -58,7 +58,7 @@ article {
     transform: translateY(0);
 }
 
-.page > .Connection.Hide ~ main {
+.Connection.Hide ~ .page {
     transition: all 0.5s ease;
     transform: translateY(-35px);
 }
@@ -268,8 +268,7 @@ h1:focus { outline: none; }
 
     #app {
         margin-top: env(safe-area-inset-top);
-        margin-bottom: env(safe-area-inset-bottom);
+        height: calc(100vh - env(safe-area-inset-top));
-        height: calc(100vh - env(safe-area-inset-top) - env(safe-area-inset-bottom));
     }
 
     .flex-column, .navbar-brand { padding-left: env(safe-area-inset-left); }

salesbook.Shared/wwwroot/css/default-theme.css

@@ -8,4 +8,6 @@
     --mud-default-borderradius: 20px !important;
     --m-page-x: 1rem;
     --mh-header: 4rem;
+
+    --light-card-background: hsl(from var(--mud-palette-background-gray) h s 97%);
 }

salesbook.Shared/wwwroot/css/form.css

@@ -5,6 +5,10 @@
     margin-bottom: 1rem;
 }
 
+.customDialog-form.disable-safe-area .mud-dialog-content { margin-top: unset !important; }
+
+.customDialog-form.disable-safe-area .content { height: 100% !important; }
+
 .customDialog-form .content {
     height: calc(100vh - (.6rem + 40px));
     overflow: auto;
@@ -12,6 +16,14 @@
     scrollbar-width: none;
 }
 
+@supports (-webkit-touch-callout: none) {
+    .customDialog-form .content { height: calc(100vh - (.6rem + 40px) - env(safe-area-inset-top)) !important; }
+
+    .customDialog-form.disable-safe-area .content { height: 100% !important; }
+
+    .customDialog-form.disable-safe-area .mud-dialog-content { margin-top: unset !important; }
+}
+
 .customDialog-form .header { padding: 0 !important; }
 
 .customDialog-form .content::-webkit-scrollbar { display: none; }
@@ -31,6 +43,8 @@
     padding: .4rem 1rem !important;
 }
 
+.input-card.clearButton.custom-border-bottom { border-bottom: .1rem solid var(--card-border-color); }
+
 .input-card > .divider { margin: 0 !important; }
 
 .form-container {
@@ -92,7 +106,7 @@
 
 .container-button {
     width: 100%;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
     padding: .5rem 0;
     border-radius: 12px;
     margin-bottom: 2rem;

salesbook.Web/Core/Services/ManageDataService.cs

@@ -24,7 +24,7 @@ public class ManageDataService : IManageDataService
         throw new NotImplementedException();
     }
 
-    public Task<List<ContactDTO>> GetContact(WhereCondContact whereCond)
+    public Task<List<ContactDTO>> GetContact(WhereCondContact whereCond, DateTime? lastSync = null)
     {
         throw new NotImplementedException();
     }
@@ -54,6 +54,11 @@ public class ManageDataService : IManageDataService
         throw new NotImplementedException();
     }
 
+    public Task DeleteProspect(string codPpro)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task Delete<T>(T objectToDelete)
     {
         throw new NotImplementedException();
@@ -64,6 +69,11 @@ public class ManageDataService : IManageDataService
         throw new NotImplementedException();
     }
 
+    public Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
+    {
+        throw new NotImplementedException();
+    }
+
     public Task ClearDb()
     {
         throw new NotImplementedException();

salesbook.Web/salesbook.Web.csproj

@@ -17,9 +17,9 @@
 
   <ItemGroup>
     <PackageReference Include="IntegryApiClient.Blazor" Version="1.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.9" />
   </ItemGroup>
 
   <ItemGroup>