Finish v2.1.0(14)

-> v2.1.0 (14)
Aggiunto tasto per il suggerimento della descrizione attvità in base al tipo
2025-10-30 11:35:29 +01:00 · 2025-10-30 11:35:22 +01:00 · 2025-10-30 10:12:10 +01:00 · 2025-10-30 09:33:48 +01:00 · 2025-10-29 12:08:56 +01:00 · 2025-10-15 10:33:11 +02:00
45 changed files with 857 additions and 517 deletions
--- a/salesbook.Maui/Core/Services/AttachedService.cs
+++ b/salesbook.Maui/Core/Services/AttachedService.cs
@@ -8,7 +8,9 @@ public class AttachedService : IAttachedService
    public async Task<AttachedDTO?> SelectImageFromCamera()
    {
        var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
-        if (cameraPerm != PermissionStatus.Granted)
+        var storagePerm = await Permissions.RequestAsync<Permissions.StorageWrite>();
+
+        if (cameraPerm != PermissionStatus.Granted || storagePerm != PermissionStatus.Granted)
            return null;

        FileResult? result = null;
@@ -20,6 +22,7 @@ public class AttachedService : IAttachedService
        catch (Exception ex)
        {
            Console.WriteLine($"Errore cattura foto: {ex.Message}");
+            SentrySdk.CaptureException(ex);
            return null;
        }

@@ -41,13 +44,13 @@ public class AttachedService : IAttachedService
        catch (Exception ex)
        {
            Console.WriteLine($"Errore selezione galleria: {ex.Message}");
+            SentrySdk.CaptureException(ex);
            return null;
        }

        return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
    }

-
    public async Task<AttachedDTO?> SelectFile()
    {
        var perm = await Permissions.RequestAsync<Permissions.StorageRead>();
@@ -115,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
@@ -128,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
        {
--- a/salesbook.Maui/Core/Services/ManageDataService.cs
+++ b/salesbook.Maui/Core/Services/ManageDataService.cs
@@ -1,8 +1,8 @@
 using AutoMapper;
-using IntegryApiClient.Core.Domain.Abstraction.Contracts.Storage;
 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;
@@ -10,7 +10,7 @@ using salesbook.Shared.Core.Interface;
 using salesbook.Shared.Core.Interface.IntegryApi;
 using salesbook.Shared.Core.Interface.System.Network;
 using System.Linq.Expressions;
-using salesbook.Shared.Core.Dto.PageState;
+using IntegryApiClient.Core.Domain.Abstraction.Contracts.Account;

 namespace salesbook.Maui.Core.Services;

@@ -19,7 +19,8 @@ public class ManageDataService(
    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() =>
@@ -178,9 +179,9 @@ public class ManageDataService(

        activities = await localDb.Get<StbActivity>(x =>
            (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-            (whereCond.Start != null && whereCond.End != null && x.EffectiveDate == null &&
-             x.EstimatedDate >= whereCond.Start && x.EstimatedDate <= whereCond.End) ||
-            (x.EffectiveDate >= whereCond.Start && x.EffectiveDate <= whereCond.End) ||
+            (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
+             x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
+            (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
            (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
        );

@@ -222,9 +223,9 @@ public class ManageDataService(
        {
            activities = await localDb.Get<StbActivity>(x =>
                (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-                (whereCond.Start != null && whereCond.End != null && x.EffectiveDate == null &&
-                 x.EstimatedDate >= whereCond.Start && x.EstimatedDate <= whereCond.End) ||
-                (x.EffectiveDate >= whereCond.Start && x.EffectiveDate <= whereCond.End) ||
+                (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
+                 x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
+                (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
                (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
            );
        }
@@ -232,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 [];

@@ -260,6 +261,11 @@ public class ManageDataService(
        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 })
@@ -291,7 +297,7 @@ public class ManageDataService(
                    }
                }

-                dto.Commessa = jtbComtList.LastOrDefault();
+                dto.Commessa = jtbComtList.Find(x => x.CodJcom.Equals(dto.CodJcom));
                return dto;
            })
            .ToList();
@@ -303,19 +309,28 @@ public class ManageDataService(
    {
        return Task.Run(async () =>
        {
-            if (response.AnagClie != null)
+            try
            {
-                await localDb.InsertOrUpdate(response.AnagClie);
+                if (response.AnagClie != null)
+                {
+                    await localDb.InsertOrUpdate(response.AnagClie);

-                if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
-                if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                    if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
+                    if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                }
+
+                if (response.PtbPros != null)
+                {
+                    await localDb.InsertOrUpdate(response.PtbPros);
+
+                    if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                }
            }
-
-            if (response.PtbPros != null)
+            catch (Exception e)
            {
-                await localDb.InsertOrUpdate(response.PtbPros);
-
-                if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                Console.WriteLine(e.Message);
+                SentrySdk.CaptureException(e);
+                throw;
            }
        });
    }
--- a/salesbook.Maui/ILLink.Descriptors.xml
+++ b/salesbook.Maui/ILLink.Descriptors.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+	<assembly fullname="salesbook.Shared" preserve="all" />
+
+	<assembly fullname="System.Private.CoreLib">
+		<type fullname="System.Runtime.InteropServices.SafeHandle" preserve="all" />
+		<type fullname="System.IO.FileStream" preserve="all" />
+	</assembly>
+
+	<assembly fullname="SourceGear.sqlite3" preserve="all"/>
+	<assembly fullname="sqlite-net-e" preserve="all"/>
+
+	<assembly fullname="Sentry.Maui" preserve="all"/>
+	<assembly fullname="Shiny.Hosting.Maui" preserve="all"/>
+	<assembly fullname="Shiny.Notifications" preserve="all"/>
+	<assembly fullname="Shiny.Push" preserve="all"/>
+</linker>
--- a/salesbook.Maui/MauiProgram.cs
+++ b/salesbook.Maui/MauiProgram.cs
@@ -104,6 +104,9 @@ namespace salesbook.Maui
            builder.Services.AddSingleton<INetworkService, NetworkService>();
            builder.Services.AddSingleton<LocalDbService>();

+            _ = typeof(System.Runtime.InteropServices.SafeHandle);
+            _ = typeof(System.IO.FileStream);
+
            return builder;
        }
    }
--- a/salesbook.Maui/Platforms/Android/AndroidManifest.xml
+++ b/salesbook.Maui/Platforms/Android/AndroidManifest.xml
@@ -1,27 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="it.integry.salesbook">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:usesCleartextTraffic="true" android:supportsRtl="true">
-		<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">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="it.integry.salesbook">
+
+	<application
+        android:allowBackup="true"
+        android:icon="@mipmap/appicon"
+        android:usesCleartextTraffic="true"
+        android:supportsRtl="true">
+
+		<!-- Firebase push -->
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdInternalReceiver"
+            android:exported="false" />
+		<receiver android:name="com.google.firebase.iid.FirebaseInstanceIdReceiver"
+            android:exported="true"
+            android:permission="com.google.android.c2dm.permission.SEND">
 			<intent-filter>
 				<action android:name="com.google.android.c2dm.intent.RECEIVE" />
 				<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
 				<category android:name="${applicationId}" />
 			</intent-filter>
 		</receiver>
+
 	</application>
+
+	<!-- Rete -->
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+
+	<!-- Geolocalizzazione -->
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+	<!-- Fotocamera -->
 	<uses-permission android:name="android.permission.CAMERA" />
+
+	<!-- Storage / Media -->
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="28" />
+	<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>
--- a/salesbook.Maui/Platforms/iOS/Info.plist
+++ b/salesbook.Maui/Platforms/iOS/Info.plist
@@ -36,8 +36,11 @@
 	    <true/>
    </dict>

+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+    <string>Questa app utilizza la tua posizione per migliorare alcune funzionalità basate sulla localizzazione.</string>
+
 	<key>NSLocationWhenInUseUsageDescription</key>
-    <string>L'app utilizza la tua posizione per allegarla alle attività.</string>
+    <string>Questa app utilizza la tua posizione solo mentre è in uso per allegarla alle attività.</string>

 	<key>NSCameraUsageDescription</key>
    <string>Questa app necessita di accedere alla fotocamera per scattare foto.</string>
--- a/salesbook.Maui/Platforms/iOS/PrivacyInfo.xcprivacy
+++ b/salesbook.Maui/Platforms/iOS/PrivacyInfo.xcprivacy
@@ -1,110 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<!-- Elenco dei dati raccolti -->
+		<key>NSPrivacyCollectedDataTypes</key>
+		<array>
+			<dict>
+				<key>NSPrivacyCollectedDataType</key>
+				<string>NSPrivacyCollectedDataTypeUserID</string>
+				<key>NSPrivacyCollectedDataTypeLinkedToUser</key>
+				<true/>
+				<key>NSPrivacyCollectedDataTypeTracking</key>
+				<false/>
+			</dict>
+		</array>

-  <?xml version="1.0" encoding="UTF-8"?>
-  <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-  <plist version="1.0">
-  <dict>
-      <key>NSPrivacyAccessedAPITypes</key>
-      <array>
-          <dict>
-              <key>NSPrivacyAccessedAPIType</key>
-              <string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
-              <key>NSPrivacyAccessedAPITypeReasons</key>
-              <array>
-                  <string>C617.1</string>
-              </array>
-          </dict>
-          <dict>
-              <key>NSPrivacyAccessedAPIType</key>
-              <string>NSPrivacyAccessedAPICategorySystemBootTime</string>
-              <key>NSPrivacyAccessedAPITypeReasons</key>
-              <array>
-                  <string>35F9.1</string>
-              </array>
-          </dict>
-          <dict>
-              <key>NSPrivacyAccessedAPIType</key>
-              <string>NSPrivacyAccessedAPICategoryDiskSpace</string>
-              <key>NSPrivacyAccessedAPITypeReasons</key>
-              <array>
-                  <string>E174.1</string>
-              </array>
-          </dict>
-          <dict>
-              <key>NSPrivacyAccessedAPIType</key>
-              <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
-              <key>NSPrivacyAccessedAPITypeReasons</key>
-              <array>
-                  <string>CA92.1</string>
-              </array>
-          </dict>
-      </array>
-      <key>NSPrivacyCollectedDataTypes</key>
-      <array>
-          <!--user info-->
-          <dict>
-              <key>NSPrivacyCollectedDataTypeUserID</key>
-              <string>NSPrivacyCollectedDataTypeLocation</string>
-              <key>NSPrivacyCollectedDataTypeLinked</key>
-              <true />
-              <key>NSPrivacyCollectedDataTypeTracking</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypePurposes</key>
-              <array>
-                  <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-              </array>
-          </dict>
-          <dict>
-              <key>NSPrivacyCollectedDataTypeEmailAddress</key>
-              <string>NSPrivacyCollectedDataTypeLocation</string>
-              <key>NSPrivacyCollectedDataTypeLinked</key>
-              <true />
-              <key>NSPrivacyCollectedDataTypeTracking</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypePurposes</key>
-              <array>
-                  <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-              </array>
-          </dict>
-          <dict>
-              <key>NSPrivacyCollectedDataTypePhoneNumber</key>
-              <string>NSPrivacyCollectedDataTypeLocation</string>
-              <key>NSPrivacyCollectedDataTypeLinked</key>
-              <true />
-              <key>NSPrivacyCollectedDataTypeTracking</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypePurposes</key>
-              <array>
-                  <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-              </array>
-          </dict>
+		<!-- API che accedono a dati sensibili -->
+		<key>NSPrivacyAccessedAPITypes</key>
+		<array>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPITypeCamera</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>CAMeraCapture</string>
+				</array>
+			</dict>
+			<dict>
+				<key>NSPrivacyAccessedAPIType</key>
+				<string>NSPrivacyAccessedAPITypePhotoLibrary</string>
+				<key>NSPrivacyAccessedAPITypeReasons</key>
+				<array>
+					<string>PHOTOLibraryAdd</string>
+					<string>PHOTOLibraryRead</string>
+				</array>
+			</dict>
+		</array>

-          <!--crashlytics/analytics-->
-          <dict>
-              <key>NSPrivacyCollectedDataType</key>
-              <string>NSPrivacyCollectedDataTypeOtherDiagnosticData</string>
-              <key>NSPrivacyCollectedDataTypeLinked</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypeTracking</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypePurposes</key>
-              <array>
-                  <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-              </array>            
-          </dict>
-          <dict>
-              <key>NSPrivacyCollectedDataType</key>
-              <string>NSPrivacyCollectedDataTypeCrashData</string>
-              <key>NSPrivacyCollectedDataTypeLinked</key>
-              <true />
-              <key>NSPrivacyCollectedDataTypeTracking</key>
-              <false />
-              <key>NSPrivacyCollectedDataTypePurposes</key>
-              <array>
-                  <string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
-              </array>
-          </dict>  
-          
-      </array>
-  </dict>
-  </plist>
-  
+		<!-- Versione e autore -->
+		<key>NSPrivacyTracking</key>
+		<false/>
+		<key>NSPrivacyTrackingDomains</key>
+		<array/>
+		<key>NSPrivacyCustomPurposeDescription</key>
+		<dict/>
+	</dict>
+</plist>
--- a/salesbook.Maui/Resources/AppIcon/appicon.svg
+++ b/salesbook.Maui/Resources/AppIcon/appicon.svg
@@ -1 +1,8 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 230 230" width="230" height="230"><style>.a{fill:#dff2ff}</style><path fill-rule="evenodd" class="a" d="m230 0v230h-230v-230z"/></svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 456 456" width="456" height="456">
+	<defs>
+		<image  width="456" height="456" id="img1" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcgAAAHIAQMAAADwb+ipAAAAAXNSR0IB2cksfwAAAANQTFRF3/L/KicjZQAAAGhJREFUeJztyzENAAAMA6DVv+l5aHrCT64V0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN0zRN05zNB6OcAcm2KNubAAAAAElFTkSuQmCC"/>
+	</defs>
+	<style>
+	</style>
+	<use id="Background" href="#img1" x="0" y="0"/>
+</svg>
--- a/salesbook.Maui/Resources/AppIcon/appiconfg.svg
+++ b/salesbook.Maui/Resources/AppIcon/appiconfg.svg
@@ -1 +1,10 @@
-<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 230 230" width="230" height="230"><style>.a{fill:none;stroke:#002339;stroke-linecap:round;stroke-linejoin:round;stroke-width:16}.b{fill:none;stroke:#00a0de;stroke-linecap:round;stroke-linejoin:round;stroke-width:16}</style><path fill-rule="evenodd" class="a" d="m119.9 71.4h34.4c20.3 0 36.8 16.5 36.8 36.9v28.3c0 20.4-16.5 36.9-36.8 36.9h-5.1l0.1 32.2-34.7-32.2h-72.2"/><path fill-rule="evenodd" class="b" d="m117.3 24l-77.1 47.4v102.1l77.1-47.4v-102.1z"/></svg>
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024">
+	<defs>
+		<image width="920" height="920" id="img1" href="data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDIzMCAyMzAiIHdpZHRoPSIyMzAiIGhlaWdodD0iMjMwIj48c3R5bGU+LmF7ZmlsbDpub25lO3N0cm9rZTojMDAyMzM5O3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2Utd2lkdGg6MTZ9LmJ7ZmlsbDpub25lO3N0cm9rZTojMDBhMGRlO3N0cm9rZS1saW5lY2FwOnJvdW5kO3N0cm9rZS1saW5lam9pbjpyb3VuZDtzdHJva2Utd2lkdGg6MTZ9PC9zdHlsZT48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJhIiBkPSJtMTE5LjkgNzEuNGgzNC40YzIwLjMgMCAzNi44IDE2LjUgMzYuOCAzNi45djI4LjNjMCAyMC40LTE2LjUgMzYuOS0zNi44IDM2LjloLTUuMWwwLjEgMzIuMi0zNC43LTMyLjJoLTcyLjIiLz48cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJiIiBkPSJtMTE3LjMgMjRsLTc3LjEgNDcuNHYxMDIuMWw3Ny4xLTQ3LjR2LTEwMi4xeiIvPjwvc3ZnPg=="/>
+	</defs>
+	<style>
+	</style>
+	<g>
+		<use id="appiconfg" href="#img1" transform="matrix(1.113,0,0,1.113,0,0)"/>
+	</g>
+</svg>
--- a/salesbook.Maui/salesbook.Maui.csproj
+++ b/salesbook.Maui/salesbook.Maui.csproj
@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>

 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
-		<ApplicationVersion>5</ApplicationVersion>
+		<ApplicationDisplayVersion>2.1.0</ApplicationDisplayVersion>
+		<ApplicationVersion>14</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 Development: Created via API (5B7B69P4JY)</CodesignKey>
-		<CodesignProvision>VS: it.integry.salesbook Development</CodesignProvision>
+		<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
+		<CodesignProvision>salesbook</CodesignProvision>
 		<ProvisioningType>manual</ProvisioningType>
 	</PropertyGroup>

@@ -105,6 +105,28 @@
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" />
 	</ItemGroup>

+	<ItemGroup>
+		<BlazorWebAssemblyLazyLoad Include="salesbook.Shared.dll" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
+		<PublishTrimmed>true</PublishTrimmed>
+		<RunAOTCompilation>true</RunAOTCompilation>
+	</PropertyGroup>
+	
+	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios' and '$(Configuration)'=='Release'">
+		<UseInterpreter>true</UseInterpreter>
+		<RunAOTCompilation>true</RunAOTCompilation>
+		<PublishTrimmed>true</PublishTrimmed>
+		<PublishAot>true</PublishAot>
+		<MonoAotMode>Hybrid</MonoAotMode>
+	</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" />
@@ -133,17 +155,18 @@
 	<ItemGroup>
 		<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.9" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.110" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.110" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.110" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.9" />
-		<PackageReference Include="Sentry.Maui" Version="5.15.0" />
+		<PackageReference Include="IntegryApiClient.MAUI" Version="1.2.2" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.120" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.120" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.120" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
+		<PackageReference Include="Sentry.Maui" Version="5.16.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>
--- a/salesbook.Shared/Components/Pages/Calendar.razor
+++ b/salesbook.Shared/Components/Pages/Calendar.razor
@@ -181,7 +181,7 @@
    private string _headerTitle = string.Empty;
    private readonly Dictionary<DateTime, List<ActivityDTO>> _eventsCache = new();
    private readonly Dictionary<DateTime, CategoryData[]> _categoriesCache = new();
-    private bool _isInitialized = false;
+    private bool _isInitialized;

    // Stato UI
    private bool Expanded { get; set; }
@@ -278,7 +278,7 @@

        // Raggruppa le attività per data
        var activitiesByDate = MonthActivities
-            .GroupBy(x => (x.EffectiveDate ?? x.EstimatedDate!).Value.Date)
+            .GroupBy(x => (x.EffectiveTime ?? x.EstimatedTime!).Value.Date)
            .ToDictionary(g => g.Key, g => g.ToList());

        foreach (var (date, activities) in activitiesByDate)
@@ -482,7 +482,7 @@
        var start = CurrentMonth;
        var end = start.AddDays(DaysInMonth - 1);
        var activities = await ManageData.GetActivity(new WhereCondActivity{Start = start, End = end});
-        MonthActivities = activities.OrderBy(x => x.EffectiveDate ?? x.EstimatedDate).ToList();
+        MonthActivities = activities.OrderBy(x => x.EffectiveTime ?? x.EstimatedTime).ToList();

        PrepareRenderingData();
        IsLoading = false;
@@ -574,7 +574,7 @@
            return;
        }

-        var date = activity.EffectiveDate ?? activity.EstimatedDate;
+        var date = activity.EffectiveTime ?? activity.EstimatedTime;

        if (CurrentMonth.Month != date!.Value.Month)
        {
--- a/salesbook.Shared/Components/Pages/Calendar.razor.css
+++ b/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;
 }

--- a/salesbook.Shared/Components/Pages/Commessa.razor
+++ b/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)
-                .OrderBy(x => 
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                ).ToList();
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
        });

        ActivityIsLoading = false;
--- a/salesbook.Shared/Components/Pages/Commessa.razor.css
+++ b/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 */
--- a/salesbook.Shared/Components/Pages/Login.razor
+++ b/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>
--- a/salesbook.Shared/Components/Pages/PersonalInfo.razor
+++ b/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">
@@ -85,21 +85,21 @@
                       FullWidth="true"
                       StartIcon="@Icons.Material.Outlined.Sync"
                       Size="Size.Medium"
-                       OnClick="() => UpdateDb(true)"
+                       OnClick="() => UpdateDb()"
                       Variant="Variant.Outlined">
                Sincronizza
            </MudButton>

-            <div class="divider"></div>
+            @* <div class="divider"></div> *@

-            <MudButton Class="button-settings red-icon"
+            @* <MudButton Class="button-settings red-icon"
                       FullWidth="true"
                       StartIcon="@Icons.Material.Outlined.Sync"
                       Size="Size.Medium"
                       OnClick="() => UpdateDb()"
                       Variant="Variant.Outlined">
                Ripristina dati
-            </MudButton>
+            </MudButton> *@
        </div>

        <div class="container-button">
--- a/salesbook.Shared/Components/Pages/PersonalInfo.razor.css
+++ b/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;
--- a/salesbook.Shared/Components/Pages/User.razor
+++ b/salesbook.Shared/Components/Pages/User.razor
@@ -24,15 +24,15 @@
              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" Variant="@(IsContact ? Variant.Filled : Variant.Outlined)" Color="Color.Secondary">
@@ -96,179 +96,188 @@ else
                }
            </div>
        </div>
+        
+        <div class="tab-section">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
+            <input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">

-        <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="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="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)
                            {
-                                <div class="divider"></div>
+                                <ContactCard Contact="person"/>
+                                @if (person != PersRif.Last())
+                                {
+                                    <div class="divider"></div>
+                                }
                            }
-                        }
-                    </div>
-                }
+                        </div>
+                    }

-                <div class="container-button">
-                    <MudButton Class="button-settings infoText"
-                               FullWidth="true"
-                               Size="Size.Medium"
-                               OnClick="OpenPersRifForm"
-                               Variant="Variant.Outlined">
-                        Aggiungi contatto
-                    </MudButton>
+                    <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>

-            <!-- 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">
-                        <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> -->
-            <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">
-                        <MudTextField T="string?"
-                                      Placeholder="Cerca..."
-                                      Variant="Variant.Text"
-                                      @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>
+            <MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
+                <MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp"/>
+            </MudScrollToTop>
        </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>
 }

@@ -416,7 +425,7 @@ else
        set
        {
            _filteredActivity = value;
-            StateHasChanged();
+            InvokeAsync(StateHasChanged);
        }
    }

@@ -527,10 +536,9 @@ else
        await Task.Run(async () =>
        {
            var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
-            ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
-                .OrderByDescending(x => 
-                    (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
-                ).ToList();
+            ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
+                (x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
+            ).ToList();
        });

        UserState.Activitys = ActivityList;
@@ -794,4 +802,5 @@ else
    }

    #endregion
+
 }
--- a/salesbook.Shared/Components/Pages/User.razor.css
+++ b/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;
@@ -85,8 +91,9 @@

 .container-button {
    width: 100%;
-    box-shadow: var(--custom-box-shadow);
-    padding: .25rem 0;
+    background: var(--light-card-background);
+    padding: 0 !important;
+    padding-bottom: .5rem !important;
    border-radius: 16px;
    margin-bottom: 0 !important;
 }
@@ -138,8 +145,7 @@
    display: flex;
    flex-direction: column;
    gap: 1rem;
-    margin-bottom: 1rem;
-    box-shadow: var(--custom-box-shadow);
+    background: var(--light-card-background);
    border-radius: 16px;
    max-height: 32vh;
    overflow: auto;
@@ -147,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;
@@ -176,12 +187,14 @@
 /*--------------
    TabPanel
 ----------------*/
+
 .box {
    display: flex;
    flex-direction: column;
    width: -webkit-fill-available;
-    box-shadow: var(--custom-box-shadow);
-    border-radius: 16px;
+    background: var(--light-card-background);
+    border-radius: 20px 20px 0 0;
+    border-bottom: .1rem solid var(--card-border-color);
    overflow: clip;
    margin-bottom: 1rem;
 }
@@ -197,7 +210,6 @@
    display: flex;
    position: relative;
    z-index: 1;
-    background: var(--mud-palette-surface);
 }

 /* la lineetta */
@@ -268,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) {
-    display: block;
-}
+#tab3:checked ~ .tab-container .tab-content:nth-child(3) { display: block; }

@keyframes fade {
    from {
@@ -286,10 +296,6 @@

 .custom-pagination ::deep ul { padding-left: 0 !important; }

-.SelectedPageSize {
-    width: 100%;
-}
+.SelectedPageSize { width: 100%; }

-.FilterSection {
-    display: flex;
-}
+.FilterSection { display: flex; }
--- a/salesbook.Shared/Components/SingleElements/Card/ActivityCard.razor.css
+++ b/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;
--- a/salesbook.Shared/Components/SingleElements/Card/AttachCard.razor.css
+++ b/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); }
--- a/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor.css
+++ b/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;
--- a/salesbook.Shared/Components/SingleElements/Card/ContactCard.razor.css
+++ b/salesbook.Shared/Components/SingleElements/Card/ContactCard.razor.css
@@ -2,8 +2,7 @@
    width: 100%;
    display: flex;
    flex-direction: row;
-    padding: 0 .75rem;
-    border-radius: 16px;
+    padding: 0 .5rem;
    line-height: normal;
    justify-content: space-between;
    align-items: center;
--- a/salesbook.Shared/Components/SingleElements/Card/NotificationCard.razor
+++ b/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:
--- a/salesbook.Shared/Components/SingleElements/Card/NotificationCard.razor.css
+++ b/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;
--- a/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
+++ b/salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor
@@ -20,17 +20,32 @@

 <MudDialog Class="customDialog-form">
    <DialogContent>
-        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")"/>
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave"
+                      OnSave="Save" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")"/>

        <div class="content">
            <div class="input-card">
-                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Descrizione" Variant="Variant.Text" Lines="3" @bind-Value="ActivityModel.ActivityDescription" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Descrizione" Variant="Variant.Text" Lines="3"
+                              @bind-Value="ActivityModel.ActivityDescription" @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+            </div>
+
+            <div class="container-button">
+                <MudButton Class="button-settings blue-icon"
+                           FullWidth="true"
+                           StartIcon="@Icons.Material.Rounded.Description"
+                           Size="Size.Medium"
+                           OnClick="@SuggestActivityDescription"
+                           Variant="Variant.Outlined">
+                    Suggerisci descrizione
+                </MudButton>
            </div>

            <div class="input-card">
                <div class="form-container">
                    <MudAutocomplete ReadOnly="IsView" T="string?" Placeholder="Cliente"
-                                     SearchFunc="@SearchCliente" @bind-Value="ActivityModel.Cliente" @bind-Value:after="OnClienteChanged"
+                                     SearchFunc="@SearchCliente" @bind-Value="ActivityModel.Cliente"
+                                     @bind-Value:after="OnClienteChanged"
                                     CoerceValue="true"/>
                </div>

@@ -39,18 +54,25 @@
                <div class="form-container">
                    <span class="disable-full-width">Commessa</span>

-                    <MudAutocomplete
-                        Disabled="ActivityModel.Cliente.IsNullOrEmpty()"
-                        T="JtbComt?" ReadOnly="IsView"
-                        @bind-Value="SelectedComessa"
-                        @bind-Value:after="OnCommessaSelectedAfter"
-                        SearchFunc="SearchCommesseAsync"
-                        ToStringFunc="@(c => c == null ? string.Empty : $"{c.CodJcom} - {c.Descrizione}")"
-                        Clearable="true"
-                        ShowProgressIndicator="true"
-                        DebounceInterval="300"
-                        MaxItems="50"
-                        Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code"/>
+                    @if (ActivityModel.CodJcom != null && SelectedComessa == null)
+                    {
+                        <MudSkeleton/>
+                    }
+                    else
+                    {
+                        <MudAutocomplete
+                            T="JtbComt?" ReadOnly="IsView"
+                            @bind-Value="SelectedComessa"
+                            @bind-Value:after="OnCommessaSelectedAfter"
+                            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>

@@ -58,7 +80,10 @@
                <div class="form-container">
                    <span>Inizio</span>

-                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture" InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedTime" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture"
+                                  InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedTime"
+                                  @bind-Value:after="OnAfterChangeValue" DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
                </div>

                <div class="divider"></div>
@@ -66,7 +91,10 @@
                <div class="form-container">
                    <span>Fine</span>

-                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture" InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedEndtime" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                    <MudTextField ReadOnly="IsView" T="DateTime?" Format="s" Culture="CultureInfo.CurrentUICulture"
+                                  InputType="InputType.DateTimeLocal" @bind-Value="ActivityModel.EstimatedEndtime"
+                                  @bind-Value:after="OnAfterChangeValue" DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue"/>
                </div>

                <div class="divider"></div>
@@ -74,14 +102,31 @@
                <div class="form-container">
                    <span class="disable-full-width">Avviso</span>

-                    <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || ActivityModel.EstimatedTime == null)" T="int" Variant="Variant.Text" @bind-Value="ActivityModel.MinuteBefore" @bind-Value:after="OnAfterChangeTimeBefore" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
-                        <MudSelectItemExtended Class="custom-item-select" Text="Nessuno" Value="-1">Nessuno</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="All'ora pianificata" Value="0">All'ora pianificata</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="30 minuti prima" Value="30">30 minuti prima</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="1 ora prima" Value="60">1 ora prima</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="2 ore prima" Value="120">2 ore prima</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="1 giorno prima" Value="1440">1 giorno prima</MudSelectItemExtended>
-                        <MudSelectItemExtended Class="custom-item-select" Text="1 settimana prima" Value="10080">1 settimana prima</MudSelectItemExtended>
+                    <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || ActivityModel.EstimatedTime == null)"
+                                       T="int" Variant="Variant.Text" @bind-Value="ActivityModel.MinuteBefore"
+                                       @bind-Value:after="OnAfterChangeTimeBefore" Class="customIcon-select"
+                                       AdornmentIcon="@Icons.Material.Filled.Code">
+                        <MudSelectItemExtended Class="custom-item-select" Text="Nessuno" Value="-1">
+                            Nessuno
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="All'ora pianificata" Value="0">All'ora
+                            pianificata
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="30 minuti prima" Value="30">
+                            30 minuti prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 ora prima" Value="60">
+                            1 ora prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="2 ore prima" Value="120">
+                            2 ore prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 giorno prima" Value="1440">
+                            1 giorno prima
+                        </MudSelectItemExtended>
+                        <MudSelectItemExtended Class="custom-item-select" Text="1 settimana prima" Value="10080">
+                            1 settimana prima
+                        </MudSelectItemExtended>
                    </MudSelectExtended>
                </div>
            </div>
@@ -90,19 +135,27 @@
                <div class="form-container">
                    <span class="disable-full-width">Assegnata a</span>

-                    <MudAutocomplete
-                        Disabled="Users.IsNullOrEmpty()" ReadOnly="IsView"
-                        T="StbUser"
-                        @bind-Value="SelectedUser"
-                        @bind-Value:after="OnUserSelectedAfter"
-                        SearchFunc="SearchUtentiAsync"
-                        ToStringFunc="@(u => u == null ? string.Empty : u.FullName)"
-                        Clearable="true"
-                        ShowProgressIndicator="true"
-                        DebounceInterval="300"
-                        MaxItems="50"
-                        Class="customIcon-select"
-                        AdornmentIcon="@Icons.Material.Filled.Code"/>
+                    @if (ActivityModel.UserName != null && SelectedUser == null)
+                    {
+                        <MudSkeleton/>
+                    }
+                    else
+                    {
+                        <MudAutocomplete
+                            Disabled="Users.IsNullOrEmpty()" ReadOnly="IsView"
+                            T="StbUser"
+                            @bind-Value="SelectedUser"
+                            @bind-Value:after="OnUserSelectedAfter"
+                            SearchFunc="SearchUtentiAsync"
+                            ToStringFunc="@(u => u == null ? string.Empty : u.FullName)"
+                            Clearable="true"
+                            OnClearButtonClick="OnUserClear"
+                            ShowProgressIndicator="true"
+                            DebounceInterval="300"
+                            MaxItems="50"
+                            Class="customIcon-select"
+                            AdornmentIcon="@Icons.Material.Filled.Code"/>
+                    }
                </div>

                <div class="divider"></div>
@@ -110,12 +163,23 @@
                <div class="form-container">
                    <span class="disable-full-width">Tipo</span>

-                    <MudSelectExtended ReadOnly="IsView" FullWidth="true" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.ActivityTypeId" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
-                        @foreach (var type in ActivityType)
-                        {
-                            <MudSelectItemExtended Class="custom-item-select" Value="@type.ActivityTypeId">@type.ActivityTypeId</MudSelectItemExtended>
-                        }
-                    </MudSelectExtended>
+                    @if (ActivityType.IsNullOrEmpty())
+                    {
+                        <MudSkeleton/>
+                    }
+                    else
+                    {
+                        <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>
@@ -123,17 +187,23 @@
                <div class="form-container" @onclick="OpenSelectEsito">
                    <span class="disable-full-width">Esito</span>

-                    <MudSelectExtended ReadOnly="true" FullWidth="true" T="string?" Variant="Variant.Text" @bind-Value="ActivityModel.ActivityResultId" @bind-Value:after="OnAfterChangeValue" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                    <MudSelectExtended ReadOnly="true" FullWidth="true" T="string?" Variant="Variant.Text"
+                                       @bind-Value="ActivityModel.ActivityResultId"
+                                       @bind-Value:after="OnAfterChangeValue" Class="customIcon-select"
+                                       AdornmentIcon="@Icons.Material.Filled.Code">
                        @foreach (var result in ActivityResult)
                        {
-                            <MudSelectItemExtended Class="custom-item-select" Value="@result.ActivityResultId">@result.ActivityResultId</MudSelectItemExtended>
+                            <MudSelectItemExtended Class="custom-item-select"
+                                                   Value="@result.ActivityResultId">@result.ActivityResultId</MudSelectItemExtended>
                        }
                    </MudSelectExtended>
                </div>
            </div>

            <div class="input-card">
-                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Note" Variant="Variant.Text" Lines="4" @bind-Value="ActivityModel.Note" @bind-Value:after="OnAfterChangeValue" DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+                <MudTextField ReadOnly="IsView" T="string?" Placeholder="Note" Variant="Variant.Text" Lines="4"
+                              @bind-Value="ActivityModel.Note" @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500" OnDebounceIntervalElapsed="OnAfterChangeValue"/>
            </div>

            <div class="container-chip-attached">
@@ -143,13 +213,15 @@
                    {
                        @if (item.p.Type == AttachedDTO.TypeAttached.Position)
                        {
-                            <MudChip T="string" Icon="@Icons.Material.Rounded.LocationOn" Color="Color.Success" OnClick="() => OpenPosition(item.p)" OnClose="() => OnRemoveAttached(item.index)">
+                            <MudChip T="string" Icon="@Icons.Material.Rounded.LocationOn" Color="Color.Success"
+                                     OnClick="() => OpenPosition(item.p)" OnClose="() => OnRemoveAttached(item.index)">
                                @item.p.Description
                            </MudChip>
                        }
                        else
                        {
-                            <MudChip T="string" Color="Color.Default" OnClick="() => OpenAttached(item.p)" OnClose="() => OnRemoveAttached(item.index)">
+                            <MudChip T="string" Color="Color.Default" OnClick="() => OpenAttached(item.p)"
+                                     OnClose="() => OnRemoveAttached(item.index)">
                                @item.p.Name
                            </MudChip>
                        }
@@ -223,7 +295,8 @@

 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>

-<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeEsito"/>
+<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel"
+             @bind-ActivityModel:after="OnAfterChangeEsito"/>

 <AddMemo @bind-IsSheetVisible="OpenAddMemo"/>

@@ -370,14 +443,14 @@
    {
        return Task.Run(async () =>
        {
-            if (!IsNew && Id != null)
-                ActivityFileList = await IntegryApiService.GetActivityFile(Id);
+            SelectedComessa = ActivityModel.Commessa;

            Users = await ManageData.GetTable<StbUser>();
            if (!ActivityModel.UserName.IsNullOrEmpty())
                SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));

-            SelectedComessa = ActivityModel.Commessa;
+            if (!IsNew && Id != null)
+                ActivityFileList = await IntegryApiService.GetActivityFile(Id);

            ActivityResult = await ManageData.GetTable<StbActivityResult>();
            Clienti = await ManageData.GetClienti(new WhereCondContact { FlagStato = "A" });
@@ -399,18 +472,29 @@
        );
    }

-    private async Task LoadCommesse()
+    private async Task LoadCommesse(string searchValue)
    {
-        if (_lastLoadedCodAnag == ActivityModel.CodAnag) return;
+        if (_lastLoadedCodAnag == ActivityModel.CodAnag && searchValue.IsNullOrEmpty()) return;
+
+        if (ActivityModel.CodAnag == null)
+        {
+            Commesse = await ManageData.GetTable<JtbComt>(x =>
+                x.CodJcom.Contains(searchValue) ||
+                x.Descrizione.Contains(searchValue)
+            );
+        }
+        else
+        {
+            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag == ActivityModel.CodAnag);
+        }

-        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag == ActivityModel.CodAnag);
        Commesse = Commesse.OrderByDescending(x => x.CodJcom).ToList();
        _lastLoadedCodAnag = ActivityModel.CodAnag;
    }

    private async Task<IEnumerable<JtbComt>> SearchCommesseAsync(string value, CancellationToken token)
    {
-        await LoadCommesse();
+        await LoadCommesse(value);
        if (Commesse.IsNullOrEmpty()) return [];

        IEnumerable<JtbComt> list;
@@ -486,18 +570,37 @@
        return Task.CompletedTask;
    }

-    private async Task OnCommessaSelectedAfter()
+    private void OnCommessaSelectedAfter()
    {
        var com = SelectedComessa;
        if (com != null)
        {
            ActivityModel.CodJcom = com.CodJcom;
            ActivityModel.Commessa = com;
+
+            if (com.CodAnag != null)
+            {
+                ActivityModel.CodAnag = com.CodAnag;
+                ActivityModel.Cliente = Clienti
+                    .Where(x => x.CodAnag != null && x.CodAnag.Equals(com.CodAnag))
+                    .Select(x => x.RagSoc)
+                    .FirstOrDefault() ?? Pros
+                    .Where(x => x.CodPpro != null && x.CodPpro.Equals(com.CodAnag))
+                    .Select(x => x.RagSoc)
+                    .FirstOrDefault();
+            }
+            else
+            {
+                ActivityModel.CodAnag = null;
+                ActivityModel.Cliente = null;
+            }
        }
        else
        {
            ActivityModel.CodJcom = null;
            ActivityModel.Commessa = null;
+            ActivityModel.CodAnag = null;
+            ActivityModel.Cliente = null;
        }

        OnAfterChangeValue();
@@ -510,6 +613,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)
@@ -677,4 +794,29 @@
    private static string AdjustCoordinate(double coordinate) =>
        coordinate.ToString(CultureInfo.InvariantCulture).Replace(",", ".");

+    private async Task SuggestActivityDescription()
+    {
+        if (ActivityModel.ActivityTypeId == null)
+        {
+            Snackbar.Add("Indicare prima il tipo attività", Severity.Error);
+            return;
+        }
+
+        VisibleOverlay = true;
+        StateHasChanged();
+        
+        _ = Task.Run(async () =>
+        {
+            var activityDescriptions = await IntegryApiService.SuggestActivityDescription(ActivityModel.ActivityTypeId);
+
+            var modal = ModalHelpers.OpenSuggestActivityDescription(Dialog, activityDescriptions);
+
+            if (modal is { IsCanceled: false, Result: not null })
+                ActivityModel.ActivityDescription = modal.Result.Data!.ToString();
+            
+            VisibleOverlay = false;
+            await InvokeAsync(StateHasChanged);
+        });
+    }
+
 }
--- a/salesbook.Shared/Components/SingleElements/Modal/AddAttached.razor
+++ b/salesbook.Shared/Components/SingleElements/Modal/AddAttached.razor
@@ -4,9 +4,9 @@
@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"/>

        @if (RequireNewName)
        {
@@ -71,9 +71,21 @@

    private AttachedDTO? Attached { get; set; }

-    private bool RequireNewName { 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
    {
@@ -102,16 +114,22 @@
    {
        Attached = await AttachedService.SelectImageFromCamera();

-        RequireNewName = true;
-        StateHasChanged();
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
    }

    private async Task OnGallery()
    {
        Attached = await AttachedService.SelectImageFromGallery();

-        RequireNewName = true;
-        StateHasChanged();
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
    }

    private async Task OnFile()
@@ -124,34 +142,40 @@
    {
        Attached = await AttachedService.SelectPosition();

-        RequireNewName = true;
-        StateHasChanged();
+        if (Attached != null)
+        {
+            RequireNewName = true;
+            StateHasChanged();
+        }
    }

    private void OnNewName()
    {
-        switch (Attached.Type)
+        if (Attached != null)
        {
-            case AttachedDTO.TypeAttached.Position:
+            switch (Attached.Type)
            {
-                CanAddPosition = false;
+                case AttachedDTO.TypeAttached.Position:
+                {
+                    CanAddPosition = false;

-                Attached.Description = NewName!;
+                    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.Image:
+                {
+                    var extension = Path.GetExtension(Attached.Name);
+                    Attached.Name = NewName! + extension;

-                break;
+                    break;
+                }
+                case AttachedDTO.TypeAttached.Document:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
            }
-            case AttachedDTO.TypeAttached.Document:
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
        }

        MudDialog.Close(Attached);
--- a/salesbook.Shared/Components/SingleElements/Modal/ModalSuggestDescription.razor
+++ b/salesbook.Shared/Components/SingleElements/Modal/ModalSuggestDescription.razor
@@ -0,0 +1,32 @@
+@using salesbook.Shared.Core.Entity
+
+<MudDialog OnBackdropClick="Cancel">
+    <DialogContent>
+        @if (!ActivityTypers.IsNullOrEmpty())
+        {
+            <MudList T="string" SelectedValueChanged="OnClickItem">
+                @foreach (var item in ActivityTypers!)
+                {
+                    <MudListItem Text="@item.ActivityTypeDescription" Value="item.ActivityTypeDescription"/>
+                }
+            </MudList>
+        }
+        else
+        {
+            <div class="spinner-container">
+                <MudIcon Size="Size.Large" Color="Color.Error" Icon="@Icons.Material.Rounded.Close"/>
+                <MudText>Nessuna descrizione consigliata</MudText>
+            </div>
+        }
+    </DialogContent>
+</MudDialog>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+    [Parameter] public List<StbActivityTyper>? ActivityTypers { get; set; }
+
+    private void Cancel() => MudDialog.Cancel();
+
+    private void OnClickItem(string? selectedValue) =>
+        MudDialog.Close(DialogResult.Ok(selectedValue));
+}
--- a/salesbook.Shared/Components/SingleElements/Modal/ModalSuggestDescription.razor.css
+++ b/salesbook.Shared/Components/SingleElements/Modal/ModalSuggestDescription.razor.css
@@ -0,0 +1 @@
+
--- a/salesbook.Shared/Core/Dto/Activity/ActivityDTO.cs
+++ b/salesbook.Shared/Core/Dto/Activity/ActivityDTO.cs
@@ -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()
@@ -33,7 +34,7 @@ public class ActivityDTO : StbActivity
               MinuteBefore == other.MinuteBefore &&
               NotificationDate == other.NotificationDate &&
               Category == other.Category &&
-               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedDate, other.EstimatedDate) && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveDate, other.EffectiveDate) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEnddate, other.EstimatedEnddate) && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEnddate, other.EffectiveEnddate) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
+               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
    }

    public override bool Equals(object? obj)
@@ -56,16 +57,12 @@ public class ActivityDTO : StbActivity
        hashCode.Add(CodAnag);
        hashCode.Add(CodJcom);
        hashCode.Add(CodJfas);
-        hashCode.Add(EstimatedDate);
        hashCode.Add(EstimatedTime);
        hashCode.Add(AlarmDate);
        hashCode.Add(AlarmTime);
-        hashCode.Add(EffectiveDate);
        hashCode.Add(EffectiveTime);
        hashCode.Add(ResultDescription);
-        hashCode.Add(EstimatedEnddate);
        hashCode.Add(EstimatedEndtime);
-        hashCode.Add(EffectiveEnddate);
        hashCode.Add(EffectiveEndtime);
        hashCode.Add(UserCreator);
        hashCode.Add(UserName);
--- a/salesbook.Shared/Core/Dto/PositionDTO.cs
+++ b/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")]
--- a/salesbook.Shared/Core/Entity/PtbProsRif.cs
+++ b/salesbook.Shared/Core/Entity/PtbProsRif.cs
@@ -7,7 +7,7 @@ namespace salesbook.Shared.Core.Entity;
 public class PtbProsRif
 {
    [PrimaryKey, Column("composite_key")] 
-    public string CompositeKey { get; set; }
+    public string CompositeKey { get; set; } = null!;

    private string? _codPpro;

--- a/salesbook.Shared/Core/Entity/StbActivity.cs
+++ b/salesbook.Shared/Core/Entity/StbActivity.cs
@@ -36,9 +36,6 @@ public class StbActivity
    [Column("cod_jfas"), JsonPropertyName("codJfas")]
    public string? CodJfas { get; set; }

-    [Column("estimated_date"), JsonPropertyName("estimatedDate")]
-    public DateTime? EstimatedDate { get; set; }
-
    [Column("estimated_time"), JsonPropertyName("estimatedTime")]
    public DateTime? EstimatedTime { get; set; }

@@ -48,24 +45,15 @@ public class StbActivity
    [Column("alarm_time"), JsonPropertyName("alarmTime")]
    public DateTime? AlarmTime { get; set; }

-    [Column("effective_date"), JsonPropertyName("effectiveDate")]
-    public DateTime? EffectiveDate { get; set; }
-
    [Column("effective_time"), JsonPropertyName("effectiveTime")]
    public DateTime? EffectiveTime { get; set; }

    [Column("result_description"), JsonPropertyName("resultDescription")]
    public string? ResultDescription { get; set; }

-    [Column("estimated_enddate"), JsonPropertyName("estimatedEnddate")]
-    public DateTime? EstimatedEnddate { get; set; }
-
    [Column("estimated_endtime"), JsonPropertyName("estimatedEndtime")]
    public DateTime? EstimatedEndtime { get; set; }

-    [Column("effective_enddate"), JsonPropertyName("effectiveEnddate")]
-    public DateTime? EffectiveEnddate { get; set; }
-
    [Column("effective_endtime"), JsonPropertyName("effectiveEndtime")]
    public DateTime? EffectiveEndtime { get; set; }

@@ -173,4 +161,7 @@ public class StbActivity

    [Column("plan_id"), JsonPropertyName("planId")]
    public long? PlanId { get; set; }
+
+    [Column("id_posizione"), JsonPropertyName("idPosizione")]
+    public long? IdPosizione { get; set; }
 }
--- a/salesbook.Shared/Core/Entity/StbActivityTyper.cs
+++ b/salesbook.Shared/Core/Entity/StbActivityTyper.cs
@@ -0,0 +1,18 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Entity;
+
+public class StbActivityTyper
+{
+    [JsonPropertyName("activityTypeId")]
+    public string? ActivityTypeId { get; set; }
+
+    [JsonPropertyName("activityTypeDescription")]
+    public string? ActivityTypeDescription { get; set; }
+
+    [JsonPropertyName("flagTipologia")]
+    public string? FlagTipologia { get; set; }
+    
+    [JsonPropertyName("idRiga")]
+    public int IdRiga { get; set; }
+}
--- a/salesbook.Shared/Core/Helpers/ModalHelpers.cs
+++ b/salesbook.Shared/Core/Helpers/ModalHelpers.cs
@@ -2,6 +2,7 @@
 using salesbook.Shared.Components.SingleElements.Modal;
 using salesbook.Shared.Core.Dto;
 using salesbook.Shared.Core.Dto.Activity;
+using salesbook.Shared.Core.Entity;

 namespace salesbook.Shared.Core.Helpers;

@@ -46,7 +47,7 @@ public class ModalHelpers
        return await modal.Result;
    }

-    public static async Task<DialogResult?> OpenPersRifForm(IDialogService dialog, PersRifDTO? persRif, 
+    public static async Task<DialogResult?> OpenPersRifForm(IDialogService dialog, PersRifDTO? persRif,
        ContactDTO? contactModel = null, List<PersRifDTO>? persRifList = null)
    {
        var modal = await dialog.ShowAsync<PersRifForm>(
@@ -54,7 +55,7 @@ public class ModalHelpers
            new DialogParameters<PersRifForm>
            {
                { x => x.OriginalModel, persRif },
-                { x => x.ContactModel,  contactModel},
+                { x => x.ContactModel, contactModel },
                { x => x.PersRifList, persRifList }
            },
            new DialogOptions
@@ -74,7 +75,7 @@ public class ModalHelpers
            "Add attached",
            new DialogParameters<AddAttached>
            {
-                { x => x.CanAddPosition,  canAddPosition}
+                { x => x.CanAddPosition, canAddPosition }
            },
            new DialogOptions
            {
@@ -87,4 +88,25 @@ public class ModalHelpers

        return await modal.Result;
    }
+
+    public static async Task<DialogResult?> OpenSuggestActivityDescription(IDialogService dialog,
+        List<StbActivityTyper>? activityTypers)
+    {
+        var modal = await dialog.ShowAsync<ModalSuggestDescription>(
+            "Suggest activity description",
+            new DialogParameters<ModalSuggestDescription>
+            {
+                { x => x.ActivityTypers, activityTypers }
+            },
+            new DialogOptions
+            {
+                FullScreen = false,
+                CloseButton = false,
+                NoHeader = true,
+                BackdropClick = false
+            }
+        );
+        
+        return await modal.Result;
+    }
 }
--- a/salesbook.Shared/Core/Interface/IManageDataService.cs
+++ b/salesbook.Shared/Core/Interface/IManageDataService.cs
@@ -25,5 +25,7 @@ public interface IManageDataService
    Task Delete<T>(T objectToDelete);
    Task DeleteActivity(ActivityDTO activity);

+    Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities);
+
    Task ClearDb();
 }
--- a/salesbook.Shared/Core/Interface/IntegryApi/IIntegryApiService.cs
+++ b/salesbook.Shared/Core/Interface/IntegryApi/IIntegryApiService.cs
@@ -25,15 +25,18 @@ public interface IIntegryApiService
    Task<CRMTransferProspectResponseDTO> TransferProspect(CRMTransferProspectRequestDTO request);

    Task UploadFile(string id, byte[] file, string fileName);
+    Task DeleteFile(string activityId, string fileName);
    Task<List<ActivityFileDto>> GetActivityFile(string activityId);
    Task<Stream> DownloadFile(string activityId, string fileName);
    Task<Stream> DownloadFileFromRefUuid(string refUuid, string fileName);

    Task<CRMJobProgressResponseDTO> RetrieveJobProgress(string codJcom);
+    
+    Task<List<StbActivityTyper>?> SuggestActivityDescription(string activityType);

    //Position
    Task<PositionDTO> SavePosition(PositionDTO position);
-    Task<PositionDTO> RetrievePosition(string id);
+    Task<PositionDTO> RetrievePosition(long id);

    //Google
    Task<List<IndirizzoDTO>?> Geocode(string address);
--- a/salesbook.Shared/Core/Services/IntegryApiService.cs
+++ b/salesbook.Shared/Core/Services/IntegryApiService.cs
@@ -26,7 +26,7 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
            return false;
        }
    }
-    
+
    public Task<List<StbActivity>?> RetrieveActivity(CRMRetrieveActivityRequestDTO activityRequest) =>
        integryApiRestClient.AuthorizedPost<List<StbActivity>?>("crm/retrieveActivity", activityRequest);

@@ -42,10 +42,10 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
        return integryApiRestClient.AuthorizedGet<List<JtbComt>?>("crm/retrieveCommesse", queryParams);
    }

-    public Task<UsersSyncResponseDTO> RetrieveAnagClie(CRMAnagRequestDTO request) => 
+    public Task<UsersSyncResponseDTO> RetrieveAnagClie(CRMAnagRequestDTO request) =>
        integryApiRestClient.AuthorizedPost<UsersSyncResponseDTO>("crm/retrieveClienti", request)!;

-    public Task<UsersSyncResponseDTO> RetrieveProspect(CRMProspectRequestDTO request) => 
+    public Task<UsersSyncResponseDTO> RetrieveProspect(CRMProspectRequestDTO request) =>
        integryApiRestClient.AuthorizedPost<UsersSyncResponseDTO>("crm/retrieveProspect", request)!;

    public Task<SettingsResponseDTO> RetrieveSettings() =>
@@ -72,8 +72,16 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
        return integryApiRestClient.AuthorizedGet<object>($"activity/delete", queryParams);
    }

-    public Task<List<StbActivity>?> SaveActivity(ActivityDTO activity) =>
-        integryApiRestClient.AuthorizedPost<List<StbActivity>?>("crm/saveActivity", activity);
+    public Task<List<StbActivity>?> SaveActivity(ActivityDTO 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);
@@ -127,7 +135,18 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
        fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
        content.Add(fileContent, "files", fileName);

-        return integryApiRestClient.Post<object>($"uploadStbActivityFileAttachment", content, queryParams);
+        return integryApiRestClient.Post<object>("uploadStbActivityFileAttachment", content, queryParams);
+    }
+
+    public Task DeleteFile(string activityId, string fileName)
+    {
+        var queryParams = new Dictionary<string, object>
+        {
+            { "activityId", activityId },
+            { "fileName", fileName }
+        };
+
+        return integryApiRestClient.Get<object>("activity/removeAttachment", queryParams);
    }

    public Task<List<ActivityFileDto>> GetActivityFile(string activityId)
@@ -157,7 +176,7 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
    public Task<PositionDTO> SavePosition(PositionDTO position) =>
        integryApiRestClient.Post<PositionDTO>("savePosition", position)!;

-    public Task<PositionDTO> RetrievePosition(string id)
+    public Task<PositionDTO> RetrievePosition(long id)
    {
        var queryParams = new Dictionary<string, object> { { "id", id } };

@@ -170,4 +189,10 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser

        return integryApiRestClient.Get<CRMJobProgressResponseDTO>("crm/retrieveJobProgress", queryParams)!;
    }
+
+    public Task<List<StbActivityTyper>?> SuggestActivityDescription(string activityType) =>
+        integryApiRestClient.Get<List<StbActivityTyper>>(
+            "activity/suggestActivityDescription",
+            new Dictionary<string, object> { { "activityType", activityType } }
+        );
 }
--- a/salesbook.Shared/Core/Utility/UtilityString.cs
+++ b/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)
--- a/salesbook.Shared/salesbook.Shared.csproj
+++ b/salesbook.Shared/salesbook.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">

 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
@@ -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.9" />
-		<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.110" />
-		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
+		<PackageReference Include="IntegryApiClient.Core" Version="1.2.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.10" />
+		<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.120" />
+		<PackageReference Include="SourceGear.sqlite3" Version="3.50.4.2" />
+		<PackageReference Include="sqlite-net-e" Version="1.10.0-beta2" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.9" />
-		<PackageReference Include="MudBlazor" Version="8.12.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.10" />
+		<PackageReference Include="MudBlazor" Version="8.13.0" />
 		<PackageReference Include="MudBlazor.ThemeManager" Version="3.0.0" />
 	</ItemGroup>

--- a/salesbook.Shared/wwwroot/css/app.css
+++ b/salesbook.Shared/wwwroot/css/app.css
@@ -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) - env(safe-area-inset-bottom));
+        height: calc(100vh - env(safe-area-inset-top));
    }

    .flex-column, .navbar-brand { padding-left: env(safe-area-inset-left); }
--- a/salesbook.Shared/wwwroot/css/default-theme.css
+++ b/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%);
 }
--- a/salesbook.Shared/wwwroot/css/form.css
+++ b/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;
--- a/salesbook.Web/Core/Services/ManageDataService.cs
+++ b/salesbook.Web/Core/Services/ManageDataService.cs
@@ -29,11 +29,6 @@ public class ManageDataService : IManageDataService
        throw new NotImplementedException();
    }

-    public Task<List<ContactDTO>> GetContact(WhereCondContact whereCond)
-    {
-        throw new NotImplementedException();
-    }
-
    public Task<ContactDTO?> GetSpecificContact(string codAnag, bool IsContact)
    {
        throw new NotImplementedException();
@@ -74,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();
--- a/salesbook.Web/salesbook.Web.csproj
+++ b/salesbook.Web/salesbook.Web.csproj
@@ -16,10 +16,10 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="IntegryApiClient.Blazor" Version="1.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.9" />
+    <PackageReference Include="IntegryApiClient.Blazor" Version="1.2.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.10" />
  </ItemGroup>

  <ItemGroup>
Author	SHA1	Message	Date
MarcoE	4698e43fd7	Finish v2.1.0(14)	2025-10-30 11:35:29 +01:00
MarcoE	5ade3b7a5f	-> v2.1.0 (14)	2025-10-30 11:35:22 +01:00
MarcoE	b7522fb116	Aggiunto tasto per il suggerimento della descrizione attvità in base al tipo	2025-10-30 10:12:10 +01:00
MarcoE	a593141185	Aggiunta possibilità che dalla commessa viene selezionato il cliente	2025-10-30 09:33:48 +01:00
MarcoE	3609749a26	Fix build ios	2025-10-29 12:08:56 +01:00
MarcoE	48930550fe	Finish v2.0.3(10)	2025-10-15 10:33:11 +02:00
MarcoE	11e7b04a88	Finish v2.0.3(10)	2025-10-15 10:33:10 +02:00
MarcoE	27588097a3	-> v2.0.3 (10)	2025-10-15 10:33:04 +02:00
MarcoE	934258d422	Fix sync	2025-10-15 10:32:24 +02:00
MarcoE	c3e646403b	Aggiunta possibilità di rimozione allegati	2025-10-15 09:57:01 +02:00
MarcoE	effdc317c2	Fix date	2025-10-13 15:14:02 +02:00
MarcoE	9f95bb23e6	Fix vari	2025-10-03 16:32:16 +02:00
MarcoE	5016b3ed8d	Finish v2.0.2(9)	2025-10-03 00:02:13 +02:00
MarcoE	5981691815	Finish v2.0.2(9)	2025-10-03 00:02:12 +02:00
MarcoE	f4621f48c8	-> 2.0.2 (9)	2025-10-03 00:02:08 +02:00
MarcoE	ff36b1cdab	Fix salvataggio posizione	2025-10-02 23:48:14 +02:00
MarcoE	36fe05e3c3	Fix apertura fotocamera e fix codJcom interno	2025-10-01 12:35:34 +02:00
MarcoE	0fe1b90417	Finish v2.0.2(8)	2025-09-23 10:44:31 +02:00
MarcoE	7359310c48	Finish v2.0.2(8)	2025-09-23 10:44:31 +02:00
MarcoE	860a25471e	-> v2.0.2 (8)	2025-09-23 10:44:25 +02:00
MarcoE	0fab8058f3	Aggiornate librerie per il supporto Android alle pagina da 16 kB	2025-09-23 10:36:02 +02:00
MarcoE	2e51420b2c	Finish V2.0.1(7)	2025-09-22 18:16:59 +02:00
MarcoE	fab2836a0e	Finish V2.0.1(7)	2025-09-22 18:16:59 +02:00
MarcoE	4521b2a02d	-> v2.0.1 (7)	2025-09-22 18:16:52 +02:00
MarcoE	ec7bedeff6	Fix compilazione in release	2025-09-22 18:16:08 +02:00
MarcoE	ea2f2d47c3	Finish v2.0.0(6)	2025-09-22 15:11:22 +02:00
MarcoE	149eb27628	Finish v2.0.0(6)	2025-09-22 15:11:20 +02:00
MarcoE	8b331d5824	-> v2.0.0 (6)	2025-09-22 15:11:15 +02:00
MarcoE	31db52d0d7	Fix vari	2025-09-22 15:10:24 +02:00
MarcoE	ce56e9e57d	Migliorata UI	2025-09-22 12:26:10 +02:00
MarcoE	c61093a942	Sistemati caricamenti	2025-09-18 15:47:20 +02:00
MarcoE	4645b2660e	Migliorie grefiche	2025-09-18 12:17:45 +02:00