Gestito elenco clienti e prospect in lista contatti

salesbook.Maui/App.xaml.cs

@@ -4,12 +4,17 @@ namespace salesbook.Maui
 {
     public partial class App : Application
     {
+        private readonly IMessenger _messenger;
+        
         public App(IMessenger messenger)
         {
             InitializeComponent();
+            _messenger = messenger;
+        }
 
-            MainPage = new NavigationPage(new MainPage(messenger));
-
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            return new Window(new MainPage(_messenger));
         }
     }
 }

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -12,6 +12,22 @@ public class ManageDataService(LocalDbService localDb, IMapper mapper) : IManage
     public Task<List<T>> GetTable<T>(Expression<Func<T, bool>>? whereCond = null) where T : new() =>
         localDb.Get(whereCond);
 
+    public async Task<List<ContactDTO>> GetContact()
+    {
+        var contactList = await localDb.Get<AnagClie>(x => x.FlagStato.Equals("A"));
+        var prospectList = await localDb.Get<PtbPros>();
+
+        // Mappa i contatti
+        var contactMapper = mapper.Map<List<ContactDTO>>(contactList);
+
+        // Mappa i prospects
+        var prospectMapper = mapper.Map<List<ContactDTO>>(prospectList);
+        
+        contactMapper.AddRange(prospectMapper);
+
+        return contactMapper;
+    }
+
     public async Task<List<ActivityDTO>> GetActivity(Expression<Func<StbActivity, bool>>? whereCond = null)
     {
         var activities = await localDb.Get(whereCond);

salesbook.Maui/Core/Services/NavigationService.cs

@@ -1,15 +0,0 @@
-using salesbook.Shared.Core.Interface;
-
-namespace salesbook.Maui.Core.Services;
-
-public class NavigationService(IServiceProvider serviceProvider) : INavigationService
-{
-    public async Task NavigateToDetailsAsync()
-    {
-        var detailsPage = serviceProvider.GetService<PersonalInfo>();
-        if (Application.Current.MainPage is NavigationPage nav && detailsPage != null)
-        {
-            await nav.Navigation.PushAsync(detailsPage);
-        }
-    }
-}

salesbook.Maui/Core/Services/PageTitleService.cs

@@ -1,18 +0,0 @@
-using salesbook.Shared.Core.Interface;
-
-namespace salesbook.Maui.Core.Services;
-
-public class PageTitleService(IDispatcher dispatcher) : IPageTitleService
-{
-    public void SetTitle(string title)
-    {
-        dispatcher.Dispatch(() =>
-        {
-            if (Application.Current?.MainPage is NavigationPage nav &&
-                nav.CurrentPage is ContentPage cp)
-            {
-                cp.Title = title;
-            }
-        });
-    }
-}

salesbook.Maui/MainPage.xaml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:salesbook.Maui"
              xmlns:shared="clr-namespace:salesbook.Shared;assembly=salesbook.Shared" 
              x:Class="salesbook.Maui.MainPage"
              BackgroundColor="{DynamicResource PageBackgroundColor}">
 
-    <BlazorWebView HostPage="wwwroot/index.html">
+    <BlazorWebView x:Name="blazorWebView" HostPage="wwwroot/index.html">
         <BlazorWebView.RootComponents>
             <RootComponent Selector="#app" ComponentType="{x:Type shared:Components.Routes}" />
         </BlazorWebView.RootComponents>

salesbook.Maui/MainPage.xaml.cs

@@ -11,8 +11,6 @@ namespace salesbook.Maui
         {
             InitializeComponent();
             _messenger = messenger;
-
-            Title = "Home";
         }
 
         protected override bool OnBackButtonPressed()

salesbook.Maui/MauiProgram.cs

@@ -1,3 +1,4 @@
+using AutoMapper;
 using CommunityToolkit.Maui;
 using CommunityToolkit.Mvvm.Messaging;
 using IntegryApiClient.MAUI;
@@ -13,7 +14,6 @@ using salesbook.Shared.Core.Messages.Activity.Copy;
 using salesbook.Shared.Core.Messages.Activity.New;
 using salesbook.Shared.Core.Messages.Back;
 using salesbook.Shared.Core.Services;
-using System.Globalization;
 
 namespace salesbook.Maui
 {
@@ -25,15 +25,20 @@ namespace salesbook.Maui
         {
             InteractiveRenderSettings.ConfigureBlazorHybridRenderModes();
 
-            CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("it-IT");
-            CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo("it-IT");
-
             var builder = MauiApp.CreateBuilder();
             builder
                 .UseMauiApp<App>()
+                .UseIntegry(appToken: AppToken, useLoginAzienda: true)
                 .UseMauiCommunityToolkit()
-                .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); })
-                .UseLoginAzienda(AppToken);
+                .UseSentry(options =>
+                {
+                    options.Dsn = "https://453b6b38f94fd67e40e0d5306d6caff8@o4508499810254848.ingest.de.sentry.io/4509605099667536";
+#if DEBUG
+                    options.Debug = true;
+#endif
+                    options.TracesSampleRate = 1.0;
+                })
+                .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); });
 
             builder.Services.AddMauiBlazorWebView();
             builder.Services.AddMudServices();
@@ -65,10 +70,6 @@ namespace salesbook.Maui
             builder.Services.AddSingleton<IFormFactor, FormFactor>();
             builder.Services.AddSingleton<LocalDbService>();
 
-            builder.Services.AddSingleton<INavigationService, NavigationService>();
-            builder.Services.AddSingleton<IPageTitleService, PageTitleService>();
-            builder.Services.AddTransient<PersonalInfo>();
-
             return builder.Build();
         }
     }

salesbook.Maui/PersonalInfo.xaml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:components="clr-namespace:salesbook.Shared.Components;assembly=salesbook.Shared"
-             x:Class="salesbook.Maui.PersonalInfo"
-             BackgroundColor="{DynamicResource PageBackgroundColor}">
-
-    <BlazorWebView HostPage="wwwroot/index.html" StartPath="/PersonalInfo">
-        <BlazorWebView.RootComponents>
-            <RootComponent Selector="#app" ComponentType="{x:Type components:Routes}" />
-        </BlazorWebView.RootComponents>
-    </BlazorWebView>
-
-</ContentPage>

salesbook.Maui/PersonalInfo.xaml.cs

@@ -1,11 +0,0 @@
-namespace salesbook.Maui;
-
-public partial class PersonalInfo : ContentPage
-{
-    public PersonalInfo()
-    {
-        InitializeComponent();
-        
-        Title = "Profilo";
-    }
-}

salesbook.Maui/Platforms/Android/MainActivity.cs

@@ -1,6 +1,5 @@
 using Android.App;
 using Android.Content.PM;
-using AndroidX.AppCompat.App;
 
 namespace salesbook.Maui
 {
@@ -10,9 +9,5 @@ namespace salesbook.Maui
                                ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity
     {
-        public MainActivity()
-        {
-            AppCompatDelegate.DefaultNightMode = AppCompatDelegate.ModeNightNo;
-        }
     }
 }

salesbook.Maui/Platforms/iOS/Info.plist

@@ -35,8 +35,5 @@
 	    <key>NSAllowsArbitraryLoads</key>
 	    <true/>
     </dict>
-
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
 </dict>
 </plist>

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>1.0.0</ApplicationDisplayVersion>
-		<ApplicationVersion>3</ApplicationVersion>
+		<ApplicationDisplayVersion>1.0.1</ApplicationDisplayVersion>
+		<ApplicationVersion>4</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -78,8 +78,9 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
-		<CodesignKey>Apple Development: Created via API (5B7B69P4JY)</CodesignKey>
-		<CodesignProvision>VS: WildCard Development</CodesignProvision>
+		<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
+		<CodesignProvision></CodesignProvision>
+		<ProvisioningType>manual</ProvisioningType>
 	</PropertyGroup>
 
 	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -118,14 +119,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Maui" Version="11.2.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.4" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.5" />
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.70" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.70" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
+		<PackageReference Include="IntegryApiClient.MAUI" Version="1.1.6" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.81" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.81" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.6" />
+		<PackageReference Include="Sentry.Maui" Version="5.11.2" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 	</ItemGroup>
 
@@ -133,16 +135,4 @@
 		<ProjectReference Include="..\salesbook.Shared\salesbook.Shared.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Compile Update="PersonalInfo.xaml.cs">
-	    <DependentUpon>PersonalInfo.xaml</DependentUpon>
-	  </Compile>
-	</ItemGroup>
-
-	<ItemGroup>
-	  <MauiXaml Update="PersonalInfo.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	</ItemGroup>
-
 </Project>

salesbook.Shared/Components/Layout/HeaderLayout.razor

@@ -1,7 +1,4 @@
-@using Microsoft.Maui.Controls
-@using salesbook.Shared.Core.Interface
 @inject IJSRuntime JS
-@inject INavigationService NavigationService
 
 <div class="@(Back ? "" : "container") header">
     <div class="header-content @(Back ? "with-back" : "no-back")">
@@ -86,9 +83,7 @@
         await JS.InvokeVoidAsync("goBack");
     }
 
-    private async Task OpenPersonalInfo()
-    {
-        await NavigationService.NavigateToDetailsAsync();
-    }
+    private void OpenPersonalInfo() =>
+        NavigationManager.NavigateTo("/PersonalInfo");
 
 }

salesbook.Shared/Components/Layout/MainLayout.razor

@@ -1,10 +1,10 @@
 @using System.Globalization
-@using salesbook.Shared.Core.Interface
+@using CommunityToolkit.Mvvm.Messaging
 @using salesbook.Shared.Core.Messages.Back
 @inherits LayoutComponentBase
 @inject IJSRuntime JS
+@inject IMessenger Messenger
 @inject BackNavigationService BackService
-@inject INavigationService NavigationService
 
 <MudThemeProvider Theme="_currentTheme" @ref="@_mudThemeProvider" @bind-IsDarkMode="@IsDarkMode" />
 <MudPopoverProvider/>

salesbook.Shared/Components/Layout/NavMenu.razor

@@ -45,7 +45,7 @@
                     <MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add" />
                 </ActivatorContent>
                 <ChildContent>
-                    <MudMenuItem Disabled="true">Nuovo contatto</MudMenuItem>
+                    <MudMenuItem OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
                     <MudMenuItem OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
                 </ChildContent>
             </MudMenu>
@@ -92,5 +92,10 @@
             Messenger.Send(new NewActivityMessage(((StbActivity)result.Data).ActivityId));
         }
     }
+
+    private async Task CreateUser()
+    {
+        var result = await ModalHelpers.OpenUserForm(Dialog, null);
+    }
 }
 

salesbook.Shared/Components/Pages/Calendar.razor

@@ -1,20 +1,21 @@
 @page "/Calendar"
 @using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Components.SingleElements
 @using salesbook.Shared.Components.Layout.Spinner
 @using salesbook.Shared.Components.SingleElements.BottomSheet
+@using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Messages.Activity.New
 @inject IManageDataService ManageData
 @inject IJSRuntime JS
 @inject NewActivityService NewActivity
-@inject IPageTitleService PageTitleService
 
-@* <HeaderLayout Title="@_headerTitle"
+<HeaderLayout Title="@_headerTitle"
               ShowFilter="true"
               ShowCalendarToggle="true"
               OnFilterToggle="ToggleFilter"
-              OnCalendarToggle="ToggleExpanded"/> *@
+              OnCalendarToggle="ToggleExpanded"/>
 
 <div @ref="_weekSliderRef" class="container week-slider @(Expanded ? "expanded" : "") @(SliderAnimation)">
     @if (Expanded)
@@ -259,8 +260,6 @@
     private void PrepareHeaderTitle()
     {
         _headerTitle = CurrentMonth.ToString("MMMM yyyy", new System.Globalization.CultureInfo("it-IT")).FirstCharToUpper();
-        PageTitleService?.SetTitle(_headerTitle);
-
     }
 
     private void PrepareEventsCache()
@@ -373,7 +372,9 @@
         filteredActivity = filteredActivity
             .Where(x => Filter.Category == null || x.Category.Equals(Filter.Category));
 
-        return filteredActivity.ToList();
+        return filteredActivity
+            .OrderBy(x => x.EffectiveTime ?? x.EstimatedTime)
+            .ToList();
     }
 
     [JSInvokable]

salesbook.Shared/Components/Pages/Notifications.razor

@@ -1,19 +1,14 @@
 @page "/Notifications"
 @attribute [Authorize]
+@using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Components.SingleElements
-@using salesbook.Shared.Core.Interface
-@inject IPageTitleService PageTitleService
 
-@* <HeaderLayout Title="Notifiche" /> *@
+<HeaderLayout Title="Notifiche" />
 
 <div class="container">
     <NoDataAvailable Text="Nessuna notifica meno recente" />
 </div>
 
 @code {
-    protected override void OnInitialized()
-    {
-        PageTitleService?.SetTitle("Notifiche");
-    }
 
 }

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -1,5 +1,6 @@
 @page "/PersonalInfo"
 @attribute [Authorize]
+@using salesbook.Shared.Components.Layout
 @using salesbook.Shared.Core.Authorization.Enum
 @using salesbook.Shared.Core.Interface
 @using salesbook.Shared.Core.Services
@@ -7,7 +8,7 @@
 @inject INetworkService NetworkService
 @inject IFormFactor FormFactor
 
-@* <HeaderLayout BackTo="Indietro" Back="true" BackOnTop="true" Title="Profilo" ShowProfile="false"/> *@
+<HeaderLayout BackTo="Indietro" Back="true" BackOnTop="true" Title="Profilo" ShowProfile="false"/>
 
 @if (IsLoggedIn)
 {

salesbook.Shared/Components/Pages/User.razor

@@ -35,16 +35,26 @@ else
 
             <div class="section-info">
                 <div class="section-personal-info">
+                    @if (!string.IsNullOrEmpty(Anag.Telefono))
+                    {
                         <div>
                             <span class="info-title">Telefono</span>
                             <span class="info-text">
-                            @if (string.IsNullOrEmpty(Anag.Telefono))
+                                @Anag.Telefono
+                            </span>
+                        </div>
+                    }
+
+                    <div>
+                        <span class="info-title">P. IVA</span>
+                        <span class="info-text">
+                            @if (string.IsNullOrEmpty(Anag.PartIva))
                             {
-                                @("Nessuna mail configurata")
+                                @("Nessuna partita iva configurata")
                             }
                             else
                             {
-                                @Anag.Telefono
+                                @Anag.PartIva
                             }
                         </span>
                     </div>
@@ -68,6 +78,8 @@ else
             </div>
         </div>
 
+        <MudTabs Elevation="2" Rounded="true" PanelClass="pt-6" Style="width: 100%" Centered="true">
+            <MudTabPanel Text="Contatti">
                 @if (PersRif is { Count: > 0 })
                 {
                     <div class="container-pers-rif">
@@ -93,6 +105,13 @@ else
                         Aggiungi contatto
                     </MudButton>
                 </div>
+            </MudTabPanel>
+            <MudTabPanel Text="Commesse">
+                <Virtualize Items="Commesse" Context="commessa">
+                    <CommessaCard Commessa="commessa" />
+                </Virtualize>
+            </MudTabPanel>
+        </MudTabs>
     </div>
 }
 
@@ -101,6 +120,7 @@ else
 
     private AnagClie Anag { get; set; } = new();
     private List<VtbCliePersRif>? PersRif { get; set; }
+    private List<JtbComt> Commesse { get; set; }
 
     private bool IsLoading { get; set; } = true;
 
@@ -113,6 +133,7 @@ else
     {
         Anag = (await ManageData.GetTable<AnagClie>(x => x.CodAnag.Equals(CodAnag))).Last();
         PersRif = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag.Equals(Anag.CodAnag));
+        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodAnag));
 
         IsLoading = false;
         StateHasChanged();

salesbook.Shared/Components/Pages/Users.razor

@@ -1,11 +1,15 @@
 @page "/Users"
 @attribute [Authorize]
-@using salesbook.Shared.Core.Entity
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.SingleElements.BottomSheet
+@using salesbook.Shared.Components.Layout.Spinner
+@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Core.Entity
 @inject IManageDataService ManageData
-@inject IPageTitleService PageTitleService
 
-@* <HeaderLayout Title="Contatti"/> *@
+<HeaderLayout Title="Contatti"/>
 
 <div class="container search-box">
     <div class="input-card clearButton">
@@ -15,11 +19,23 @@
         {
             <MudIconButton Class="closeIcon" Icon="@Icons.Material.Filled.Close" OnClick="() => FilterUsers(true)"/>
         }
+        
+        <MudIconButton Class="rounded-button" OnClick="ToggleFilter" Icon="@Icons.Material.Rounded.FilterList" Variant="Variant.Filled" Color="Color.Secondary" Size="Size.Small" />
     </div>
+    
+    <MudChipSet Class="mt-2" T="string" @bind-SelectedValue="TypeUser" @bind-SelectedValue:after="FilterUsers" SelectionMode="SelectionMode.SingleSelection">
+        <MudChip Color="Color.Secondary" Variant="Variant.Text" Value="@("all")">Tutti</MudChip>
+        <MudChip Color="Color.Secondary" Variant="Variant.Text" Value="@("contact")">Contatti</MudChip>
+        <MudChip Color="Color.Secondary" Variant="Variant.Text" Value="@("prospect")">Prospect</MudChip>
+    </MudChipSet>
 </div>
 
 <div class="container users">
-    @if (GroupedUserList?.Count > 0)
+    @if (IsLoading)
+    {
+        <SpinnerLayout FullScreen="false"/>
+    }
+    else if (GroupedUserList?.Count > 0)
     {
         <Virtualize Items="FilteredGroupedUserList" Context="item">
             @if (item.ShowHeader)
@@ -29,30 +45,45 @@
             <UserCard User="item.User"/>
         </Virtualize>
     }
+    else
+    {
+        <NoDataAvailable Text="Nessun contatto trovato"/>
+    }
 </div>
 
+<FilterUsers @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="FilterUsers"/>
+
 @code {
     private List<UserDisplayItem> GroupedUserList { get; set; } = [];
     private List<UserDisplayItem> FilteredGroupedUserList { get; set; } = [];
-    private string? TextToFilter { get; set; }
 
-    protected override void OnInitialized()
-    {
-        PageTitleService?.SetTitle("Contatti");
-    }
+    private bool IsLoading { get; set; }
+
+    //Filtri
+    private string? TextToFilter { get; set; }
+    private bool OpenFilter { get; set; }
+    private FilterUserDTO Filter { get; set; } = new();
+    private string TypeUser { get; set; } = "all";
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
         {
             await LoadData();
-            StateHasChanged();
         }
     }
 
     private async Task LoadData()
     {
-        var users = await ManageData.GetTable<AnagClie>(x => x.FlagStato.Equals("A"));
+        IsLoading = true;
+        StateHasChanged();
+
+        var loggedUser = (await ManageData.GetTable<StbUser>(x => x.UserName.Equals(UserSession.User.Username))).Last();
+
+        if (loggedUser.UserCode != null)
+            Filter.Agenti = [loggedUser.UserCode];
+
+        var users = await ManageData.GetContact();
 
         var sortedUsers = users
             .Where(u => !string.IsNullOrWhiteSpace(u.RagSoc))
@@ -85,11 +116,14 @@
         }
 
         FilterUsers();
+
+        IsLoading = false;
+        StateHasChanged();
     }
 
     private class UserDisplayItem
     {
-        public required AnagClie User { get; set; }
+        public required ContactDTO User { get; set; }
         public bool ShowHeader { get; set; }
         public string? HeaderLetter { get; set; }
     }
@@ -101,23 +135,49 @@
         if (clearFilter || string.IsNullOrWhiteSpace(TextToFilter))
         {
             TextToFilter = null;
-            FilteredGroupedUserList = GroupedUserList;
-            return;
         }
 
-        var filter = TextToFilter.Trim();
         var result = new List<UserDisplayItem>();
 
         foreach (var item in GroupedUserList)
         {
             var user = item.User;
-            if (
+
+            switch (TypeUser)
+            {
+                case "contact" when !user.IsContact:
+                case "prospect" when user.IsContact:
+                    continue;
+            }
+
+            var matchesFilter =
+                (Filter.Prov.IsNullOrEmpty() || user.Prov.Equals(Filter.Prov, StringComparison.OrdinalIgnoreCase)) &&
+                (Filter.Citta.IsNullOrEmpty() || user.Citta.Contains(Filter.Citta!, StringComparison.OrdinalIgnoreCase)) &&
+                (Filter.Nazione.IsNullOrEmpty() || user.Nazione.Contains(Filter.Nazione!, StringComparison.OrdinalIgnoreCase)) &&
+                (Filter.Indirizzo.IsNullOrEmpty() || user.Indirizzo.Contains(Filter.Indirizzo!, StringComparison.OrdinalIgnoreCase)) &&
+                (!Filter.ConAgente || user.CodVage is not null) &&
+                (!Filter.SenzaAgente || user.CodVage is null) &&
+                (Filter.Agenti.IsNullOrEmpty() || (user.CodVage != null && Filter.Agenti!.Contains(user.CodVage)));
+
+            if (!matchesFilter) continue;
+
+            if (!string.IsNullOrWhiteSpace(TextToFilter))
+            {
+                var filter = TextToFilter.Trim();
+
+                var matchesText =
                     (!string.IsNullOrEmpty(user.RagSoc) && user.RagSoc.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.Indirizzo) && user.Indirizzo.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.Telefono) && user.Telefono.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
                     (!string.IsNullOrEmpty(user.EMail) && user.EMail.Contains(filter, StringComparison.OrdinalIgnoreCase)) ||
-                (!string.IsNullOrEmpty(user.PartIva) && user.PartIva.Contains(filter, StringComparison.OrdinalIgnoreCase))
-            )
+                    (!string.IsNullOrEmpty(user.PartIva) && user.PartIva.Contains(filter, StringComparison.OrdinalIgnoreCase));
+
+                if (matchesText)
+                {
+                    result.Add(item);
+                }
+            }
+            else
             {
                 result.Add(item);
             }
@@ -126,4 +186,10 @@
         FilteredGroupedUserList = result;
     }
 
+    private void ToggleFilter()
+    {
+        OpenFilter = !OpenFilter;
+        StateHasChanged();
+    }
+
 }

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

@@ -28,6 +28,6 @@
     padding-bottom: .5rem;
 }
 
-.search-box .input-card {
-    margin: 0 !important;
-}
+.search-box .input-card { margin: 0 !important; }
+
+.search-box .input-card ::deep .rounded-button { border-radius: 50%; }

salesbook.Shared/Components/Routes.razor

@@ -1,4 +1,4 @@
-@using salesbook.Shared.Components.SingleElements
+@using salesbook.Shared.Components.SingleElements.Modal.ExceptionModal
 @inject NavigationManager NavigationManager
 
 <ErrorBoundary @ref="ErrorBoundary">

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

@@ -0,0 +1,45 @@
+<div class="bottom-sheet-backdrop @(IsSheetVisible ? "show" : "")" @onclick="CloseBottomSheet"></div>
+
+<div class="bottom-sheet-container @(IsSheetVisible ? "show" : "")">
+    <div class="bottom-sheet pb-safe-area">
+        <div class="title">
+            <MudText Typo="Typo.h6">
+                <b>Aggiungi un promemoria</b>
+            </MudText>
+            <MudIconButton Icon="@Icons.Material.Filled.Close" OnClick="() => CloseBottomSheet()"/>
+        </div>
+        
+        <div class="input-card">
+            <div class="form-container">
+                <span>Data</span>
+
+                <MudTextField T="DateTime?" Format="yyyy-MM-dd" InputType="InputType.Date" @bind-Value="Date" />
+            </div>
+        </div>
+        
+        <div class="input-card">
+            <MudTextField T="string?" Placeholder="Memo" Variant="Variant.Text" Lines="4" @bind-Value="Memo" />
+        </div>
+
+        <div class="button-section">
+            <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="() => CloseBottomSheet(true)">Salva</MudButton>
+        </div>
+    </div>
+</div>
+
+@code {
+    [Parameter] public bool IsSheetVisible { get; set; }
+    [Parameter] public EventCallback<bool> IsSheetVisibleChanged { get; set; }
+
+    private DateTime? Date { get; set; } = DateTime.Today;
+    private string? Memo { get; set; }
+
+    private void CloseBottomSheet(bool save)
+    {
+        IsSheetVisible = false;
+        IsSheetVisibleChanged.InvokeAsync(IsSheetVisible);
+    }
+
+    private void CloseBottomSheet() => CloseBottomSheet(false);
+
+}

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

@@ -0,0 +1 @@
+

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

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

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

@@ -0,0 +1,24 @@
+@using salesbook.Shared.Core.Entity
+
+<div class="activity-card">
+    <div class="activity-left-section">
+        <div class="activity-body-section">
+            <div class="title-section">
+                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">@Commessa.Descrizione</MudText>
+                <div class="activity-hours-section">
+                    <span class="activity-hours">
+                        @Commessa.CodJcom
+                    </span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="activity-info-section">
+        <MudChip T="string" Icon="@IconConstants.Chip.User" Size="Size.Small">Stato</MudChip>
+    </div>
+</div>
+
+@code {
+    [Parameter] public JtbComt Commessa { get; set; } = new();
+}

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

@@ -0,0 +1,59 @@
+.activity-card {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: .5rem .5rem;
+    border-radius: 12px;
+    line-height: normal;
+    box-shadow: var(--custom-box-shadow);
+}
+
+.activity-card.memo { border-left: 5px solid var(--mud-palette-info-darken); }
+
+.activity-card.interna { border-left: 5px solid var(--mud-palette-success-darken); }
+
+.activity-card.commessa { border-left: 5px solid var(--mud-palette-warning); }
+
+.activity-left-section {
+    display: flex;
+    align-items: center;
+    margin-left: 4px;
+}
+
+.title-section {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+}
+
+.activity-hours {
+    font-weight: 700;
+    color: var(--mud-palette-text-primary);
+}
+
+.activity-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; }
+
+.activity-body-section {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.title-section ::deep > .activity-title {
+    font-weight: 800 !important;
+    margin: 0 !important;
+    line-height: normal !important;
+    color: var(--mud-palette-text-primary);
+}
+
+.activity-body-section ::deep > .activity-subtitle {
+    color: var(--mud-palette-gray-darker);
+    margin: .2rem 0 !important;
+    line-height: normal !important;
+}
+
+.activity-info-section {
+    display: flex;
+    flex-wrap: wrap;
+}

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

@@ -18,11 +18,12 @@
     <div class="contact-right-section">
         @if (!Contact.NumCellulare.IsNullOrEmpty())
         {
-            <MudIcon Color="Color.Success" Size="Size.Large" Icon="@Icons.Material.Outlined.Phone" />
+            <MudIconButton Href="@($"tel:{Contact.NumCellulare}")" Color="Color.Success" Size="Size.Large" Icon="@Icons.Material.Outlined.Phone" />
         }
 
-        @if (!Contact.EMail.IsNullOrEmpty()){
-            <MudIcon Color="Color.Info" Size="Size.Large" Icon="@Icons.Material.Filled.MailOutline" />
+        @if (!Contact.EMail.IsNullOrEmpty())
+        {
+            <MudIconButton Href="@($"mailto:{Contact.EMail}")" Color="Color.Info" Size="Size.Large" Icon="@Icons.Material.Filled.MailOutline" />
         }
     </div>
 </div>

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

@@ -1,3 +1,4 @@
+@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
 @inject IManageDataService ManageData
@@ -6,7 +7,7 @@
     <div class="user-card-left-section">
         <div class="user-card-body-section">
             <div class="title-section">
-                <MudIcon @onclick="OpenUser" Color="Color.Primary" Icon="@Icons.Material.Filled.Person" Size="Size.Large" />
+                <MudIcon @onclick="OpenUser" Color="@(User.IsContact? Color.Primary: Color.Secondary)" Icon="@(User.IsContact? Icons.Material.Filled.Person : Icons.Material.Filled.PersonOutline)" Size="Size.Large" />
 
                 <div class="user-card-right-section">
                     <div class="user-card-title">
@@ -47,14 +48,14 @@
 </div>
 
 @code {
-    [Parameter] public AnagClie User { get; set; } = new();
+    [Parameter] public ContactDTO User { get; set; } = new();
 
     private List<JtbComt>? Commesse { get; set; }
     private bool IsLoading { get; set; } = true;
     private bool ShowSectionCommesse { get; set; }
 
     private void OpenUser() =>
-        NavigationManager.NavigateTo($"/User/{User.CodAnag}");
+        NavigationManager.NavigateTo($"/User/{User.CodContact}");
 
     private async Task ShowCommesse()
     {
@@ -62,7 +63,7 @@
 
         if (ShowSectionCommesse)
         {
-            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag.Equals(User.CodAnag));
+            Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag.Equals(User.CodContact));
             IsLoading = false;
             StateHasChanged();
             return;

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

@@ -149,17 +149,31 @@
             </MessageContent>
             <YesButton>
                 <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Error"
-                           StartIcon="@Icons.Material.Filled.DeleteForever">
+                           StartIcon="@Icons.Material.Filled.Check">
                     Cancella
                 </MudButton>
             </YesButton>
         </MudMessageBox>
+        
+        <MudMessageBox @ref="ConfirmMemo" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
+            <MessageContent>
+                Vuoi creare un promemoria?
+            </MessageContent>
+            <YesButton>
+                <MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
+                           StartIcon="@Icons.Material.Filled.DeleteForever">
+                    Crea
+                </MudButton>
+            </YesButton>
+        </MudMessageBox>
     </DialogContent>
 </MudDialog>
 
 <SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
 
-<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeValue"/>
+<SelectEsito @bind-IsSheetVisible="OpenEsito" @bind-ActivityModel="ActivityModel" @bind-ActivityModel:after="OnAfterChangeEsito"/>
+
+<AddMemo @bind-IsSheetVisible="OpenAddMemo" />
 
 @code {
     [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
@@ -186,12 +200,17 @@
     private bool VisibleOverlay { get; set; }
     private bool SuccessAnimation { get; set; }
 
-    private bool OpenEsito { get; set; } = false;
+    private bool OpenEsito { get; set; }
+    private bool OpenAddMemo { get; set; }
 
+    //MessageBox
     private MudMessageBox ConfirmDelete { get; set; }
+    private MudMessageBox ConfirmMemo { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
+        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+
         _ = LoadData();
 
         LabelSave = IsNew ? "Aggiungi" : null;
@@ -243,7 +262,6 @@
     private bool CheckPreSave()
     {
         Snackbar.Clear();
-        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
 
         if (!ActivityModel.ActivityTypeId.IsNullOrEmpty()) return true;
         Snackbar.Add("Tipo attività obbligatorio!", Severity.Error);
@@ -317,9 +335,23 @@
         }
     }
 
+    private async Task OnAfterChangeEsito()
+    {
+        OnAfterChangeValue();
+
+        var result = await ConfirmMemo.ShowAsync();
+
+        if (result is true)
+            OpenAddMemo = !OpenAddMemo;
+    }
+
     private void OpenSelectEsito()
     {
-        if (!IsNew && (ActivityModel.UserName is null || !ActivityModel.UserName.Equals(UserSession.User.Username))) return;
+        if (!IsNew && (ActivityModel.UserName is null || !ActivityModel.UserName.Equals(UserSession.User.Username)))
+        {
+            Snackbar.Add("Non puoi inserire un esito per un'attività che non ti è stata assegnata.", Severity.Info);
+            return;
+        }
 
         OpenEsito = !OpenEsito;
         StateHasChanged();

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

@@ -0,0 +1,201 @@
+@using salesbook.Shared.Core.Dto
+@using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.Layout.Overlay
+@inject IManageDataService ManageData
+@inject INetworkService NetworkService
+@inject IIntegryApiService IntegryApiService
+
+<MudDialog Class="customDialog-form">
+    <DialogContent>
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuovo" : $"{ContactModel.CodContact}")"/>
+
+        <div class="content">
+            <div class="input-card">
+                <MudTextField ReadOnly="IsView" 
+                              T="string?" 
+                              Placeholder="Azienda"
+                              Variant="Variant.Text"
+                              Lines="1"
+                              @bind-Value="ContactModel.RagSoc"
+                              @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500"
+                              OnDebounceIntervalElapsed="OnAfterChangeValue"/>
+            </div>
+
+            <div class="input-card">
+                <MudTextField ReadOnly="IsView"
+                              T="string?"
+                              Placeholder="Partita IVA"
+                              Variant="Variant.Text"
+                              Lines="1"
+                              @bind-Value="ContactModel.PartIva"
+                              @bind-Value:after="OnAfterChangeValue"
+                              DebounceInterval="500"
+                              OnDebounceIntervalElapsed="OnAfterChangeValue" />
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Placeholder="Indirizzo"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Indirizzo"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+                
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Placeholder="CAP"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Cap"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+                
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Placeholder="Città"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Citta"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+                
+                <div class="divider"></div>
+                
+                <div class="form-container">
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Placeholder="Provincia"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Prov"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+                
+                <div class="divider"></div>
+
+                <div class="form-container">
+                    <MudTextField ReadOnly="IsView"
+                                  T="string?"
+                                  Placeholder="Nazione"
+                                  Variant="Variant.Text"
+                                  Lines="1"
+                                  @bind-Value="ContactModel.Nazione"
+                                  @bind-Value:after="OnAfterChangeValue"
+                                  DebounceInterval="500"
+                                  OnDebounceIntervalElapsed="OnAfterChangeValue" />
+                </div>
+            </div>
+
+            <div class="input-card">
+                <div class="form-container">
+                    <span class="disable-full-width">Tipo cliente</span>
+
+                    @* @if (Commesse.IsNullOrEmpty())
+                    {
+                        <span class="warning-text">Nessuna commessa presente</span>
+                    }
+                    else
+                    {
+                        <MudSelectExtended FullWidth="true" ReadOnly="@(IsView || Commesse.IsNullOrEmpty())" T="string?" Variant="Variant.Text" @bind-Value="UserModel.CodJcom" @bind-Value:after="OnCommessaChanged" Class="customIcon-select" AdornmentIcon="@Icons.Material.Filled.Code">
+                            @foreach (var com in Commesse)
+                            {
+                                <MudSelectItemExtended Class="custom-item-select" Value="@com.CodJcom">@($"{com.CodJcom} - {com.Descrizione}")</MudSelectItemExtended>
+                            }
+                        </MudSelectExtended>
+                    } *@
+                </div>
+            </div>
+            
+            @if (IsNew)
+            {
+                <div class="container-button">
+                    <MudButton Class="button-settings gray-icon"
+                               FullWidth="true"
+                               StartIcon="@Icons.Material.Filled.PersonAddAlt1"
+                               Size="Size.Medium"
+                               OnClick="NewPersRif"
+                               Variant="Variant.Outlined">
+                        Persona di riferimento
+                    </MudButton>
+                </div>
+            }
+        </div>
+    </DialogContent>
+</MudDialog>
+
+<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
+
+@code {
+    [CascadingParameter] private IMudDialogInstance MudDialog { get; set; }
+
+    [Parameter] public string? CodAnag { get; set; }
+    [Parameter] public string? UserType { get; set; }
+
+    private ContactDTO OriginalModel { get; set; } = new();
+    private ContactDTO ContactModel { get; set; } = new();
+
+    private bool IsNew => CodAnag.IsNullOrEmpty();
+    private bool IsView => !NetworkService.IsNetworkAvailable();
+
+    private string? LabelSave { get; set; }
+
+    //Overlay for save
+    private bool VisibleOverlay { get; set; }
+    private bool SuccessAnimation { get; set; }
+
+    protected override async Task OnInitializedAsync()
+    {
+        Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
+
+        _ = LoadData();
+
+        LabelSave = IsNew ? "Aggiungi" : null;
+    }
+
+    private async Task Save()
+    {
+        SuccessAnimation = true;
+        StateHasChanged();
+
+        await Task.Delay(1250);
+
+        MudDialog.Close();
+    }
+
+    private async Task LoadData()
+    {
+        
+    }
+
+    private void OnAfterChangeValue()
+    {
+        if (!IsNew)
+        {
+            LabelSave = !OriginalModel.Equals(ContactModel) ? "Aggiorna" : null;
+        }
+    }
+
+    private void NewPersRif()
+    {
+
+    }
+}

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

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

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

@@ -1,6 +1,3 @@
-@using salesbook.Shared.Core.Services
-@inject AppAuthenticationStateProvider AuthenticationStateProvider
-
 <div class="container container-modal">
     <div class="c-modal">
         <div class="exception-header mb-2">

salesbook.Shared/Core/Dto/ContactDTO.cs

@@ -0,0 +1,60 @@
+using System.Text.Json.Serialization;
+
+namespace salesbook.Shared.Core.Dto;
+
+public class ContactDTO
+{
+    [JsonPropertyName("codContact")]
+    public string CodContact { get; set; }
+
+    [JsonPropertyName("isContact")]
+    public bool IsContact { get; set; }
+
+    [JsonPropertyName("codVtip")]
+    public string? CodVtip { get; set; }
+
+    [JsonPropertyName("codVage")]
+    public string? CodVage { get; set; }
+
+    [JsonPropertyName("ragSoc")]
+    public string RagSoc { get; set; }
+
+    [JsonPropertyName("indirizzo")]
+    public string Indirizzo { get; set; }
+
+    [JsonPropertyName("cap")]
+    public string Cap { get; set; }
+
+    [JsonPropertyName("citta")]
+    public string Citta { get; set; }
+
+    [JsonPropertyName("prov")]
+    public string Prov { get; set; }
+
+    [JsonPropertyName("nazione")]
+    public string Nazione { get; set; }
+
+    [JsonPropertyName("telefono")]
+    public string? Telefono { get; set; }
+
+    [JsonPropertyName("fax")]
+    public string Fax { get; set; }
+
+    [JsonPropertyName("partIva")]
+    public string PartIva { get; set; }
+
+    [JsonPropertyName("codFisc")]
+    public string CodFisc { get; set; }
+
+    [JsonPropertyName("note")]
+    public string Note { get; set; }
+
+    [JsonPropertyName("personaRif")]
+    public string PersonaRif { get; set; }
+
+    [JsonPropertyName("eMail")]
+    public string? EMail { get; set; }
+
+    [JsonPropertyName("eMailPec")]
+    public string EMailPec { get; set; }
+}

salesbook.Shared/Core/Dto/FilterUserDTO.cs

@@ -0,0 +1,13 @@
+namespace salesbook.Shared.Core.Dto;
+
+public class FilterUserDTO
+{
+    public bool ConAgente { get; set; }
+    public bool SenzaAgente { get; set; }
+    public IEnumerable<string>? Agenti { get; set; }
+    
+    public string? Indirizzo { get; set; }
+    public string? Citta { get; set; }
+    public string? Nazione { get; set; }
+    public string? Prov { get; set; }
+}

salesbook.Shared/Core/Entity/StbUser.cs

@@ -11,4 +11,10 @@ public class StbUser
 
     [Column("full_name"), JsonPropertyName("fullName")]
     public string FullName { get; set; }
+
+    [Column("key_group"), JsonPropertyName("keyGroup")]
+    public int KeyGroup { get; set; }
+
+    [Column("user_code"), JsonPropertyName("userCode")]
+    public string? UserCode { get; set; }
 }

salesbook.Shared/Core/Helpers/MappingProfile.cs

@@ -9,5 +9,15 @@ public class MappingProfile : Profile
     public MappingProfile()
     {
         CreateMap<StbActivity, ActivityDTO>();
+
+        // Mapping da AnagClie a ContactDTO
+        CreateMap<AnagClie, ContactDTO>()
+            .ForMember(dest => dest.CodContact, opt => opt.MapFrom(src => src.CodAnag))
+            .ForMember(dest => dest.IsContact, opt => opt.MapFrom(src => true));
+
+        // Mapping da PtbPros a ContactDTO
+        CreateMap<PtbPros, ContactDTO>()
+            .ForMember(dest => dest.CodContact, opt => opt.MapFrom(src => src.CodPpro))
+            .ForMember(dest => dest.IsContact, opt => opt.MapFrom(src => false));
     }
 }

salesbook.Shared/Core/Helpers/ModalHelpers.cs

@@ -25,4 +25,23 @@ public class ModalHelpers
 
         return await modal.Result;
     }
+
+    public static async Task<DialogResult?> OpenUserForm(IDialogService dialog, string? codAnag)
+    {
+        var modal = await dialog.ShowAsync<ContactForm>(
+            "User form",
+            new DialogParameters<ContactForm>
+            {
+                { x => x.CodAnag, codAnag }
+            },
+            new DialogOptions
+            {
+                FullScreen = true,
+                CloseButton = false,
+                NoHeader = true
+            }
+        );
+
+        return await modal.Result;
+    }
 }

salesbook.Shared/Core/Interface/IManageDataService.cs

@@ -7,7 +7,9 @@ namespace salesbook.Shared.Core.Interface;
 public interface IManageDataService
 {
     Task<List<T>> GetTable<T>(Expression<Func<T, bool>>? whereCond = null) where T : new();
+    
     Task<List<ActivityDTO>> GetActivity(Expression<Func<StbActivity, bool>>? whereCond = null);
+    Task<List<ContactDTO>> GetContact();
 
     Task InsertOrUpdate<T>(T objectToSave);
 

salesbook.Shared/Core/Interface/INavigationService.cs

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

salesbook.Shared/Core/Interface/IPageTitleService.cs

@@ -1,6 +0,0 @@
-namespace salesbook.Shared.Core.Interface;
-
-public interface IPageTitleService
-{
-    void SetTitle(string title);
-}

salesbook.Shared/salesbook.Shared.csproj

@@ -14,12 +14,11 @@
         <PackageReference Include="AutoMapper" Version="14.0.0" />
         <PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.2" />
         <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-        <PackageReference Include="IntegryApiClient.Core" Version="1.1.4" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5" />
-        <PackageReference Include="Microsoft.Maui.Controls.Core" Version="9.0.70" />
+        <PackageReference Include="IntegryApiClient.Core" Version="1.1.6" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
         <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
-        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.11.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.5" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.6" />
         <PackageReference Include="MudBlazor" Version="8.6.0" />
         <PackageReference Include="MudBlazor.ThemeManager" Version="3.0.0" />
     </ItemGroup>

salesbook.Web/Core/Services/ManageDataService.cs

@@ -17,6 +17,11 @@ public class ManageDataService : IManageDataService
         throw new NotImplementedException();
     }
 
+    public Task<List<ContactDTO>> GetContact()
+    {
+        throw new NotImplementedException();
+    }
+
     public Task InsertOrUpdate<T>(T objectToSave)
     {
         throw new NotImplementedException();

salesbook.Web/Program.cs

@@ -22,7 +22,8 @@ builder.Services.AddScoped<IManageDataService, ManageDataService>();
 builder.Services.AddScoped<AppAuthenticationStateProvider>();
 builder.Services.AddScoped<AuthenticationStateProvider>(provider => provider.GetRequiredService<AppAuthenticationStateProvider>());
 
-builder.Services.UseLoginAzienda("f0484398-1f8b-42f5-ab79-5282c164e1d8");
+const string appToken = "f0484398-1f8b-42f5-ab79-5282c164e1d8";
+builder.Services.UseIntegry(appToken: appToken, useLoginAzienda: true);
 
 builder.RootComponents.Add<Routes>("#app");
 builder.RootComponents.Add<HeadOutlet>("head::after");

salesbook.Web/salesbook.Web.csproj

@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IntegryApiClient.Blazor" Version="1.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.5" />
+    <PackageReference Include="IntegryApiClient.Blazor" Version="1.1.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.6" />
   </ItemGroup>
 
   <ItemGroup>