9 Commits

Author SHA1 Message Date
149eb27628 Finish v2.0.0(6) 2025-09-22 15:11:20 +02:00
8b331d5824 -> v2.0.0 (6) 2025-09-22 15:11:15 +02:00
31db52d0d7 Fix vari 2025-09-22 15:10:24 +02:00
ce56e9e57d Migliorata UI 2025-09-22 12:26:10 +02:00
c61093a942 Sistemati caricamenti 2025-09-18 15:47:20 +02:00
4645b2660e Migliorie grefiche 2025-09-18 12:17:45 +02:00
06bda7c881 Gestita fotocamera per allegare immagini 2025-09-18 10:56:21 +02:00
8a45bffebc Fix e migliorati caricamenti 2025-09-18 09:40:31 +02:00
e9a0ffdb7a Fix ui 2025-09-16 10:46:56 +02:00
46 changed files with 868 additions and 553 deletions

View File

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

View File

@@ -5,20 +5,49 @@ namespace salesbook.Maui.Core.Services;
public class AttachedService : IAttachedService
{
public async Task<AttachedDTO?> SelectImage()
public async Task<AttachedDTO?> SelectImageFromCamera()
{
var perm = await Permissions.RequestAsync<Permissions.Photos>();
if (perm != PermissionStatus.Granted) return null;
var cameraPerm = await Permissions.RequestAsync<Permissions.Camera>();
if (cameraPerm != PermissionStatus.Granted)
return null;
var result = await FilePicker.PickAsync(new PickOptions
FileResult? result = null;
try
{
PickerTitle = "Scegli un'immagine",
FileTypes = FilePickerFileType.Images
});
result = await MediaPicker.Default.CapturePhotoAsync();
}
catch (Exception ex)
{
Console.WriteLine($"Errore cattura foto: {ex.Message}");
return null;
}
return result is null ? null : await ConvertToDto(result, AttachedDTO.TypeAttached.Image);
}
public async Task<AttachedDTO?> SelectImageFromGallery()
{
var storagePerm = await Permissions.RequestAsync<Permissions.StorageRead>();
if (storagePerm != PermissionStatus.Granted)
return null;
FileResult? result = null;
try
{
result = await MediaPicker.Default.PickPhotoAsync();
}
catch (Exception ex)
{
Console.WriteLine($"Errore selezione galleria: {ex.Message}");
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>();

View File

@@ -1,22 +1,23 @@
using AutoMapper;
using MudBlazor.Extensions;
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.Entity;
using salesbook.Shared.Core.Helpers;
using salesbook.Shared.Core.Helpers.Enum;
using salesbook.Shared.Core.Interface;
using salesbook.Shared.Core.Interface.IntegryApi;
using salesbook.Shared.Core.Interface.System.Network;
using Sentry.Protocol;
using System.Linq.Expressions;
using salesbook.Shared.Core.Helpers;
using salesbook.Shared.Core.Dto.PageState;
namespace salesbook.Maui.Core.Services;
public class ManageDataService(
LocalDbService localDb,
IMapper mapper,
UserListState userListState,
IIntegryApiService integryApiService,
INetworkService networkService
) : IManageDataService
@@ -86,7 +87,7 @@ public class ManageDataService(
return prospect;
}
public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond)
public async Task<List<ContactDTO>> GetContact(WhereCondContact? whereCond, DateTime? lastSync)
{
List<AnagClie>? contactList;
List<PtbPros>? prospectList;
@@ -94,26 +95,37 @@ public class ManageDataService(
if (networkService.ConnectionAvailable)
{
var response = new UsersSyncResponseDTO();
var clienti = await integryApiService.RetrieveAnagClie(
new CRMAnagRequestDTO
{
CodAnag = whereCond.CodAnag,
FlagStato = whereCond.FlagStato,
PartIva = whereCond.PartIva,
ReturnPersRif = !whereCond.OnlyContact
ReturnPersRif = !whereCond.OnlyContact,
FilterDate = lastSync
}
);
_ = UpdateDbUsers(clienti);
response.AnagClie = clienti.AnagClie;
response.VtbDest = clienti.VtbDest;
response.VtbCliePersRif = clienti.VtbCliePersRif;
var prospect = await integryApiService.RetrieveProspect(
new CRMProspectRequestDTO
{
CodPpro = whereCond.CodAnag,
PartIva = whereCond.PartIva,
ReturnPersRif = !whereCond.OnlyContact
ReturnPersRif = !whereCond.OnlyContact,
FilterDate = lastSync
}
);
_ = UpdateDbUsers(prospect);
response.PtbPros = prospect.PtbPros;
response.PtbProsRif = prospect.PtbProsRif;
_ = UpdateDbUsers(response);
contactList = clienti.AnagClie;
prospectList = prospect.PtbPros;
@@ -220,7 +232,7 @@ public class ManageDataService(
return await MapActivity(activities);
}
private async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
public async Task<List<ActivityDTO>> MapActivity(List<StbActivity>? activities)
{
if (activities == null) return [];
@@ -230,17 +242,20 @@ public class ManageDataService(
.Distinct().ToList();
var jtbComtList = await localDb.Get<JtbComt>(x => codJcomList.Contains(x.CodJcom));
var commesseDict = jtbComtList.ToDictionary(x => x.CodJcom, x => x.Descrizione);
var codAnagList = activities
.Select(x => x.CodAnag)
.Where(x => !string.IsNullOrEmpty(x))
.Distinct().ToList();
var clientList = await localDb.Get<AnagClie>(x => codAnagList.Contains(x.CodAnag));
var distinctClient = clientList.ToDictionary(x => x.CodAnag, x => x.RagSoc);
var prospectList = await localDb.Get<PtbPros>(x => codAnagList.Contains(x.CodPpro));
var distinctProspect = prospectList.ToDictionary(x => x.CodPpro, x => x.RagSoc);
IDictionary<string, string?>? distinctUser = null;
if (userListState.AllUsers != null)
{
distinctUser = userListState.AllUsers
.Where(x => codAnagList.Contains(x.CodContact))
.ToDictionary(x => x.CodContact, x => x.RagSoc);
}
var returnDto = activities
.Select(activity =>
@@ -269,16 +284,14 @@ public class ManageDataService(
{
string? ragSoc;
if (distinctClient.TryGetValue(activity.CodAnag, out ragSoc) ||
distinctProspect.TryGetValue(activity.CodAnag, out ragSoc))
if (distinctUser != null && (distinctUser.TryGetValue(activity.CodAnag, out ragSoc) ||
distinctUser.TryGetValue(activity.CodAnag, out ragSoc)))
{
dto.Cliente = ragSoc;
}
}
dto.Commessa = activity.CodJcom != null && commesseDict.TryGetValue(activity.CodJcom, out var descr)
? descr
: null;
dto.Commessa = jtbComtList.Find(x => x.CodJcom.Equals(dto.CodJcom));
return dto;
})
.ToList();
@@ -322,6 +335,26 @@ public class ManageDataService(
public Task InsertOrUpdate<T>(T objectToSave) =>
localDb.InsertOrUpdate<T>([objectToSave]);
public async Task DeleteProspect(string codPpro)
{
var persRifList = await GetTable<PtbProsRif>(x => x.CodPpro!.Equals(codPpro));
if (!persRifList.IsNullOrEmpty())
{
foreach (var persRif in persRifList)
{
await localDb.Delete(persRif);
}
}
var ptbPros = (await GetTable<PtbPros>(x => x.CodPpro!.Equals(codPpro))).FirstOrDefault();
if (ptbPros != null)
{
await localDb.Delete(ptbPros);
}
}
public Task Delete<T>(T objectToDelete) =>
localDb.Delete(objectToDelete);

View File

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

View File

@@ -14,7 +14,10 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" />
<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.READ_MEDIA_IMAGES" />
<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" />

View File

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

View File

@@ -29,8 +29,8 @@
<ApplicationId>it.integry.salesbook</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
<ApplicationVersion>5</ApplicationVersion>
<ApplicationDisplayVersion>2.0.0</ApplicationDisplayVersion>
<ApplicationVersion>6</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
@@ -78,8 +78,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net9.0-ios'">
<CodesignKey>Apple Distribution: Integry S.r.l. (UNP26J4R89)</CodesignKey>
<CodesignProvision></CodesignProvision>
<CodesignKey>Apple Development: Created via API (5B7B69P4JY)</CodesignKey>
<CodesignProvision>VS: it.integry.salesbook Development</CodesignProvision>
<ProvisioningType>manual</ProvisioningType>
</PropertyGroup>
@@ -95,16 +95,6 @@
<BundleResource Include="Platforms\iOS\PrivacyInfo.xcprivacy" LogicalName="PrivacyInfo.xcprivacy" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-android'">
<GoogleServicesJson Include="google-services.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</GoogleServicesJson>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-ios'">
<BundleResource Include="GoogleService-Info.plist" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<!-- Android App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" ForegroundScale="0.65" />
@@ -130,16 +120,26 @@
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<GoogleServicesJson Include="google-services.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</GoogleServicesJson>
</ItemGroup>
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
<BundleResource Include="GoogleService-Info.plist" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Maui" Version="12.0.0" />
<PackageReference Include="CommunityToolkit.Maui" Version="12.2.0" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="IntegryApiClient.MAUI" Version="1.2.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
<PackageReference Include="Microsoft.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="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="Shiny.Hosting.Maui" Version="3.3.4" />
<PackageReference Include="Shiny.Notifications" Version="3.3.4" />
<PackageReference Include="Shiny.Push" Version="3.3.4" />

View File

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

View File

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

View File

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

View File

@@ -3,6 +3,7 @@
@using salesbook.Shared.Core.Dto.Activity
@using salesbook.Shared.Core.Dto.PageState
@using salesbook.Shared.Core.Entity
@using salesbook.Shared.Core.Interface.System.Network
@using salesbook.Shared.Core.Messages.Activity.Copy
@using salesbook.Shared.Core.Messages.Activity.New
@using salesbook.Shared.Core.Messages.Contact
@@ -13,6 +14,7 @@
@inject CopyActivityService CopyActivityService
@inject NewPushNotificationService NewPushNotificationService
@inject NotificationState Notification
@inject INetworkService NetworkService
@inject NotificationsLoadedService NotificationsLoadedService
<div class="container animated-navbar @(IsVisible ? "show-nav" : "hide-nav") @(IsVisible ? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
@@ -55,8 +57,8 @@
<MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add"/>
</ActivatorContent>
<ChildContent>
<MudMenuItem OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
<MudMenuItem OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
<MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateUser()">Nuovo contatto</MudMenuItem>
<MudMenuItem Disabled="!NetworkService.IsNetworkAvailable()" OnClick="() => CreateActivity()">Nuova attivit<69></MudMenuItem>
</ChildContent>
</MudMenu>
}

View File

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

View File

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

View File

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

View File

@@ -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,8 +149,7 @@ else
await Task.Run(async () =>
{
var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodJcom = CodJcom });
ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
.OrderBy(x =>
ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
(x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
).ToList();
});

View File

@@ -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 */

View File

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

View File

@@ -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">

View File

@@ -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;

View File

@@ -24,18 +24,18 @@
Back="true"
BackOnTop="true"
Title=""
ShowProfile="false" />
ShowProfile="false"/>
@if (IsLoading)
{
<SpinnerLayout FullScreen="true" />
<SpinnerLayout FullScreen="true"/>
}
else
{
<div class="container content" style="overflow: auto;" id="topPage">
<div class="container content pb-safe-area" style="overflow: auto;" id="topPage">
<div class="container-primary-info">
<div class="section-primary-info">
<MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold" Color="Color.Secondary">
<MudAvatar Style="height: 70px; width: 70px; font-size: 2rem; font-weight: bold" Variant="@(IsContact ? Variant.Filled : Variant.Outlined)" Color="Color.Secondary">
@UtilityString.ExtractInitials(Anag.RagSoc)
</MudAvatar>
@@ -55,44 +55,49 @@ else
<div class="divider"></div>
<div class="section-info">
@if (Agente != null)
{
<div class="section-personal-info">
<div>
<span class="info-title">Agente</span>
<span class="info-text">@Agente.FullName</span>
</div>
</div>
}
@if (!string.IsNullOrEmpty(Anag.Telefono))
{
<div class="section-personal-info">
<div>
<span class="info-title">Telefono</span>
<span class="info-text">@Anag.Telefono</span>
</div>
</div>
}
@if (!string.IsNullOrEmpty(Anag.PartIva))
{
<div class="section-personal-info">
<div>
<span class="info-title">P. IVA</span>
<span class="info-text">@Anag.PartIva</span>
</div>
}
</div>
}
<div class="section-personal-info">
@if (!string.IsNullOrEmpty(Anag.EMail))
{
<div class="section-personal-info">
<div>
<span class="info-title">E-mail</span>
<span class="info-text">@Anag.EMail</span>
</div>
}
@if (Agente != null)
{
<div>
<span class="info-title">Agente</span>
<span class="info-text">@Agente.FullName</span>
</div>
}
</div>
</div>
</div>
<div class="tab-section">
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
@@ -119,7 +124,7 @@ else
<div class="container-pers-rif">
@foreach (var person in PersRif)
{
<ContactCard Contact="person" />
<ContactCard Contact="person"/>
@if (person != PersRif.Last())
{
<div class="divider"></div>
@@ -129,9 +134,12 @@ else
}
<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
@@ -143,28 +151,30 @@ else
<div class="tab-content" style="display: @(ActiveTab == 1 ? "block" : "none")">
@if (IsLoadingCommesse)
{
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
}
else if (Commesse?.Count == 0)
{
<NoDataAvailable Text="Nessuna commessa presente" />
<NoDataAvailable Text="Nessuna commessa presente"/>
}
else if (Commesse != null)
{
<!-- Filtri e ricerca -->
<div class="input-card clearButton">
<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" />
DebounceInterval="500"/>
</div>
<div class="commesse-container">
@if (IsLoadingSteps)
{
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3" />
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-3"/>
}
@foreach (var commessa in CurrentPageCommesse)
@@ -172,14 +182,14 @@ else
<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" />
<CommessaCard Steps="@steps" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
}
else
{
<CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa" />
<CommessaCard Steps="null" RagSoc="@Anag.RagSoc" Commessa="commessa"/>
@if (IsLoadingStep(commessa.CodJcom))
{
<MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;" />
<MudProgressLinear Indeterminate="true" Color="Color.Primary" Class="my-1" Style="height: 2px;"/>
}
}
</div>
@@ -190,7 +200,7 @@ else
<div class="custom-pagination">
<MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
@bind-Selected="SelectedPageCommesse"
Color="Color.Primary" />
Color="Color.Primary"/>
</div>
<div class="SelectedPageSize">
@@ -213,28 +223,30 @@ else
<div class="tab-content" style="display: @(ActiveTab == 2 ? "block" : "none")">
@if (ActivityIsLoading)
{
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7"/>
}
else if (ActivityList?.Count == 0)
{
<NoDataAvailable Text="Nessuna attivit<69> presente" />
<NoDataAvailable Text="Nessuna attivit<69> presente"/>
}
else if (ActivityList != null)
{
<!-- Filtri e ricerca -->
<div class="input-card clearButton">
<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" />
DebounceInterval="500"/>
</div>
<div class="attivita-container">
@foreach (var activity in CurrentPageActivity)
{
<ActivityCard ShowDate="true" Activity="activity" />
<ActivityCard ShowDate="true" Activity="activity"/>
}
@if (TotalPagesActivity > 1)
@@ -242,7 +254,7 @@ else
<div class="custom-pagination">
<MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesActivity"
@bind-Selected="CurrentPageActivityIndex"
Color="Color.Primary" />
Color="Color.Primary"/>
</div>
<div class="SelectedPageSize">
@@ -263,9 +275,10 @@ else
</div>
<MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
<MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp" />
<MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp"/>
</MudScrollToTop>
</div>
</div>
}
@code {
@@ -523,8 +536,7 @@ else
await Task.Run(async () =>
{
var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
.OrderByDescending(x =>
ActivityList = (await ManageData.MapActivity(activities)).OrderByDescending(x =>
(x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
).ToList();
});
@@ -773,7 +785,16 @@ else
{
var result = await ModalHelpers.OpenUserForm(Dialog, anag);
if (result is { Canceled: false })
if (result is { Canceled: false, Data: not null } && result.Data.GetType() == typeof(AnagClie))
{
var clie = (AnagClie)result.Data;
IsContact = true;
CodContact = clie.CodAnag!;
await LoadAnagAsync();
SaveDataToSession();
}
else if (result is { Canceled: false })
{
await LoadAnagAsync();
SaveDataToSession();
@@ -781,4 +802,5 @@ else
}
#endregion
}

View File

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

View File

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

View File

@@ -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 98%);
}
.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 98%);
}
.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 98%);
}
.activity-left-section {
display: flex;

View File

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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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:

View File

@@ -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;

View File

@@ -1,5 +1,4 @@
@using System.Globalization
@using System.Text.RegularExpressions
@using CommunityToolkit.Mvvm.Messaging
@using salesbook.Shared.Components.Layout
@using salesbook.Shared.Components.Layout.Overlay
@@ -40,18 +39,26 @@
<div class="form-container">
<span class="disable-full-width">Commessa</span>
@if (ActivityModel.CodJcom != null && SelectedComessa == null)
{
<MudSkeleton />
}
else
{
<MudAutocomplete
Disabled="ActivityModel.Cliente.IsNullOrEmpty()"
T="JtbComt?"
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>
@@ -90,19 +97,28 @@
<div class="input-card">
<div class="form-container">
<span class="disable-full-width">Assegnata a</span>
@if (ActivityModel.UserName != null && SelectedUser == null)
{
<MudSkeleton />
}
else
{
<MudAutocomplete
Disabled="Users.IsNullOrEmpty()"
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 +126,19 @@
<div class="form-container">
<span class="disable-full-width">Tipo</span>
@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>
@@ -167,6 +190,8 @@
}
</div>
@if (!IsView)
{
<div class="container-button">
<MudButton Class="button-settings green-icon"
FullWidth="true"
@@ -202,6 +227,7 @@
</MudButton>
}
</div>
}
</div>
<MudMessageBox @ref="ConfirmDelete" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
@@ -215,30 +241,6 @@
</MudButton>
</YesButton>
</MudMessageBox>
<MudMessageBox @ref="AddNamePosition" Class="c-messageBox" Title="Nome della posizione" CancelText="Annulla">
<MessageContent>
<MudTextField @bind-Value="NamePosition" Variant="Variant.Outlined"/>
</MessageContent>
<YesButton>
<MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.Check">
Salva
</MudButton>
</YesButton>
</MudMessageBox>
<MudMessageBox @ref="ConfirmMemo" Class="c-messageBox" Title="Attenzione!" CancelText="Annulla">
<MessageContent>
Vuoi creare un promemoria?
</MessageContent>
<YesButton>
<MudButton Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.Check">
Crea
</MudButton>
</YesButton>
</MudMessageBox>
</DialogContent>
</MudDialog>
@@ -279,12 +281,9 @@
//MessageBox
private MudMessageBox ConfirmDelete { get; set; }
private MudMessageBox ConfirmMemo { get; set; }
private MudMessageBox AddNamePosition { get; set; }
//Attached
private List<AttachedDTO>? AttachedList { get; set; }
private string? NamePosition { get; set; }
private bool CanAddPosition { get; set; } = true;
// cache per commesse
@@ -394,13 +393,15 @@
{
return Task.Run(async () =>
{
if (!IsNew && Id != null)
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));
if (!IsNew && Id != null)
ActivityFileList = await IntegryApiService.GetActivityFile(Id);
ActivityResult = await ManageData.GetTable<StbActivityResult>();
Clienti = await ManageData.GetClienti(new WhereCondContact { FlagStato = "A" });
Pros = await ManageData.GetProspect();
@@ -514,7 +515,7 @@
if (com != null)
{
ActivityModel.CodJcom = com.CodJcom;
ActivityModel.Commessa = com.Descrizione;
ActivityModel.Commessa = com;
}
else
{
@@ -532,6 +533,20 @@
OnAfterChangeValue();
}
private async Task OnCommessaClear()
{
ActivityModel.Commessa = null;
ActivityModel.CodJcom = null;
StateHasChanged();
}
private async Task OnUserClear()
{
ActivityModel.UserName = null;
ActivityType = [];
StateHasChanged();
}
private void OnAfterChangeTimeBefore()
{
if (ActivityModel.EstimatedTime is not null)
@@ -569,6 +584,8 @@
private void OpenSelectEsito()
{
if (IsView) return;
if (!IsNew && (ActivityModel.UserName is null || !ActivityModel.UserName.Equals(UserSession.User.Username)))
{
Snackbar.Add("Non puoi inserire un esito per un'attività che non ti è stata assegnata.", Severity.Info);
@@ -627,16 +644,8 @@
var attached = (AttachedDTO)result.Data;
if (attached.Type == AttachedDTO.TypeAttached.Position)
{
CanAddPosition = false;
var resultNamePosition = await AddNamePosition.ShowAsync();
if (resultNamePosition is true)
attached.Description = NamePosition;
attached.Name = NamePosition!;
}
AttachedList ??= [];
AttachedList.Add(attached);

View File

@@ -4,10 +4,18 @@
@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"/>
@if (RequireNewName)
{
<MudTextField @bind-Value="NewName" Class="px-3" Variant="Variant.Outlined"/>
}
else
{
@if (!SelectTypePicture)
{
<div style="margin-bottom: 1rem;" class="content attached">
<MudFab Size="Size.Small" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.Image"
@@ -24,7 +32,30 @@
Label="Posizione" OnClick="OnPosition"/>
}
</div>
}
else
{
<div style="margin-bottom: 1rem;" class="content attached">
<MudFab Size="Size.Small" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.CameraAlt"
Label="Camera" OnClick="OnCamera"/>
<MudFab Size="Size.Small" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.Image"
Label="Galleria" OnClick="OnGallery"/>
</div>
}
}
</DialogContent>
<DialogActions>
@if (RequireNewName)
{
<MudButton Disabled="NewName.IsNullOrEmpty()" Class="my-3" Size="Size.Small" Variant="Variant.Filled" Color="Color.Primary"
StartIcon="@Icons.Material.Rounded.Check" OnClick="OnNewName">
Salva
</MudButton>
}
</DialogActions>
</MudDialog>
<SaveOverlay VisibleOverlay="VisibleOverlay" SuccessAnimation="SuccessAnimation"/>
@@ -40,34 +71,47 @@
private AttachedDTO? Attached { get; set; }
private bool RequireNewName { get; set; }
private bool SelectTypePicture { get; set; }
private string? _newName;
private string? NewName
{
get => _newName;
set
{
_newName = value;
StateHasChanged();
}
}
protected override async Task OnInitializedAsync()
{
SelectTypePicture = false;
RequireNewName = false;
Snackbar.Configuration.PositionClass = Defaults.Classes.Position.TopCenter;
_ = LoadData();
}
private async Task LoadData()
{
}
private async Task Save()
{
VisibleOverlay = true;
StateHasChanged();
SuccessAnimation = true;
StateHasChanged();
await Task.Delay(1250);
MudDialog.Close();
}
private async Task OnImage()
{
Attached = await AttachedService.SelectImage();
MudDialog.Close(Attached);
SelectTypePicture = true;
StateHasChanged();
}
private async Task OnCamera()
{
Attached = await AttachedService.SelectImageFromCamera();
RequireNewName = true;
StateHasChanged();
}
private async Task OnGallery()
{
Attached = await AttachedService.SelectImageFromGallery();
RequireNewName = true;
StateHasChanged();
}
private async Task OnFile()
@@ -79,6 +123,37 @@
private async Task OnPosition()
{
Attached = await AttachedService.SelectPosition();
RequireNewName = true;
StateHasChanged();
}
private void OnNewName()
{
switch (Attached.Type)
{
case AttachedDTO.TypeAttached.Position:
{
CanAddPosition = false;
Attached.Description = NewName!;
Attached.Name = NewName!;
break;
}
case AttachedDTO.TypeAttached.Image:
{
var extension = Path.GetExtension(Attached.Name);
Attached.Name = NewName! + extension;
break;
}
case AttachedDTO.TypeAttached.Document:
break;
default:
throw new ArgumentOutOfRangeException();
}
MudDialog.Close(Attached);
}

View File

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

View File

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

View File

@@ -6,7 +6,7 @@ namespace salesbook.Shared.Core.Dto.Activity;
public class ActivityDTO : StbActivity
{
public string? Commessa { get; set; }
public JtbComt? Commessa { get; set; }
public string? Cliente { get; set; }
public ActivityCategoryEnum Category { get; set; }
public bool Complete { get; set; }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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)

View File

@@ -25,12 +25,12 @@
<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="IntegryApiClient.Core" Version="1.2.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
<PackageReference Include="Microsoft.Maui.Essentials" Version="9.0.81" />
<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="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="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="MudBlazor.ThemeManager" Version="3.0.0" />
</ItemGroup>

View File

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

View File

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

View File

@@ -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;

View File

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

View File

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