MarcoE/TaskHybrid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implementato controllo conessione dispositivo e servizi. Completata pagination commesse e attività per cliente

Browse Source
This commit is contained in:
Marco Elefante
2025-09-08 10:24:50 +02:00
parent 014e2ffc41
commit 82d268d9f8
23 changed files with 530 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

337
salesbook.Shared/Components/Pages/User.razor
View File

@@ -7,6 +7,7 @@
@using salesbook.Shared.Components.Layout.Spinner
@using salesbook.Shared.Core.Dto
@using salesbook.Shared.Components.SingleElements
@using salesbook.Shared.Core.Dto.Activity
@using salesbook.Shared.Core.Dto.JobProgress
@using salesbook.Shared.Core.Dto.PageState
@implements IAsyncDisposable
@@ -93,6 +94,7 @@ else
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab1" checked="@(ActiveTab == 0)">
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab2" checked="@(ActiveTab == 1)">
<input type="radio" class="tab-toggle" name="tab-toggle" id="tab3" checked="@(ActiveTab == 2)">
<div class="box">
<ul class="tab-list">
@@ -102,6 +104,9 @@ else
<li class="tab-item">
<label class="tab-trigger" for="tab2" @onclick="() => SwitchTab(1)">Commesse</label>
</li>
<li class="tab-item">
<label class="tab-trigger" for="tab3" @onclick="() => SwitchTab(2)">Attivit<69></label>
</li>
</ul>
</div>
@@ -150,8 +155,8 @@ else
<MudTextField T="string?"
Placeholder="Cerca..."
Variant="Variant.Text"
@bind-Value="SearchTerm"
OnDebounceIntervalElapsed="() => ApplyFilters()"
@bind-Value="SearchTermCommesse"
OnDebounceIntervalElapsed="() => ApplyFiltersCommesse()"
DebounceInterval="500" />
</div>
@@ -179,46 +184,86 @@ else
</div>
}
@if (TotalPages > 1)
@if (TotalPagesCommesse > 1)
{
<div class="custom-pagination">
<MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPages"
@bind-Selected="CurrentPage"
Color="Color.Primary"/>
<MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesCommesse"
@bind-Selected="SelectedPageCommesse"
Color="Color.Primary" />
</div>
<div class="SelectedPageSize">
<MudSelect @bind-Value="SelectedPageSize"
<MudSelect @bind-Value="SelectedPageSizeCommesse"
Variant="Variant.Text"
Label="Elementi per pagina"
Dense="true"
Style="width: 100%;">
<MudSelectItem Value="5">5</MudSelectItem>
<MudSelectItem Value="10">10</MudSelectItem>
<MudSelectItem Value="20">15</MudSelectItem>
<MudSelectItem Value="15">15</MudSelectItem>
</MudSelect>
</div>
}
</div>
}
</div>
<MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
<MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp" />
</MudScrollToTop>
<!-- Tab Attivit<69> -->
<div class="tab-content" style="display: @(ActiveTab == 2 ? "block" : "none")">
@if (ActivityIsLoading)
{
<MudProgressLinear Color="Color.Primary" Indeterminate="true" Class="my-7" />
}
else if (ActivityList?.Count == 0)
{
<NoDataAvailable Text="Nessuna attivit<69> presente" />
}
else if (ActivityList != null)
{
<!-- Filtri e ricerca -->
<div class="input-card clearButton">
<MudTextField T="string?"
Placeholder="Cerca..."
Variant="Variant.Text"
@bind-Value="SearchTermActivity"
OnDebounceIntervalElapsed="() => ApplyFiltersActivity()"
DebounceInterval="500" />
</div>
<div class="attivita-container">
@foreach (var activity in CurrentPageActivity)
{
<ActivityCard ShowDate="true" Activity="activity" />
}
@* <div class="commesse-stats mt-4">
<MudChip T="string" Size="Size.Small" Color="Color.Info">
Visualizzate: @CurrentPageCommesse.Count() / @FilteredCommesse.Count()
</MudChip>
@if (!string.IsNullOrEmpty(SearchTerm))
{
<MudChip T="string" Size="Size.Small" Color="Color.Warning" OnClose="ClearSearch">
Filtro: "@SearchTerm"
</MudChip>
}
</div> *@
@if (TotalPagesActivity > 1)
{
<div class="custom-pagination">
<MudPagination BoundaryCount="1" MiddleCount="1" Count="@TotalPagesActivity"
@bind-Selected="CurrentPageActivityIndex"
Color="Color.Primary" />
</div>
<div class="SelectedPageSize">
<MudSelect @bind-Value="SelectedPageSizeActivity"
Variant="Variant.Text"
Label="Elementi per pagina"
Dense="true"
Style="width: 100%;">
<MudSelectItem Value="5">5</MudSelectItem>
<MudSelectItem Value="15">15</MudSelectItem>
<MudSelectItem Value="30">30</MudSelectItem>
</MudSelect>
</div>
}
</div>
}
</div>
</div>
<MudScrollToTop Selector="#topPage" VisibleCssClass="visible absolute" TopOffset="100" HiddenCssClass="invisible">
<MudFab Size="Size.Small" Color="Color.Primary" StartIcon="@Icons.Material.Rounded.KeyboardArrowUp" />
</MudScrollToTop>
</div>
}
@@ -230,75 +275,77 @@ else
private ContactDTO Anag { get; set; } = new();
private List<PersRifDTO>? PersRif { get; set; }
private List<JtbComt>? Commesse { get; set; }
private List<ActivityDTO> ActivityList { get; set; } = [];
private StbUser? Agente { get; set; }
private Dictionary<string, List<CRMJobStepDTO>?> Steps { get; set; } = new();
// Stati di caricamento
private bool IsLoading { get; set; } = true;
private bool IsLoadingCommesse { get; set; } = true;
private bool IsLoadingSteps { get; set; } = false;
private readonly HashSet<string> _loadingSteps = new();
private bool ActivityIsLoading { get; set; } = true;
private bool IsLoadingSteps { get; set; }
private readonly HashSet<string> _loadingSteps = [];
// Gestione tab
private int ActiveTab { get; set; } = 0;
private int ActiveTab { get; set; }
// Paginazione e filtri
private int _currentPage = 1;
private int _selectedPageSize = 5;
private string _searchTerm = string.Empty;
private List<JtbComt> _filteredCommesse = new();
// Paginazione e filtri per COMMESSE
private int _selectedPageCommesse = 1;
private int _selectedPageSizeCommesse = 5;
private string _searchTermCommesse = string.Empty;
private List<JtbComt> _filteredCommesse = [];
// Paginazione e filtri per ATTIVIT<49>
private int _currentPageActivity = 1;
private int _selectedPageSizeActivity = 5;
private string _searchTermActivity = string.Empty;
private List<ActivityDTO> _filteredActivity = [];
// Cancellation tokens per gestire le richieste asincrone
private CancellationTokenSource? _loadingCts;
private CancellationTokenSource? _stepsCts;
// Timer per il debounce della ricerca
private Timer? _searchTimer;
private Timer? _searchTimerCommesse;
private Timer? _searchTimerActivity;
private const int SearchDelayMs = 300;
#region Properties
#region Properties per Commesse
private int CurrentPage
private int SelectedPageCommesse
{
get => _currentPage;
get => _selectedPageCommesse;
set
{
if (_currentPage != value)
{
_currentPage = value;
_ = LoadStepsForCurrentPageAsync();
}
if (_selectedPageCommesse == value) return;
_selectedPageCommesse = value;
_ = LoadStepsForCurrentPageAsync();
}
}
private int SelectedPageSize
private int SelectedPageSizeCommesse
{
get => _selectedPageSize;
get => _selectedPageSizeCommesse;
set
{
if (_selectedPageSize != value)
{
_selectedPageSize = value;
_currentPage = 1;
ApplyFilters();
_ = LoadStepsForCurrentPageAsync();
}
if (_selectedPageSizeCommesse == value) return;
_selectedPageSizeCommesse = value;
_selectedPageCommesse = 1;
ApplyFiltersCommesse();
_ = LoadStepsForCurrentPageAsync();
}
}
private string SearchTerm
private string SearchTermCommesse
{
get => _searchTerm;
get => _searchTermCommesse;
set
{
if (_searchTerm != value)
{
_searchTerm = value;
if (_searchTermCommesse == value) return;
_searchTermCommesse = value;
// Debounce della ricerca
_searchTimer?.Dispose();
_searchTimer = new Timer(async _ => await InvokeAsync(ApplyFilters), null, SearchDelayMs, Timeout.Infinite);
}
_searchTimerCommesse?.Dispose();
_searchTimerCommesse = new Timer(async _ => await InvokeAsync(ApplyFiltersCommesse), null, SearchDelayMs, Timeout.Infinite);
}
}
@@ -312,11 +359,67 @@ else
}
}
private int TotalPages =>
FilteredCommesse.Count == 0 ? 1 : (int)Math.Ceiling(FilteredCommesse.Count / (double)SelectedPageSize);
private int TotalPagesCommesse =>
FilteredCommesse.Count == 0 ? 1 : (int)Math.Ceiling(FilteredCommesse.Count / (double)SelectedPageSizeCommesse);
private IEnumerable<JtbComt> CurrentPageCommesse =>
FilteredCommesse.Skip((CurrentPage - 1) * SelectedPageSize).Take(SelectedPageSize);
FilteredCommesse.Skip((SelectedPageCommesse - 1) * SelectedPageSizeCommesse).Take(SelectedPageSizeCommesse);
#endregion
#region Properties per Attivit<69>
private int CurrentPageActivityIndex
{
get => _currentPageActivity;
set
{
if (_currentPageActivity == value) return;
_currentPageActivity = value;
StateHasChanged();
}
}
private int SelectedPageSizeActivity
{
get => _selectedPageSizeActivity;
set
{
if (_selectedPageSizeActivity == value) return;
_selectedPageSizeActivity = value;
_currentPageActivity = 1;
ApplyFiltersActivity();
}
}
private string SearchTermActivity
{
get => _searchTermActivity;
set
{
if (_searchTermActivity == value) return;
_searchTermActivity = value;
_searchTimerActivity?.Dispose();
_searchTimerActivity = new Timer(async _ => await InvokeAsync(ApplyFiltersActivity), null, SearchDelayMs, Timeout.Infinite);
}
}
private List<ActivityDTO> FilteredActivity
{
get => _filteredActivity;
set
{
_filteredActivity = value;
StateHasChanged();
}
}
private int TotalPagesActivity =>
FilteredActivity.Count == 0 ? 1 : (int)Math.Ceiling(FilteredActivity.Count / (double)SelectedPageSizeActivity);
private IEnumerable<ActivityDTO> CurrentPageActivity =>
FilteredActivity.Skip((CurrentPageActivityIndex - 1) * SelectedPageSizeActivity).Take(SelectedPageSizeActivity);
#endregion
@@ -339,7 +442,6 @@ else
}
catch (Exception ex)
{
// Log dell'errore
Console.WriteLine($"Errore in OnInitializedAsync: {ex.Message}");
}
finally
@@ -351,11 +453,12 @@ else
public async ValueTask DisposeAsync()
{
_loadingCts?.Cancel();
_loadingCts?.CancelAsync();
_loadingCts?.Dispose();
_stepsCts?.Cancel();
_stepsCts?.CancelAsync();
_stepsCts?.Dispose();
_searchTimer?.Dispose();
_searchTimerCommesse?.DisposeAsync();
_searchTimerActivity?.DisposeAsync();
}
#endregion
@@ -366,21 +469,18 @@ else
{
try
{
// Caricamento dati principali
await LoadAnagAsync();
await LoadPersRifAsync();
_ = LoadActivity();
// Caricamento agente
if (!string.IsNullOrEmpty(Anag.CodVage))
{
Agente = (await ManageData.GetTable<StbUser>(x => x.UserCode != null && x.UserCode.Equals(Anag.CodVage)))
.LastOrDefault();
}
// Salvataggio in sessione
SaveDataToSession();
// Caricamento commesse in background
_ = Task.Run(async () => await LoadCommesseAsync());
}
catch (Exception ex)
@@ -393,12 +493,12 @@ else
{
if (IsContact)
{
var clie = (await ManageData.GetTable<AnagClie>(x => x.CodAnag.Equals(CodContact))).Last();
var clie = (await ManageData.GetTable<AnagClie>(x => x.CodAnag!.Equals(CodContact))).Last();
Anag = Mapper.Map<ContactDTO>(clie);
}
else
{
var pros = (await ManageData.GetTable<PtbPros>(x => x.CodPpro.Equals(CodContact))).Last();
var pros = (await ManageData.GetTable<PtbPros>(x => x.CodPpro!.Equals(CodContact))).Last();
Anag = Mapper.Map<ContactDTO>(pros);
}
}
@@ -407,16 +507,35 @@ else
{
if (IsContact)
{
var pers = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag.Equals(Anag.CodContact));
var pers = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag!.Equals(Anag.CodContact));
PersRif = Mapper.Map<List<PersRifDTO>>(pers);
}
else
{
var pers = await ManageData.GetTable<PtbProsRif>(x => x.CodPpro.Equals(Anag.CodContact));
var pers = await ManageData.GetTable<PtbProsRif>(x => x.CodPpro!.Equals(Anag.CodContact));
PersRif = Mapper.Map<List<PersRifDTO>>(pers);
}
}
private async Task LoadActivity()
{
await Task.Run(async () =>
{
var activities = await IntegryApiService.RetrieveActivity(new CRMRetrieveActivityRequestDTO { CodAnag = Anag.CodContact });
ActivityList = Mapper.Map<List<ActivityDTO>>(activities)
.OrderByDescending(x =>
(x.EffectiveTime ?? x.EstimatedTime) ?? x.DataInsAct
).ToList();
});
UserState.Activitys = ActivityList;
ApplyFiltersActivity();
ActivityIsLoading = false;
StateHasChanged();
}
private async Task LoadCommesseAsync()
{
try
@@ -425,17 +544,14 @@ else
Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodContact));
// Ordinamento ottimizzato
Commesse = Commesse?
.OrderByDescending(x => x.LastUpd ?? DateTime.MinValue)
.ThenByDescending(x => x.CodJcom)
.OrderByDescending(x => x.CodJcom)
.ToList();
UserState.Commesse = Commesse;
ApplyFilters();
ApplyFiltersCommesse();
// Caricamento steps per la prima pagina
await LoadStepsForCurrentPageAsync();
}
catch (Exception ex)
@@ -455,11 +571,14 @@ else
PersRif = UserState.PersRif;
Commesse = UserState.Commesse;
Agente = UserState.Agente;
Steps = UserState.Steps ?? new Dictionary<string, List<CRMJobStepDTO>?>();
Steps = UserState.Steps;
ActivityList = UserState.Activitys;
ApplyFilters();
ApplyFiltersCommesse();
ApplyFiltersActivity();
IsLoadingCommesse = false;
ActivityIsLoading = false;
}
private void SaveDataToSession()
@@ -469,6 +588,7 @@ else
UserState.PersRif = PersRif;
UserState.Agente = Agente;
UserState.Steps = Steps;
UserState.Activitys = ActivityList;
}
#endregion
@@ -560,30 +680,32 @@ else
{
ActiveTab = tabIndex;
// Se si passa alle commesse e non sono ancora state caricate
if (tabIndex == 1 && Commesse == null)
{
_ = Task.Run(async () => await LoadCommesseAsync());
} else if (tabIndex == 1 && Steps.IsNullOrEmpty())
}
else if (tabIndex == 1 && Steps.IsNullOrEmpty())
{
_ = Task.Run(async () => await LoadStepsForCurrentPageAsync());
}
else if (tabIndex == 2 && ActivityList?.Count == 0)
{
_ = Task.Run(async () => await LoadActivity());
}
}
private void ApplyFilters()
private void ApplyFiltersCommesse()
{
if (Commesse == null)
{
FilteredCommesse = new List<JtbComt>();
FilteredCommesse = [];
return;
}
var filtered = Commesse.AsEnumerable();
// Filtro per testo di ricerca
if (!string.IsNullOrWhiteSpace(SearchTerm))
if (!string.IsNullOrWhiteSpace(SearchTermCommesse))
{
var searchLower = SearchTerm.ToLowerInvariant();
var searchLower = SearchTermCommesse.ToLowerInvariant();
filtered = filtered.Where(c =>
c.CodJcom?.ToLowerInvariant().Contains(searchLower) == true ||
c.Descrizione?.ToLowerInvariant().Contains(searchLower) == true ||
@@ -591,21 +713,40 @@ else
}
FilteredCommesse = filtered.ToList();
if (SelectedPageCommesse > TotalPagesCommesse && TotalPagesCommesse > 0) _selectedPageCommesse = 1;
// Reset della pagina se necessario
if (CurrentPage > TotalPages && TotalPages > 0)
{
_currentPage = 1;
}
// Carica gli steps per la pagina corrente
_ = LoadStepsForCurrentPageAsync();
}
private void ClearSearch()
private void ApplyFiltersActivity()
{
SearchTerm = string.Empty;
ApplyFilters();
var filtered = ActivityList.AsEnumerable();
if (!string.IsNullOrWhiteSpace(SearchTermActivity))
{
var searchLower = SearchTermActivity.ToLowerInvariant();
filtered = filtered.Where(a =>
a.ActivityDescription?.ToLowerInvariant().Contains(searchLower) == true ||
a.ActivityId?.ToLowerInvariant().Contains(searchLower) == true);
}
FilteredActivity = filtered.ToList();
if (CurrentPageActivityIndex > TotalPagesActivity && TotalPagesActivity > 0)
{
_currentPageActivity = 1;
}
}
private void ClearSearchCommesse()
{
SearchTermCommesse = string.Empty;
ApplyFiltersCommesse();
}
private void ClearSearchActivity()
{
SearchTermActivity = string.Empty;
ApplyFiltersActivity();
}
#endregion
@@ -629,12 +770,10 @@ else
if (result is { Canceled: false })
{
// Aggiorna i dati se necessario
await LoadAnagAsync();
SaveDataToSession();
}
}
#endregion
}